anydi 0.27.0a8__py3-none-any.whl → 0.28.0__py3-none-any.whl

anydi/_container.py

@@ -429,9 +429,9 @@ class Container:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: types.TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the singleton context."""
-        self.close()
+        return self._singleton_context.__exit__(exc_type, exc_val, exc_tb)
 
     def start(self) -> None:
         """Start the singleton context."""
@@ -464,9 +464,9 @@ class Container:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: types.TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the singleton context."""
-        await self.aclose()
+        return await self._singleton_context.__aexit__(exc_type, exc_val, exc_tb)
 
     async def astart(self) -> None:
         """Start the singleton context asynchronously."""

anydi/_context.py

@@ -195,6 +195,14 @@ class ResourceScopedContext(ScopedContext):
         """
         return interface in self._instances
 
+    def _create_instance(self, provider: Provider) -> Any:
+        """Create an instance using the provider."""
+        instance = super()._create_instance(provider)
+        # Enter the context manager if the instance is closable.
+        if hasattr(instance, "__enter__") and hasattr(instance, "__exit__"):
+            self._stack.enter_context(instance)
+        return instance
+
     def _create_resource(self, provider: Provider) -> Any:
         """Create a resource using the provider.
 
@@ -208,6 +216,14 @@ class ResourceScopedContext(ScopedContext):
         cm = contextlib.contextmanager(provider.obj)(*args, **kwargs)
         return self._stack.enter_context(cm)
 
+    async def _acreate_instance(self, provider: Provider) -> Any:
+        """Create an instance asynchronously using the provider."""
+        instance = await super()._acreate_instance(provider)
+        # Enter the context manager if the instance is closable.
+        if hasattr(instance, "__aenter__") and hasattr(instance, "__aexit__"):
+            await self._async_stack.enter_async_context(instance)
+        return instance
+
     async def _acreate_resource(self, provider: Provider) -> Any:
         """Create a resource asynchronously using the provider.
 
@@ -243,7 +259,7 @@ class ResourceScopedContext(ScopedContext):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the context.
 
         Args:
@@ -251,8 +267,7 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        self.close()
-        return
+        return self._stack.__exit__(exc_type, exc_val, exc_tb)  # type: ignore[return-value]
 
     @abc.abstractmethod
     def start(self) -> None:
@@ -262,7 +277,7 @@ class ResourceScopedContext(ScopedContext):
 
     def close(self) -> None:
         """Close the scoped context."""
-        self._stack.close()
+        self._stack.__exit__(None, None, None)
 
     async def __aenter__(self) -> Self:
         """Enter the context asynchronously.
@@ -278,7 +293,7 @@ class ResourceScopedContext(ScopedContext):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the context asynchronously.
 
         Args:
@@ -286,8 +301,9 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        await self.aclose()
-        return
+        return await run_async(
+            self.__exit__, exc_type, exc_val, exc_tb
+        ) or await self._async_stack.__aexit__(exc_type, exc_val, exc_tb)
 
     @abc.abstractmethod
     async def astart(self) -> None:
@@ -295,8 +311,7 @@ class ResourceScopedContext(ScopedContext):
 
     async def aclose(self) -> None:
         """Close the scoped context asynchronously."""
-        await run_async(self._stack.close)
-        await self._async_stack.aclose()
+        await self.__aexit__(None, None, None)
 
 
 @final

anydi/_utils.py

@@ -6,7 +6,7 @@ import builtins
 import functools
 import inspect
 import sys
-from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar, cast
+from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar
 
 from typing_extensions import ParamSpec, get_args, get_origin
 
@@ -16,17 +16,6 @@ except ImportError:
     anyio = None  # type: ignore[assignment]
 
 
-if sys.version_info < (3, 9):  # pragma: nocover
-
-    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-        return type_._evaluate(globalns, localns)  # noqa
-
-else:
-
-    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-        return cast(Any, type_)._evaluate(globalns, localns, set())  # noqa
-
-
 T = TypeVar("T")
 P = ParamSpec("P")
 
@@ -62,6 +51,12 @@ def is_builtin_type(tp: type[Any]) -> bool:
     return tp.__module__ == builtins.__name__
 
 
