python-cq 0.23.1__py3-none-any.whl → 0.24.0__py3-none-any.whl

cq/__init__.py

@@ -12,9 +12,7 @@ from ._core.queuing.pump import Pump
 from ._core.queuing.queues.abc import Consumer, Delivery, Producer, Queue
 from ._core.queuing.queues.memory import MemoryQueue
 from ._core.related_events import AnyIORelatedEvents, RelatedEvents
-from ._core.routing.command_pipeline import (
-    ContextCommandPipeline as _ContextCommandPipeline,
-)
+from ._core.routing.command_pipeline import ContextCommandPipeline
 from ._core.routing.di import DIAdapter
 from ._core.routing.dispatchers.abc import Dispatcher
 from ._core.routing.dispatchers.bus import Bus
@@ -77,9 +75,4 @@ new_command_bus = __router__.new_command_bus
 new_event_bus = __router__.new_event_bus
 new_query_bus = __router__.new_query_bus
 
-
-class ContextCommandPipeline[C: Command](_ContextCommandPipeline[C]):
-    __slots__ = ()
-
-    def __init__(self, di: DIAdapter = __router__.di) -> None:
-        super().__init__(di)
+ContextCommandPipeline._set_default_di(__router__.di)

cq/_core/routing/command_pipeline.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Self, overload
+from typing import TYPE_CHECKING, Any, ClassVar, Self, overload
 
 from cq._core.common.typing import Decorator
 from cq._core.message import Command, CommandBus, Query, QueryBus
@@ -18,7 +18,10 @@ class ContextCommandPipeline[C: Command](ContextPipeline[C]):
 
     __query_dispatcher: Dispatcher[Query, Any]
 
-    def __init__(self, di: DIAdapter) -> None:
+    __default_di: ClassVar[DIAdapter]
+
+    def __init__(self, di: DIAdapter | None = None, /) -> None:
+        di = di or self.__default_di
         super().__init__(LazyDispatcher(CommandBus, di))
         self.__query_dispatcher = LazyDispatcher(QueryBus, di)
 
@@ -50,3 +53,7 @@ class ContextCommandPipeline[C: Command](ContextPipeline[C]):
         /,
     ) -> Any:
         return self.step(wrapped, dispatcher=self.__query_dispatcher)
+
+    @classmethod
+    def _set_default_di(cls, di: DIAdapter, /) -> None:
+        cls.__default_di = di

cq/_core/routing/di.py

@@ -2,11 +2,8 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from collections.abc import Awaitable, Callable
-from contextlib import nullcontext
 from typing import TYPE_CHECKING, Any, Concatenate, Protocol, runtime_checkable
 
-from cq.middlewares.contextlib import AsyncContextManagerMiddleware
-
 if TYPE_CHECKING:  # pragma: no cover
     from cq import Command, CommandBus, EventBus, Middleware, QueryBus
 
@@ -23,8 +20,7 @@ class DIAdapter(Protocol):
 
     __slots__ = ()
 
-    @abstractmethod
-    def command_scope(self) -> Middleware[Concatenate[Command, ...], Any]:
+    def command_scope(self) -> Middleware[Concatenate[Command, ...], Any] | None:
         """
         Return a middleware that wraps each command dispatch.
 
@@ -39,7 +35,7 @@ class DIAdapter(Protocol):
         instead of writing the middleware by hand.
         """
 
-        raise NotImplementedError
+        return None
 
     @abstractmethod
     def lazy[T](self, tp: type[T]) -> Callable[[], Awaitable[T]]:
@@ -88,9 +84,6 @@ class DIAdapter(Protocol):
 class NoDI(DIAdapter):
     __slots__ = ()
 
