fixed dependencies and refactored typing

Author: proafxin

.coveragerc

@@ -20,12 +20,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@master
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@master
         with:
           python-version: ${{ matrix.python-version }}
       - name: Tox
@@ -34,11 +34,11 @@ jobs:
           python -m pip install -U tox
           tox
       - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
-      
+        uses: trunk-io/trunk-action@main
+
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        
+        uses: codecov/codecov-action@main
+
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: ./

.github/workflows/python-package.yml renamed to .github/workflows/ci.yml

@@ -16,6 +16,7 @@ aiomysql = "^0.2.0"
 aiosqlite = "^0.19.0"
 fastapi-cli = "^0.0.4"
 fastapi = "^0.111.0"
+cryptography = "^42.0.8"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"

poetry.lock

@@ -1,4 +1,5 @@
 import asyncio
+from typing import AsyncGenerator
 
 import pytest
 import pytest_asyncio
@@ -14,16 +15,12 @@
 
 SQLALCHEMY_DATABASE_URL = "sqlite+aiosqlite:///./test_db.db"
 
-engine = create_async_engine(
-    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
-)
-
-SessionTesting = sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
+engine = create_async_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
 
 
 @pytest_asyncio.fixture(scope="class")
 async def app():
-    session = SessionTesting()
+    session = sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)()
     app_test = FastAPI()
     app_test.dependency_overrides[get_db] = lambda: session
     app_test.include_router(bug_router)
@@ -35,7 +32,7 @@ async def app():
 
 
 @pytest_asyncio.fixture(scope="class")
-async def client(app: FastAPI) -> AsyncClient:
+async def client(app: FastAPI) -> AsyncGenerator[AsyncClient, None]:
     async with engine.begin() as conn:
         await conn.run_sync(Base.metadata.create_all)
 

pyproject.toml

@@ -16,9 +16,7 @@ platform =
 passenv = *
 basepython = python3
 recreate = false
-
-deps =
-    poetry >= 1.3.2
+deps = poetry
 
 commands =
     poetry install
@@ -28,8 +26,8 @@ commands =
 
 commands =
     poetry install --with dev
-    poetry run coverage run --source=. -m pytest -v
-    poetry run coverage report -m
+    poetry run coverage run --source=. -m pytest
+    poetry run coverage report -m --fail-under=85
     poetry run coverage xml -o coverage.xml
 
 ; [testenv:docs-win32]

tests/conftest.py

@@ -4,5 +4,4 @@
 DBUSER = environ["MYSQL_USER"]
 DBPASSWORD = environ["MYSQL_PASSWORD"]
 DBHOST = environ["MYSQL_HOST"]
-DBPORT = environ["MYSQL_PORT"]
-DBPORT = int(DBPORT)
+DBPORT = int(environ["MYSQL_PORT"])

tox.ini

@@ -8,18 +8,18 @@
 from tracker.views.story import router as story_router
 
 
-def configure_router():
+async def configure_router():
     app.include_router(story_router)
     app.include_router(bug_router)
 
 
 async def configure():
-    configure_router()
+    await configure_router()
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
-    configure()
+    await configure()
     yield
     await engine.dispose()
 

tracker/config/settings.py

@@ -9,9 +9,7 @@ class Base(BaseModel):
     __abstract__ = True
 
     id: Mapped[int] = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    created_at: Mapped[TIMESTAMP] = Column(
-        TIMESTAMP, server_default=func.now(), index=True
-    )
+    created_at: Mapped[TIMESTAMP] = Column(TIMESTAMP, server_default=func.now(), index=True)
     updated_at: Mapped[TIMESTAMP] = Column(
         TIMESTAMP,
         server_default=func.now(),

tracker/main.py

@@ -1,5 +1,7 @@
+from typing import Annotated
+
 from fastapi import APIRouter, Depends
-from sqlalchemy.orm import Session
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from tracker.db.session import get_db
 from tracker.serializers.bug import BugInput, BugOutput
@@ -10,23 +12,19 @@
 
 
 @router.post("/bugs/", response_model=BugOutput)
-# trunk-ignore(ruff/B008)
-async def create(bug: BugInput, db: Session = Depends(get_db)):
+async def create(bug: BugInput, db: Annotated[AsyncSession, Depends(get_db)]):
     obj = await create_bug(db=db, bug=bug)
 
     return obj
 
 
 @router.get("/bugs/", response_model=list[BugOutput])
-# trunk-ignore(ruff/B008)
-async def get(skip: int = 0, limit: int = 10, db: Session = Depends(get_db)):
+async def get(db: Annotated[AsyncSession, Depends(get_db)], skip: int = 0, limit: int = 10):
     return await bugs(db=db, skip=skip, limit=limit)
 
 
 @router.get("/bugs/{id}", response_model=BugOutput)
-# trunk-ignore(ruff/B008)
-async def get_bug(id: int, db: Session = Depends(get_db)):
+async def get_bug(id: int, db: Annotated[AsyncSession, Depends(get_db)]):
     obj = await bug_by_id(db=db, id=id)
-    print(obj)
 
     return obj