anydi 0.36.1a2__tar.gz → 0.36.1a4__tar.gz

{anydi-0.36.1a2 → anydi-0.36.1a4}/PKG-INFO

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

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