python-cq 0.22.0__tar.gz → 0.23.0__tar.gz

{python_cq-0.22.0 → python_cq-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: python-cq
-Version: 0.22.0
+Version: 0.23.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
@@ -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.22.0 → python_cq-0.23.0}/cq/__init__.py

@@ -1,9 +1,3 @@
-from ._core.cq import CQ
-from ._core.di import DIAdapter
-from ._core.di import NoDI as _NoDI
-from ._core.dispatchers.abc import Dispatcher
-from ._core.dispatchers.bus import Bus
-from ._core.dispatchers.pipe import ContextPipeline, Pipe
 from ._core.message import (
     AnyCommandBus,
     Command,
@@ -14,25 +8,30 @@ from ._core.message import (
     QueryBus,
 )
 from ._core.middleware import Middleware, MiddlewareResult, resolve_handler_source
-from ._core.pipetools import ContextCommandPipeline as _ContextCommandPipeline
-from ._core.pump import Pump
-from ._core.queues.abc import Consumer, Delivery, Producer, Queue
-from ._core.queues.memory import MemoryQueue
+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.di import DIAdapter
+from ._core.routing.dispatchers.abc import Dispatcher
+from ._core.routing.dispatchers.bus import Bus
+from ._core.routing.dispatchers.pipe import ContextPipeline, Pipe
+from ._core.routing.router import Router
 
 __all__ = (
-    "__cq__",
     "AnyCommandBus",
     "AnyIORelatedEvents",
     "Bus",
-    "CQ",
     "Command",
     "CommandBus",
     "Consumer",
     "ContextCommandPipeline",
     "ContextPipeline",
-    "Delivery",
     "DIAdapter",
+    "Delivery",
     "Dispatcher",
     "Event",
     "EventBus",
@@ -46,6 +45,8 @@ __all__ = (
     "QueryBus",
     "Queue",
     "RelatedEvents",
+    "Router",
+    "__router__",
     "command_handler",
     "event_handler",
     "new_command_bus",
@@ -55,28 +56,30 @@ __all__ = (
     "resolve_handler_source",
 )
 
+
 try:
-    from .ext.injection import InjectionAdapter as _InjectionAdapter
+    from .ext.injection import InjectionAdapter
 
 except ImportError:  # pragma: no cover
-    __cq__ = CQ(_NoDI())
+    __router__ = Router()
 
 else:
-    __cq__ = CQ(_InjectionAdapter())
+    __router__ = Router(InjectionAdapter())
+    del InjectionAdapter
 
-__cq__.register_defaults()
+__router__.register_defaults()
 
-command_handler = __cq__.command_handler
-event_handler = __cq__.event_handler
-query_handler = __cq__.query_handler
+command_handler = __router__.command_handler
+event_handler = __router__.event_handler
+query_handler = __router__.query_handler
 
-new_command_bus = __cq__.new_command_bus
-new_event_bus = __cq__.new_event_bus
-new_query_bus = __cq__.new_query_bus
+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 = __cq__.di) -> None:
+    def __init__(self, di: DIAdapter = __router__.di) -> None:
         super().__init__(di)

{python_cq-0.22.0 → python_cq-0.23.0}/cq/_core/message.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from cq._core.dispatchers.abc import Dispatcher
+from cq._core.routing.dispatchers.abc import Dispatcher
 
 Command = object
 Event = object

{python_cq-0.22.0 → python_cq-0.23.0}/cq/_core/middleware.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass, field
 from inspect import isasyncgenfunction
 from typing import Any, Concatenate, Self, TypeGuard
 
-from cq._core.handler import HandleFunction, HandlerType
+from cq._core.routing.handler import HandleFunction, HandlerType
 from cq.exceptions import MiddlewareError
 
 type MiddlewareResult[T] = AsyncGenerator[None, T]
@@ -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.22.0/cq/_core → python_cq-0.23.0/cq/_core/queuing}/pump.py

@@ -6,7 +6,7 @@ from typing import Any, Self
 import anyio
 
 from cq._core.middleware import Middleware, MiddlewareGroup
-from cq._core.queues.abc import Consumer
+from cq._core.queuing.queues.abc import Consumer
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)

