migrate to modern-di 1.x (#37)

Author: lesnik512

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: astral-sh/setup-uv@v3
-      - run: uv python install 3.13
+      - run: uv python install 3.14
       - run: |
           uv sync --all-extras --frozen --no-install-project
           uv run ruff format . --check
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: astral-sh/setup-uv@v3
-      - run: uv python install 3.13
+      - run: uv python install 3.14
       - run: |
           uv sync --all-extras --frozen --no-install-project
           uv run alembic upgrade head

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-slim
+FROM python:3.14-slim
 
 # required for psycopg2
 RUN apt update \

app/api/decks.py

@@ -6,7 +6,7 @@
 from sqlalchemy import orm
 from starlette import status
 
-from app import ioc, models, schemas
+from app import models, schemas
 from app.repositories import CardsService, DecksService
 
 
@@ -15,7 +15,7 @@
 
 @ROUTER.get("/decks/")
 async def list_decks(
-    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
+    decks_service: DecksService = FromDI(DecksService),
 ) -> schemas.Decks:
     objects = await decks_service.list()
     return typing.cast("schemas.Decks", {"items": objects})
@@ -24,7 +24,7 @@ async def list_decks(
 @ROUTER.get("/decks/{deck_id}/")
 async def get_deck(
     deck_id: int,
-    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
+    decks_service: DecksService = FromDI(DecksService),
 ) -> schemas.Deck:
     instance = await decks_service.get_one_or_none(
         models.Deck.id == deck_id,
@@ -40,7 +40,7 @@ async def get_deck(
 async def update_deck(
     deck_id: int,
     data: schemas.DeckCreate,
-    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
+    decks_service: DecksService = FromDI(DecksService),
 ) -> schemas.Deck:
     try:
         instance = await decks_service.update(data=data.model_dump(), item_id=deck_id)
@@ -53,7 +53,7 @@ async def update_deck(
 @ROUTER.post("/decks/")
 async def create_deck(
     data: schemas.DeckCreate,
-    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
+    decks_service: DecksService = FromDI(DecksService),
 ) -> schemas.Deck:
     instance = await decks_service.create(data.model_dump())
     return typing.cast("schemas.Deck", instance)
@@ -62,7 +62,7 @@ async def create_deck(
 @ROUTER.get("/decks/{deck_id}/cards/")
 async def list_cards(
     deck_id: int,
-    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
+    cards_service: CardsService = FromDI(CardsService),
 ) -> schemas.Cards:
     objects = await cards_service.list(models.Card.deck_id == deck_id)
     return typing.cast("schemas.Cards", {"items": objects})
@@ -71,7 +71,7 @@ async def list_cards(
 @ROUTER.get("/cards/{card_id}/")
 async def get_card(
     card_id: int,
-    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
+    cards_service: CardsService = FromDI(CardsService),
 ) -> schemas.Card:
     instance = await cards_service.get_one_or_none(models.Card.id == card_id)
     if not instance:
@@ -83,7 +83,7 @@ async def get_card(
 async def create_cards(
     deck_id: int,
     data: list[schemas.CardCreate],
-    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
+    cards_service: CardsService = FromDI(CardsService),
 ) -> schemas.Cards:
     objects = await cards_service.create_many(
         data=[models.Card(**card.model_dump(), deck_id=deck_id) for card in data],
@@ -95,7 +95,7 @@ async def create_cards(
 async def update_cards(
     deck_id: int,
     data: list[schemas.Card],
-    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
+    cards_service: CardsService = FromDI(CardsService),
 ) -> schemas.Cards:
     objects = await cards_service.upsert_many(
         data=[models.Card(**card.model_dump(exclude={"deck_id"}), deck_id=deck_id) for card in data],

app/application.py

@@ -1,22 +1,28 @@
 import dataclasses
+from typing import TYPE_CHECKING
 
-import fastapi
+import modern_di
 import modern_di_fastapi
 from advanced_alchemy.exceptions import DuplicateKeyError
 from lite_bootstrap import FastAPIBootstrapper
 from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
 from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
 
-from app import exceptions
+from app import exceptions, ioc
 from app.api.decks import ROUTER
 from app.settings import settings
 
 
+if TYPE_CHECKING:
+    import fastapi
+
+
 def include_routers(app: fastapi.FastAPI) -> None:
     app.include_router(ROUTER, prefix="/api")
 
 
 def build_app() -> fastapi.FastAPI:
+    di_container = modern_di.AsyncContainer(groups=[ioc.Dependencies])
     bootstrap_config = dataclasses.replace(
         settings.api_bootstrapper_config,
         opentelemetry_instrumentors=[
@@ -26,7 +32,7 @@ def build_app() -> fastapi.FastAPI:
     )
     bootstrapper = FastAPIBootstrapper(bootstrap_config=bootstrap_config)
     app: fastapi.FastAPI = bootstrapper.bootstrap()
-    modern_di_fastapi.setup_di(app)
+    modern_di_fastapi.setup_di(app, di_container)
     include_routers(app)
     app.add_exception_handler(
         DuplicateKeyError,

app/exceptions.py

@@ -1,7 +1,12 @@
-from advanced_alchemy.exceptions import DuplicateKeyError
+from typing import TYPE_CHECKING
+
 from fastapi.responses import JSONResponse
 from starlette import status
-from starlette.requests import Request
+
+
+if TYPE_CHECKING:
+    from advanced_alchemy.exceptions import DuplicateKeyError
+    from starlette.requests import Request
 
 
 async def duplicate_key_error_handler(_: Request, exc: DuplicateKeyError) -> JSONResponse:

app/ioc.py

@@ -1,10 +1,10 @@
-from modern_di import BaseGraph, Scope, providers
+from modern_di import Group, Scope, providers
 
 from app import repositories
 from app.resources.db import create_sa_engine, create_session
 
 
-class Dependencies(BaseGraph):
+class Dependencies(Group):
     database_engine = providers.Resource(Scope.APP, create_sa_engine)
     session = providers.Resource(Scope.REQUEST, create_session, engine=database_engine.cast)
 

app/models.py

@@ -14,7 +14,7 @@ class Deck(BigIntAuditBase):
 
     name: orm.Mapped[str] = orm.mapped_column(sa.String, nullable=False)
     description: orm.Mapped[str | None] = orm.mapped_column(sa.String, nullable=True)
-    cards: orm.Mapped[list["Card"]] = orm.relationship("Card", lazy="noload", uselist=True)
+    cards: orm.Mapped[list[Card]] = orm.relationship("Card", lazy="noload", uselist=True)
 
 
 class Card(BigIntAuditBase):

pyproject.toml

@@ -3,15 +3,15 @@ name = "fastapi-sqlalchemy-template"
 version = "0"
 description = "Async template on FastAPI and SQLAlchemy 2"
 readme = "README.md"
-requires-python = ">=3.13"
+requires-python = ">=3.14"
 authors = [
     { name = "Artur Shiriev", email = "me@shiriev.ru" },
 ]
 license = "MIT License"
 dependencies = [
     "fastapi>=0.76",
     "lite-bootstrap[fastapi-all]",
-    "modern-di-fastapi",
+    "modern-di-fastapi>=1",
     "advanced-alchemy",
     "pydantic-settings",
     "granian[uvloop]",
@@ -42,7 +42,7 @@ dev = [
 fix = true
 unsafe-fixes = true
 line-length = 120
-target-version = "py313"
+target-version = "py314"
 extend-exclude = ["bin"]
 
 [tool.ruff.lint]
@@ -69,7 +69,7 @@ isort.no-lines-before = ["standard-library", "local-folder"]
 ]
 
 [tool.mypy]
-python_version = "3.13"
+python_version = "3.14"
 strict = true
 pretty = true
 

tests/conftest.py

@@ -1,7 +1,5 @@
 import typing
 
-import fastapi
-import modern_di
 import modern_di_fastapi
 import pytest
 from asgi_lifespan import LifespanManager
@@ -12,6 +10,11 @@
 from app.application import build_app
 
 
+if typing.TYPE_CHECKING:
+    import fastapi
+    import modern_di
+
+
 @pytest.fixture
 async def app() -> typing.AsyncIterator[fastapi.FastAPI]:
     app_ = build_app()
@@ -29,17 +32,17 @@ async def client(app: fastapi.FastAPI) -> typing.AsyncIterator[AsyncClient]:
 
 
 @pytest.fixture
-def di_container(app: fastapi.FastAPI) -> modern_di.Container:
+def di_container(app: fastapi.FastAPI) -> modern_di.AsyncContainer:
     return modern_di_fastapi.fetch_di_container(app)
 
 
 @pytest.fixture(autouse=True)
-async def db_session(di_container: modern_di.Container) -> typing.AsyncIterator[AsyncSession]:
-    engine = await ioc.Dependencies.database_engine.async_resolve(di_container)
+async def db_session(di_container: modern_di.AsyncContainer) -> typing.AsyncIterator[AsyncSession]:
+    engine = await di_container.resolve_provider(ioc.Dependencies.database_engine)
     connection = await engine.connect()
     transaction = await connection.begin()
     await connection.begin_nested()
-    ioc.Dependencies.database_engine.override(connection, di_container)
+    di_container.override(ioc.Dependencies.database_engine, connection)
 
     try:
         yield AsyncSession(connection, expire_on_commit=False, autoflush=False)

tests/test_cards.py

@@ -1,10 +1,15 @@
+from typing import TYPE_CHECKING
+
 from fastapi import status
-from httpx import AsyncClient
-from sqlalchemy.ext.asyncio import AsyncSession
 
 from tests import factories
 
 
+if TYPE_CHECKING:
+    from httpx import AsyncClient
+    from sqlalchemy.ext.asyncio import AsyncSession
+
+
 async def test_get_cards_empty(client: AsyncClient, db_session: AsyncSession) -> None:
     factories.DeckModelFactory.__async_session__ = db_session
     deck = await factories.DeckModelFactory.create_async()