From 05121b3d0658956744df7ceba3a070b036fa445f Mon Sep 17 00:00:00 2001 From: IluaAir Date: Sun, 22 Jun 2025 12:01:04 +0300 Subject: [PATCH] add dep user in db, fix typecheck --- src/api/dependancies.py | 10 ++++++++-- src/models/tasks.py | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/api/dependancies.py b/src/api/dependancies.py index 77745be..b3276b6 100644 --- a/src/api/dependancies.py +++ b/src/api/dependancies.py @@ -1,14 +1,20 @@ -from typing import Annotated +from typing import Annotated, AsyncGenerator from fastapi import Depends +from fastapi_users_db_sqlalchemy import SQLAlchemyUserDatabase from sqlalchemy.ext.asyncio import AsyncSession from src.db.database import async_session_maker +from src.models import UsersORM -async def get_db(): +async def get_db() -> AsyncGenerator[AsyncSession, None]: async with async_session_maker as db: yield db DBDep = Annotated[AsyncSession, Depends(get_db)] + + +async def get_user_db(session: DBDep): + yield SQLAlchemyUserDatabase(session, UsersORM) diff --git a/src/models/tasks.py b/src/models/tasks.py index 2c4950d..e10bfe1 100644 --- a/src/models/tasks.py +++ b/src/models/tasks.py @@ -6,14 +6,14 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from src.db.database import Base +if TYPE_CHECKING: + from src.models.users import UsersORM status_enum = Enum("open", "closed", "in_progress", "todo", name="status_enum") priority_enum = Enum("low", "medium", "high", "critical", name="priority_enum") class TasksORM(Base): - if TYPE_CHECKING: - from src.models.users import UsersORM __tablename__ = "tasks" id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)