anydi 0.33.0__tar.gz → 0.33.1__tar.gz

{anydi-0.33.0 → anydi-0.33.1}/PKG-INFO

@@ -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 → anydi-0.33.1}/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-0.33.0 → anydi-0.33.1}/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-0.33.0 → anydi-0.33.1}/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-0.33.0 → anydi-0.33.1}/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 → anydi-0.33.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anydi"
-version = "0.33.0"
+version = "0.33.1"
 description = "Dependency Injection library"
 authors = ["Anton Ruhlov <antonruhlov@gmail.com>"]
 license = "MIT"