python-cq 0.5.1__tar.gz → 0.6.1__tar.gz

{python_cq-0.5.1 → python_cq-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-cq
-Version: 0.5.1
+Version: 0.6.1
 Summary: Lightweight CQRS library.
 Project-URL: Repository, https://github.com/100nm/python-cq
 Author: remimd
@@ -19,7 +19,6 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: <4,>=3.12
 Requires-Dist: anyio
-Requires-Dist: pydantic<3,>=2
 Requires-Dist: python-injection
 Description-Content-Type: text/markdown
 

{python_cq-0.5.1 → python_cq-0.6.1}/cq/__init__.py

@@ -1,13 +1,11 @@
 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,
@@ -27,10 +25,8 @@ __all__ = (
     "CQScope",
     "Command",
     "CommandBus",
-    "DTO",
     "Event",
     "EventBus",
-    "Message",
     "Middleware",
     "MiddlewareResult",
     "Pipe",

{python_cq-0.5.1 → python_cq-0.6.1}/cq/_core/message.py

@@ -1,10 +1,8 @@
-from abc import ABC
 from typing import Any
 
 import injection
 
 from cq._core.dispatcher.bus import Bus, SimpleBus, TaskBus
-from cq._core.dto import DTO
 from cq._core.handler import (
     HandlerDecorator,
     MultipleHandlerManager,
@@ -13,22 +11,9 @@ from cq._core.handler import (
 from cq._core.scope import CQScope
 from cq.middlewares.scope import InjectionScopeMiddleware
 
-
-class Message(DTO, ABC):
-    __slots__ = ()
-
-
-class Command(Message, ABC):
-    __slots__ = ()
-
-
-class Event(Message, ABC):
-    __slots__ = ()
-
-
-class Query(Message, ABC):
-    __slots__ = ()
-
+Command = object
+Event = object
+Query = object
 
 type CommandBus[T] = Bus[Command, T]
 type EventBus = Bus[Event, None]
@@ -48,31 +33,18 @@ query_handler: HandlerDecorator[Query, Any] = HandlerDecorator(
 )
 
 
-@injection.singleton(
-    on=CommandBus,
-    ignore_type_hint=True,  # type: ignore[call-arg]
-    inject=False,
-    mode="fallback",
-)
-def new_command_bus[T]() -> CommandBus[T]:
+@injection.singleton(inject=False, mode="fallback")
+def new_command_bus() -> CommandBus:  # type: ignore[type-arg]
     bus = SimpleBus(command_handler.manager)
     bus.add_middlewares(InjectionScopeMiddleware(CQScope.ON_COMMAND))
     return bus
 
 
-@injection.singleton(
-    inject=False,
-    mode="fallback",
-)
+@injection.singleton(inject=False, mode="fallback")
 def new_event_bus() -> EventBus:
     return TaskBus(event_handler.manager)
 
 
-@injection.singleton(
-    on=QueryBus,
-    ignore_type_hint=True,  # type: ignore[call-arg]
-    inject=False,
-    mode="fallback",
-)
-def new_query_bus[T]() -> QueryBus[T]:
+@injection.singleton(inject=False, mode="fallback")
+def new_query_bus() -> QueryBus:  # type: ignore[type-arg]
     return SimpleBus(query_handler.manager)

{python_cq-0.5.1 → python_cq-0.6.1}/cq/_core/related_events.py

@@ -20,7 +20,7 @@ class RelatedEvents(Protocol):
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)
-class _RelatedEvents(RelatedEvents):
+class SimpleRelatedEvents(RelatedEvents):
     items: list[Event] = field(default_factory=list)
 
     def add(self, *events: Event) -> None:
@@ -29,7 +29,7 @@ class _RelatedEvents(RelatedEvents):
 
 @injection.scoped(CQScope.ON_COMMAND, mode="fallback")
 async def related_events_recipe(event_bus: EventBus) -> AsyncIterator[RelatedEvents]:
-    yield (instance := _RelatedEvents())
+    yield (instance := SimpleRelatedEvents())
     events = instance.items
 
     if not events:

{python_cq-0.5.1 → python_cq-0.6.1}/cq/middlewares/retry.py

@@ -32,9 +32,9 @@ class RetryMiddleware:
             try:
                 yield
 
-            except self.__exceptions as exc:
+            except self.__exceptions:
                 if attempt == retry:
-                    raise exc
+                    raise
 
             else:
                 break

{python_cq-0.5.1 → python_cq-0.6.1}/pyproject.toml

@@ -10,6 +10,8 @@ dev = [
 ]
 example = [
     "fastapi",
+    "msgspec",
+    "pydantic",
 ]
 test = [
     "pytest",
@@ -19,7 +21,7 @@ test = [
 
 [project]
 name = "python-cq"
-version = "0.5.1"
+version = "0.6.1"
 description = "Lightweight CQRS library."
 license = { text = "MIT" }
 readme = "README.md"
@@ -41,7 +43,6 @@ classifiers = [
 ]
 dependencies = [
     "anyio",
-    "pydantic (>=2, <3)",
     "python-injection",
 ]
 
@@ -71,15 +72,9 @@ disallow_subclassing_any = true
 disallow_untyped_defs = true
 follow_imports = "silent"
 no_implicit_reexport = true
-plugins = ["pydantic.mypy"]
 warn_redundant_casts = true
 warn_unused_ignores = true
 
-[tool.pydantic-mypy]
-init_forbid_extra = true
-init_typed = true
-warn_required_dynamic_aliases = true
-
 [tool.pytest.ini_options]
 python_files = "test_*.py"
 addopts = "--tb short --cov ./ --cov-report term-missing:skip-covered"

python_cq-0.5.1/cq/_core/dto.py

@@ -1,10 +0,0 @@
-from abc import ABC
-from typing import ClassVar
-
-from pydantic import BaseModel, ConfigDict
-
-
-class DTO(BaseModel, ABC):
-    __slots__ = ()
-
-    model_config: ClassVar[ConfigDict] = ConfigDict(frozen=True)