anydi 0.36.1a5__py3-none-any.whl → 0.37.1__py3-none-any.whl

anydi/_container.py

@@ -36,7 +36,9 @@ from ._utils import (
     get_full_qualname,
     get_typed_parameters,
     import_string,
+    is_async_context_manager,
     is_builtin_type,
+    is_context_manager,
     run_async,
 )
 
@@ -553,7 +555,10 @@ class Container:
             cm = contextlib.contextmanager(provider.call)(**provider_kwargs)
             return context.enter(cm)
 
-        return provider.call(**provider_kwargs)
+        instance = provider.call(**provider_kwargs)
+        if context is not None and provider.is_class and is_context_manager(instance):
+            context.enter(instance)
+        return instance
 
     async def _acreate_instance(
         self, provider: Provider, context: InstanceContext | None, /, **defaults: Any
@@ -584,7 +589,14 @@ class Container:
 
             return await run_async(_create)
 
-        return await run_async(provider.call, **provider_kwargs)
+        instance = await run_async(provider.call, **provider_kwargs)
+        if (
+            context is not None
+            and provider.is_class
+            and is_async_context_manager(instance)
+        ):
+            await context.aenter(instance)
+        return instance
 
     def _get_provided_kwargs(
         self, provider: Provider, context: InstanceContext | None, /, **defaults: Any
@@ -627,7 +639,7 @@ class Container:
 
         # Wrap the instance in a proxy for testing
         if self.testing:
-            return InstanceProxy(interface=parameter.annotation, instance=instance)
+            return InstanceProxy(instance, interface=parameter.annotation)
         return instance
 
     async def _aget_provided_kwargs(
@@ -671,7 +683,7 @@ class Container:
 
         # Wrap the instance in a proxy for testing
         if self.testing:
-            return InstanceProxy(interface=parameter.annotation, instance=instance)
+            return InstanceProxy(instance, interface=parameter.annotation)
         return instance
 
     def _resolve_parameter(
@@ -776,6 +788,10 @@ class Container:
         """
         Override the provider for the specified interface with a specific instance.
         """
+        if not self.testing:
+            raise RuntimeError(
+                "The `override` method can only be used in testing mode."
+            )
         if not self.is_registered(interface) and self.strict:
             raise LookupError(
                 f"The provider interface `{get_full_qualname(interface)}` "

anydi/_provider.py

@@ -38,6 +38,7 @@ class Provider:
         "_kind",
         "_interface",
         "_parameters",
+        "_is_class",
         "_is_coroutine",
         "_is_generator",
         "_is_async_generator",
@@ -57,6 +58,7 @@ class Provider:
         # Detect the kind of callable provider
         self._detect_kind()
 
+        self._is_class = self._kind == CallableKind.CLASS
         self._is_coroutine = self._kind == CallableKind.COROUTINE
         self._is_generator = self._kind == CallableKind.GENERATOR
         self._is_async_generator = self._kind == CallableKind.ASYNC_GENERATOR
@@ -107,6 +109,11 @@ class Provider:
     def parameters(self) -> list[inspect.Parameter]:
         return self._parameters
 
+    @property
+    def is_class(self) -> bool:
+        """Check if the provider is a class."""
+        return self._is_class
+
     @property
     def is_coroutine(self) -> bool:
         """Check if the provider is a coroutine."""

anydi/_types.py

@@ -5,6 +5,7 @@ from collections.abc import Iterable
 from types import ModuleType
 from typing import Annotated, Any, NamedTuple, Union
 
+import wrapt
 from typing_extensions import Literal, Self, TypeAlias
 
 Scope = Literal["transient", "singleton", "request"]
@@ -37,20 +38,19 @@ def is_event_type(obj: Any) -> bool:
     return inspect.isclass(obj) and issubclass(obj, Event)
 
 
-class InstanceProxy:
-    __slots__ = ("interface", "instance")
+class InstanceProxy(wrapt.ObjectProxy):  # type: ignore[misc]
+    def __init__(self, wrapped: Any, *, interface: type[Any]) -> None:
+        super().__init__(wrapped)
+        self._self_interface = interface
 
-    def __init__(self, *, interface: type[Any], instance: Any):
-        self.interface = interface
-        self.instance = instance
+    @property
+    def interface(self) -> type[Any]:
+        return self._self_interface
 
-    def __getattribute__(self, name: str) -> Any:
-        if name in ("interface", "instance"):
-            return object.__getattribute__(self, name)
-        return getattr(self.instance, name)
-
-    def __repr__(self) -> str:
-        return f"InstanceProxy({self.interface!r})"
+    def __getattribute__(self, item: str) -> Any:
+        if item in "interface":
+            return object.__getattribute__(self, item)
+        return object.__getattribute__(self, item)
 
 
 class ProviderDecoratorArgs(NamedTuple):

anydi/_utils.py

@@ -44,6 +44,16 @@ def is_builtin_type(tp: type[Any]) -> bool:
     return tp.__module__ == builtins.__name__
 
 
+def is_context_manager(obj: Any) -> bool:
+    """Check if the given object is a context manager."""
+    return hasattr(obj, "__enter__") and hasattr(obj, "__exit__")
+
+
+def is_async_context_manager(obj: Any) -> bool:
+    """Check if the given object is an async context manager."""
+    return hasattr(obj, "__aenter__") and hasattr(obj, "__aexit__")
+
+
 def get_typed_annotation(
     annotation: Any, globalns: dict[str, Any], module: Any = None
 ) -> Any:

{anydi-0.36.1a5.dist-info → anydi-0.37.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.36.1a5
+Version: 0.37.1
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -33,6 +33,7 @@ Requires-Dist: anyio (>=3.7.1)
 Requires-Dist: mkdocs (>=1.4.2,<2.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)
+Requires-Dist: wrapt (>=1.17.0,<2.0.0)
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 

{anydi-0.36.1a5.dist-info → anydi-0.37.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 anydi/__init__.py,sha256=OfRg2EfXD65pHTGQKhfkABMwUhw5LvsuTQV_Tv4V4wk,501
-anydi/_container.py,sha256=7Qwreyqnc95M0mgDus6vQmyuIF5qLFTMaBoA7GoWELg,37772
+anydi/_container.py,sha256=6dr2sOSkx8GRdqzlokHB5McfBNOWp_9ozyyiS5dpxoE,38320
 anydi/_context.py,sha256=7LV_SL4QWkJeiG7_4D9PZ5lmU-MPzhofxC95zCgY9Gc,2651
-anydi/_provider.py,sha256=W42y8wbsnWbb9B9gI-pnEa-lsz68nK0VIm55CJW3pWg,7457
-anydi/_types.py,sha256=Vttj9GTp9g0KKpK-uqolLfVZJPIM7f7_YL8bPlablcQ,1539
-anydi/_utils.py,sha256=gU5ccCC2JZpKOY84ZCJ3PHyaEGhTW82PkGAhS6_R_qI,4027
+anydi/_provider.py,sha256=1IyxHO83NHjsPDHLDIZtW1pJ7i8VpWD3EM4T6duw9zA,7661
+anydi/_types.py,sha256=fdO4xNXtGMxVArmlfDkFYbyR895ixkBTW6V8lMceN7Q,1562
+anydi/_utils.py,sha256=INI0jNIXrJ6LS4zqJymMO2yUEobpxmBGASf4G_vR6AU,4378
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
@@ -22,8 +22,8 @@ anydi/ext/pytest_plugin.py,sha256=ShGhiZnP1KyMHhnc9Ci1RKAuHVhw628OTS2P2BLEOfc,50
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=9CQtGg5ZzUz2gFSzJr8U4BWzwNjK8XMctm3n52M77Z0,792
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.36.1a5.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.36.1a5.dist-info/METADATA,sha256=pmhLHtLYS6Hi90rx0etN5ViIkIJYGMeOopTfyKPCHhY,5066
-anydi-0.36.1a5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.36.1a5.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.36.1a5.dist-info/RECORD,,
+anydi-0.37.1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.37.1.dist-info/METADATA,sha256=9pkB0M7YtPuvIXxskF0h7roe7FY_R90rHZ6772w2LSI,5103
+anydi-0.37.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.37.1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.37.1.dist-info/RECORD,,