anydi 0.36.1a3__py3-none-any.whl → 0.36.1a5__py3-none-any.whl

anydi/_container.py

@@ -36,9 +36,7 @@ from ._utils import (
     get_full_qualname,
     get_typed_parameters,
     import_string,
-    is_async_context_manager,
     is_builtin_type,
-    is_context_manager,
     run_async,
 )
 
@@ -555,10 +553,7 @@ class Container:
             cm = contextlib.contextmanager(provider.call)(**provider_kwargs)
             return context.enter(cm)
 
-        instance = provider.call(**provider_kwargs)
-        if context is not None and is_context_manager(instance):
-            context.enter(instance)
-        return instance
+        return provider.call(**provider_kwargs)
 
     async def _acreate_instance(
         self, provider: Provider, context: InstanceContext | None, /, **defaults: Any
@@ -569,10 +564,7 @@ class Container:
         )
 
         if provider.is_coroutine:
-            instance = await provider.call(**provider_kwargs)
-            if context is not None and is_async_context_manager(instance):
-                await context.aenter(instance)
-            return instance
+            return await provider.call(**provider_kwargs)
 
         if provider.is_async_generator:
             if context is None:
@@ -592,10 +584,7 @@ class Container:
 
             return await run_async(_create)
 
-        instance = await run_async(provider.call, **provider_kwargs)
-        if context is not None and is_async_context_manager(instance):
-            await context.aenter(instance)
-        return instance
+        return await run_async(provider.call, **provider_kwargs)
 
     def _get_provided_kwargs(
         self, provider: Provider, context: InstanceContext | None, /, **defaults: Any
@@ -618,25 +607,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 context and parameter.annotation in context:
-            return context[parameter.annotation]
+        # Try to get instance from context
+        elif context and parameter.annotation in context:
+            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(
@@ -660,20 +651,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 context and parameter.annotation in context:
-            return context[parameter.annotation]
+        # Try to get instance from context
+        elif context and parameter.annotation in context:
+            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:
@@ -727,6 +721,9 @@ class Container:
                 return self.resolve(_interface)
             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:
@@ -747,9 +744,6 @@ class Container:
             instance.__class__.__getattribute__ = __getattribute__
             instance.__class__.__getattribute_patched__ = True
 
-        # Attach the resolver getter to the instance
-        instance.__resolver_getter__ = __resolver_getter__
-
         return instance
 
     def is_resolved(self, interface: AnyInterface) -> bool:

anydi/_utils.py

@@ -44,16 +44,6 @@ def is_builtin_type(tp: type[Any]) -> bool:
     return tp.__module__ == builtins.__name__
 
 
-def is_context_manager(obj: Any) -> bool:
-    """Check if the given object is a context manager."""
-    return hasattr(obj, "__enter__") and hasattr(obj, "__exit__")
-
-
-def is_async_context_manager(obj: Any) -> bool:
-    """Check if the given object is an async context manager."""
-    return hasattr(obj, "__aenter__") and hasattr(obj, "__aexit__")
-
-
 def get_typed_annotation(
     annotation: Any, globalns: dict[str, Any], module: Any = None
 ) -> Any:

{anydi-0.36.1a3.dist-info → anydi-0.36.1a5.dist-info}/METADATA

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

{anydi-0.36.1a3.dist-info → anydi-0.36.1a5.dist-info}/RECORD

@@ -1,9 +1,9 @@
 anydi/__init__.py,sha256=OfRg2EfXD65pHTGQKhfkABMwUhw5LvsuTQV_Tv4V4wk,501
-anydi/_container.py,sha256=iJy5GoGDvs7CmV7NsTtzfnl1k53wWky6IvT0vCLAD2k,38090
+anydi/_container.py,sha256=7Qwreyqnc95M0mgDus6vQmyuIF5qLFTMaBoA7GoWELg,37772
 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
-anydi/_utils.py,sha256=INI0jNIXrJ6LS4zqJymMO2yUEobpxmBGASf4G_vR6AU,4378
+anydi/_utils.py,sha256=gU5ccCC2JZpKOY84ZCJ3PHyaEGhTW82PkGAhS6_R_qI,4027
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
@@ -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.1a3.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.36.1a3.dist-info/METADATA,sha256=KacqHtuQbewO_xqZOchuioqBcgXuHcLiGjHUsp8hDDM,5066
-anydi-0.36.1a3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.36.1a3.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.36.1a3.dist-info/RECORD,,
+anydi-0.36.1a5.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.36.1a5.dist-info/METADATA,sha256=pmhLHtLYS6Hi90rx0etN5ViIkIJYGMeOopTfyKPCHhY,5066
+anydi-0.36.1a5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.36.1a5.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.36.1a5.dist-info/RECORD,,