anydi 0.36.1a2__py3-none-any.whl → 0.36.1a4__py3-none-any.whl

anydi/_container.py

@@ -618,27 +618,27 @@ class Container:
         **defaults: Any,
     ) -> Any:
         """Retrieve an instance of a dependency from the scoped context."""
+
+        # Try to get instance from defaults
         if parameter.name in defaults:
-            return defaults[parameter.name]
+            instance = defaults[parameter.name]
 
-        # Get instance from overrides or context cache
-        if parameter.annotation in self._override_instances:
-            return self._override_instances[parameter.annotation]
+        # Try to get instance from context
         elif context and parameter.annotation in context:
-            return context[parameter.annotation]
+            instance = context[parameter.annotation]
 
-        # Resolve the instance
-        try:
-            instance = self._resolve_parameter(provider, parameter)
-        except LookupError:
-            if parameter.default is inspect.Parameter.empty:
-                raise
-            instance = parameter.default
+        # Resolve new instance
+        else:
+            try:
+                instance = self._resolve_parameter(provider, parameter)
+            except LookupError:
+                if parameter.default is inspect.Parameter.empty:
+                    raise
+                instance = parameter.default
 
         # Wrap the instance in a proxy for testing
         if self.testing:
             return InstanceProxy(interface=parameter.annotation, instance=instance)
-
         return instance
 
     async def _aget_provided_kwargs(
@@ -662,22 +662,23 @@ class Container:
         **defaults: Any,
     ) -> Any:
         """Asynchronously retrieve an instance of a dependency from the context."""
+
+        # Try to get instance from defaults
         if parameter.name in defaults:
-            return defaults[parameter.name]
+            instance = defaults[parameter.name]
 
-        # Get instance from overrides or context cache
-        if parameter.annotation in self._override_instances:
-            return self._override_instances[parameter.annotation]
+        # Try to get instance from context
         elif context and parameter.annotation in context:
-            return context[parameter.annotation]
+            instance = context[parameter.annotation]
 
-        # Resolve the instance
-        try:
-            instance = await self._aresolve_parameter(provider, parameter)
-        except LookupError:
-            if parameter.default is inspect.Parameter.empty:
-                raise
-            instance = parameter.default
+        # Resolve new instance
+        else:
+            try:
+                instance = await self._aresolve_parameter(provider, parameter)
+            except LookupError:
+                if parameter.default is inspect.Parameter.empty:
+                    raise
+                instance = parameter.default
 
         # Wrap the instance in a proxy for testing
         if self.testing:
@@ -713,10 +714,9 @@ class Container:
         if interface in self._override_instances:
             return self._override_instances[interface]
 
-        if not hasattr(instance, "__dict__"):
-            return instance
-
-        if hasattr(instance, "__patched__"):
+        if not hasattr(instance, "__dict__") or hasattr(
+            instance, "__resolver_getter__"
+        ):
             return instance
 
         wrapped = {
@@ -725,20 +725,35 @@ class Container:
             if isinstance(value, InstanceProxy)
         }
 
-        # Custom resolver function
-        def _resolver(_self: Any, _name: str) -> Any:
-            if _name in wrapped:
-                _interface = wrapped[_name]
+        def __resolver_getter__(name: str) -> Any:
+            if name in wrapped:
+                _interface = wrapped[name]
                 # Resolve the dependency if it's wrapped
                 return self.resolve(_interface)
-            # Fall back to default behavior
-            return object.__getattribute__(_self, _name)
+            raise LookupError
+
+        # Attach the resolver getter to the instance
+        instance.__resolver_getter__ = __resolver_getter__
+
+        if not hasattr(instance.__class__, "__getattribute_patched__"):
+
+            def __getattribute__(_self: Any, name: str) -> Any:
+                # Skip the resolver getter
+                if name in {"__resolver_getter__"}:
+                    return object.__getattribute__(_self, name)
+
+                if hasattr(_self, "__resolver_getter__"):
+                    try:
+                        return _self.__resolver_getter__(name)
+                    except LookupError:
+                        pass
 
-        # Apply the patched resolver if wrapped attributes exist
-        if wrapped:
-            instance.__class__.__getattribute__ = _resolver
+                # Fall back to default behavior
+                return object.__getattribute__(_self, name)
 
-        instance.__patched__ = True
+            # Apply the patched resolver if wrapped attributes exist
+            instance.__class__.__getattribute__ = __getattribute__
+            instance.__class__.__getattribute_patched__ = True
 
         return instance
 

{anydi-0.36.1a2.dist-info → anydi-0.36.1a4.dist-info}/METADATA

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

{anydi-0.36.1a2.dist-info → anydi-0.36.1a4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 anydi/__init__.py,sha256=OfRg2EfXD65pHTGQKhfkABMwUhw5LvsuTQV_Tv4V4wk,501
-anydi/_container.py,sha256=Nf8fG7aFebE8DWFE41MzsiTkxN7J0_MHX1qfG-4nujo,37715
+anydi/_container.py,sha256=LSa1IMR8JeAtA5im9EWU8NOKqSCDjKmxXRt9mVXPAf4,38251
 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
@@ -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.1a2.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.36.1a2.dist-info/METADATA,sha256=UH6N4WaWq8NIEDk_RGBFqA9mPAu-zYAl1pFrLA8C8TY,5066
-anydi-0.36.1a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.36.1a2.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.36.1a2.dist-info/RECORD,,
+anydi-0.36.1a4.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.36.1a4.dist-info/METADATA,sha256=cDcue6lJu_2S7GNsR8ryi_C_lAti0rSKuXZebraSXRA,5066
+anydi-0.36.1a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.36.1a4.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.36.1a4.dist-info/RECORD,,