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

modern_di_fastapi/__init__.py

@@ -1,9 +1,9 @@
-from modern_di_fastapi.depends import FromDI, setup_modern_di
-from modern_di_fastapi.middleware import ContainerMiddleware
+from modern_di_fastapi.main import FromDI, enter_di_request_scope, fetch_di_container, save_di_container
 
 
 __all__ = [
-    "ContainerMiddleware",
     "FromDI",
-    "setup_modern_di",
+    "enter_di_request_scope",
+    "fetch_di_container",
+    "save_di_container",
 ]

modern_di_fastapi/main.py

@@ -0,0 +1,38 @@
+import dataclasses
+import typing
+
+import fastapi
+from modern_di import Container, providers
+
+
+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 fetch_di_container(obj: fastapi.FastAPI | fastapi.Request) -> Container:
+    return typing.cast(Container, obj.state.di_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))
+
+
+def FromDI(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.1.4.dist-info → modern_di_fastapi-0.2.0.dist-info}/METADATA

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

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

modern_di_fastapi/depends.py

@@ -1,24 +0,0 @@
-import dataclasses
-import typing
-
-import fastapi
-from modern_di import Container, providers
-
-
-T_co = typing.TypeVar("T_co", covariant=True)
-
-
-@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(request.state.modern_di_container)
-
-
-def FromDI(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))
-
-
-def setup_modern_di(container: Container, app: fastapi.FastAPI) -> None:
-    app.state.modern_di_container = container

modern_di_fastapi/middleware.py

@@ -1,27 +0,0 @@
-import typing
-
-import modern_di
-from starlette.requests import Request
-from starlette.types import ASGIApp, Receive, Scope, Send
-
-
-class ContainerMiddleware:
-    def __init__(self, app: ASGIApp) -> None:
-        self.app = app
-
-    async def __call__(
-        self,
-        scope: Scope,
-        receive: Receive,
-        send: Send,
-    ) -> None:
-        if scope["type"] != "http":
-            return await self.app(scope, receive, send)
-
-        request = Request(scope, receive=receive, send=send)
-        context: dict[str, typing.Any] = {"request": request}
-
-        container: modern_di.Container = request.app.state.modern_di_container
-        async with container.build_child_container(context=context) as request_container:
-            request.state.modern_di_container = request_container
-            return await self.app(scope, receive, send)

modern_di_fastapi-0.1.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-modern_di_fastapi/__init__.py,sha256=L-WPazuGrU4OB-ME-1BxMtfK1n2H8cg5yDZPUSEYcgA,203
-modern_di_fastapi/depends.py,sha256=zu7i4iL2nySrVLzyTa_AV7fhV720TbvARd_iPsu-i6o,762
-modern_di_fastapi/middleware.py,sha256=R9Yau5TWWyU2nBb84ba5MQOxg3w0bc7FR6-JjgvgUQ8,857
-modern_di_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_fastapi-0.1.4.dist-info/METADATA,sha256=W98ITZ8vdsZzfS3ppz2cvgQmSca8S6qefsOSWyG3yLM,926
-modern_di_fastapi-0.1.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-modern_di_fastapi-0.1.4.dist-info/RECORD,,