modern-di-fastapi 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

modern_di_fastapi/__init__.py

@@ -1,9 +1,9 @@
-from modern_di_fastapi.main import FromDI, enter_di_request_scope, fetch_di_container, save_di_container
+from modern_di_fastapi.main import Provide, build_di_container, fetch_di_container, setup_di
 
 
 __all__ = [
-    "FromDI",
-    "enter_di_request_scope",
+    "Provide",
+    "build_di_container",
     "fetch_di_container",
-    "save_di_container",
+    "setup_di",
 ]

modern_di_fastapi/main.py

@@ -1,38 +1,47 @@
 import dataclasses
+import enum
 import typing
 
 import fastapi
-from modern_di import Container, providers
+from modern_di import Container, Scope, providers
+from starlette.requests import HTTPConnection
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-def save_di_container(obj: fastapi.FastAPI | fastapi.Request, container: Container) -> None:
-    obj.state.di_container = container
+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(obj: fastapi.FastAPI | fastapi.Request) -> Container:
-    return typing.cast(Container, obj.state.di_container)
+def fetch_di_container(app: fastapi.FastAPI) -> Container:
+    return typing.cast(Container, app.state.di_container)
+
+
+async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator[Container]:
+    context: dict[str, typing.Any] = {}
+    scope: Scope | None = None
+    if isinstance(connection, fastapi.Request):
+        scope = Scope.REQUEST
+        context["request"] = connection
+    elif isinstance(connection, fastapi.WebSocket):
+        context["websocket"] = connection
+        scope = Scope.SESSION
+    container: Container = 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]
 
-    async def __call__(self, request: fastapi.Request) -> T_co:
-        return await self.dependency.async_resolve(fetch_di_container(request))
+    async def __call__(
+        self, request_container: typing.Annotated[Container, fastapi.Depends(build_di_container)]
+    ) -> T_co:
+        return await self.dependency.async_resolve(request_container)
 
 
-def FromDI(dependency: providers.AbstractProvider[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
+def Provide(dependency: providers.AbstractProvider[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
     return typing.cast(T_co, fastapi.Depends(dependency=Dependency(dependency), use_cache=use_cache))
-
-
-async def enter_di_request_scope(request: fastapi.Request) -> typing.AsyncIterator[None]:
-    container: Container = fetch_di_container(request.app)
-    async with container.build_child_container(context={"request": request}) as request_container:
-        save_di_container(request, request_container)
-        try:
-            yield
-        finally:
-            del request.state.di_container

{modern_di_fastapi-0.2.0.dist-info → modern_di_fastapi-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: modern-di-fastapi
-Version: 0.2.0
+Version: 0.4.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.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+modern_di_fastapi/__init__.py,sha256=LSjAug5Mj6Bw7dAR7lWJpRjV9WMT8r9vSGJRHghXF_s,192
+modern_di_fastapi/main.py,sha256=20znQkJZmsAmhehZ3-Cv2D13--SiCz2EkqjPuTkfpCI,1654
+modern_di_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modern_di_fastapi-0.4.0.dist-info/METADATA,sha256=Aye0Hpe0RmbyJHb4L94YoeLLKa47CDf8uhbqr7681_8,926
+modern_di_fastapi-0.4.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+modern_di_fastapi-0.4.0.dist-info/RECORD,,

modern_di_fastapi-0.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-modern_di_fastapi/__init__.py,sha256=8Djsc0SZVfYQkXlkYpaZ6tcYVQvsK4kJXWwr1nEg4js,216
-modern_di_fastapi/main.py,sha256=gX4amXitXg-zTqIQXComCgkcF5XkWDRkKqhxebM6uEI,1301
-modern_di_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_fastapi-0.2.0.dist-info/METADATA,sha256=0rwzKbi7rv7CEGDS9uHJgrgs2vgkC_EYH6mjf-fGlTs,926
-modern_di_fastapi-0.2.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-modern_di_fastapi-0.2.0.dist-info/RECORD,,