{python_cq-0.22.0/cq/_core → python_cq-0.23.0/cq/_core/queuing}/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.22.0/cq/_core → python_cq-0.23.0/cq/_core/queuing}/queues/memory.py

@@ -7,8 +7,8 @@ import anyio
 from anyio.abc import ObjectReceiveStream, ObjectSendStream
 
 from cq._core.middleware import Middleware
-from cq._core.pump import Pump
-from cq._core.queues.abc import Delivery, Queue
+from cq._core.queuing.pump import Pump
+from cq._core.queuing.queues.abc import Delivery, Queue
 
 
 class MemoryQueue[T](Queue[T]):
@@ -17,7 +17,7 @@ class MemoryQueue[T](Queue[T]):
     __consumer: ObjectReceiveStream[T]
     __producer: ObjectSendStream[T]
 
-    def __init__(self, maxsize: int = 0) -> None:
+    def __init__(self, maxsize: float = 0) -> None:
         self.__producer, self.__consumer = anyio.create_memory_object_stream(maxsize)
 
     async def __aenter__(self) -> Self:
@@ -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.22.0/cq/_core/pipetools.py → python_cq-0.23.0/cq/_core/routing/command_pipeline.py

@@ -1,16 +1,16 @@
 from typing import TYPE_CHECKING, Any, Self, overload
 
-from cq import Dispatcher
 from cq._core.common.typing import Decorator