-    def command_scope(self) -> Middleware[Concatenate[Command, ...], Any]:
-        return AsyncContextManagerMiddleware(nullcontext())
-
     def lazy[T](self, tp: type[T], /) -> Callable[[], Awaitable[T]]:
         tp_str = getattr(tp, "__name__", str(tp))
         raise RuntimeError(

cq/_core/routing/router.py

@@ -2,6 +2,7 @@ from collections.abc import KeysView
 from typing import Any, Self
 
 from cq._core.message import Command, Event, Query
+from cq._core.routing.command_pipeline import ContextCommandPipeline
 from cq._core.routing.di import DIAdapter, NoDI
 from cq._core.routing.dispatchers.bus import Bus, SimpleBus, TaskBus
 from cq._core.routing.handler import (
@@ -54,9 +55,16 @@ class Router:
     def query_types(self) -> KeysView[type[Query]]:
         return self.__query_registry.message_types
 
+    def command_pipeline[T](self) -> ContextCommandPipeline[T]:
+        return ContextCommandPipeline(self.__di)
+
     def new_command_bus(self) -> Bus[Command, Any]:
         bus = SimpleBus(self.__command_registry)
-        bus.add_middlewares(self.__di.command_scope())
+
+        command_scope_middleware = self.__di.command_scope()
+        if command_scope_middleware is not None:
+            bus.add_middlewares(command_scope_middleware)
+
         return bus
 
     def new_event_bus(self) -> Bus[Event, None]:

{python_cq-0.23.1.dist-info → python_cq-0.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-cq
-Version: 0.23.1
+Version: 0.24.0
 Summary: CQRS library for async Python projects.
 Project-URL: Documentation, https://python-cq.remimd.dev
 Project-URL: Repository, https://github.com/100nm/python-cq

{python_cq-0.23.1.dist-info → python_cq-0.24.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cq/__init__.py,sha256=gN4nQM3HrA8FLrZ4u_AI-I9o9syhbLAr78lVfFb84c4,2076
+cq/__init__.py,sha256=0HISWerIbqoHHk_ZTH43RBRN2fwt1X4KXPBuIj0WF60,1911
 cq/exceptions.py,sha256=lmIpWDbPPwdS9bAAKxUvampA1KKmB706wWaB2mKZyPc,111
 cq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cq/_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,10 +13,10 @@ cq/_core/queuing/queues/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 cq/_core/queuing/queues/abc.py,sha256=XAKHNK6Ez20UWTo_WC5DysMR1h1O3c3gPvwj0TWzQQk,728
 cq/_core/queuing/queues/memory.py,sha256=8brPNzKVDiev4rWf3MDeV_eU8gsXpLgCws7jSgYvAMQ,1815
 cq/_core/routing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cq/_core/routing/command_pipeline.py,sha256=PvuCH6PW2zgXDM3s3KNzIYa9ZNjpnHwe_6lf9M2LIXE,1637
-cq/_core/routing/di.py,sha256=i3AJJV1vSb9ovg2IWub3t0xhDljK0VydAAxUj0a_ask,3414
+cq/_core/routing/command_pipeline.py,sha256=30Au2tkuUUHNGaC4sZ9755cgIt_bbwG6hHD16FxqKpU,1844
+cq/_core/routing/di.py,sha256=Bp5CTDb-KkNzVJ7ostYt7VHMo3WnoE5L67KuiOYdG50,3147
 cq/_core/routing/handler.py,sha256=K6sR30thqT1Zbu--HFt2MUwDxqXap2qLrfjO25DoyLU,7656
-cq/_core/routing/router.py,sha256=8x6HH7A4qxdbjhSmqx3Us27UqjwOHSGk_tt3HeqpG8A,2362
+cq/_core/routing/router.py,sha256=s6xkFeBosOOTjh5CTwBF64uYu23TSzFRK67xlDjJvPI,2660
 cq/_core/routing/dispatchers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cq/_core/routing/dispatchers/abc.py,sha256=PKHHrs4lmK5nDAOLI97X_hueHnmarZKFXXX51MCpJDw,1268
 cq/_core/routing/dispatchers/bus.py,sha256=ZQ1nvSuhLgEvqGMPIgKgWdkKueVzwrTDWeK07TfE57g,3429
@@ -28,7 +28,7 @@ cq/middlewares/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cq/middlewares/contextlib.py,sha256=_kwbXteGADGuzD-o2pPoPWOeTKiXcPCNuDmpG-f-YnY,875
 cq/middlewares/exc.py,sha256=ecAMoksj6B4osySSZ9g_cBR35_tiABQdpII-Drxkz44,1604
 cq/middlewares/retry.py,sha256=L6X_Wa2TZ0IYNXmi8oexTXQyM_lkjJt5Ew4D-2VzwBY,957
-python_cq-0.23.1.dist-info/METADATA,sha256=Uk2HoqN2q3KnMExb1O7lLFVuM5FNEaWbfY9PBdIebiw,4562
-python_cq-0.23.1.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_cq-0.23.1.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
-python_cq-0.23.1.dist-info/RECORD,,
+python_cq-0.24.0.dist-info/METADATA,sha256=6ENGI4KWPmBJUKAlUXI45DcYHVIWA3qGogeHqgWY0MQ,4562
+python_cq-0.24.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_cq-0.24.0.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
+python_cq-0.24.0.dist-info/RECORD,,