modern-di-fastapi 0.4.1__tar.gz → 0.5.0__tar.gz

{modern_di_fastapi-0.4.1 → modern_di_fastapi-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 0.4.1
+Version: 0.5.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.5.0/modern_di_fastapi/__init__.py

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

{modern_di_fastapi-0.4.1 → modern_di_fastapi-0.5.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,15 +12,26 @@ 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)
+
+
+@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:
     app.state.di_container = Container(scope=scope)
+    old_lifespan_manager = app.router.lifespan_context
+    app.router.lifespan_context = _merge_lifespan_context(
+        old_lifespan_manager,
+        _lifespan_manager,
+    )
     return app.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
@@ -43,5 +56,5 @@ class Dependency(typing.Generic[T_co]):
         return await self.dependency.async_resolve(request_container)
 
 
-def Provide(dependency: providers.AbstractProvider[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
+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))

{modern_di_fastapi-0.4.1 → modern_di_fastapi-0.5.0}/pyproject.toml

@@ -22,7 +22,15 @@ repository = "https://github.com/modern-python/modern-di"
 docs = "https://modern-di.readthedocs.io"
 
 [dependency-groups]
-dev = ["httpx", "asgi-lifespan"]
+dev = [
+    "pytest",
+    "pytest-cov",
+    "pytest-asyncio",
+    "ruff",
+    "mypy",
+    "typing-extensions",
+    "httpx",
+]
 
 [build-system]
 requires = ["hatchling", "hatch-vcs"]
@@ -39,6 +47,7 @@ include = ["modern_di_fastapi"]
 [tool.pytest.ini_options]
 addopts = "--cov=. --cov-report term-missing"
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.coverage.report]
 exclude_also = ["if typing.TYPE_CHECKING:"]

modern_di_fastapi-0.4.1/modern_di_fastapi/__init__.py

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