modern-di-fastapi 1.1.0__py3-none-any.whl → 2.0.0a0__py3-none-any.whl

modern_di_fastapi/main.py

@@ -1,37 +1,24 @@
-import contextlib
 import dataclasses
 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)
+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, container: AsyncContainer) -> AsyncContainer:
+def setup_di(app: fastapi.FastAPI, container: Container) -> Container:
     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[AsyncContainer]:
+async def build_di_container(connection: HTTPConnection) -> Container:
     context: dict[type[typing.Any], typing.Any] = {}
     scope: Scope | None = None
     if isinstance(connection, fastapi.Request):
@@ -40,9 +27,7 @@ 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
+    return fetch_di_container(connection.app).build_child_container(context=context, scope=scope)
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
@@ -50,11 +35,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.1.0.dist-info → modern_di_fastapi-2.0.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 1.1.0
+Version: 2.0.0a0
 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-2.0.0a0.dist-info/RECORD

@@ -0,0 +1,6 @@
+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,,

modern_di_fastapi-1.1.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-modern_di_fastapi/__init__.py,sha256=t4ox50Pc4k7bDNprfg3_ujqj4dwidTTuzV9WRNH-EOs,190
-modern_di_fastapi/main.py,sha256=21y8wmPHmaQpZE-IxvJVul0lHuM9k7PaEL9DmqWi9rw,2270
-modern_di_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_fastapi-1.1.0.dist-info/METADATA,sha256=6o5px2yTPFAYn7woBqej2rSnMmGDQ3uhqMS0GHU72Kg,989
-modern_di_fastapi-1.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-modern_di_fastapi-1.1.0.dist-info/RECORD,,