python-cq 0.2.0__tar.gz → 0.2.2__tar.gz

{python_cq-0.2.0 → python_cq-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-cq
-Version: 0.2.0
+Version: 0.2.2
 Summary: Lightweight CQRS library.
 Home-page: https://github.com/100nm/python-cq
 License: MIT

{python_cq-0.2.0 → python_cq-0.2.2}/cq/__init__.py

@@ -1,16 +1,23 @@
-from ._core.command import (
+from ._core.dispatcher.bus import Bus
+from ._core.dispatcher.pipe import Pipe
+from ._core.dto import DTO
+from ._core.message import (
     AnyCommandBus,
     Command,
     CommandBus,
+    Event,
+    EventBus,
+    Message,
+    Query,
+    QueryBus,
     command_handler,
+    event_handler,
     find_command_bus,
+    find_event_bus,
+    find_query_bus,
+    query_handler,
 )
-from ._core.dispatcher.bus import Bus
-from ._core.dispatcher.pipe import Pipe
-from ._core.dto import DTO
-from ._core.event import Event, EventBus, event_handler, find_event_bus
 from ._core.middleware import Middleware, MiddlewareResult
-from ._core.query import Query, QueryBus, find_query_bus, query_handler
 
 __all__ = (
     "AnyCommandBus",
@@ -20,6 +27,7 @@ __all__ = (
     "DTO",
     "Event",
     "EventBus",
+    "Message",
     "Middleware",
     "MiddlewareResult",
     "Pipe",

{python_cq-0.2.0 → python_cq-0.2.2}/cq/_core/dispatcher/base.py

@@ -1,7 +1,7 @@
 import asyncio
 from abc import ABC, abstractmethod
-from collections.abc import Awaitable
-from typing import Callable, Protocol, Self, runtime_checkable
+from collections.abc import Awaitable, Callable
+from typing import Protocol, Self, runtime_checkable
 
 from cq._core.middleware import Middleware, MiddlewareGroup
 
@@ -15,7 +15,7 @@ class Dispatcher[I, O](Protocol):
         raise NotImplementedError
 
     @abstractmethod
-    def dispatch_no_wait(self, first_input_value: I, /, *input_values: I) -> None:
+    def dispatch_no_wait(self, *input_values: I) -> None:
         raise NotImplementedError
 
     @abstractmethod
@@ -31,12 +31,9 @@ class BaseDispatcher[I, O](Dispatcher[I, O], ABC):
     def __init__(self) -> None:
         self.__middleware_group = MiddlewareGroup()
 
-    def dispatch_no_wait(self, first_input_value: I, /, *input_values: I) -> None:
+    def dispatch_no_wait(self, *input_values: I) -> None:
         asyncio.gather(
-            *(
-                self.dispatch(input_value)
-                for input_value in (first_input_value, *input_values)
-            ),
+            *(self.dispatch(input_value) for input_value in input_values),
             return_exceptions=True,
         )
 

{python_cq-0.2.0 → python_cq-0.2.2}/cq/_core/dispatcher/bus.py

@@ -40,13 +40,8 @@ class SubscriberDecorator[I, O]:
     bus_type: BusType[I, O] | TypeAliasType | GenericAlias
     injection_module: injection.Module = field(default_factory=injection.mod)
 
-    def __call__[T](
-        self,
-        first_input_type: type[I],
-        /,
-        *input_types: type[I],
-    ) -> Callable[[T], T]:
-        def decorator(wrapped: T) -> T:
+    def __call__(self, first_input_type: type[I], /, *input_types: type[I]):  # type: ignore[no-untyped-def]
+        def decorator(wrapped):  # type: ignore[no-untyped-def]
             if not isclass(wrapped) or not issubclass(wrapped, Handler):
                 raise TypeError(f"`{wrapped}` isn't a valid handler.")
 
@@ -56,7 +51,7 @@ class SubscriberDecorator[I, O]:
             for input_type in (first_input_type, *input_types):
                 bus.subscribe(input_type, factory)
 
-            return wrapped  # type: ignore[return-value]
+            return wrapped
 
         return decorator
 

{python_cq-0.2.0 → python_cq-0.2.2}/cq/_core/dispatcher/pipe.py

@@ -1,6 +1,6 @@
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
-from typing import Any, Awaitable
+from typing import Any, Self
 
 from cq._core.dispatcher.base import BaseDispatcher, Dispatcher
 
@@ -38,6 +38,18 @@ class Pipe[I, O](BaseDispatcher[I, O]):
 
         return decorator(wrapped) if wrapped else decorator
 
+    def add_static_step[T](
+        self,
+        input_value: T,
+        *,
+        dispatcher: Dispatcher[T, Any] | None = None,
+    ) -> Self:
+        @self.step(dispatcher=dispatcher)
+        async def converter(_: Any) -> T:
+            return input_value
+
+        return self
+
     async def dispatch(self, input_value: I, /) -> O:
         return await self._invoke_with_middlewares(self.__execute, input_value)
 

python_cq-0.2.2/cq/_core/message.py

@@ -0,0 +1,51 @@
+from abc import ABC
+from typing import Any
+
+import injection
+
+from cq._core.dispatcher.bus import Bus, SimpleBus, SubscriberDecorator, TaskBus
+from cq._core.dto import DTO
+
+
+class Message(DTO, ABC):
+    __slots__ = ()
+
+
+class Command(Message, ABC):
+    __slots__ = ()
+
+
+class Event(Message, ABC):
+    __slots__ = ()
+
+
+class Query(Message, ABC):
+    __slots__ = ()
+
+
+type CommandBus[T] = Bus[Command, T]
+type EventBus = Bus[Event, None]
+type QueryBus[T] = Bus[Query, T]
+
+AnyCommandBus = CommandBus[Any]
+
+
+command_handler: SubscriberDecorator[Command, Any] = SubscriberDecorator(CommandBus)
+event_handler: SubscriberDecorator[Event, None] = SubscriberDecorator(EventBus)
+query_handler: SubscriberDecorator[Query, Any] = SubscriberDecorator(QueryBus)
+
+injection.set_constant(SimpleBus(), CommandBus, alias=True)
+injection.set_constant(TaskBus(), EventBus, alias=True)
+injection.set_constant(SimpleBus(), QueryBus, alias=True)
+
+
+def find_command_bus[T]() -> CommandBus[T]:
+    return injection.find_instance(CommandBus)
+
+
+def find_event_bus() -> EventBus:
+    return injection.find_instance(EventBus)
+
+
+def find_query_bus[T]() -> QueryBus[T]:
+    return injection.find_instance(QueryBus)

{python_cq-0.2.0 → python_cq-0.2.2}/cq/_core/middleware.py

@@ -2,6 +2,8 @@ from collections.abc import AsyncGenerator, Awaitable, Callable, Iterator
 from dataclasses import dataclass, field
 from typing import Self
 
+from cq.exceptions import MiddlewareError
+
 type MiddlewareResult[T] = AsyncGenerator[None, T]
 type Middleware[**P, T] = Callable[P, MiddlewareResult[T]]
 
@@ -47,7 +49,9 @@ class MiddlewareGroup[**P, T]:
                         await generator.athrow(exc)
                     else:
                         await generator.asend(value)
-                        break
+                        raise MiddlewareError(
+                            f"Too many `yield` keywords in `{middleware}`."
+                        )
 
             except StopAsyncIteration:
                 ...

python_cq-0.2.2/cq/exceptions.py

@@ -0,0 +1,7 @@
+__all__ = ("CQError", "MiddlewareError")
+
+
+class CQError(Exception): ...
+
+
+class MiddlewareError(CQError): ...

{python_cq-0.2.0 → python_cq-0.2.2}/cq/middlewares/retry.py

@@ -3,6 +3,8 @@ from typing import Any
 
 from cq import MiddlewareResult
 
+__all__ = ("RetryMiddleware",)
+
 
 class RetryMiddleware:
     __slots__ = ("__delay", "__exceptions", "__retry")

{python_cq-0.2.0 → python_cq-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-cq"
-version = "0.2.0"
+version = "0.2.2"
 description = "Lightweight CQRS library."
 license = "MIT"
 authors = ["remimd"]

python_cq-0.2.0/cq/_core/command.py

@@ -1,22 +0,0 @@
-from abc import ABC
-from typing import Any
-
-import injection
-
-from cq._core.dispatcher.bus import Bus, SimpleBus, SubscriberDecorator
-from cq._core.dto import DTO
-
-
-class Command(DTO, ABC):
-    __slots__ = ()
-
-
-type CommandBus[T] = Bus[Command, T]
-AnyCommandBus = CommandBus[Any]
-command_handler: SubscriberDecorator[Command, Any] = SubscriberDecorator(CommandBus)
-
-injection.set_constant(SimpleBus(), CommandBus, alias=True)
-
-
-def find_command_bus[T]() -> CommandBus[T]:
-    return injection.find_instance(CommandBus)

python_cq-0.2.0/cq/_core/event.py

@@ -1,20 +0,0 @@
-from abc import ABC
-
-import injection
-
-from cq._core.dispatcher.bus import Bus, SubscriberDecorator, TaskBus
-from cq._core.dto import DTO
-
-
-class Event(DTO, ABC):
-    __slots__ = ()
-
-
-type EventBus = Bus[Event, None]
-event_handler: SubscriberDecorator[Event, None] = SubscriberDecorator(EventBus)
-
-injection.set_constant(TaskBus(), EventBus, alias=True)
-
-
-def find_event_bus() -> EventBus:
-    return injection.find_instance(EventBus)

python_cq-0.2.0/cq/_core/query.py

@@ -1,21 +0,0 @@
-from abc import ABC
-from typing import Any
-
-import injection
-
-from cq._core.dispatcher.bus import Bus, SimpleBus, SubscriberDecorator
-from cq._core.dto import DTO
-
-
-class Query(DTO, ABC):
-    __slots__ = ()
-
-
-type QueryBus[T] = Bus[Query, T]
-query_handler: SubscriberDecorator[Query, Any] = SubscriberDecorator(QueryBus)
-
-injection.set_constant(SimpleBus(), QueryBus, alias=True)
-
-
-def find_query_bus[T]() -> QueryBus[T]:
-    return injection.find_instance(QueryBus)