anydi 0.33.0__py3-none-any.whl → 0.33.1__py3-none-any.whl

anydi/_container.py

@@ -25,7 +25,7 @@ from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._provider import Provider
 from ._scanner import Scanner
-from ._types import AnyInterface, Interface, Scope, TestInterface, is_marker
+from ._types import AnyInterface, DependencyWrapper, Interface, Scope, is_marker
 from ._utils import get_full_qualname, get_typed_parameters, is_builtin_type
 
 T = TypeVar("T", bound=Any)
@@ -371,28 +371,6 @@ class Container:
             self._patch_test_resolver(instance)
         return cast(T, instance)
 
-    def _patch_test_resolver(self, instance: Any) -> None:
-        """Patch the test resolver for the instance."""
-
-        def _resolver(_self: Any, _name: str) -> Any:
-            try:
-                test_interfaces = object.__getattribute__(_self, "__test_interfaces__")
-            except AttributeError:
-                test_interfaces = {
-                    name: value.interface
-                    for name, value in object.__getattribute__(
-                        _self, "__dict__"
-                    ).items()
-                    if isinstance(value, TestInterface)
-                }
-                object.__setattr__(_self, "__test_interfaces__", test_interfaces)
-            if _name in test_interfaces:
-                return self.resolve(test_interfaces[_name])
-            return object.__getattribute__(_self, _name)
-
-        if hasattr(instance, "__class__") and not is_builtin_type(instance.__class__):
-            instance.__class__.__getattribute__ = _resolver
-
     @overload
     async def aresolve(self, interface: Interface[T]) -> T: ...
 
@@ -411,6 +389,29 @@ class Container:
             self._patch_test_resolver(instance)
         return cast(T, instance)
 
+    def _patch_test_resolver(self, instance: Any) -> None:
+        """Patch the test resolver for the instance."""
+        if not hasattr(instance, "__dict__"):
+            return
+
+        wrapped = {
+            name: value.interface
+            for name, value in instance.__dict__.items()
+            if isinstance(value, DependencyWrapper)
+        }
+
+        # Custom resolver function
+        def _resolver(_self: Any, _name: str) -> Any:
+            if _name in wrapped:
+                # Resolve the dependency if it's wrapped
+                return self.resolve(wrapped[_name])
+            # Fall back to default behavior
+            return object.__getattribute__(_self, _name)
+
+        # Apply the patched resolver if wrapped attributes exist
+        if wrapped:
+            instance.__class__.__getattribute__ = _resolver
+
     def is_resolved(self, interface: AnyInterface) -> bool:
         """Check if an instance by interface exists."""
         try:

anydi/_context.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, Callable, ClassVar
 from typing_extensions import Self, final
 
 from ._provider import CallableKind, Provider
-from ._types import AnyInterface, Scope, TestInterface, is_event_type
+from ._types import AnyInterface, DependencyWrapper, Scope, is_event_type
 from ._utils import get_full_qualname, run_async
 
 if TYPE_CHECKING:
@@ -99,7 +99,9 @@ class ScopedContext(abc.ABC):
                     instance = parameter.default
                 else:
                     if self.container.testing:
-                        instance = TestInterface(interface=parameter.annotation)
+                        instance = DependencyWrapper(
+                            interface=parameter.annotation, instance=instance
+                        )
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
             else:
@@ -127,7 +129,9 @@ class ScopedContext(abc.ABC):
                     instance = parameter.default
                 else:
                     if self.container.testing:
-                        instance = TestInterface(interface=parameter.annotation)
+                        instance = DependencyWrapper(
+                            interface=parameter.annotation, instance=instance
+                        )
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
             else:

anydi/_types.py

@@ -39,5 +39,11 @@ def is_event_type(obj: Any) -> bool:
 
 
 @dataclass(frozen=True)
-class TestInterface:
+class DependencyWrapper:
     interface: type[Any]
+    instance: Any
+
+    def __getattribute__(self, name: str) -> Any:
+        if name in {"interface", "instance"}:
+            return object.__getattribute__(self, name)
+        return getattr(self.instance, name)