-from cq._core.di import DIAdapter
-from cq._core.dispatchers.lazy import LazyDispatcher
-from cq._core.dispatchers.pipe import (
+from cq._core.message import Command, CommandBus, Query, QueryBus
+from cq._core.routing.di import DIAdapter
+from cq._core.routing.dispatchers.abc import Dispatcher
+from cq._core.routing.dispatchers.lazy import LazyDispatcher
+from cq._core.routing.dispatchers.pipe import (
     ContextPipeline,
     ConvertMethod,
     ConvertMethodAsync,
     ConvertMethodSync,
 )
-from cq._core.message import Command, CommandBus, Query, QueryBus
 
 
 class ContextCommandPipeline[C: Command](ContextPipeline[C]):

{python_cq-0.22.0/cq/_core → python_cq-0.23.0/cq/_core/routing}/dispatchers/bus.py

@@ -5,15 +5,15 @@ from typing import Any, Protocol, Self, runtime_checkable
 import anyio
 from anyio.abc import TaskGroup
 
-from cq._core.dispatchers.abc import BaseDispatcher, Dispatcher
-from cq._core.handler import (
+from cq._core.middleware import Middleware
+from cq._core.routing.dispatchers.abc import BaseDispatcher, Dispatcher
+from cq._core.routing.handler import (
     HandleFunction,
     HandlerFactory,
     HandlerRegistry,
     MultipleHandlerRegistry,
     SingleHandlerRegistry,
 )
-from cq._core.middleware import Middleware
 
 type Listener[T] = Callable[[T], Awaitable[Any]]
 
@@ -82,7 +82,7 @@ class SimpleBus[I, O](BaseBus[I, O]):
         async with anyio.create_task_group() as task_group:
             self._trigger_listeners(message, task_group)
 
-        for handler in self._handlers_from(type(message)):
+        for handler in self._handlers_from(message.__class__):
             return await self._invoke(handler, message, handler.fail_silently)
 
         return NotImplemented
@@ -98,7 +98,7 @@ class TaskBus[I](BaseBus[I, None]):
         async with anyio.create_task_group() as task_group:
             self._trigger_listeners(message, task_group)
 
-            for handler in self._handlers_from(type(message)):
+            for handler in self._handlers_from(message.__class__):
                 task_group.start_soon(
                     self._invoke,
                     handler,

{python_cq-0.22.0/cq/_core → python_cq-0.23.0/cq/_core/routing}/dispatchers/lazy.py

@@ -2,8 +2,8 @@ from collections.abc import Awaitable, Callable
 from types import GenericAlias
 from typing import TypeAliasType
 
-from cq._core.di import DIAdapter
-from cq._core.dispatchers.abc import Dispatcher
+from cq._core.routing.di import DIAdapter
+from cq._core.routing.dispatchers.abc import Dispatcher
 
 
 class LazyDispatcher[I, O](Dispatcher[I, O]):

{python_cq-0.22.0/cq/_core → python_cq-0.23.0/cq/_core/routing}/dispatchers/pipe.py

@@ -14,8 +14,8 @@ from typing import (
 )
 
 from cq._core.common.typing import Decorator, Method
-from cq._core.dispatchers.abc import BaseDispatcher, Dispatcher
 from cq._core.middleware import Middleware, MiddlewareGroup
+from cq._core.routing.dispatchers.abc import BaseDispatcher, Dispatcher
 
 type ConvertAsync[**P, I, O] = Callable[Concatenate[O, P], Awaitable[I]]
 type ConvertSync[**P, I, O] = Callable[Concatenate[O, P], I]

{python_cq-0.22.0/cq/_core → python_cq-0.23.0/cq/_core/routing}/handler.py

@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Any, Protocol, Self, overload, runtime_checkab
 from type_analyzer import MatchingTypesConfig, iter_matching_types, matching_types
 
 from cq._core.common.typing import Decorator
-from cq._core.di import DIAdapter, NoDI
+from cq._core.routing.di import DIAdapter, NoDI
 
 type HandlerType[**P, T] = type[Handler[P, T]]
 type HandlerFactory[**P, T] = Callable[..., Awaitable[Handler[P, T]]]
@@ -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.22.0/cq/_core/cq.py → python_cq-0.23.0/cq/_core/routing/router.py

@@ -1,18 +1,18 @@
 from collections.abc import KeysView
 from typing import Any, Self
 
-from cq._core.di import DIAdapter
-from cq._core.dispatchers.bus import Bus, SimpleBus, TaskBus
-from cq._core.handler import (
+from cq._core.message import Command, Event, Query
+from cq._core.routing.di import DIAdapter, NoDI
+from cq._core.routing.dispatchers.bus import Bus, SimpleBus, TaskBus
+from cq._core.routing.handler import (
     HandlerDecorator,
     HandlerRegistry,
     MultipleHandlerRegistry,
     SingleHandlerRegistry,
 )
-from cq._core.message import Command, Event, Query
 
 
-class CQ:
+class Router:
     __slots__ = ("__command_registry", "__di", "__event_registry", "__query_registry")
 
     __command_registry: HandlerRegistry[Command, Any]
@@ -20,8 +20,8 @@ class CQ:
     __event_registry: HandlerRegistry[Event, Any]
     __query_registry: HandlerRegistry[Query, Any]
 
-    def __init__(self, di: DIAdapter, /) -> None:
-        self.__di = di
+    def __init__(self, di: DIAdapter | None = None, /) -> None:
+        self.__di = di or NoDI()
         self.__command_registry = SingleHandlerRegistry()
         self.__event_registry = MultipleHandlerRegistry()
         self.__query_registry = SingleHandlerRegistry()

{python_cq-0.22.0 → python_cq-0.23.0}/cq/ext/injection.py

@@ -1,16 +1,16 @@
-from collections.abc import AsyncIterator
+from collections.abc import AsyncIterator, Awaitable, Callable
 from contextlib import AsyncExitStack
 from dataclasses import dataclass, field
 from enum import StrEnum
-from typing import Any, 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 Command, CommandBus, EventBus, QueryBus
 from cq._core.middleware import Middleware, MiddlewareResult
 from cq._core.related_events import AnyIORelatedEvents, RelatedEvents
+from cq._core.routing.di import DIAdapter
 
 __all__ = ("CQScope", "InjectionAdapter", "InjectionScopeMiddleware")
 

{python_cq-0.22.0 → python_cq-0.23.0}/cq/middlewares/contextlib.py

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

{python_cq-0.22.0 → python_cq-0.23.0}/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.22.0 → python_cq-0.23.0}/pyproject.toml

@@ -20,7 +20,7 @@ test = [
 
 [project]
 name = "python-cq"
-version = "0.22.0"
+version = "0.23.0"
 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",