anydi 0.27.0__py3-none-any.whl → 0.27.0a0__py3-none-any.whl

anydi/_container.py

@@ -11,9 +11,11 @@ from contextvars import ContextVar
 from functools import wraps
 from typing import (
     Any,
+    AsyncContextManager,
     AsyncIterator,
     Awaitable,
     Callable,
+    ContextManager,
     Iterable,
     Iterator,
     Mapping,
@@ -41,7 +43,7 @@ from ._context import (
 from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._scanner import Scanner
-from ._types import AnyInterface, Event, Interface, Provider, Scope, is_marker
+from ._types import AnyInterface, Interface, Provider, Scope, is_marker
 from ._utils import (
     get_full_qualname,
     get_typed_parameters,
@@ -84,7 +86,7 @@ class Container:
             strict: Whether to enable strict mode. Defaults to False.
         """
         self._providers: dict[type[Any], Provider] = {}
-        self._resource_cache: dict[Scope, list[type[Any]]] = defaultdict(list)
+        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,7 +172,7 @@ class Container:
 
         # Create Event type
         if provider.is_resource and (interface is NoneType or interface is None):
-            interface = type(f"Event_{uuid.uuid4().hex}", (Event,), {})
+            interface = type(f"Event_{uuid.uuid4().hex}", (), {})
 
         if interface in self._providers:
             if override:
@@ -223,7 +225,7 @@ class Container:
                 scoped_context.delete(interface)
 
         # Cleanup provider references
-        self._delete_provider(interface)
+        self._providers.pop(interface, None)
 
     def _get_provider(self, interface: AnyInterface) -> Provider:
         """Get provider by interface.
@@ -284,17 +286,7 @@ class Container:
         """
         self._providers[interface] = provider
         if provider.is_resource:
-            self._resource_cache[provider.scope].append(interface)
-
-    def _delete_provider(self, interface: AnyInterface) -> None:
-        """Delete a provider by interface.
-
-        Args:
-            interface: The interface for which to delete the provider.
-        """
-        provider = self._providers.pop(interface, None)
-        if provider is not None and provider.is_resource:
-            self._resource_cache[provider.scope].remove(interface)
+            self._providers_cache[provider.scope].append(interface)
 
     def _validate_provider_scope(self, provider: Provider) -> None:
         """Validate the scope of a provider.
@@ -429,9 +421,9 @@ class Container:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: types.TracebackType | None,
-    ) -> bool:
+    ) -> None:
         """Exit the singleton context."""
-        return self._singleton_context.__exit__(exc_type, exc_val, exc_tb)
+        self.close()
 
     def start(self) -> None:
         """Start the singleton context."""
@@ -441,13 +433,20 @@ class Container:
         """Close the singleton context."""
         self._singleton_context.close()
 
-    @contextlib.contextmanager
-    def request_context(self) -> Iterator[None]:
+    def request_context(self) -> ContextManager[None]:
         """Obtain a context manager for the request-scoped context.
 
         Returns:
             A context manager for the request-scoped context.
         """
+        return contextlib.contextmanager(self._request_context)()
+
+    def _request_context(self) -> Iterator[None]:
+        """Internal method that manages the request-scoped context.
+
+        Yields:
+            Yield control to the code block within the request context.
+        """
         context = RequestContext(self)
         token = self._request_context_var.set(context)
         with context:
@@ -464,25 +463,34 @@ class Container:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: types.TracebackType | None,
-    ) -> bool:
+    ) -> None:
         """Exit the singleton context."""
-        return await self._singleton_context.__aexit__(exc_type, exc_val, exc_tb)
+        await self.aclose()
 
     async def astart(self) -> None:
         """Start the singleton context asynchronously."""
-        await self._singleton_context.astart()
+        for interface, provider in self._providers.items():
+            if provider.scope == "singleton":
+                await self.aresolve(interface)  # noqa
 
     async def aclose(self) -> None:
         """Close the singleton context asynchronously."""
         await self._singleton_context.aclose()
 
-    @contextlib.asynccontextmanager
-    async def arequest_context(self) -> AsyncIterator[None]:
+    def arequest_context(self) -> AsyncContextManager[None]:
         """Obtain an async context manager for the request-scoped context.
 
         Returns:
             An async context manager for the request-scoped context.
         """
+        return contextlib.asynccontextmanager(self._arequest_context)()
+
+    async def _arequest_context(self) -> AsyncIterator[None]:
+        """Internal method that manages the async request-scoped context.
+
+        Yields:
+            Yield control to the code block within the request context.
+        """
         context = RequestContext(self)
         token = self._request_context_var.set(context)
         async with context:

anydi/_context.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, TypeVar, cast
 
 from typing_extensions import Self, final
 
-from ._types import AnyInterface, Interface, Provider, Scope, is_event_type
+from ._types import AnyInterface, Interface, Provider, Scope
 from ._utils import run_async
 
 if TYPE_CHECKING:
@@ -243,7 +243,7 @@ class ResourceScopedContext(ScopedContext):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> bool:
+    ) -> None:
         """Exit the context.
 
         Args:
@@ -251,17 +251,17 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        return self._stack.__exit__(exc_type, exc_val, exc_tb)  # type: ignore[return-value]
+        self.close()
+        return
 
-    @abc.abstractmethod
     def start(self) -> None:
         """Start the scoped context."""
-        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
+        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.__exit__(None, None, None)
+        self._stack.close()
 
     async def __aenter__(self) -> Self:
         """Enter the context asynchronously.
@@ -277,7 +277,7 @@ class ResourceScopedContext(ScopedContext):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> bool:
+    ) -> None:
         """Exit the context asynchronously.
 
         Args:
@@ -285,17 +285,18 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        return await run_async(
-            self.__exit__, exc_type, exc_val, exc_tb
-        ) or await self._async_stack.__aexit__(exc_type, exc_val, exc_tb)
+        await self.aclose()
+        return
 
-    @abc.abstractmethod
     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 self.__aexit__(None, None, None)
+        await run_async(self._stack.close)
+        await self._async_stack.aclose()
 
 
 @final
@@ -304,16 +305,6 @@ class SingletonContext(ResourceScopedContext):
 
     scope = "singleton"
 
-    def start(self) -> None:
-        """Start the scoped context."""
-        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
-            self.container.resolve(interface)
-
-    async def astart(self) -> None:
-        """Start the scoped context asynchronously."""
-        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
-            await self.container.aresolve(interface)
-
 
 @final
 class RequestContext(ResourceScopedContext):
@@ -321,20 +312,6 @@ class RequestContext(ResourceScopedContext):
 
     scope = "request"
 
-    def start(self) -> None:
-        """Start the scoped context."""
-        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
-            if not is_event_type(interface):
-                continue
-            self.container.resolve(interface)
-
-    async def astart(self) -> None:
-        """Start the scoped context asynchronously."""
-        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
-            if not is_event_type(interface):
-                continue
-            await self.container.aresolve(interface)
-
 
 @final
 class TransientContext(ScopedContext):

anydi/_types.py

@@ -30,17 +30,6 @@ def is_marker(obj: Any) -> bool:
     return isinstance(obj, Marker)
 
 
-class Event:
-    """Represents an event object."""
-
-    __slots__ = ()
-
-
-def is_event_type(obj: Any) -> bool:
-    """Checks if an object is an event type."""
-    return inspect.isclass(obj) and issubclass(obj, Event)
-
-
 @dataclass(frozen=True)
 class Provider:
     """Represents a provider object.

anydi/_utils.py

@@ -6,7 +6,7 @@ import builtins
 import functools
 import inspect
 import sys
-from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar
+from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar, cast
 
 from typing_extensions import ParamSpec, get_args, get_origin
 
@@ -16,18 +16,19 @@ except ImportError:
     anyio = None  # type: ignore[assignment]
 
 
-T = TypeVar("T")
-P = ParamSpec("P")
+if sys.version_info < (3, 9):  # pragma: nocover
 
-
-def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-    if sys.version_info < (3, 9):
+    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
         return type_._evaluate(globalns, localns)  # noqa
-    elif sys.version_info >= (3, 12):
-        return type_._evaluate(  # noqa
-            globalns, localns, frozenset(), recursive_guard=frozenset()
-        )
-    return type_._evaluate(globalns, localns, frozenset())  # noqa
+
+else:
+
+    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+        return cast(Any, type_)._evaluate(globalns, localns, set())  # noqa
+
+
+T = TypeVar("T")
+P = ParamSpec("P")
 
 
 def get_full_qualname(obj: Any) -> str:
@@ -69,12 +70,10 @@ def get_typed_annotation(
 ) -> Any:
     """Get the typed annotation of a parameter."""
     if isinstance(annotation, str):
-        if sys.version_info >= (3, 10, 2):
-            annotation = ForwardRef(annotation, module=module, is_class=is_class)
-        elif sys.version_info >= (3, 10, 0):
-            annotation = ForwardRef(annotation, module=module)
-        else:
+        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
 

anydi/ext/faststream.py

@@ -1,7 +1,3 @@
-"""AnyDI FastStream extension."""
-
-from __future__ import annotations
-
 import logging
 from typing import Any, cast
 
