chore: run lint and prettifier

This commit is contained in:
3252a8
2026-05-12 21:54:12 +03:00
parent f31540afdb
commit 11187487b4
174 changed files with 12383 additions and 6688 deletions
+36 -24
View File
@@ -1,14 +1,14 @@
import logging
from typing import Optional, List
from typing import List, Optional
from sqlalchemy import func, or_
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.future import select
from sqlalchemy import func, or_
from ..models import MessageLog, User
from ..models import MessageLog
async def create_message_log(session: AsyncSession,
log_data: dict) -> Optional[MessageLog]:
async def create_message_log(session: AsyncSession, log_data: dict) -> Optional[MessageLog]:
try:
log_entry = await create_message_log_no_commit(session, log_data)
@@ -17,15 +17,12 @@ async def create_message_log(session: AsyncSession,
return log_entry
except Exception as e:
await session.rollback()
logging.error(f"Failed to create and commit message log: {e}",
exc_info=True)
logging.error(f"Failed to create and commit message log: {e}", exc_info=True)
return None
async def get_all_message_logs(session: AsyncSession, limit: int,
offset: int) -> List[MessageLog]:
stmt = select(MessageLog).order_by(
MessageLog.timestamp.desc()).limit(limit).offset(offset)
async def get_all_message_logs(session: AsyncSession, limit: int, offset: int) -> List[MessageLog]:
stmt = select(MessageLog).order_by(MessageLog.timestamp.desc()).limit(limit).offset(offset)
result = await session.execute(stmt)
return result.scalars().all()
@@ -36,30 +33,45 @@ async def count_all_message_logs(session: AsyncSession) -> int:
return result.scalar_one()
async def get_user_message_logs(session: AsyncSession, user_id_to_search: int,
limit: int, offset: int) -> List[MessageLog]:
stmt = (select(MessageLog).where(
or_(MessageLog.user_id == user_id_to_search,
MessageLog.target_user_id == user_id_to_search)).order_by(
MessageLog.timestamp.desc()).limit(limit).offset(offset))
async def get_user_message_logs(
session: AsyncSession, user_id_to_search: int, limit: int, offset: int
) -> List[MessageLog]:
stmt = (
select(MessageLog)
.where(
or_(
MessageLog.user_id == user_id_to_search,
MessageLog.target_user_id == user_id_to_search,
)
)
.order_by(MessageLog.timestamp.desc())
.limit(limit)
.offset(offset)
)
result = await session.execute(stmt)
return result.scalars().all()
async def count_user_message_logs(session: AsyncSession,
user_id_to_search: int) -> int:
stmt = (select(func.count()).select_from(MessageLog).where(
or_(MessageLog.user_id == user_id_to_search,
MessageLog.target_user_id == user_id_to_search)))
async def count_user_message_logs(session: AsyncSession, user_id_to_search: int) -> int:
stmt = (
select(func.count())
.select_from(MessageLog)
.where(
or_(
MessageLog.user_id == user_id_to_search,
MessageLog.target_user_id == user_id_to_search,
)
)
)
result = await session.execute(stmt)
return result.scalar_one()
async def create_message_log_no_commit(session: AsyncSession,
log_data: dict) -> MessageLog:
async def create_message_log_no_commit(session: AsyncSession, log_data: dict) -> MessageLog:
if log_data.get("target_user_id"):
from .user_dal import get_user_by_id
target_user = await get_user_by_id(session, log_data["target_user_id"])
if not target_user:
logging.warning(