anydi 0.39.0__py3-none-any.whl → 0.39.2__py3-none-any.whl

anydi/_container.py

@@ -8,7 +8,6 @@ import importlib
 import inspect
 import logging
 import pkgutil
-import threading
 import types
 import uuid
 from collections import defaultdict
@@ -36,7 +35,6 @@ from ._types import (
     is_marker,
 )
 from ._utils import (
-    AsyncRLock,
     get_full_qualname,
     get_typed_annotation,
     get_typed_parameters,
@@ -44,15 +42,11 @@ from ._utils import (
     is_async_context_manager,
     is_builtin_type,
     is_context_manager,
+    is_iterator_type,
+    is_none_type,
     run_async,
 )
 
-try:
-    from types import NoneType
-except ImportError:
-    NoneType = type(None)  # type: ignore[misc]
-
-
 T = TypeVar("T", bound=Any)
 M = TypeVar("M", bound="Module")
 P = ParamSpec("P")
@@ -107,8 +101,6 @@ class Container:
         self._logger = logger or logging.getLogger(__name__)
         self._resources: dict[str, list[type[Any]]] = defaultdict(list)
         self._singleton_context = InstanceContext()
-        self._singleton_lock = threading.RLock()
-        self._singleton_async_lock = AsyncRLock()
         self._request_context_var: ContextVar[InstanceContext | None] = ContextVar(
             "request_context", default=None
         )
@@ -254,7 +246,7 @@ class Container:
             )
         return request_context
 
-    def _get_scoped_context(self, scope: Scope) -> InstanceContext:
+    def _get_instance_context(self, scope: Scope) -> InstanceContext:
         """Get the instance context for the specified scope."""
         if scope == "singleton":
             return self._singleton_context
@@ -292,7 +284,7 @@ class Container:
         # Cleanup instance context
         if provider.scope != "transient":
             try:
-                context = self._get_scoped_context(provider.scope)
+                context = self._get_instance_context(provider.scope)
             except LookupError:
                 pass
             else:
@@ -343,16 +335,16 @@ class Container:
                 interface = signature.return_annotation
                 if interface is inspect.Signature.empty:
                     interface = None
-                else:
-                    interface = get_typed_annotation(interface, globalns, module)
+
+        if isinstance(interface, str):
+            interface = get_typed_annotation(interface, globalns, module)
 
         # If the callable is an iterator, return the actual type
-        iterator_types = {Iterator, AsyncIterator}
-        if interface in iterator_types or get_origin(interface) in iterator_types:
+        if is_iterator_type(interface) or is_iterator_type(get_origin(interface)):
             if args := get_args(interface):
                 interface = args[0]
                 # If the callable is a generator, return the resource type
-                if interface in {None, NoneType}:
+                if is_none_type(interface):
                     interface = type(f"Event_{uuid.uuid4().hex}", (Event,), {})
             else:
                 raise TypeError(
@@ -361,7 +353,7 @@ class Container:
                 )
 
         # None interface is not allowed
-        if interface in {None, NoneType}:
+        if is_none_type(interface):
             raise TypeError(f"Missing `{name}` provider return annotation.")
 
         # Check for existing provider
@@ -424,7 +416,7 @@ class Container:
 
         # Check for unresolved parameters
         if unresolved_parameter:
-            if detected_scope not in {"singleton", "transient"}:
+            if detected_scope not in ("singleton", "transient"):
                 self._unresolved_interfaces.add(interface)
             else:
                 raise LookupError(
@@ -466,10 +458,7 @@ class Container:
                 f"scopes are supported: {', '.join(allowed_scopes)}. "
                 "Please use one of the supported scopes when registering a provider."
             )
