anydi 0.25.1__py3-none-any.whl → 0.26.0__py3-none-any.whl

anydi/_container.py

@@ -6,6 +6,7 @@ import contextlib
 import inspect
 import types
 import uuid
+from collections import defaultdict
 from contextvars import ContextVar
 from functools import wraps
 from typing import (
@@ -24,7 +25,7 @@ from typing import (
     overload,
 )
 
-from typing_extensions import ParamSpec, final, get_args, get_origin
+from typing_extensions import ParamSpec, Self, final, get_args, get_origin
 
 try:
     from types import NoneType
@@ -85,6 +86,7 @@ class Container:
             strict: Whether to enable strict mode. Defaults to False.
         """
         self._providers: dict[type[Any], Provider] = {}
+        self._providers_cache: dict[Scope, list[type[Any]]] = defaultdict(list)
         self._singleton_context = SingletonContext(self)
         self._transient_context = TransientContext(self)
         self._request_context_var: ContextVar[RequestContext | None] = ContextVar(
@@ -170,11 +172,11 @@ class Container:
 
         # Create Event type
         if provider.is_resource and (interface is NoneType or interface is None):
-            interface = type(f"Event{uuid.uuid4().hex}", (), {})
+            interface = type(f"Event_{uuid.uuid4().hex}", (), {})
 
         if interface in self._providers:
             if override:
-                self._providers[interface] = provider
+                self._set_provider(interface, provider)
                 return provider
 
             raise LookupError(
@@ -187,7 +189,7 @@ class Container:
         self._validate_provider_type(provider)
         self._validate_provider_match_scopes(interface, provider)
 
-        self._providers[interface] = provider
+        self._set_provider(interface, provider)
         return provider
 
     def unregister(self, interface: AnyInterface) -> None:
@@ -275,6 +277,17 @@ class Container:
                 return self.register(interface, interface, scope=scope or "transient")
             raise
 
+    def _set_provider(self, interface: AnyInterface, provider: Provider) -> None:
+        """Set a provider by interface.
+
+        Args:
+            interface: The interface for which to set the provider.
+            provider: The provider object to set.
+        """
+        self._providers[interface] = provider
+        if provider.is_resource:
+            self._providers_cache[provider.scope].append(interface)
+
     def _validate_provider_scope(self, provider: Provider) -> None:
         """Validate the scope of a provider.
 
@@ -398,11 +411,23 @@ class Container:
         """
         self._modules.register(module)
 
+    def __enter__(self) -> Self:
+        """Enter the singleton context."""
+        self.start()
+        return self
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: types.TracebackType | None,
+    ) -> None:
+        """Exit the singleton context."""
+        self.close()
+
     def start(self) -> None:
         """Start the singleton context."""
-        for interface, provider in self._providers.items():
-            if provider.scope == "singleton":
-                self.resolve(interface)  # noqa
+        self._singleton_context.start()
 
     def close(self) -> None:
         """Close the singleton context."""
@@ -428,6 +453,20 @@ class Container:
             yield
             self._request_context_var.reset(token)
 
+    async def __aenter__(self) -> Self:
+        """Enter the singleton context."""
+        await self.astart()
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: types.TracebackType | None,
+    ) -> None:
+        """Exit the singleton context."""
+        await self.aclose()
+
     async def astart(self) -> None:
         """Start the singleton context asynchronously."""
         for interface, provider in self._providers.items():

anydi/_context.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 import abc
 import contextlib
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, TypeVar, cast
+from typing import TYPE_CHECKING, Any, ClassVar, TypeVar, cast
 
 from typing_extensions import Self, final
 
-from ._types import AnyInterface, Interface, Provider
+from ._types import AnyInterface, Interface, Provider, Scope
 from ._utils import run_async
 
 if TYPE_CHECKING:
@@ -19,6 +19,8 @@ T = TypeVar("T")
 class ScopedContext(abc.ABC):
     """ScopedContext base class."""
 
+    scope: ClassVar[Scope]
+
     def __init__(self, container: Container) -> None:
         self.container = container
 
@@ -233,6 +235,7 @@ class ResourceScopedContext(ScopedContext):
         Returns:
             The scoped context.
         """
+        self.start()
         return self
 
     def __exit__(
@@ -251,6 +254,11 @@ class ResourceScopedContext(ScopedContext):
         self.close()
         return
 
+    def start(self) -> None:
+        """Start the scoped context."""
+        for interface in self.container._providers_cache.get(self.scope, []):  # noqa
+            self.container.resolve(interface)
+
     def close(self) -> None:
         """Close the scoped context."""
         self._stack.close()
@@ -261,6 +269,7 @@ class ResourceScopedContext(ScopedContext):
         Returns:
             The scoped context.
         """
+        await self.astart()
         return self
 
     async def __aexit__(
@@ -279,6 +288,11 @@ class ResourceScopedContext(ScopedContext):
         await self.aclose()
         return
 
+    async def astart(self) -> None:
+        """Start the scoped context asynchronously."""
+        for interface in self.container._providers_cache.get(self.scope, []):  # noqa
+            await self.container.aresolve(interface)
+
     async def aclose(self) -> None:
         """Close the scoped context asynchronously."""
         await run_async(self._stack.close)
@@ -289,16 +303,22 @@ class ResourceScopedContext(ScopedContext):
 class SingletonContext(ResourceScopedContext):
     """A scoped context representing the "singleton" scope."""
 
+    scope = "singleton"
+
 
 @final
 class RequestContext(ResourceScopedContext):
     """A scoped context representing the "request" scope."""
 
+    scope = "request"
+
 
 @final
 class TransientContext(ScopedContext):
     """A scoped context representing the "transient" scope."""
 
+    scope = "transient"
+
     def get(self, interface: Interface[T], provider: Provider) -> T:
         """Get an instance of a dependency from the transient context.
 

anydi/_utils.py

@@ -8,7 +8,7 @@ import inspect
 import sys
 from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar, cast
 
-from typing_extensions import Annotated, ParamSpec, get_origin
+from typing_extensions import ParamSpec, get_args, get_origin
 
 try:
     import anyio  # noqa
@@ -33,27 +33,28 @@ P = ParamSpec("P")
 
 def get_full_qualname(obj: Any) -> str:
     """Get the fully qualified name of an object."""
-    origin = get_origin(obj)
-    if origin is Annotated:
-        metadata = ", ".join(
-            [
-                f'"{arg}"' if isinstance(arg, str) else str(arg)
-                for arg in obj.__metadata__
-            ]
-        )
-        return f"Annotated[{get_full_qualname(obj.__args__[0])}, {metadata}]]"
-
     qualname = getattr(obj, "__qualname__", None)
-    module_name = getattr(obj, "__module__", None)
+    module = getattr(obj, "__module__", None)
+
     if qualname is None:
         qualname = type(obj).__qualname__
 
-    if module_name is None:
-        module_name = type(obj).__module__
+    if module is None:
+        module = type(obj).__module__
 
-    if module_name == builtins.__name__:
+    if module == builtins.__name__:
         return qualname
-    return f"{module_name}.{qualname}"
+
+    origin = get_origin(obj)
+
+    if origin:
+        args = ", ".join(
+            get_full_qualname(arg) if not isinstance(arg, str) else f'"{arg}"'
+            for arg in get_args(obj)
+        )
+        return f"{get_full_qualname(origin)}[{args}]"
+
+    return f"{module}.{qualname}"
 
 
 def is_builtin_type(tp: type[Any]) -> bool:
@@ -61,17 +62,19 @@ def is_builtin_type(tp: type[Any]) -> bool:
     return tp.__module__ == builtins.__name__
 
 
-def make_forwardref(annotation: str, globalns: dict[str, Any]) -> Any:
-    """Create a forward reference from a string annotation."""
-    forward_ref = ForwardRef(annotation)
-    return evaluate_forwardref(forward_ref, globalns, globalns)
-
-
-def get_typed_annotation(annotation: Any, globalns: dict[str, Any]) -> Any:
+def get_typed_annotation(
+    annotation: Any,
+    globalns: dict[str, Any],
+    module: Any = None,
+    is_class: bool = False,
+) -> Any:
     """Get the typed annotation of a parameter."""
     if isinstance(annotation, str):
-        annotation = ForwardRef(annotation)
-        annotation = evaluate_forwardref(annotation, globalns, globalns)
+        if sys.version_info < (3, 9):
+            annotation = ForwardRef(annotation)
+        else:
+            annotation = ForwardRef(annotation, module=module, is_class=is_class)
+        annotation = evaluate_forwardref(annotation, globalns, {})
     return annotation
 
 
@@ -82,15 +85,24 @@ def get_typed_return_annotation(obj: Callable[..., Any]) -> Any:
     if annotation is inspect.Signature.empty:
         return None
     globalns = getattr(obj, "__globals__", {})
-    return get_typed_annotation(annotation, globalns)
+    module = getattr(obj, "__module__", None)
+    is_class = inspect.isclass(obj)
+    return get_typed_annotation(annotation, globalns, module=module, is_class=is_class)
 
 
 def get_typed_parameters(obj: Callable[..., Any]) -> list[inspect.Parameter]:
     """Get the typed parameters of a callable object."""
     globalns = getattr(obj, "__globals__", {})
+    module = getattr(obj, "__module__", None)
+    is_class = inspect.isclass(obj)
     return [
         parameter.replace(
-            annotation=get_typed_annotation(parameter.annotation, globalns)
+            annotation=get_typed_annotation(
+                parameter.annotation,
+                globalns,
+                module=module,
+                is_class=is_class,
+            )
         )
         for name, parameter in inspect.signature(obj).parameters.items()
     ]

anydi/ext/pytest_plugin.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, Iterator, cast
 import pytest
 
 from anydi import Container
+from anydi._utils import get_typed_parameters
 
 
 def pytest_configure(config: pytest.Config) -> None:
@@ -63,14 +64,14 @@ def _anydi_injected_parameter_iterator(
     _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
-        for name, parameter in inspect.signature(request.function).parameters.items():
+        for parameter in get_typed_parameters(request.function):
             if (
                 ((interface := parameter.annotation) is parameter.empty)
                 or interface in _anydi_unresolved
-                or name in request.node.funcargs
+                or parameter.name in request.node.funcargs
             ):
                 continue
-            yield name, interface
+            yield parameter.name, interface
 
     return _iterator
 

{anydi-0.25.1.dist-info → anydi-0.26.0.dist-info}/METADATA

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

{anydi-0.25.1.dist-info → anydi-0.26.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
-anydi/_container.py,sha256=rZ0HgWFC7jJuZo7iLjMYnTm4utWBMOeiaPThz8a5sbY,27996
-anydi/_context.py,sha256=k956mFE_pfPdU0fxOJ8YRHBZx7sU_ln8fheYNofbmSs,10215
+anydi/_container.py,sha256=7G0z8NkVzwZA_kXhyPymuGN-xGPWoCoXccIT4brGWLQ,29168
+anydi/_context.py,sha256=e0VX0fiflzW_2O9w3HvUH3YRCwXHsruQjf3Lu-zXgDw,10815
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=E1TfLud_Af-MPB83PxIzHVA1jlDW2FGaRP_il1a6y3Y,3675
 anydi/_scanner.py,sha256=cyEk-K2Q8ssZStq8GrxMeEcCuAZMw-RXrjlgWEevKCs,6667
 anydi/_types.py,sha256=vQTrFjsYhlMxfo1nOFem05x2QUJMQkVh4ZaC7W0XZJY,3434
-anydi/_utils.py,sha256=XHVNkd-__SKlWlyeGE2e1Yi-DBr4DPWzZOIVbTrQyMI,3692
+anydi/_utils.py,sha256=zP4UvO1aVQJTB8pFNUWAcncvSiuhcg4xNdRU7CoLrqw,3871
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
@@ -17,12 +17,12 @@ anydi/ext/django/ninja/__init__.py,sha256=kW3grUgWp_nkWSG_-39ADHMrZLGNcj9TsJ9OW8
 anydi/ext/django/ninja/_operation.py,sha256=wSWa7D73XTVlOibmOciv2l6JHPe1ERZcXrqI8W-oO2w,2696
 anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfyk_NVEWw,2207
 anydi/ext/fastapi.py,sha256=kVUKVKtqCx1Nfnm1oh2BMyB0G7qQKPw6OGfxFlqUqtc,5305
-anydi/ext/pytest_plugin.py,sha256=vtjQCwQ0_saG8qhYAYn2wQzXVrXfwXOEhJlTjGqtXA8,3999
+anydi/ext/pytest_plugin.py,sha256=nDNqjblVQufLha6P8J8hZw4Q0EuwC71bOI_bdaGm-OQ,4043
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=Ni0BQaPjs_Ha6zcLZYYJ3-XkslTCnL9aCSa06rnRDMI,1139
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.25.1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.25.1.dist-info/METADATA,sha256=fB_AJZKJ6uqYM9Sd4O5ULmFJWuyJq1i1Vi1zV5AyBJE,5160
-anydi-0.25.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.25.1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.25.1.dist-info/RECORD,,
+anydi-0.26.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.26.0.dist-info/METADATA,sha256=7Y5qjNdubHH60T1MZa3UL_3xDUam-vXKI_LS7M0uRzE,5160
+anydi-0.26.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+anydi-0.26.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.26.0.dist-info/RECORD,,