refactor

Author: lesnik512

app/__main__.py

@@ -7,8 +7,9 @@
 
 if __name__ == "__main__":
     granian.Granian(  # type: ignore[attr-defined]
-        target="app.application:application",
-        address="0.0.0.0",  # noqa: S104
+        target="app.application:build_app",
+        factory=True,
+        address=settings.app_host,
         port=settings.app_port,
         interface=Interfaces.ASGI,
         log_level=LogLevels(settings.log_level),

app/application.py

@@ -35,6 +35,3 @@ def build_app() -> litestar.Litestar:
     )
     bootstrapper = LitestarBootstrapper(bootstrap_config=bootstrap_config)
     return bootstrapper.bootstrap()
-
-
-application = build_app()

app/schemas.py

@@ -17,8 +17,6 @@ class CardCreate(CardBase):
 
 
 class Card(CardBase):
-    model_config = pydantic.ConfigDict(from_attributes=True)
-
     id: PositiveInt
     deck_id: PositiveInt | None = None
 
@@ -37,8 +35,6 @@ class DeckCreate(DeckBase):
 
 
 class Deck(DeckBase):
-    model_config = pydantic.ConfigDict(from_attributes=True)
-
     id: PositiveInt
     cards: list[Card] | None
 

app/settings.py

@@ -15,6 +15,7 @@ class Settings(pydantic_settings.BaseSettings):
     db_max_overflow: int = 0
     db_pool_pre_ping: bool = True
 
+    app_host: str = "0.0.0.0"  # noqa: S104
     app_port: int = 8000
 
     opentelemetry_endpoint: str = ""

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - .:/code
       - /code/.venv
     ports:
-      - "8001:8000"
+      - "8000:8000"
     depends_on:
       db:
         condition: service_healthy

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
-name = "litestar-sqlalchemy-template"
+name = "fastapi-sqlalchemy-template"
 version = "0"
-description = "Async template on LiteStar and SQLAlchemy 2"
+description = "Async template on FastAPI and SQLAlchemy 2"
 readme = "README.md"
 requires-python = ">=3.13"
 authors = [
@@ -11,10 +11,10 @@ license = "MIT License"
 dependencies = [
     "litestar",
     "lite-bootstrap[litestar-all]",
+    "modern-di-litestar",
     "advanced-alchemy",
     "pydantic-settings",
-    "granian",
-    "modern-di-litestar",
+    "granian[uvloop]",
     # database
     "alembic",
     "psycopg2",
@@ -32,6 +32,7 @@ dev = [
     "pytest",
     "pytest-cov",
     "pytest-asyncio",
+    "asgi_lifespan",
     "ruff",
     "mypy",
     "asyncpg-stubs",

tests/conftest.py

@@ -1,29 +1,36 @@
 import typing
 
+import litestar
 import modern_di
 import modern_di_litestar
 import pytest
+from asgi_lifespan import LifespanManager
 from httpx import ASGITransport, AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app import ioc
-from app.application import application
+from app.application import build_app
 
 
 @pytest.fixture
-async def client() -> typing.AsyncIterator[AsyncClient]:
+async def app() -> typing.AsyncIterator[litestar.Litestar]:
+    app_ = build_app()
+    async with LifespanManager(app_):  # type: ignore[arg-type]
+        yield app_
+
+
+@pytest.fixture
+async def client(app: litestar.Litestar) -> typing.AsyncIterator[AsyncClient]:
     async with AsyncClient(
-        transport=ASGITransport(app=application),  # type: ignore[arg-type]
+        transport=ASGITransport(app=app),  # type: ignore[arg-type]
         base_url="http://test",
     ) as client:
         yield client
 
 
 @pytest.fixture
-async def di_container() -> typing.AsyncIterator[modern_di.Container]:
-    di_container_: typing.Final = modern_di_litestar.fetch_di_container(application)
-    async with di_container_:
-        yield di_container_
+def di_container(app: litestar.Litestar) -> modern_di.Container:
+    return modern_di_litestar.fetch_di_container(app)
 
 
 @pytest.fixture(autouse=True)

tests/factories.py

@@ -14,9 +14,5 @@ class CardModelFactory(SQLAlchemyFactory[models.Card]):
     id = None
 
 
-class DeckCreateSchemaFactory(ModelFactory[schemas.DeckCreate]):
-    __model__ = schemas.DeckCreate
-
-
 class CardCreateSchemaFactory(ModelFactory[schemas.CardCreate]):
     __model__ = schemas.CardCreate