From e0ff94090dbbf7589903e6f336b1fa275f1ad326 Mon Sep 17 00:00:00 2001 From: MAGICX Date: Wed, 4 Dec 2024 17:20:52 +0500 Subject: [PATCH] refactor: ruff --- backend/app/api/v1/endpoints/overlay.py | 3 +++ backend/app/crud/overlay.py | 3 +++ backend/app/db/session.py | 2 ++ backend/app/schemas/overlay.py | 12 +++++------- backend/app/settings.py | 16 +++++++++------- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/backend/app/api/v1/endpoints/overlay.py b/backend/app/api/v1/endpoints/overlay.py index 2500d6f..2c76578 100644 --- a/backend/app/api/v1/endpoints/overlay.py +++ b/backend/app/api/v1/endpoints/overlay.py @@ -7,14 +7,17 @@ router = APIRouter() + @router.get("/", response_model=list[OverlaySchema]) async def get_overlays(session: AsyncSession = Depends(get_db)): return await overlay.get_overlays(session) + @router.get("/{overlay_id}", response_model=OverlaySchema) async def get_overlay(overlay_id: str, session: AsyncSession = Depends(get_db)): return await overlay.get_overlay(overlay_id, session) + @router.post("/", response_model=OverlaySchema) async def add_overlay(overlay: OverlayCreate, session: AsyncSession = Depends(get_db)): return await overlay.add_overlay(overlay, session) diff --git a/backend/app/crud/overlay.py b/backend/app/crud/overlay.py index 114f400..16c3860 100644 --- a/backend/app/crud/overlay.py +++ b/backend/app/crud/overlay.py @@ -4,17 +4,20 @@ from app.models.overlay import Overlay from app.schemas.overlay import OverlayCreate + async def get_overlays(session: AsyncSession) -> list[Overlay]: result = await session.execute(select(Overlay)) overlays = result.scalars().all() return overlays + async def get_overlay(overlay_id: str, session: AsyncSession) -> Overlay: overlay = await session.get(Overlay, overlay_id) if overlay is None: raise HTTPException(status_code=404, detail="Overlay not found") return overlay + async def add_overlay(overlay_data: OverlayCreate, session: AsyncSession) -> Overlay: new_overlay = Overlay(**overlay_data.dict()) session.add(new_overlay) diff --git a/backend/app/db/session.py b/backend/app/db/session.py index cb1fe38..3fe3dee 100644 --- a/backend/app/db/session.py +++ b/backend/app/db/session.py @@ -15,10 +15,12 @@ expire_on_commit=False, ) + async def get_db() -> AsyncSession: async with AsyncSessionLocal() as session: yield session + async def init_db(): async with engine.begin() as conn: await conn.run_sync(SQLModel.metadata.create_all) diff --git a/backend/app/schemas/overlay.py b/backend/app/schemas/overlay.py index 673826a..7e70a1d 100644 --- a/backend/app/schemas/overlay.py +++ b/backend/app/schemas/overlay.py @@ -10,16 +10,14 @@ class OverlaySchema(BaseModel): riot_id: str hdev_api_key: str - model_config = { - "from_attributes": True - } + model_config = {"from_attributes": True} + class OverlayCreate(OverlayBase): - pass + pass + class OverlayRead(OverlayBase): uuid: uuid_pkg.UUID - model_config = { - "from_attributes": True - } \ No newline at end of file + model_config = {"from_attributes": True} diff --git a/backend/app/settings.py b/backend/app/settings.py index 75d3f36..65fcc4a 100644 --- a/backend/app/settings.py +++ b/backend/app/settings.py @@ -3,22 +3,24 @@ from dotenv import load_dotenv + def str_to_bool(value: str) -> bool: return value.lower() in ("true", "1", "yes") + BASE_DIR: str = Path(__file__).resolve().parent.parent.parent -dotenv_file: str = BASE_DIR / '.env' +dotenv_file: str = BASE_DIR / ".env" if dotenv_file.is_file(): load_dotenv(dotenv_file) else: - raise ImportError('⚠ .env was not found') - + raise ImportError("⚠ .env was not found") + DEBUG: bool = str_to_bool(environ.get("DEBUG", "False")) -PROJECT_NAME: str = environ.get('PROJECT_NAME') -VERSION: str = environ.get('VERSION') +PROJECT_NAME: str = environ.get("PROJECT_NAME") +VERSION: str = environ.get("VERSION") -DATABASE_URL: str = environ.get('DATABASE_URL') -DEGUB_DATABASE_URL: str = environ.get('DEGUB_DATABASE_URL') \ No newline at end of file +DATABASE_URL: str = environ.get("DATABASE_URL") +DEGUB_DATABASE_URL: str = environ.get("DEGUB_DATABASE_URL")