anydi 0.27.0a5__py3-none-any.whl → 0.27.0a6__py3-none-any.whl

anydi/_container.py

@@ -11,11 +11,9 @@ from contextvars import ContextVar
 from functools import wraps
 from typing import (
     Any,
-    AsyncContextManager,
     AsyncIterator,
     Awaitable,
     Callable,
-    ContextManager,
     Iterable,
     Iterator,
     Mapping,
@@ -43,7 +41,7 @@ from ._context import (
 from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._scanner import Scanner
-from ._types import AnyInterface, Interface, Provider, Scope, is_marker
+from ._types import AnyInterface, Event, Interface, Provider, Scope, is_marker
 from ._utils import (
     get_full_qualname,
     get_typed_parameters,
@@ -86,7 +84,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._resource_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(
@@ -172,7 +170,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}", (), {})
+            interface = type(f"Event_{uuid.uuid4().hex}", (Event,), {})
 
         if interface in self._providers:
             if override:
@@ -286,7 +284,7 @@ class Container:
         """
         self._providers[interface] = provider
         if provider.is_resource:
-            self._providers_cache[provider.scope].append(interface)
+            self._resource_cache[provider.scope].append(interface)
 
     def _delete_provider(self, interface: AnyInterface) -> None:
         """Delete a provider by interface.
@@ -296,7 +294,7 @@ class Container:
         """
         provider = self._providers.pop(interface, None)
         if provider is not None and provider.is_resource:
-            self._providers_cache[provider.scope].remove(interface)
+            self._resource_cache[provider.scope].remove(interface)
 
     def _validate_provider_scope(self, provider: Provider) -> None:
         """Validate the scope of a provider.
@@ -443,20 +441,13 @@ class Container:
         """Close the singleton context."""
         self._singleton_context.close()
 
-    def request_context(self) -> ContextManager[None]:
+    @contextlib.contextmanager
+    def request_context(self) -> Iterator[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:
@@ -479,28 +470,19 @@ class Container:
 
     async def astart(self) -> None:
         """Start the singleton context asynchronously."""
-        for interface, provider in self._providers.items():
-            if provider.scope == "singleton":
-                await self.aresolve(interface)  # noqa
+        await self._singleton_context.astart()
 
     async def aclose(self) -> None:
         """Close the singleton context asynchronously."""
         await self._singleton_context.aclose()
 
-    def arequest_context(self) -> AsyncContextManager[None]:
+    @contextlib.asynccontextmanager
+    async def arequest_context(self) -> AsyncIterator[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
+from ._types import AnyInterface, Interface, Provider, Scope, is_event_type
 from ._utils import run_async
 
 if TYPE_CHECKING:
@@ -254,9 +254,10 @@ class ResourceScopedContext(ScopedContext):
         self.close()
         return
 
+    @abc.abstractmethod
     def start(self) -> None:
         """Start the scoped context."""
-        for interface in self.container._providers_cache.get(self.scope, []):  # noqa
+        for interface in self.container._resource_cache.get(self.scope, []):  # noqa
             self.container.resolve(interface)
 
     def close(self) -> None:
@@ -288,10 +289,9 @@ class ResourceScopedContext(ScopedContext):
         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."""
@@ -305,6 +305,16 @@ 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):
@@ -312,6 +322,20 @@ 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,6 +30,17 @@ def is_marker(obj: Any) -> bool:
     return isinstance(obj, Marker)
 
 
+class Event:
+    """Represents an event object."""
+
+    __slots__ = ()
+
+
+def is_event_type(cls: Any) -> bool:
+    """Checks if an object is an event type."""
+    return issubclass(cls, Event)
+
+
 @dataclass(frozen=True)
 class Provider:
     """Represents a provider object.

{anydi-0.27.0a5.dist-info → anydi-0.27.0a6.dist-info}/METADATA

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

{anydi-0.27.0a5.dist-info → anydi-0.27.0a6.dist-info}/RECORD

@@ -1,10 +1,10 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
-anydi/_container.py,sha256=iVmVlnhK3qfcSCvDZsbD23x2REBtBD26abqKJuLGyHs,29631
-anydi/_context.py,sha256=e0VX0fiflzW_2O9w3HvUH3YRCwXHsruQjf3Lu-zXgDw,10815
+anydi/_container.py,sha256=OjzwZPiQuf9ouyhmIqlNht99pHa77hjZ0sM_n_GovW0,28947
+anydi/_context.py,sha256=AVml53KyrQL4yyoJZkU2pbNzQwtg-1Jyt7m6R_0l6_8,11740
 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/_types.py,sha256=YGfHVyysu2qNSXaZnvl_1BwPzKub84o3e3F4rK0tGQw,3628
 anydi/_utils.py,sha256=zP4UvO1aVQJTB8pFNUWAcncvSiuhcg4xNdRU7CoLrqw,3871
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=2kxLPTMM9Ro3s6-knbqYzONlqRB3hMcwZFFRQGHcFUg,2691
@@ -23,8 +23,8 @@ anydi/ext/pytest_plugin.py,sha256=pFLcfxGtJfGSqtk7sPrrHFSKOaZoKZTWt5X8CT0ydmA,42
 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.0a5.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.27.0a5.dist-info/METADATA,sha256=GoZY2ldWbiQZtFTCMEvGfDhfKb_ZnFjV7AYD6ZwlUzo,5163
-anydi-0.27.0a5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.27.0a5.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.27.0a5.dist-info/RECORD,,
+anydi-0.27.0a6.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.27.0a6.dist-info/METADATA,sha256=G95uZ9BoMP2BLlYVARh_BWIoArTZEeuEz-eJUBi9d5g,5163
+anydi-0.27.0a6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.27.0a6.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.27.0a6.dist-info/RECORD,,

{anydi-0.27.0a5.dist-info → anydi-0.27.0a6.dist-info}/WHEEL

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