anydi 0.36.0a0__py3-none-any.whl → 0.36.1a0__py3-none-any.whl

anydi/_container.py

@@ -449,25 +449,18 @@ class Container:
 
     def resolve(self, interface: type[T]) -> T:
         """Resolve an instance by interface."""
-        if interface in self._override_instances:
-            return cast(T, self._override_instances[interface])
-
         provider = self._get_or_register_provider(interface, None)
         if provider.scope == "transient":
-            instance, created = self._create_instance(provider, None), True
+            instance = self._create_instance(provider, None)
         else:
             context = self._get_scoped_context(provider.scope)
             if provider.scope == "singleton":
                 with self._singleton_lock:
-                    instance, created = self._get_or_create_instance(
-                        provider, context=context
-                    )
+                    instance = self._get_or_create_instance(provider, context)
             else:
-                instance, created = self._get_or_create_instance(
-                    provider, context=context
-                )
-        if self.testing and created:
-            self._patch_test_resolver(instance)
+                instance = self._get_or_create_instance(provider, context)
+        if self.testing:
+            instance = self._patch_test_resolver(provider.interface, instance)
         return cast(T, instance)
 
     @overload
@@ -478,25 +471,18 @@ class Container:
 
     async def aresolve(self, interface: type[T]) -> T:
         """Resolve an instance by interface asynchronously."""
-        if interface in self._override_instances:
-            return cast(T, self._override_instances[interface])
-
         provider = self._get_or_register_provider(interface, None)
         if provider.scope == "transient":
-            instance, created = await self._acreate_instance(provider, None), True
+            instance = await self._acreate_instance(provider, None)
         else:
             context = self._get_scoped_context(provider.scope)
             if provider.scope == "singleton":
                 async with self._singleton_async_lock:
-                    instance, created = await self._aget_or_create_instance(
-                        provider, context=context
-                    )
+                    instance = await self._aget_or_create_instance(provider, context)
             else:
-                instance, created = await self._aget_or_create_instance(
-                    provider, context=context
-                )
-        if self.testing and created:
-            self._patch_test_resolver(instance)
+                instance = await self._aget_or_create_instance(provider, context)
+        if self.testing:
+            instance = self._patch_test_resolver(interface, instance)
         return cast(T, instance)
 
     def create(self, interface: type[T], **defaults: Any) -> T:
@@ -531,27 +517,25 @@ class Container:
 
     def _get_or_create_instance(
         self, provider: Provider, context: InstanceContext
-    ) -> tuple[Any, bool]:
+    ) -> Any:
         """Get an instance of a dependency from the scoped context."""
         instance = context.get(provider.interface)
         if instance is None:
             instance = self._create_instance(provider, context)
-            if not self._override_instances:
-                context.set(provider.interface, instance)
-                return instance, True
-        return instance, False
+            context.set(provider.interface, instance)
+            return instance
+        return instance
 
     async def _aget_or_create_instance(
         self, provider: Provider, context: InstanceContext
-    ) -> tuple[Any, bool]:
+    ) -> Any:
         """Get an async instance of a dependency from the scoped context."""
         instance = context.get(provider.interface)
         if instance is None:
             instance = await self._acreate_instance(provider, context)
-            if not self._override_instances:
-                context.set(provider.interface, instance)
-                return instance, True
-        return instance, False
+            context.set(provider.interface, instance)
+            return instance
+        return instance
 
     def _create_instance(
         self, provider: Provider, context: InstanceContext | None, /, **defaults: Any
@@ -638,9 +622,7 @@ class Container:
             return defaults[parameter.name]
 
         # Get instance from overrides or context cache
-        if parameter.annotation in self._override_instances:
-            return self._override_instances[parameter.annotation]
-        elif context and parameter.annotation in context:
+        if context and parameter.annotation in context:
             return context[parameter.annotation]
 
         # Resolve the instance
@@ -724,10 +706,16 @@ class Container:
                 "or set in the scoped context."
             )
 
-    def _patch_test_resolver(self, instance: Any) -> None:
+    def _patch_test_resolver(self, interface: type[Any], instance: Any) -> Any:
         """Patch the test resolver for the instance."""
+        if interface in self._override_instances:
+            return self._override_instances[interface]
+
         if not hasattr(instance, "__dict__"):
-            return
+            return instance
+
+        if hasattr(instance, "__patched__"):
+            return instance
 
         wrapped = {
             name: value.interface
@@ -738,8 +726,9 @@ class Container:
         # Custom resolver function
         def _resolver(_self: Any, _name: str) -> Any:
             if _name in wrapped:
+                _interface = wrapped[_name]
                 # Resolve the dependency if it's wrapped
-                return self.resolve(wrapped[_name])
+                return self.resolve(_interface)
             # Fall back to default behavior
             return object.__getattribute__(_self, _name)
 
@@ -747,6 +736,10 @@ class Container:
         if wrapped:
             instance.__class__.__getattribute__ = _resolver
 
+        instance.__patched__ = True
+
+        return instance
+
     def is_resolved(self, interface: AnyInterface) -> bool:
         """Check if an instance by interface exists."""
         try:

{anydi-0.36.0a0.dist-info → anydi-0.36.1a0.dist-info}/METADATA

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

{anydi-0.36.0a0.dist-info → anydi-0.36.1a0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 anydi/__init__.py,sha256=OfRg2EfXD65pHTGQKhfkABMwUhw5LvsuTQV_Tv4V4wk,501
-anydi/_container.py,sha256=2MvGilZn2qV1kyNiOkT9wiIbVAbaN5m1XvEyPUDj2ks,38028
+anydi/_container.py,sha256=zqra2aBaSxWYjcQscxWIzS2dhdIaNw7O4OS45YWiYi8,37586
 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.0a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.36.0a0.dist-info/METADATA,sha256=iM_-xJgNAYAACfpk7h4RHI3F1lPz7dQj_CWxEho8VHs,5066
-anydi-0.36.0a0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.36.0a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.36.0a0.dist-info/RECORD,,
+anydi-0.36.1a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.36.1a0.dist-info/METADATA,sha256=L4tC2RFRJJEaRxq67bb1-iDWZsLTDZ4BqHnrbP_7urQ,5066
+anydi-0.36.1a0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.36.1a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.36.1a0.dist-info/RECORD,,