modern-di-fastapi 2.0.0a0__py3-none-any.whl → 2.0.0a1__py3-none-any.whl

modern_di_fastapi/main.py

@@ -1,7 +1,9 @@
+import contextlib
 import dataclasses
 import typing
 
 import fastapi
+from fastapi.routing import _merge_lifespan_context
 from modern_di import Container, Scope, providers
 from starlette.requests import HTTPConnection
 
@@ -9,16 +11,35 @@ from starlette.requests import HTTPConnection
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
+fastapi_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=fastapi.Request)
+fastapi_websocket = providers.ContextProvider(scope=Scope.REQUEST, 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]:
+    container = fetch_di_container(app_)
+    try:
+        yield
+    finally:
+        await container.close_async()
+
+
 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,
+        _lifespan_manager,
+    )
     return container
 
 
-async def build_di_container(connection: HTTPConnection) -> Container:
+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):
@@ -27,7 +48,11 @@ async def build_di_container(connection: HTTPConnection) -> Container:
     elif isinstance(connection, fastapi.WebSocket):
         context[fastapi.WebSocket] = connection
         scope = Scope.SESSION
-    return fetch_di_container(connection.app).build_child_container(context=context, scope=scope)
+    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)

{modern_di_fastapi-2.0.0a0.dist-info → modern_di_fastapi-2.0.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 2.0.0a0
+Version: 2.0.0a1
 Summary: Modern-DI integration for FastAPI
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
@@ -16,7 +16,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Requires-Python: <4,>=3.10
 Requires-Dist: fastapi>=0.100
-Requires-Dist: modern-di>=1.0.0alpha
+Requires-Dist: modern-di>=2.0.0alpha1
 Description-Content-Type: text/markdown
 
 "Modern-DI-FastAPI"

modern_di_fastapi-2.0.0a1.dist-info/RECORD

@@ -0,0 +1,6 @@
+modern_di_fastapi/__init__.py,sha256=t4ox50Pc4k7bDNprfg3_ujqj4dwidTTuzV9WRNH-EOs,190
+modern_di_fastapi/main.py,sha256=lgW7RSbE6eV9lvHhyBh2a-IKN_cL6DJyQlN9cS4uLzA,2585
+modern_di_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modern_di_fastapi-2.0.0a1.dist-info/METADATA,sha256=YlW6gotlVI9TC-4zYIP8CQoQkQnqkXQ-AKqz5jWosKY,992
+modern_di_fastapi-2.0.0a1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+modern_di_fastapi-2.0.0a1.dist-info/RECORD,,

modern_di_fastapi-2.0.0a0.dist-info/RECORD

@@ -1,6 +0,0 @@
-modern_di_fastapi/__init__.py,sha256=t4ox50Pc4k7bDNprfg3_ujqj4dwidTTuzV9WRNH-EOs,190
-modern_di_fastapi/main.py,sha256=Kwq7h23JafSrAQsCjEAGBimw_V9upoT_t_UuP82By5c,1683
-modern_di_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_fastapi-2.0.0a0.dist-info/METADATA,sha256=6X-CtNc2nL8isvPBQW4a5oJOCw2r15uroPl8E3A0KgY,991
-modern_di_fastapi-2.0.0a0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-modern_di_fastapi-2.0.0a0.dist-info/RECORD,,