+def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+    if sys.version_info < (3, 9):
+        return type_._evaluate(globalns, localns)
+    return type_._evaluate(globalns, localns, recursive_guard=frozenset())
+
+
 def get_typed_annotation(
     annotation: Any,
     globalns: dict[str, Any],
@@ -70,10 +65,12 @@ def get_typed_annotation(
 ) -> Any:
     """Get the typed annotation of a parameter."""
     if isinstance(annotation, str):
-        if sys.version_info < (3, 9):
-            annotation = ForwardRef(annotation)
-        else:
+        if sys.version_info >= (3, 10, 2):
             annotation = ForwardRef(annotation, module=module, is_class=is_class)
+        elif sys.version_info >= (3, 10, 0):
+            annotation = ForwardRef(annotation, module=module)
+        else:
+            annotation = ForwardRef(annotation)
         annotation = evaluate_forwardref(annotation, globalns, {})
     return annotation
 

{anydi-0.27.0a8.dist-info → anydi-0.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.27.0a8
+Version: 0.28.0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -22,7 +22,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
@@ -33,7 +32,7 @@ Provides-Extra: async
 Provides-Extra: docs
 Requires-Dist: anyio (>=3.6.2,<4.0.0) ; extra == "async"
 Requires-Dist: mkdocs (>=1.4.2,<2.0.0) ; extra == "docs"
-Requires-Dist: mkdocs-material (>=9.5.21,<10.0.0) ; extra == "docs"
+Requires-Dist: mkdocs-material (>=9.5.29,<10.0.0) ; extra == "docs"
 Requires-Dist: typing-extensions (>=4.12.1,<5.0.0)
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown

{anydi-0.27.0a8.dist-info → anydi-0.28.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
-anydi/_container.py,sha256=OjzwZPiQuf9ouyhmIqlNht99pHa77hjZ0sM_n_GovW0,28947
-anydi/_context.py,sha256=AVml53KyrQL4yyoJZkU2pbNzQwtg-1Jyt7m6R_0l6_8,11740
+anydi/_container.py,sha256=-vpiYl2Tx2QK9wl74DiF5qLFRudJ3e78TqEyuyOrthE,29055
+anydi/_context.py,sha256=Wm4DT8Ie_TPchWmIBe8Q9f90dQrGd5lY8H5K85rStgY,12706
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=E1TfLud_Af-MPB83PxIzHVA1jlDW2FGaRP_il1a6y3Y,3675
 anydi/_scanner.py,sha256=cyEk-K2Q8ssZStq8GrxMeEcCuAZMw-RXrjlgWEevKCs,6667
 anydi/_types.py,sha256=i8xFxz8pmFj7SGqwOwae_P9VtiRie6DVLwfaLibLwhc,3653
-anydi/_utils.py,sha256=zP4UvO1aVQJTB8pFNUWAcncvSiuhcg4xNdRU7CoLrqw,3871
+anydi/_utils.py,sha256=q6vEI3_vmZ5sMNau2E5EVk3uMG5geDnXYOW83-vW08M,3857
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=2kxLPTMM9Ro3s6-knbqYzONlqRB3hMcwZFFRQGHcFUg,2691
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
@@ -23,8 +23,8 @@ anydi/ext/pytest_plugin.py,sha256=3OWphc4nEzla46_8KR7LXtwGns5eol_YlUWfTf4Cr2Q,39
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=Ni0BQaPjs_Ha6zcLZYYJ3-XkslTCnL9aCSa06rnRDMI,1139
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.27.0a8.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.27.0a8.dist-info/METADATA,sha256=-yLzaxlmDc16XJOD6PfNlbXPvsbY3QmS-0b4yT1DYjE,5163
-anydi-0.27.0a8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.27.0a8.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.27.0a8.dist-info/RECORD,,
+anydi-0.28.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.28.0.dist-info/METADATA,sha256=0z7X_RPJ0ilu3uOJvsSIBjuXLyf27UUXpfhdZ6zTZvE,5111
+anydi-0.28.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.28.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.28.0.dist-info/RECORD,,