anydi/ext/pytest_plugin.py

@@ -105,8 +105,10 @@ def _anydi_inject(
 
         try:
             request.node.funcargs[argname] = container.resolve(interface)
-        except Exception:  # noqa
-            logger.warning(f"Failed to resolve dependency for argument '{argname}'.")
+        except Exception as exc:
+            logger.warning(
+                f"Failed to resolve dependency for argument '{argname}'.", exc_info=exc
+            )
             _anydi_unresolved.append(interface)
 
 
@@ -131,6 +133,8 @@ async def _anydi_ainject(
 
         try:
             request.node.funcargs[argname] = await container.aresolve(interface)
-        except Exception:  # noqa
-            logger.warning(f"Failed to resolve dependency for argument '{argname}'.")
+        except Exception as exc:
+            logger.warning(
+                f"Failed to resolve dependency for argument '{argname}'.", exc_info=exc
+            )
             _anydi_unresolved.append(interface)

{anydi-0.33.0.dist-info → anydi-0.33.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.33.0
+Version: 0.33.1
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT

{anydi-0.33.0.dist-info → anydi-0.33.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 anydi/__init__.py,sha256=EsR-HiMe8cWS9PQbY23ibc91STK1WTn02DFMPV-TNU4,509
-anydi/_container.py,sha256=M1V7OMYp1BGSj0RQInS6xXYi3HgDGQ9CwjDezvC-fQc,21538
-anydi/_context.py,sha256=vBbL0POdkdL-kr2CEp35gQvzIBlFN2q7-wCNhr6gJqg,12708
+anydi/_container.py,sha256=shefN3SuhmPBzU6gxV-YRGJlz-m8Nv5RJ-T93veSxgE,21389
+anydi/_context.py,sha256=6Veqt15Tp4DfOzppUOIBaymosicYUWMeSa1b7ZAdtxw,12866
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=cgojC7Z7oMtsUnkfSc65cRYOfZ8Q6KwjusNJzx_VSbk,2729
 anydi/_provider.py,sha256=w_GnRo324aqNORRJwuURexA54c1M3smj34Q8EaV0QGE,6213
 anydi/_scanner.py,sha256=F2sHgJvkRYXYnu4F5iSrnIPVzwnNeS7tRPXziirh4NI,4898
-anydi/_types.py,sha256=GK6grYnmcCQODhtDvqn224IU0FXqV9Grm6oj4MDQCPY,902
+anydi/_types.py,sha256=90xdbH2NrFXbridFf9mjOknhcXMW5L0jm92zP_LvKrg,1120
 anydi/_utils.py,sha256=guw4sFCvsisJmneKWlZi18YDYll_CjlO_f2cH97rDFQ,3280
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
@@ -21,12 +21,12 @@ anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfy
 anydi/ext/fastapi.py,sha256=AEL3ubu-LxUPHMMt1YIn3En_JZC7nyBKmKxmhka3O3c,2436
 anydi/ext/faststream.py,sha256=qXnNGvAqWWp9kbhbQUE6EF_OPUiYQmtOH211_O7BI_0,1898
 anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
-anydi/ext/pytest_plugin.py,sha256=Df0pFgAOk-44UFsdZGAOSxElJTJLchs4sk2UZuV-KVk,4212
+anydi/ext/pytest_plugin.py,sha256=3x_ZYFcLp4ZCRrs7neoohmWz56O9ydm92jxi_LnyD7w,4298
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=PKip_omFZDgg7h2OY-nnV2OIS1MbbmrrOJBwG7_Peuw,793
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.33.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.33.0.dist-info/METADATA,sha256=NASeDNxy6DOKFk8hNXO7QAnOmWLgqFvJ0qNK8qlL7BE,5112
-anydi-0.33.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.33.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.33.0.dist-info/RECORD,,
+anydi-0.33.1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.33.1.dist-info/METADATA,sha256=u-YkBHTqAbah4ytfw7CXHEUNDVyjhBFUwD2dV8z84Jc,5112
+anydi-0.33.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.33.1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.33.1.dist-info/RECORD,,