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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 2.0.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
@@ -16,7 +16,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Requires-Python: <4,>=3.10
 Requires-Dist: fastapi>=0.100
-Requires-Dist: modern-di>=2.0.0alpha1
+Requires-Dist: modern-di>=1.0.0alpha
 Description-Content-Type: text/markdown
 
 "Modern-DI-FastAPI"

{modern_di_fastapi-2.0.0 → modern_di_fastapi-2.0.0a0}/modern_di_fastapi/main.py

@@ -1,9 +1,7 @@
-import contextlib
 import dataclasses
 import typing
 
 import fastapi
-from fastapi.routing import _merge_lifespan_context
 from modern_di import Container, Scope, providers
 from starlette.requests import HTTPConnection
 
@@ -11,35 +9,16 @@ from starlette.requests import HTTPConnection
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-fastapi_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=fastapi.Request)
-fastapi_websocket = providers.ContextProvider(scope=Scope.SESSION, context_type=fastapi.WebSocket)
-
-
 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]:
-    container = fetch_di_container(app_)
-    try:
-        yield
-    finally:
-        await container.close_async()
-
-
 def setup_di(app: fastapi.FastAPI, container: Container) -> Container:
     app.state.di_container = container
-    container.providers_registry.add_providers(fastapi_request=fastapi_request, fastapi_websocket=fastapi_websocket)
-    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[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):
@@ -48,11 +27,7 @@ async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator
     elif isinstance(connection, fastapi.WebSocket):
         context[fastapi.WebSocket] = connection
         scope = Scope.SESSION
-    container = fetch_di_container(connection.app).build_child_container(context=context, scope=scope)
-    try:
-        yield container
-    finally:
-        await container.close_async()
+    return fetch_di_container(connection.app).build_child_container(context=context, scope=scope)
 
 
 @dataclasses.dataclass(slots=True, frozen=True)

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

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