modern-di-fastapi 1.1.0__tar.gz → 2.0.0a0__tar.gz

{modern_di_fastapi-1.1.0 → modern_di_fastapi-2.0.0a0}/PKG-INFO

@@ -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/modern_di_fastapi/main.py

@@ -0,0 +1,46 @@
+import dataclasses
+import typing
+
+import fastapi
+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) -> Container:
+    return typing.cast(Container, app_.state.di_container)
+
+
+def setup_di(app: fastapi.FastAPI, container: Container) -> Container:
+    app.state.di_container = container
+    return container
+
+
+async def build_di_container(connection: HTTPConnection) -> Container:
+    context: dict[type[typing.Any], typing.Any] = {}
+    scope: Scope | None = None
+    if isinstance(connection, fastapi.Request):
+        scope = Scope.REQUEST
+        context[fastapi.Request] = connection
+    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)
+
+
+@dataclasses.dataclass(slots=True, frozen=True)
+class Dependency(typing.Generic[T_co]):
+    dependency: providers.AbstractProvider[T_co] | type[T_co]
+
+    async def __call__(
+        self, request_container: typing.Annotated[Container, fastapi.Depends(build_di_container)]
+    ) -> T_co:
+        if isinstance(self.dependency, providers.AbstractProvider):
+            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
+    return typing.cast(T_co, fastapi.Depends(dependency=Dependency(dependency), use_cache=use_cache))

{modern_di_fastapi-1.1.0 → modern_di_fastapi-2.0.0a0}/pyproject.toml

@@ -16,7 +16,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = ["fastapi>=0.100", "modern-di>=1.0.0alpha"]
-version = "1.1.0"
+version = "2.0.0a0"
 
 [project.urls]
 repository = "https://github.com/modern-python/modern-di"

modern_di_fastapi-1.1.0/modern_di_fastapi/main.py

@@ -1,61 +0,0 @@
-import contextlib
-import dataclasses
-import typing
-
-import fastapi
-from fastapi.routing import _merge_lifespan_context
-from modern_di import AsyncContainer, 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)
-
-
-@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:
-    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]:
-    context: dict[type[typing.Any], typing.Any] = {}
-    scope: Scope | None = None
-    if isinstance(connection, fastapi.Request):
-        scope = Scope.REQUEST
-        context[fastapi.Request] = connection
-    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
-
-
-@dataclasses.dataclass(slots=True, frozen=True)
-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)]
-    ) -> 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)
-
-
-def FromDI(dependency: providers.AbstractProvider[T_co] | type[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
-    return typing.cast(T_co, fastapi.Depends(dependency=Dependency(dependency), use_cache=use_cache))