Merge pull request #118 from modern-python/fix-resolving

fix resolving in incorrect scope

Author: lesnik512

packages/modern-di-fastapi/modern_di_fastapi/main.py

@@ -12,7 +12,7 @@
 
 
 fastapi_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=fastapi.Request)
-fastapi_websocket = providers.ContextProvider(scope=Scope.REQUEST, context_type=fastapi.WebSocket)
+fastapi_websocket = providers.ContextProvider(scope=Scope.SESSION, context_type=fastapi.WebSocket)
 
 
 def fetch_di_container(app_: fastapi.FastAPI) -> Container:

packages/modern-di-litestar/modern_di_litestar/main.py

@@ -16,7 +16,7 @@
 
 
 litestar_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=litestar.Request)
-litestar_websocket = providers.ContextProvider(scope=Scope.REQUEST, context_type=litestar.WebSocket)
+litestar_websocket = providers.ContextProvider(scope=Scope.SESSION, context_type=litestar.WebSocket)
 
 
 def fetch_di_container(app_: litestar.Litestar) -> Container:

packages/modern-di/modern_di/container.py

@@ -91,7 +91,7 @@ def resolve(self, dependency_type: type[T_co] | None = None, *, dependency_name:
         return typing.cast(T_co, provider.resolve(self))
 
     def resolve_provider(self, provider: "AbstractProvider[T_co]") -> T_co:
-        return typing.cast(T_co, provider.resolve(self.find_container(provider.scope)))
+        return typing.cast(T_co, provider.resolve(self))
 
     async def close_async(self) -> None:
         if not self.parent_container:

packages/modern-di/modern_di/providers/context_provider.py

@@ -17,4 +17,5 @@ def __init__(self, *, scope: Scope = Scope.APP, context_type: type[types.T_co])
         self._context_type = context_type
 
     def resolve(self, container: "Container") -> types.T_co | None:
+        container = container.find_container(self.scope)
         return container.context_registry.find_context(self._context_type)

packages/modern-di/modern_di/providers/factory.py

@@ -59,6 +59,7 @@ def _compile_kwargs(self, container: "Container") -> dict[str, typing.Any]:
         return result
 
     def resolve(self, container: "Container") -> types.T_co:
+        container = container.find_container(self.scope)
         cache_item = container.cache_registry.fetch_cache_item(self)
         if cache_item.kwargs is not None:
             kwargs = cache_item.kwargs

packages/modern-di/tests_core/providers/test_singleton.py

@@ -36,7 +36,7 @@ class MyGroup(Group):
     )
 
 
-def test_app_singleton() -> None:
+async def test_app_singleton() -> None:
     app_container = Container(groups=[MyGroup])
     singleton1 = app_container.resolve_provider(MyGroup.app_singleton)
     singleton2 = app_container.resolve_provider(MyGroup.app_singleton)
@@ -45,6 +45,9 @@ def test_app_singleton() -> None:
     cache_item = app_container.cache_registry.fetch_cache_item(MyGroup.app_singleton)
     assert cache_item.cache
 
+    app_container.resolve_provider(MyGroup.app_singleton)
+    await app_container.close_async()
+
 
 async def test_request_singleton() -> None:
     app_container = Container(groups=[MyGroup])