fix: clear container cache on __exit__ and __aexit__

Author: notypecheck

aioinject/container.py

@@ -309,6 +309,7 @@ async def __aexit__(
     ) -> None:
         if self._root:
             await self._root.__aexit__(exc_type, exc_val, exc_tb)
+            self._root = None
 
 
 class SyncContainer(_BaseContainer):
@@ -340,6 +341,7 @@ def __exit__(
     ) -> None:
         if self._root:
             self._root.__exit__(exc_type, exc_val, exc_tb)
+            self._root = None
 
     @property
     def root(self) -> SyncContext:

tests/context/test_singletons_async.py

@@ -24,3 +24,26 @@ async def dependency() -> AsyncIterator[int]:
 
         assert shutdown is False
     assert shutdown is True
+
+
+async def test_root_context_should_close_singletons() -> None:
+    open_count = 0
+    closed_count = 0
+
+    @contextlib.asynccontextmanager
+    async def dependency() -> AsyncIterator[int]:
+        nonlocal open_count, closed_count
+        open_count += 1
+        yield i
+        closed_count += 1
+
+    container = Container()
+    container.register(Singleton(dependency))
+
+    for i in range(1, 5 + 1):
+        async with container:
+            assert closed_count == i - 1
+            assert await container.root.resolve(int) == i
+            assert open_count == i
+            assert closed_count == i - 1
+        assert closed_count == i

tests/context/test_singletons_sync.py

@@ -23,3 +23,26 @@ def dependency() -> Iterator[int]:
 
         assert shutdown is False
     assert shutdown is True
+
+
+async def test_root_context_should_close_singletons() -> None:
+    open_count = 0
+    closed_count = 0
+
+    @contextlib.contextmanager
+    def dependency() -> Iterator[int]:
+        nonlocal open_count, closed_count
+        open_count += 1
+        yield i
+        closed_count += 1
+
+    container = SyncContainer()
+    container.register(Singleton(dependency))
+
+    for i in range(1, 5 + 1):
+        with container:
+            assert closed_count == i - 1
+            assert container.root.resolve(int) == i
+            assert open_count == i
+            assert closed_count == i - 1
+        assert closed_count == i