db.py - Преобразован в контекстный менеджер, добавлены версии апи и автоподставка версии в зависимости от названия директории

Author: ProFastCode

app/api/__init__.py

@@ -4,7 +4,7 @@
 
 from fastapi import APIRouter
 
-from . import endpoints
+from . import v1
 
 api_router = APIRouter()
-api_router.include_router(endpoints.router)
+api_router.include_router(v1.router)

app/api/endpoints/__init__.py

@@ -0,0 +1,15 @@
+"""
+Endpoints API Module
+"""
+
+from pathlib import Path
+from fastapi import APIRouter
+
+from . import users
+
+FOLDER_NAME = f"{Path(__file__).parent.name}"
+
+router = APIRouter(prefix=f"/{FOLDER_NAME}", tags=[FOLDER_NAME])
+router.include_router(users.router)
+
+__all__ = ["router"]

app/api/v1/__init__.py

@@ -6,9 +6,9 @@
 
 from . import auth, create, retrieve
 
-router = APIRouter(prefix='/users', tags=['users'])
+router = APIRouter(prefix="/users", tags=["users"])
 router.include_router(auth.router)
 router.include_router(create.router)
 router.include_router(retrieve.router)
 
-__all__ = ['router']
+__all__ = ["router"]

app/api/endpoints/users/__init__.py renamed to app/api/v1/users/__init__.py

@@ -0,0 +1,8 @@
+from fastapi import APIRouter
+
+from . import token
+
+router = APIRouter(prefix="/auth", tags=["auth"])
+router.include_router(token.router)
+
+__all__ = ["router"]

app/api/v1/users/auth/__init__.py

@@ -4,12 +4,15 @@
 from app.models.token import AccessToken
 from app.models.user import UserCreate
 
-router = APIRouter(prefix='/auth')
+router = APIRouter(prefix="/token")
 
 
-@router.post('/token/', response_model=AccessToken)
+@router.post("/", response_model=AccessToken)
 async def token(data: UserCreate, logic: anotations.Logic):
     """
     Retrieve new access token
     """
     return await logic.users.generate_token(**data.model_dump())
+
+
+__all__ = ["router"]

app/api/endpoints/users/auth.py renamed to app/api/v1/users/auth/token.py

@@ -3,12 +3,15 @@
 from app.api import anotations
 from app.models.user import UserCreate, UserRead
 
-router = APIRouter(prefix='/create')
+router = APIRouter(prefix="/create")
 
 
-@router.post('/', response_model=UserRead)
+@router.post("/", response_model=UserRead)
 async def create(data: UserCreate, logic: anotations.Logic):
     """
     Create user
     """
     return await logic.users.create(**data.model_dump())
+
+
+__all__ = ["router"]

app/api/endpoints/users/create.py renamed to app/api/v1/users/create.py

@@ -10,9 +10,12 @@
 router = APIRouter()
 
 
-@router.get('/', response_model=UserRead)
+@router.get("/", response_model=UserRead)
 async def retrieve(user: anotations.CurrentUser):
     """
     Retrieve user
     """
     return user
+
+
+__all__ = ["router"]

app/api/endpoints/users/retrieve.py renamed to app/api/v1/users/retrieve.py

@@ -2,34 +2,40 @@
 Database
 """
 
-from sqlalchemy.ext.asyncio import (AsyncEngine, async_sessionmaker,
-                                    create_async_engine)
+from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker, create_async_engine
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from app import repositories as repos
 from app.core.settings import settings
 
 
-def get_async_engine() -> AsyncEngine:
-    engine: AsyncEngine = create_async_engine(
-        settings.pg_dsn.unicode_string(), echo=False, future=True
-    )
-    return engine
-
-
-SessionLocal = async_sessionmaker(
-    autocommit=False,
-    autoflush=False,
-    bind=get_async_engine(),
-    class_=AsyncSession,
-    expire_on_commit=False,
-)
-
-
 class Database:
-    def __init__(
-        self,
-        session: AsyncSession,
-    ):
-        self.session = session
-        self.user = repos.UserRepo(session=session)
+    session: AsyncSession
+
+    @classmethod
+    def __get_async_engine(cls) -> AsyncEngine:
+        return create_async_engine(
+            settings.pg_dsn.unicode_string(), echo=False, future=True
+        )
+
+    @classmethod
+    def __get_async_session(cls) -> async_sessionmaker[AsyncSession]:
+        return async_sessionmaker(
+            autocommit=False,
+            autoflush=False,
+            bind=cls.__get_async_engine(),
+            class_=AsyncSession,
+            expire_on_commit=False,
+        )
+
+    def __set_repositories(self):
+        self.user = repos.UserRepo(session=self.session)
+
+    async def __aenter__(self):
+        async with self.__get_async_session()() as session:
+            self.session = session
+        self.__set_repositories()
+        return self
+
+    async def __aexit__(self, exc_type, exc_value, traceback):
+        await self.session.close()

app/core/db.py

@@ -7,15 +7,15 @@
 from fastapi import Depends
 from fastapi.security import APIKeyHeader
 
-from app.core.db import Database, SessionLocal
+from app.core.db import Database
 from app.core.security import Security
 from app.logic import Logic
 from app.models.user import User
 
 
 async def get_db() -> AsyncGenerator[Database, Any]:
-    async with SessionLocal() as session:
-        yield Database(session)
+    async with Database() as db:
+        yield db
 
 
 async def get_security() -> Security: