anydi 0.25.2__py3-none-any.whl → 0.26.0a0__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-0.25.2.dist-info → anydi-0.26.0a0.dist-info}/METADATA

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

{anydi-0.25.2.dist-info → anydi-0.26.0a0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 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
@@ -21,8 +21,8 @@ anydi/ext/pytest_plugin.py,sha256=nDNqjblVQufLha6P8J8hZw4Q0EuwC71bOI_bdaGm-OQ,40
 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.2.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.25.2.dist-info/METADATA,sha256=5i5o5jrVz-bp48inB3Cz6LpDjElsKfSvqjMyVn_LFJY,5160
-anydi-0.25.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.25.2.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.25.2.dist-info/RECORD,,
+anydi-0.26.0a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.26.0a0.dist-info/METADATA,sha256=54eUUCdk0kU_oVFlTWh6IGeCNWCCzihHKoKJapNomPw,5162
+anydi-0.26.0a0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+anydi-0.26.0a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.26.0a0.dist-info/RECORD,,