modern-di-fastapi 0.4.2__tar.gz → 0.6.0__tar.gz

{modern_di_fastapi-0.4.2 → modern_di_fastapi-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 0.4.2
+Version: 0.6.0
 Summary: Modern-DI integration for FastAPI
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io

{modern_di_fastapi-0.4.2 → modern_di_fastapi-0.6.0}/modern_di_fastapi/main.py

@@ -1,8 +1,10 @@
+import contextlib
 import dataclasses
 import enum
 import typing
 
 import fastapi
+from fastapi.routing import _merge_lifespan_context
 from modern_di import Container, Scope, providers
 from starlette.requests import HTTPConnection
 
@@ -10,13 +12,26 @@ from starlette.requests import HTTPConnection
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-def setup_di(app: fastapi.FastAPI, scope: enum.IntEnum = Scope.APP) -> Container:
-    app.state.di_container = Container(scope=scope)
-    return app.state.di_container
+def fetch_di_container(app_: fastapi.FastAPI) -> Container:
+    return typing.cast(Container, app_.state.di_container)
 
 
-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_):
+        yield
+
+
+def setup_di(app: fastapi.FastAPI, scope: enum.IntEnum = Scope.APP, container: Container | None = None) -> Container:
+    if not container:
+        container = Container(scope=scope)
+    app.state.di_container = container
+    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) -> typing.AsyncIterator[Container]:

{modern_di_fastapi-0.4.2 → modern_di_fastapi-0.6.0}/pyproject.toml

@@ -30,7 +30,6 @@ dev = [
     "mypy",
     "typing-extensions",
     "httpx",
-    "asgi-lifespan",
 ]
 
 [build-system]