python-cq 0.21.1__tar.gz → 0.22.1__tar.gz

{python_cq-0.21.1 → python_cq-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-cq
-Version: 0.21.1
+Version: 0.22.1
 Summary: CQRS library for async Python projects.
 Project-URL: Documentation, https://python-cq.remimd.dev
 Project-URL: Repository, https://github.com/100nm/python-cq
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
@@ -80,23 +81,27 @@ from cq import CommandBus, command_handler
 from dataclasses import dataclass
 from injection import inject
 
+
 @dataclass
 class CreateUserCommand:
     name: str
     email: str
 
+
 @command_handler
 class CreateUserHandler:
     async def handle(self, command: CreateUserCommand) -> int:
         # ... persist the user, return its id
         return 42
 
+
 @inject
 async def main(bus: CommandBus[int]) -> None:
     command = CreateUserCommand(name="Ada", email="ada@example.com")
     user_id = await bus.dispatch(command)
     print(f"Created user {user_id}")
 
+
 asyncio.run(main())
 ```
 

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/cq.py

@@ -10,7 +10,6 @@ from cq._core.handler import (
     SingleHandlerRegistry,
 )
 from cq._core.message import Command, Event, Query
-from cq._core.middlewares.scope import CommandDispatchScopeMiddleware
 
 
 class CQ:
@@ -57,8 +56,7 @@ class CQ:
 
     def new_command_bus(self) -> Bus[Command, Any]:
         bus = SimpleBus(self.__command_registry)
-        command_middleware = CommandDispatchScopeMiddleware(self.__di)
-        bus.add_middlewares(command_middleware)
+        bus.add_middlewares(self.__di.command_scope())
         return bus
 
     def new_event_bus(self) -> Bus[Event, None]:

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/di.py

@@ -3,10 +3,12 @@ from __future__ import annotations
 from abc import abstractmethod
 from collections.abc import Awaitable, Callable
 from contextlib import nullcontext
-from typing import TYPE_CHECKING, Any, AsyncContextManager, Protocol, runtime_checkable
+from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
+
+from cq.middlewares.contextlib import AsyncContextManagerMiddleware
 
 if TYPE_CHECKING:  # pragma: no cover
-    from cq import CommandBus, EventBus, QueryBus
+    from cq import Command, CommandBus, EventBus, Middleware, QueryBus
 
 
 @runtime_checkable
@@ -22,30 +24,19 @@ class DIAdapter(Protocol):
     __slots__ = ()
 
     @abstractmethod
-    def command_scope(self) -> AsyncContextManager[None]:
+    def command_scope(self) -> Middleware[[Command], Any]:
         """
-        Return an async context manager that delimits the lifetime of a
-        command dispatch.
+        Return a middleware that wraps each command dispatch.
 
         **Responsibilities**
 
-        The scope must at minimum manage the lifecycle of a ``RelatedEvents``
-        instance and register it so that it is resolvable via injection for
-        the duration of the scope.
-
-        **Nested calls**
-
-        ``command_scope`` is entered in two distinct situations:
-
-        1. Around a standard command dispatch (via
-           ``CommandDispatchScopeMiddleware``).
-        2. Around each step of a ``ContextCommandPipeline``, which itself
-           wraps a command dispatch.
+        The middleware must at minimum manage the lifecycle of a
+        ``RelatedEvents`` instance and register it so that it is resolvable
+        via injection for the duration of the dispatch.
 
-        This means two nested calls can occur for a single logical command.
-        Implementations must detect re-entrant activation (e.g. a scope
-        already active on the current task) and silently ignore the inner
-        call instead of opening a second, conflicting scope.
+        If you already have an async context manager for the scope, wrap it
+        with ``cq.middlewares.contextlib.AsyncContextManagerMiddleware``
+        instead of writing the middleware by hand.
         """
 
         raise NotImplementedError
@@ -97,8 +88,8 @@ class DIAdapter(Protocol):
 class NoDI(DIAdapter):
     __slots__ = ()
 
-    def command_scope(self) -> AsyncContextManager[None]:
-        return nullcontext()
+    def command_scope(self) -> Middleware[[Command], Any]:
+        return AsyncContextManagerMiddleware(nullcontext())
 
     def lazy[T](self, tp: type[T], /) -> Callable[[], Awaitable[T]]:
         tp_str = getattr(tp, "__name__", str(tp))

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/handler.py

@@ -183,7 +183,7 @@ class HandlerDecorator[I, O]:
             and issubclass(message_or_handler_type, Handler)
         ):
             return self.__decorator(
-                message_or_handler_type,
+                message_or_handler_type,  # type: ignore[arg-type]
                 fail_silently=fail_silently,
             )
 

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/middleware.py

@@ -98,7 +98,7 @@ class _GeneratorMiddleware[**P, T]:
             while True:
                 try:
                     value = await call_next(*args, **kwargs)
-                except BaseException as exc:
+                except BaseException as exc:  # noqa: BLE001
                     await generator.athrow(exc)
                 else:
                     await generator.asend(value)

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/pipetools.py

@@ -11,7 +11,6 @@ from cq._core.dispatchers.pipe import (
     ConvertMethodSync,
 )
 from cq._core.message import Command, CommandBus, Query, QueryBus
-from cq._core.middlewares.scope import CommandDispatchScopeMiddleware
 
 
 class ContextCommandPipeline[C: Command](ContextPipeline[C]):
@@ -22,8 +21,6 @@ class ContextCommandPipeline[C: Command](ContextPipeline[C]):
     def __init__(self, di: DIAdapter) -> None:
         super().__init__(LazyDispatcher(CommandBus, di))
         self.__query_dispatcher = LazyDispatcher(QueryBus, di)
-        command_middleware = CommandDispatchScopeMiddleware(di)
-        self.add_middlewares(command_middleware)
 
     def add_static_query_step[Q: Query](self, query: Q, /) -> Self:
         return self.add_static_step(query, dispatcher=self.__query_dispatcher)

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/queues/abc.py

@@ -1,6 +1,7 @@
 from abc import abstractmethod
 from collections.abc import AsyncIterable
-from typing import AsyncContextManager, Protocol, runtime_checkable
+from contextlib import AbstractAsyncContextManager
+from typing import Protocol, runtime_checkable
 
 
 @runtime_checkable
@@ -16,7 +17,7 @@ class Producer[T](Protocol):
 
 
 @runtime_checkable
-class Delivery[T](AsyncContextManager[T], Protocol):
+class Delivery[T](AbstractAsyncContextManager[T], Protocol):
     __slots__ = ()
 
 

{python_cq-0.21.1 → python_cq-0.22.1}/cq/_core/queues/memory.py

@@ -51,10 +51,10 @@ class MemoryQueue[T](Queue[T]):
         async with (
             Pump(self, dispatcher, fail_silently)
             .add_middlewares(*middlewares)
-            .draining(concurrency=concurrency, graceful=True)
+            .draining(concurrency=concurrency, graceful=True),
+            self,
         ):
-            async with self:
-                yield self
+            yield self
 
     async def send(self, message: T, /) -> None:
         await self.__producer.send(message)

{python_cq-0.21.1 → python_cq-0.22.1}/cq/ext/injection.py

@@ -1,15 +1,15 @@
-from collections.abc import AsyncIterator
-from contextlib import AsyncExitStack, asynccontextmanager
+from collections.abc import AsyncIterator, Awaitable, Callable
+from contextlib import AsyncExitStack
 from dataclasses import dataclass, field
 from enum import StrEnum
-from typing import Any, AsyncContextManager, Awaitable, Callable
+from typing import Any
 
 from injection import Module, adefine_scope, mod
 from injection.exceptions import ScopeAlreadyDefinedError
 
 from cq._core.di import DIAdapter
-from cq._core.message import CommandBus, EventBus, QueryBus
-from cq._core.middleware import MiddlewareResult
+from cq._core.message import Command, CommandBus, EventBus, QueryBus
+from cq._core.middleware import Middleware, MiddlewareResult
 from cq._core.related_events import AnyIORelatedEvents, RelatedEvents
 
 __all__ = ("CQScope", "InjectionAdapter", "InjectionScopeMiddleware")
@@ -24,12 +24,11 @@ class InjectionAdapter(DIAdapter):
     module: Module = field(default_factory=mod)
     threadsafe: bool | None = field(default=None)
 
-    def command_scope(self) -> AsyncContextManager[None]:
-        return InjectionScopeMiddleware(  # type: ignore[return-value]
+    def command_scope(self) -> Middleware[[Command], Any]:
+        return InjectionScopeMiddleware(
             CQScope.COMMAND_DISPATCH,
-            exist_ok=True,
             threadsafe=self.threadsafe,
-        )._cm
+        )
 
     def lazy[T](self, tp: type[T], /) -> Callable[[], Awaitable[T]]:
         awaitable = self.module.aget_lazy_instance(tp, threadsafe=self.threadsafe)
@@ -83,12 +82,6 @@ class InjectionScopeMiddleware:
     threadsafe: bool | None = field(default=None, kw_only=True)
 
     async def __call__(self, /, *args: Any, **kwargs: Any) -> MiddlewareResult[Any]:
-        async with self._cm:  # type: ignore[attr-defined]
-            yield
-
-    @property
-    @asynccontextmanager
-    async def _cm(self) -> AsyncIterator[None]:
         async with AsyncExitStack() as stack:
             try:
                 await stack.enter_async_context(

python_cq-0.22.1/cq/middlewares/contextlib.py

@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+from contextlib import AbstractAsyncContextManager, AbstractContextManager
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:  # pragma: no cover
+    from cq import MiddlewareResult
+
+__all__ = ("AsyncContextManagerMiddleware", "ContextManagerMiddleware")
+
+
+@dataclass(repr=False, eq=False, frozen=True, slots=True)
+class AsyncContextManagerMiddleware:
+    context: AbstractAsyncContextManager[Any]
+
+    async def __call__(self, /, *args: Any, **kwargs: Any) -> MiddlewareResult[Any]:
+        async with self.context:
+            yield
+
+
+@dataclass(repr=False, eq=False, frozen=True, slots=True)
+class ContextManagerMiddleware:
+    context: AbstractContextManager[Any]
+
+    async def __call__(self, /, *args: Any, **kwargs: Any) -> MiddlewareResult[Any]:
+        with self.context:
+            yield

{python_cq-0.21.1 → python_cq-0.22.1}/docs/index.md

@@ -49,23 +49,27 @@ from cq import CommandBus, command_handler
 from dataclasses import dataclass
 from injection import inject
 
+
 @dataclass
 class CreateUserCommand:
     name: str
     email: str
 
+
 @command_handler
 class CreateUserHandler:
     async def handle(self, command: CreateUserCommand) -> int:
         # ... persist the user, return its id
         return 42
 
+
 @inject
 async def main(bus: CommandBus[int]) -> None:
     command = CreateUserCommand(name="Ada", email="ada@example.com")
     user_id = await bus.dispatch(command)
     print(f"Created user {user_id}")
 
+
 asyncio.run(main())
 ```
 

{python_cq-0.21.1 → python_cq-0.22.1}/pyproject.toml

@@ -20,7 +20,7 @@ test = [
 
 [project]
 name = "python-cq"
-version = "0.21.1"
+version = "0.22.1"
 description = "CQRS library for async Python projects."
 license = "MIT"
 license-files = ["LICENSE"]
@@ -39,6 +39,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Operating System :: OS Independent",
     "Intended Audience :: Developers",
     "Natural Language :: English",

python_cq-0.21.1/cq/_core/middlewares/scope.py

@@ -1,14 +0,0 @@
-from dataclasses import dataclass
-from typing import Any
-
-from cq._core.di import DIAdapter
-from cq._core.middleware import MiddlewareResult
-
-
-@dataclass(repr=False, eq=False, frozen=True, slots=True)
-class CommandDispatchScopeMiddleware:
-    di: DIAdapter
-
-    async def __call__(self, /, *args: Any, **kwargs: Any) -> MiddlewareResult[Any]:
-        async with self.di.command_scope():
-            yield

{python_cq-0.21.1 → python_cq-0.22.1}/cq/__init__.py

@@ -21,18 +21,17 @@ from ._core.queues.memory import MemoryQueue
 from ._core.related_events import AnyIORelatedEvents, RelatedEvents
 
 __all__ = (
-    "__cq__",
+    "CQ",
     "AnyCommandBus",
     "AnyIORelatedEvents",
     "Bus",
-    "CQ",
     "Command",
     "CommandBus",
     "Consumer",
     "ContextCommandPipeline",
     "ContextPipeline",
-    "Delivery",
     "DIAdapter",
+    "Delivery",
     "Dispatcher",
     "Event",
     "EventBus",
@@ -46,6 +45,7 @@ __all__ = (
     "QueryBus",
     "Queue",
     "RelatedEvents",
+    "__cq__",
     "command_handler",
     "event_handler",
     "new_command_bus",