anydi 0.33.0__py3-none-any.whl → 0.34.0__py3-none-any.whl

anydi/_container.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import contextlib
 import functools
 import inspect
+import threading
 import types
 from collections import defaultdict
 from collections.abc import AsyncIterator, Iterable, Iterator, Sequence
@@ -25,8 +26,8 @@ from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._provider import Provider
 from ._scanner import Scanner
-from ._types import AnyInterface, Interface, Scope, TestInterface, is_marker
-from ._utils import get_full_qualname, get_typed_parameters, is_builtin_type
+from ._types import AnyInterface, DependencyWrapper, Interface, Scope, is_marker
+from ._utils import AsyncRLock, get_full_qualname, get_typed_parameters, is_builtin_type
 
 T = TypeVar("T", bound=Any)
 P = ParamSpec("P")
@@ -54,6 +55,8 @@ class Container:
         self._providers: dict[type[Any], Provider] = {}
         self._resource_cache: dict[Scope, list[type[Any]]] = defaultdict(list)
         self._singleton_context = SingletonContext(self)
+        self._singleton_lock = threading.RLock()
+        self._singleton_async_lock = AsyncRLock()
         self._transient_context = TransientContext(self)
         self._request_context_var: ContextVar[RequestContext | None] = ContextVar(
             "request_context", default=None
@@ -366,33 +369,15 @@ class Container:
 
         provider = self._get_or_register_provider(interface)
         scoped_context = self._get_scoped_context(provider.scope)
-        instance, created = scoped_context.get_or_create(provider)
+        if provider.scope == "singleton":
+            with self._singleton_lock:
+                instance, created = scoped_context.get_or_create(provider)
+        else:
+            instance, created = scoped_context.get_or_create(provider)
         if self.testing and created:
             self._patch_test_resolver(instance)
         return cast(T, instance)
 
-    def _patch_test_resolver(self, instance: Any) -> None:
-        """Patch the test resolver for the instance."""
-
-        def _resolver(_self: Any, _name: str) -> Any:
-            try:
-                test_interfaces = object.__getattribute__(_self, "__test_interfaces__")
-            except AttributeError:
-                test_interfaces = {
-                    name: value.interface
-                    for name, value in object.__getattribute__(
-                        _self, "__dict__"
-                    ).items()
-                    if isinstance(value, TestInterface)
-                }
-                object.__setattr__(_self, "__test_interfaces__", test_interfaces)
-            if _name in test_interfaces:
-                return self.resolve(test_interfaces[_name])
-            return object.__getattribute__(_self, _name)
-
-        if hasattr(instance, "__class__") and not is_builtin_type(instance.__class__):
-            instance.__class__.__getattribute__ = _resolver
-
     @overload
     async def aresolve(self, interface: Interface[T]) -> T: ...
 
@@ -406,11 +391,38 @@ class Container:
 
         provider = self._get_or_register_provider(interface)
         scoped_context = self._get_scoped_context(provider.scope)
-        instance, created = await scoped_context.aget_or_create(provider)
+        if provider.scope == "singleton":
+            async with self._singleton_async_lock:
+                instance, created = await scoped_context.aget_or_create(provider)
+        else:
+            instance, created = await scoped_context.aget_or_create(provider)
         if self.testing and created:
             self._patch_test_resolver(instance)
         return cast(T, instance)
 
+    def _patch_test_resolver(self, instance: Any) -> None:
+        """Patch the test resolver for the instance."""
+        if not hasattr(instance, "__dict__"):
+            return
+
+        wrapped = {
+            name: value.interface
+            for name, value in instance.__dict__.items()
+            if isinstance(value, DependencyWrapper)
+        }
+
+        # Custom resolver function
+        def _resolver(_self: Any, _name: str) -> Any:
+            if _name in wrapped:
+                # Resolve the dependency if it's wrapped
+                return self.resolve(wrapped[_name])
+            # Fall back to default behavior
+            return object.__getattribute__(_self, _name)
+
+        # Apply the patched resolver if wrapped attributes exist
+        if wrapped:
+            instance.__class__.__getattribute__ = _resolver
+
     def is_resolved(self, interface: AnyInterface) -> bool:
         """Check if an instance by interface exists."""
         try:

anydi/_context.py

@@ -9,8 +9,13 @@ from typing import TYPE_CHECKING, Any, Callable, ClassVar
 from typing_extensions import Self, final
 
 from ._provider import CallableKind, Provider
-from ._types import AnyInterface, Scope, TestInterface, is_event_type
-from ._utils import get_full_qualname, run_async
+from ._types import AnyInterface, DependencyWrapper, Scope, is_event_type
+from ._utils import (
+    get_full_qualname,
+    is_async_context_manager,
+    is_context_manager,
+    run_async,
+)
 
 if TYPE_CHECKING:
     from ._container import Container
@@ -99,7 +104,9 @@ class ScopedContext(abc.ABC):
                     instance = parameter.default
                 else:
                     if self.container.testing:
-                        instance = TestInterface(interface=parameter.annotation)
+                        instance = DependencyWrapper(
+                            interface=parameter.annotation, instance=instance
+                        )
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
             else:
@@ -127,7 +134,9 @@ class ScopedContext(abc.ABC):
                     instance = parameter.default
                 else:
                     if self.container.testing:
-                        instance = TestInterface(interface=parameter.annotation)
+                        instance = DependencyWrapper(
+                            interface=parameter.annotation, instance=instance
+                        )
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
             else:
@@ -184,7 +193,7 @@ class ResourceScopedContext(ScopedContext):
         """Create an instance using the provider."""
         instance = super()._create_instance(provider)
         # Enter the context manager if the instance is closable.
-        if hasattr(instance, "__enter__") and hasattr(instance, "__exit__"):
+        if is_context_manager(instance):
             self._stack.enter_context(instance)
         return instance
 
@@ -198,7 +207,7 @@ class ResourceScopedContext(ScopedContext):
         """Create an instance asynchronously using the provider."""
         instance = await super()._acreate_instance(provider)
         # Enter the context manager if the instance is closable.
-        if hasattr(instance, "__aenter__") and hasattr(instance, "__aexit__"):
+        if is_async_context_manager(instance):
             await self._async_stack.enter_async_context(instance)
         return instance
 
@@ -229,8 +238,6 @@ class ResourceScopedContext(ScopedContext):
     @abc.abstractmethod
     def start(self) -> None:
         """Start the scoped context."""
-        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
-            self.container.resolve(interface)
 
     def close(self) -> None:
         """Close the scoped context."""

anydi/_types.py

@@ -39,5 +39,11 @@ def is_event_type(obj: Any) -> bool:
 
 
 @dataclass(frozen=True)
-class TestInterface:
+class DependencyWrapper:
     interface: type[Any]
+    instance: Any
+
+    def __getattribute__(self, name: str) -> Any:
+        if name in {"interface", "instance"}:
+            return object.__getattribute__(self, name)
+        return getattr(self.instance, name)

anydi/_utils.py

@@ -8,15 +8,11 @@ import importlib
 import inspect
 import re
 import sys
+from types import TracebackType
 from typing import Any, Callable, ForwardRef, TypeVar
 
-from typing_extensions import ParamSpec, get_args, get_origin
-
-try:
-    import anyio  # noqa
-except ImportError:
-    anyio = None  # type: ignore[assignment]
-
+import anyio
+from typing_extensions import ParamSpec, Self, get_args, get_origin
 
 T = TypeVar("T")
 P = ParamSpec("P")
@@ -48,6 +44,16 @@ 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:
@@ -82,11 +88,6 @@ async def run_async(
     **kwargs: P.kwargs,
 ) -> T:
     """Runs the given function asynchronously using the `anyio` library."""
-    if not anyio:
-        raise ImportError(
-            "`anyio` library is not currently installed. Please make sure to install "
-            "it first, or consider using `anydi[full]` instead."
-        )
     return await anyio.to_thread.run_sync(functools.partial(func, *args, **kwargs))
 
 
@@ -103,3 +104,39 @@ def import_string(dotted_path: str) -> Any:
             return importlib.import_module(attribute_name)
     except (ImportError, AttributeError) as exc:
         raise ImportError(f"Cannot import '{dotted_path}': {exc}") from exc
+
+
+class AsyncRLock:
+    def __init__(self) -> None:
+        self._lock = anyio.Lock()
+        self._owner: anyio.TaskInfo | None = None
+        self._count = 0
+
+    async def acquire(self) -> None:
+        current_task = anyio.get_current_task()
+        if self._owner == current_task:
+            self._count += 1
+        else:
+            await self._lock.acquire()
+            self._owner = current_task
+            self._count = 1
+
+    def release(self) -> None:
+        if self._owner != anyio.get_current_task():
+            raise RuntimeError("Lock can only be released by the owner")
+        self._count -= 1
+        if self._count == 0:
+            self._owner = None
+            self._lock.release()
+
+    async def __aenter__(self) -> Self:
+        await self.acquire()
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> Any:
+        self.release()

anydi/ext/pytest_plugin.py

@@ -105,8 +105,10 @@ def _anydi_inject(
 
         try:
             request.node.funcargs[argname] = container.resolve(interface)
-        except Exception:  # noqa
-            logger.warning(f"Failed to resolve dependency for argument '{argname}'.")
+        except Exception as exc:
+            logger.warning(
+                f"Failed to resolve dependency for argument '{argname}'.", exc_info=exc
+            )
             _anydi_unresolved.append(interface)
 
 
@@ -131,6 +133,8 @@ async def _anydi_ainject(
 
         try:
             request.node.funcargs[argname] = await container.aresolve(interface)
-        except Exception:  # noqa
-            logger.warning(f"Failed to resolve dependency for argument '{argname}'.")
+        except Exception as exc:
+            logger.warning(
+                f"Failed to resolve dependency for argument '{argname}'.", exc_info=exc
+            )
             _anydi_unresolved.append(interface)

{anydi-0.33.0.dist-info → anydi-0.34.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.33.0
+Version: 0.34.0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -28,9 +28,8 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Provides-Extra: async
 Provides-Extra: docs
-Requires-Dist: anyio (>=3.6.2,<4.0.0) ; extra == "async"
+Requires-Dist: anyio (>=3.6.2,<4.0.0)
 Requires-Dist: mkdocs (>=1.4.2,<2.0.0) ; extra == "docs"
 Requires-Dist: mkdocs-material (>=9.5.29,<10.0.0) ; extra == "docs"
 Requires-Dist: typing-extensions (>=4.12.1,<5.0.0)

{anydi-0.33.0.dist-info → anydi-0.34.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 anydi/__init__.py,sha256=EsR-HiMe8cWS9PQbY23ibc91STK1WTn02DFMPV-TNU4,509
-anydi/_container.py,sha256=M1V7OMYp1BGSj0RQInS6xXYi3HgDGQ9CwjDezvC-fQc,21538
-anydi/_context.py,sha256=vBbL0POdkdL-kr2CEp35gQvzIBlFN2q7-wCNhr6gJqg,12708
+anydi/_container.py,sha256=p1e8Lrh5JIzrtSsvqYWe8sP-W7dmlpxERspOGS4iivE,21884
+anydi/_context.py,sha256=2QvG4fDnfafXu7yF2EbY8kds96hkKyd8vni_NVmUrRs,12734
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=cgojC7Z7oMtsUnkfSc65cRYOfZ8Q6KwjusNJzx_VSbk,2729
 anydi/_provider.py,sha256=w_GnRo324aqNORRJwuURexA54c1M3smj34Q8EaV0QGE,6213
 anydi/_scanner.py,sha256=F2sHgJvkRYXYnu4F5iSrnIPVzwnNeS7tRPXziirh4NI,4898
-anydi/_types.py,sha256=GK6grYnmcCQODhtDvqn224IU0FXqV9Grm6oj4MDQCPY,902
-anydi/_utils.py,sha256=guw4sFCvsisJmneKWlZi18YDYll_CjlO_f2cH97rDFQ,3280
+anydi/_types.py,sha256=90xdbH2NrFXbridFf9mjOknhcXMW5L0jm92zP_LvKrg,1120
+anydi/_utils.py,sha256=INI0jNIXrJ6LS4zqJymMO2yUEobpxmBGASf4G_vR6AU,4378
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
@@ -21,12 +21,12 @@ anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfy
 anydi/ext/fastapi.py,sha256=AEL3ubu-LxUPHMMt1YIn3En_JZC7nyBKmKxmhka3O3c,2436
 anydi/ext/faststream.py,sha256=qXnNGvAqWWp9kbhbQUE6EF_OPUiYQmtOH211_O7BI_0,1898
 anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
-anydi/ext/pytest_plugin.py,sha256=Df0pFgAOk-44UFsdZGAOSxElJTJLchs4sk2UZuV-KVk,4212
+anydi/ext/pytest_plugin.py,sha256=3x_ZYFcLp4ZCRrs7neoohmWz56O9ydm92jxi_LnyD7w,4298
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=PKip_omFZDgg7h2OY-nnV2OIS1MbbmrrOJBwG7_Peuw,793
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.33.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.33.0.dist-info/METADATA,sha256=NASeDNxy6DOKFk8hNXO7QAnOmWLgqFvJ0qNK8qlL7BE,5112
-anydi-0.33.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.33.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.33.0.dist-info/RECORD,,
+anydi-0.34.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.34.0.dist-info/METADATA,sha256=VwSg8GNsINsMsEnlpRkFPxzGDCqYuqfyt5yJ1sL3pR8,5071
+anydi-0.34.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.34.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.34.0.dist-info/RECORD,,