-        if (
-            kind in {ProviderKind.GENERATOR, ProviderKind.ASYNC_GENERATOR}
-            and scope == "transient"
-        ):
+        if scope == "transient" and ProviderKind.is_resource(kind):
             raise TypeError(
                 f"The resource provider `{name}` is attempting to register "
                 "with a transient scope, which is not allowed."
@@ -565,7 +554,7 @@ class Container:
             return False
         if provider.scope == "transient":
             return False
-        context = self._get_scoped_context(provider.scope)
+        context = self._get_instance_context(provider.scope)
         return interface in context
 
     def release(self, interface: AnyInterface) -> None:
@@ -573,7 +562,7 @@ class Container:
         provider = self._get_provider(interface)
         if provider.scope == "transient":
             return None
-        context = self._get_scoped_context(provider.scope)
+        context = self._get_instance_context(provider.scope)
         del context[interface]
 
     def reset(self) -> None:
@@ -582,7 +571,7 @@ class Container:
             if provider.scope == "transient":
                 continue
             try:
-                context = self._get_scoped_context(provider.scope)
+                context = self._get_instance_context(provider.scope)
             except LookupError:
                 continue
             del context[interface]
@@ -595,15 +584,8 @@ class Container:
         if provider.scope == "transient":
             instance = self._create_instance(provider, None, **defaults)
         else:
-            context = self._get_scoped_context(provider.scope)
-            if provider.scope == "singleton":
-                with self._singleton_lock:
-                    instance = (
-                        self._get_or_create_instance(provider, context)
-                        if not create
-                        else self._create_instance(provider, context, **defaults)
-                    )
-            else:
+            context = self._get_instance_context(provider.scope)
+            with context.lock():
                 instance = (
                     self._get_or_create_instance(provider, context)
                     if not create
@@ -623,15 +605,8 @@ class Container:
         if provider.scope == "transient":
             instance = await self._acreate_instance(provider, None, **defaults)
         else:
-            context = self._get_scoped_context(provider.scope)
-            if provider.scope == "singleton":
-                async with self._singleton_async_lock:
-                    instance = (
-                        await self._aget_or_create_instance(provider, context)
-                        if not create
-                        else await self._acreate_instance(provider, context, **defaults)
-                    )
-            else:
+            context = self._get_instance_context(provider.scope)
+            async with context.alock():
                 instance = (
                     await self._aget_or_create_instance(provider, context)
                     if not create
@@ -853,8 +828,10 @@ class Container:
                 "not registered."
             )
         self._override_instances[interface] = instance
-        yield
-        del self._override_instances[interface]
+        try:
+            yield
+        finally:
+            self._override_instances.pop(interface, None)
 
     ############################
     # Testing Methods

anydi/_context.py

@@ -1,23 +1,26 @@
 from __future__ import annotations
 
 import contextlib
+import threading
 from types import TracebackType
 from typing import Any
 
 from typing_extensions import Self
 
-from ._utils import run_async
+from ._utils import AsyncRLock, run_async
 
 
 class InstanceContext:
     """A context to store instances."""
 
-    __slots__ = ("_instances", "_stack", "_async_stack")
+    __slots__ = ("_instances", "_stack", "_async_stack", "_lock", "_async_lock")
 
     def __init__(self) -> None:
         self._instances: dict[type[Any], Any] = {}
         self._stack = contextlib.ExitStack()
         self._async_stack = contextlib.AsyncExitStack()
+        self._lock = threading.RLock()
+        self._async_lock = AsyncRLock()
 
     def get(self, interface: type[Any]) -> Any | None:
         """Get an instance from the context."""
@@ -82,3 +85,11 @@ class InstanceContext:
     async def aclose(self) -> None:
         """Close the scoped context asynchronously."""
         await self.__aexit__(None, None, None)
+
+    def lock(self) -> threading.RLock:
+        """Acquire the context lock."""
+        return self._lock
+
+    def alock(self) -> AsyncRLock:
+        """Acquire the context lock asynchronously."""
+        return self._async_lock

anydi/_types.py

@@ -82,10 +82,9 @@ class ProviderKind(enum.IntEnum):
             "object. Only callable providers are allowed."
         )
 
-
-@dataclass(kw_only=True, frozen=True)
-class ProviderParameter:
-    pass
+    @classmethod
+    def is_resource(cls, kind: ProviderKind) -> bool:
+        return kind in (cls.GENERATOR, cls.ASYNC_GENERATOR)
 
 
 @dataclass(kw_only=True, frozen=True)
@@ -122,7 +121,7 @@ class Provider:
 
     @cached_property
     def is_resource(self) -> bool:
-        return self.is_generator or self.is_async_generator
+        return ProviderKind.is_resource(self.kind)
 
 
 class ProviderArgs(NamedTuple):

anydi/_utils.py

@@ -8,12 +8,18 @@ import importlib
 import inspect
 import re
 import sys
+from collections.abc import AsyncIterator, Iterator
 from types import TracebackType
 from typing import Any, Callable, ForwardRef, TypeVar
 
 import anyio
 from typing_extensions import ParamSpec, Self, get_args, get_origin
 
+try:
+    from types import NoneType
+except ImportError:
+    NoneType = type(None)  # type: ignore[misc]
+
 T = TypeVar("T")
 P = ParamSpec("P")
 
@@ -57,6 +63,16 @@ def is_async_context_manager(obj: Any) -> bool:
     return hasattr(obj, "__aenter__") and hasattr(obj, "__aexit__")
 
 
+def is_none_type(tp: Any) -> bool:
+    """Check if the given object is a None type."""
+    return tp in (None, NoneType)
+
+
+def is_iterator_type(tp: Any) -> bool:
+    """Check if the given object is an iterator type."""
+    return tp in (Iterator, AsyncIterator)
+
+
 def get_typed_annotation(
     annotation: Any, globalns: dict[str, Any], module: Any = None
 ) -> Any:

{anydi-0.39.0.dist-info → anydi-0.39.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.39.0
+Version: 0.39.2
 Summary: Dependency Injection library
 Project-URL: Repository, https://github.com/antonrh/anydi
 Author-email: Anton Ruhlov <antonruhlov@gmail.com>
@@ -91,7 +91,7 @@ container = Container()
 
 @container.provider(scope="singleton")
 def message() -> str:
-    return "Hello, world!"
+    return "Hello, World!"
 
 
 @container.inject

{anydi-0.39.0.dist-info → anydi-0.39.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
 anydi/__init__.py,sha256=aAq10a1V_zQ3_Me3p_pll5d1O77PIgqotkOm3pshORI,495
-anydi/_container.py,sha256=wZ-_p0hehK7MBeHos7mi4TrZoPd1daeG52bcFmX4ZRA,42421
-anydi/_context.py,sha256=7LV_SL4QWkJeiG7_4D9PZ5lmU-MPzhofxC95zCgY9Gc,2651
-anydi/_types.py,sha256=S7scIdAzc2SyDUfEA4Knc89W6q-sdoGa3UBq-dqtq2c,3582
-anydi/_utils.py,sha256=OxePzLBD_mn3Ex2I93udoodlIARyKT3TLjXTFbZdmqw,4427
+anydi/_container.py,sha256=TmiH3ZXY1edF_i1-peCwrxNpJxjJ1eyIbbO5WMSVDNE,41499
+anydi/_context.py,sha256=dlRvOFHbbIcg-q7g4TqJfytiSOERtbwTlCsdzXwo4GE,3012
+anydi/_types.py,sha256=ColGaOgF7Zqdh34N2JSWxr-8rt5bTVJomW0JqZASKHM,3631
+anydi/_utils.py,sha256=X_sSQFpRogHLh6Bxu0MdUthpc24jvnkHqdwKndQminA,4848
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
@@ -21,8 +21,8 @@ anydi/ext/django/ninja/_operation.py,sha256=wSWa7D73XTVlOibmOciv2l6JHPe1ERZcXrqI
 anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfyk_NVEWw,2207
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=9CQtGg5ZzUz2gFSzJr8U4BWzwNjK8XMctm3n52M77Z0,792
-anydi-0.39.0.dist-info/METADATA,sha256=N5gGFXgCfjaZ8V-MQvItEOeWJhDreePyYk4nuf4Af2g,4957
-anydi-0.39.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.39.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.39.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.39.0.dist-info/RECORD,,
+anydi-0.39.2.dist-info/METADATA,sha256=lqw8W8T5TTlZs--a9J7F9h-tf1f9zrngbntTCE-VNNY,4957
+anydi-0.39.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.39.2.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.39.2.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.39.2.dist-info/RECORD,,