@@ -30,22 +26,12 @@ def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
     """
     broker._container = container  # type: ignore[attr-defined]
 
-    for handler in _get_broken_handlers(broker):
-        call = handler._original_call  # noqa
+    for subscriber in broker._subscribers.values():  # noqa
+        call = subscriber.calls[0].handler._original_call  # noqa
         for parameter in get_typed_parameters(call):
             patch_call_parameter(call, parameter, container)
 
 
-def _get_broken_handlers(broker: BrokerUsecase[Any, Any]) -> list[Any]:
-    if hasattr(broker, "handlers"):
-        return [handler.calls[0][0] for handler in broker.handlers.values()]
-    # faststream > 0.5.0
-    return [
-        subscriber.calls[0].handler
-        for subscriber in broker._subscribers.values()  # noqa
-    ]
-
-
 def get_container(broker: BrokerUsecase[Any, Any]) -> Container:
     return cast(Container, getattr(broker, "_container"))  # noqa
 
@@ -57,8 +43,7 @@ class Resolver(HasInterface, Depends):
         super().__init__(dependency=self._dependency, use_cache=True, cast=True)
 
     async def _dependency(self, context: ContextRepo) -> Any:
-        container = get_container(context.get("broker"))
-        return await container.aresolve(self.interface)
+        return get_container(context.get("broker")).resolve(self.interface)
 
 
 def Inject() -> Any:  # noqa

anydi/ext/pytest_plugin.py

@@ -63,15 +63,12 @@ def _anydi_injected_parameter_iterator(
     request: pytest.FixtureRequest,
     _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
-    registered_fixtures = request.session._fixturemanager._arg2fixturedefs  # noqa
-
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
         for parameter in get_typed_parameters(request.function):
-            interface = parameter.annotation
             if (
-                interface is parameter.empty
+                ((interface := parameter.annotation) is parameter.empty)
                 or interface in _anydi_unresolved
-                or parameter.name in registered_fixtures
+                or parameter.name in request.node.funcargs
             ):
                 continue
             yield parameter.name, interface
@@ -95,14 +92,18 @@ def _anydi_inject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
-        # Skip if the interface is not registered
-        if container.strict and not container.is_registered(interface):
-            continue
-
         try:
-            request.node.funcargs[argname] = container.resolve(interface)
-        except Exception:  # noqa
+            # Release the instance if it was already resolved
+            container.release(interface)
+        except LookupError:
+            pass
+        try:
+            # Resolve the instance
+            instance = container.resolve(interface)
+        except LookupError:
             _anydi_unresolved.append(interface)
+            continue
+        request.node.funcargs[argname] = instance
 
 
 @pytest.fixture(autouse=True)
@@ -120,11 +121,15 @@ async def _anydi_ainject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
-        # Skip if the interface is not registered
-        if container.strict and not container.is_registered(interface):
-            continue
-
         try:
-            request.node.funcargs[argname] = await container.aresolve(interface)
-        except Exception:  # noqa
+            # Release the instance if it was already resolved
+            container.release(interface)
+        except LookupError:
+            pass
+        try:
+            # Resolve the instance
+            instance = await container.aresolve(interface)
+        except LookupError:
             _anydi_unresolved.append(interface)
+            continue
+        request.node.funcargs[argname] = instance

{anydi-0.27.0.dist-info → anydi-0.27.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.27.0
+Version: 0.27.0a0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.7
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
@@ -32,8 +33,8 @@ Provides-Extra: async
 Provides-Extra: docs
 Requires-Dist: anyio (>=3.6.2,<4.0.0) ; extra == "async"
 Requires-Dist: mkdocs (>=1.4.2,<2.0.0) ; extra == "docs"
-Requires-Dist: mkdocs-material (>=9.5.21,<10.0.0) ; extra == "docs"
-Requires-Dist: typing-extensions (>=4.12.1,<5.0.0)
+Requires-Dist: mkdocs-material (>=9.1.13,<10.0.0) ; extra == "docs"
+Requires-Dist: typing-extensions (>=4.8.0,<5.0.0)
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 

{anydi-0.27.0.dist-info → anydi-0.27.0a0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
-anydi/_container.py,sha256=-vpiYl2Tx2QK9wl74DiF5qLFRudJ3e78TqEyuyOrthE,29055
-anydi/_context.py,sha256=_hJ1Cf2amgAr4uLvgk2KtGWMo0p7JFM_db1_YbWweHI,11895
+anydi/_container.py,sha256=IhfucOoAPYpMY9A0uHcqa1EOzE3_0TsExR-ZehZrZ6U,29246
+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=i8xFxz8pmFj7SGqwOwae_P9VtiRie6DVLwfaLibLwhc,3653
-anydi/_utils.py,sha256=TzUZRTNaXu78Uzv9NCNLSM5s9TgEIiXtXgr1HhsfHac,4017
+anydi/_types.py,sha256=vQTrFjsYhlMxfo1nOFem05x2QUJMQkVh4ZaC7W0XZJY,3434
+anydi/_utils.py,sha256=zP4UvO1aVQJTB8pFNUWAcncvSiuhcg4xNdRU7CoLrqw,3871
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=2kxLPTMM9Ro3s6-knbqYzONlqRB3hMcwZFFRQGHcFUg,2691
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
@@ -18,13 +18,13 @@ 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=vhfSyovXuCjvSkx6AiLOTNU975i8wDg72C5fqXQiFLw,2896
-anydi/ext/faststream.py,sha256=L4rkWYIO4ZZuWH-8M8NT6_J0bT0Dz_EWO3B6Oj1iFBI,2024
-anydi/ext/pytest_plugin.py,sha256=3OWphc4nEzla46_8KR7LXtwGns5eol_YlUWfTf4Cr2Q,3952
+anydi/ext/faststream.py,sha256=svMtqFVSRTpuf4H5yeozHWmrBXi_F8cevb5d2mo3m-E,1617
+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.27.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.27.0.dist-info/METADATA,sha256=zazVcW9x_zEq3W2q7We5DMLMuJoNWH1I5JOzVsfTb_g,5111
-anydi-0.27.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.27.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.27.0.dist-info/RECORD,,
+anydi-0.27.0a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.27.0a0.dist-info/METADATA,sha256=sVLcw-YRcQ7PD1C39knmNRgN0gbvoQlqzfU2pF7NpkM,5162
+anydi-0.27.0a0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+anydi-0.27.0a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.27.0a0.dist-info/RECORD,,

{anydi-0.27.0.dist-info → anydi-0.27.0a0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.8.1
 Root-Is-Purelib: true
 Tag: py3-none-any