style: reformat imports, whitespace and line breaks across project

This commit is contained in:
2026-07-30 16:18:15 +05:00
parent c3ad9a9918
commit ecc006287b
13 changed files with 118 additions and 101 deletions
+6 -1
View File
@@ -4,7 +4,12 @@ from contextlib import AbstractAsyncContextManager, asynccontextmanager
from pathlib import Path
from sqlalchemy import event
from sqlalchemy.ext.asyncio import AsyncAttrs, AsyncSession, async_sessionmaker, create_async_engine
from sqlalchemy.ext.asyncio import (
AsyncAttrs,
AsyncSession,
async_sessionmaker,
create_async_engine,
)
from sqlalchemy.orm import DeclarativeBase
from tgbot.data.config import PATH_DATABASE
+18 -14
View File
@@ -13,8 +13,12 @@ from tgbot.utils.const_functions import get_unix
class UserModel(Base):
__tablename__ = "storage_users"
increment: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
user_id: Mapped[int] = mapped_column(BigInteger, nullable=False, unique=True, index=True)
increment: Mapped[int] = mapped_column(
Integer, primary_key=True, autoincrement=True
)
user_id: Mapped[int] = mapped_column(
BigInteger, nullable=False, unique=True, index=True
)
user_login: Mapped[str] = mapped_column(String(255), nullable=False, default="")
user_name: Mapped[str] = mapped_column(String(255), nullable=False, default="")
user_surname: Mapped[str] = mapped_column(String(255), nullable=False, default="")
@@ -35,12 +39,12 @@ class UsersRepository(BaseRepository[UserModel]):
# Для совместимости add ведет себя как upsert
async def add(
self,
user_id: int,
user_login: str,
user_name: str,
user_surname: str,
user_fullname: str,
self,
user_id: int,
user_login: str,
user_name: str,
user_surname: str,
user_fullname: str,
) -> UserModel:
return await self.upsert(
user_id=user_id,
@@ -52,12 +56,12 @@ class UsersRepository(BaseRepository[UserModel]):
# Создание пользователя или обновление его данных по user_id
async def upsert(
self,
user_id: int,
user_login: str,
user_name: str,
user_surname: str,
user_fullname: str,
self,
user_id: int,
user_login: str,
user_name: str,
user_surname: str,
user_fullname: str,
) -> UserModel:
statement = insert(UserModel).values(
user_id=user_id,
+4 -4
View File
@@ -83,9 +83,7 @@ class BaseRepository(Generic[ModelTranslator]):
async with session_scope() as session:
await session.execute(
sqlalchemy_update(model)
.filter_by(**filters)
.values(**kwargs)
sqlalchemy_update(model).filter_by(**filters).values(**kwargs)
)
@@ -101,6 +99,8 @@ async def prepare_database() -> None:
try:
await SettingsRepository().ensure_default()
except SQLAlchemyError as error:
raise RuntimeError("База данных не готова. Запусти миграции командой: python migrate.py") from error
raise RuntimeError(
"База данных не готова. Запусти миграции командой: python migrate.py"
) from error
bot_logger.info("База данных готова")