anydi 0.37.0__py3-none-any.whl → 0.37.2__py3-none-any.whl

anydi/_container.py

@@ -622,7 +622,7 @@ class Container:
 
         # Try to get instance from defaults
         if parameter.name in defaults:
-            instance = defaults[parameter.name]
+            return defaults[parameter.name]
 
         # Try to get instance from context
         elif context and parameter.annotation in context:
@@ -635,11 +635,11 @@ class Container:
             except LookupError:
                 if parameter.default is inspect.Parameter.empty:
                     raise
-                instance = parameter.default
+                return parameter.default
 
         # 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(
@@ -666,7 +666,7 @@ class Container:
 
         # Try to get instance from defaults
         if parameter.name in defaults:
-            instance = defaults[parameter.name]
+            return defaults[parameter.name]
 
         # Try to get instance from context
         elif context and parameter.annotation in context:
@@ -679,11 +679,11 @@ class Container:
             except LookupError:
                 if parameter.default is inspect.Parameter.empty:
                     raise
-                instance = parameter.default
+                return parameter.default
 
         # 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(

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-0.37.0.dist-info → anydi-0.37.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.37.0
+Version: 0.37.2
 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.37.0.dist-info → anydi-0.37.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
 anydi/__init__.py,sha256=OfRg2EfXD65pHTGQKhfkABMwUhw5LvsuTQV_Tv4V4wk,501
-anydi/_container.py,sha256=-hk-6rzRZeMdxnVFqPkEehTlk0yF2DYjm1n1wGHsTLY,38338
+anydi/_container.py,sha256=Mfo5fOacyWMbKJmAt1s8P_t7vX7qpAXnC7WFsxKWs4E,38304
 anydi/_context.py,sha256=7LV_SL4QWkJeiG7_4D9PZ5lmU-MPzhofxC95zCgY9Gc,2651
 anydi/_provider.py,sha256=1IyxHO83NHjsPDHLDIZtW1pJ7i8VpWD3EM4T6duw9zA,7661
-anydi/_types.py,sha256=Vttj9GTp9g0KKpK-uqolLfVZJPIM7f7_YL8bPlablcQ,1539
+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
@@ -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.37.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.37.0.dist-info/METADATA,sha256=kBDlCMavWC9DuKj2TnoeZroVJZg7DCdWzKzvAMkEkkk,5064
-anydi-0.37.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.37.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.37.0.dist-info/RECORD,,
+anydi-0.37.2.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.37.2.dist-info/METADATA,sha256=Fplyfc7Bg67HhINBdcRkvn4kJUSR3mWxJ42Bj5B_jEs,5103
+anydi-0.37.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.37.2.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.37.2.dist-info/RECORD,,