anydi 0.36.0a0__tar.gz → 0.36.1a1__tar.gz

{anydi-0.36.0a0 → anydi-0.36.1a1}/PKG-INFO

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

{anydi-0.36.0a0 → anydi-0.36.1a1}/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
@@ -682,9 +664,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 +704,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 +724,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 +734,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 → anydi-0.36.1a1}/pyproject.toml

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