modern-di-fastapi 1.0.0a0__tar.gz → 2.1.1__tar.gz

{modern_di_fastapi-1.0.0a0 → modern_di_fastapi-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 1.0.0a0
+Version: 2.1.1
 Summary: Modern-DI integration for FastAPI
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
@@ -11,11 +11,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Requires-Python: <4,>=3.10
 Requires-Dist: fastapi>=0.100
-Requires-Dist: modern-di>=1
+Requires-Dist: modern-di>=2
 Description-Content-Type: text/markdown
 
 "Modern-DI-FastAPI"

{modern_di_fastapi-1.0.0a0 → modern_di_fastapi-2.1.1}/modern_di_fastapi/main.py

@@ -4,25 +4,33 @@ import typing
 
 import fastapi
 from fastapi.routing import _merge_lifespan_context
-from modern_di import AsyncContainer, Scope, providers
+from modern_di import Container, Scope, providers
 from starlette.requests import HTTPConnection
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-def fetch_di_container(app_: fastapi.FastAPI) -> AsyncContainer:
-    return typing.cast(AsyncContainer, app_.state.di_container)
+fastapi_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=fastapi.Request)
+fastapi_websocket = providers.ContextProvider(scope=Scope.SESSION, context_type=fastapi.WebSocket)
+
+
+def fetch_di_container(app_: fastapi.FastAPI) -> Container:
+    return typing.cast(Container, app_.state.di_container)
 
 
 @contextlib.asynccontextmanager
 async def _lifespan_manager(app_: fastapi.FastAPI) -> typing.AsyncIterator[None]:
-    async with fetch_di_container(app_):
+    container = fetch_di_container(app_)
+    try:
         yield
+    finally:
+        await container.close_async()
 
 
-def setup_di(app: fastapi.FastAPI, container: AsyncContainer) -> AsyncContainer:
+def setup_di(app: fastapi.FastAPI, container: Container) -> Container:
     app.state.di_container = container
+    container.providers_registry.add_providers(fastapi_request=fastapi_request, fastapi_websocket=fastapi_websocket)
     old_lifespan_manager = app.router.lifespan_context
     app.router.lifespan_context = _merge_lifespan_context(
         old_lifespan_manager,
@@ -31,7 +39,7 @@ def setup_di(app: fastapi.FastAPI, container: AsyncContainer) -> AsyncContainer:
     return container
 
 
-async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator[AsyncContainer]:
+async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator[Container]:
     context: dict[type[typing.Any], typing.Any] = {}
     scope: Scope | None = None
     if isinstance(connection, fastapi.Request):
@@ -40,9 +48,11 @@ async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator
     elif isinstance(connection, fastapi.WebSocket):
         context[fastapi.WebSocket] = connection
         scope = Scope.SESSION
-    container: AsyncContainer = fetch_di_container(connection.app)
-    async with container.build_child_container(context=context, scope=scope) as request_container:
-        yield request_container
+    container = fetch_di_container(connection.app).build_child_container(context=context, scope=scope)
+    try:
+        yield container
+    finally:
+        await container.close_async()
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
@@ -50,11 +60,11 @@ class Dependency(typing.Generic[T_co]):
     dependency: providers.AbstractProvider[T_co] | type[T_co]
 
     async def __call__(
-        self, request_container: typing.Annotated[AsyncContainer, fastapi.Depends(build_di_container)]
+        self, request_container: typing.Annotated[Container, fastapi.Depends(build_di_container)]
     ) -> T_co:
         if isinstance(self.dependency, providers.AbstractProvider):
-            return await request_container.resolve_provider(self.dependency)
-        return await request_container.resolve(dependency_type=self.dependency)
+            return request_container.resolve_provider(self.dependency)
+        return request_container.resolve(dependency_type=self.dependency)
 
 
 def FromDI(dependency: providers.AbstractProvider[T_co] | type[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802

{modern_di_fastapi-1.0.0a0 → modern_di_fastapi-2.1.1}/pyproject.toml

@@ -11,11 +11,12 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Typing :: Typed",
     "Topic :: Software Development :: Libraries",
 ]
-dependencies = ["fastapi>=0.100", "modern-di>=1"]
-version = "1.0.0a0"
+dependencies = ["fastapi>=0.100", "modern-di>=2"]
+version = "2.1.1"
 
 [project.urls]
 repository = "https://github.com/modern-python/modern-di"