diff --git a/cq/_core/routing/command_pipeline.py b/cq/_core/routing/command_pipeline.py index 01d595e..f664b05 100644 --- a/cq/_core/routing/command_pipeline.py +++ b/cq/_core/routing/command_pipeline.py @@ -29,8 +29,8 @@ def __init__(self, di: DIAdapter | None = None, /) -> None: "or build the pipeline with `router.command_pipeline()`." ) from exc - super().__init__(LazyDispatcher(CommandBus, di)) - self.__query_dispatcher = LazyDispatcher(QueryBus, di) + super().__init__(LazyDispatcher(CommandBus, di)) # type: ignore[arg-type] + self.__query_dispatcher = LazyDispatcher(QueryBus, di) # type: ignore[arg-type] def add_static_query_step[Q: Query](self, query: Q, /) -> Self: return self.add_static_step(query, dispatcher=self.__query_dispatcher) diff --git a/cq/_core/routing/di.py b/cq/_core/routing/di.py index dc13d93..cf4157a 100644 --- a/cq/_core/routing/di.py +++ b/cq/_core/routing/di.py @@ -4,6 +4,8 @@ from collections.abc import Awaitable, Callable from typing import TYPE_CHECKING, Any, Concatenate, Protocol, runtime_checkable +from typing_extensions import TypeForm + if TYPE_CHECKING: # pragma: no cover from cq import Command, CommandBus, EventBus, Middleware, QueryBus @@ -38,11 +40,11 @@ def command_scope(self) -> Middleware[Concatenate[Command, ...], Any] | None: return None @abstractmethod - def lazy[T](self, tp: type[T]) -> Callable[[], Awaitable[T]]: + def lazy[T](self, type_: TypeForm[T]) -> Callable[[], Awaitable[T]]: """ - Return a callable that resolves an instance of ``tp`` in two steps. + Return a callable that resolves an instance of ``type_`` in two steps. - 1. ``lazy(tp)`` obtains a resolver from the DI framework for ``tp``. + 1. ``lazy(type_)`` obtains a resolver from the DI framework for ``type_``. 2. Calling and awaiting the returned callable performs the actual resolution and returns the instance. """ @@ -69,9 +71,9 @@ def register_defaults( return @abstractmethod - def wire[T](self, tp: type[T]) -> Callable[..., Awaitable[T]]: + def wire[T](self, type_: type[T]) -> Callable[..., Awaitable[T]]: """ - Return an async factory that instantiates ``tp`` with injected + Return an async factory that instantiates ``type_`` with injected dependencies. Used internally to build handler instances whose dependencies are @@ -84,14 +86,14 @@ def wire[T](self, tp: type[T]) -> Callable[..., Awaitable[T]]: class NoDI(DIAdapter): __slots__ = () - def lazy[T](self, tp: type[T], /) -> Callable[[], Awaitable[T]]: - tp_str = getattr(tp, "__name__", str(tp)) + def lazy[T](self, type_: TypeForm[T], /) -> Callable[[], Awaitable[T]]: + type_str = getattr(type_, "__name__", str(type_)) raise RuntimeError( - f"Can't lazily resolve {tp_str}: no DI container configured." + f"Can't lazily resolve {type_str}: no DI container configured." ) - def wire[T](self, tp: type[T], /) -> Callable[..., Awaitable[T]]: + def wire[T](self, type_: type[T], /) -> Callable[..., Awaitable[T]]: async def factory() -> T: - return tp() + return type_() return factory diff --git a/cq/_core/routing/dispatchers/bus.py b/cq/_core/routing/dispatchers/bus.py index 609e3c2..78972b1 100644 --- a/cq/_core/routing/dispatchers/bus.py +++ b/cq/_core/routing/dispatchers/bus.py @@ -1,10 +1,10 @@ -import sys from abc import ABC, abstractmethod from collections.abc import Awaitable, Callable, Iterator from typing import Any, Concatenate, Protocol, Self, runtime_checkable import anyio from anyio.abc import TaskGroup +from typing_extensions import TypeForm, deprecated from cq._core.middleware import Middleware from cq._core.routing.dispatchers.abc import BaseDispatcher, Dispatcher @@ -15,11 +15,6 @@ SingleHandlerRegistry, ) -if sys.version_info >= (3, 13): # pragma: no cover - from warnings import deprecated -else: # pragma: no cover - from typing_extensions import deprecated - type Listener[T] = Callable[[T], Awaitable[Any]] @@ -43,7 +38,7 @@ def add_middlewares(self, *middlewares: Middleware[Concatenate[I, ...], O]) -> S @abstractmethod def subscribe( self, - message_type: type[I], + message_type: TypeForm[I], function: Callable[Concatenate[I, ...], Awaitable[O]], fail_silently: bool = ..., ) -> Self: @@ -67,7 +62,7 @@ def add_listeners(self, *listeners: Listener[I]) -> Self: def subscribe( self, - message_type: type[I], + message_type: TypeForm[I], function: Callable[Concatenate[I, ...], Awaitable[O]], fail_silently: bool = False, ) -> Self: diff --git a/cq/_core/routing/dispatchers/lazy.py b/cq/_core/routing/dispatchers/lazy.py index 339e0c1..11650fe 100644 --- a/cq/_core/routing/dispatchers/lazy.py +++ b/cq/_core/routing/dispatchers/lazy.py @@ -1,6 +1,6 @@ from collections.abc import Awaitable, Callable -from types import GenericAlias -from typing import TypeAliasType + +from typing_extensions import TypeForm from cq._core.routing.di import DIAdapter from cq._core.routing.dispatchers.abc import Dispatcher @@ -13,11 +13,11 @@ class LazyDispatcher[I, O](Dispatcher[I, O]): def __init__( self, - dispatcher_type: type[Dispatcher[I, O]] | TypeAliasType | GenericAlias, + dispatcher_type: TypeForm[Dispatcher[I, O]], /, di: DIAdapter, ) -> None: - self.__resolve = di.lazy(dispatcher_type) # type: ignore[arg-type] + self.__resolve = di.lazy(dispatcher_type) async def dispatch(self, message: I, /) -> O: dispatcher = await self.__resolve() diff --git a/cq/_core/routing/handler.py b/cq/_core/routing/handler.py index 6857fff..c361de7 100644 --- a/cq/_core/routing/handler.py +++ b/cq/_core/routing/handler.py @@ -16,6 +16,7 @@ ) from type_analyzer import MatchingTypesConfig, iter_matching_types, matching_types +from typing_extensions import TypeForm from cq._core.common.typing import Decorator from cq._core.routing.di import DIAdapter, NoDI @@ -92,7 +93,7 @@ def handlers_from( @abstractmethod def subscribe( self, - message_type: type[I], + message_type: TypeForm[I], entry: HandlerEntry[Concatenate[I, ...], O], ) -> Self: raise NotImplementedError @@ -118,7 +119,7 @@ def handlers_from( def subscribe( self, - message_type: type[I], + message_type: TypeForm[I], entry: HandlerEntry[Concatenate[I, ...], O], ) -> Self: for key_type in _build_key_types(message_type): @@ -149,7 +150,7 @@ def handlers_from( def subscribe( self, - message_type: type[I], + message_type: TypeForm[I], entry: HandlerEntry[Concatenate[I, ...], O], ) -> Self: entries = {key_type: entry for key_type in _build_key_types(message_type)} @@ -171,10 +172,19 @@ class HandlerDecorator[I, O]: if TYPE_CHECKING: # pragma: no cover + @overload + def __call__[T: HandlerType[..., Any]]( # type: ignore[overload-overlap] + self, + handler: T, + /, + *, + fail_silently: bool = ..., + ) -> T: ... + @overload def __call__( self, - message_type: type[I], + message_type: TypeForm[I], /, *, fail_silently: bool = ..., @@ -200,7 +210,10 @@ def __call__( def __call__[T]( self, - message_or_handler: type[I] | T | None = None, + message_or_handler: HandlerType[Concatenate[I, ...], O] + | TypeForm[I] + | T + | None = None, /, *, fail_silently: bool = False, @@ -219,7 +232,7 @@ def __decorator[T]( wrapped: T, /, *, - message_type: type[I] | None, + message_type: TypeForm[I] | None, fail_silently: bool, ) -> T: if not self.__try_subscribe(wrapped, message_type, fail_silently): @@ -230,7 +243,7 @@ def __decorator[T]( def __try_subscribe( self, handler: Any, - message_type: type[I] | None, + message_type: TypeForm[I] | None, fail_silently: bool, ) -> bool: if isfunction(handler): @@ -266,7 +279,7 @@ def _iter_key_types(message_type: Any) -> Iterator[Any]: def _resolve_message_type[I, O]( handler: Callable[Concatenate[I, ...], Awaitable[O]], -) -> type[I]: +) -> TypeForm[I]: signature = inspect_signature(handler, eval_str=True) for parameter in signature.parameters.values(): diff --git a/cq/ext/injection.py b/cq/ext/injection.py index f19dcd1..7f5fd80 100644 --- a/cq/ext/injection.py +++ b/cq/ext/injection.py @@ -6,6 +6,7 @@ from injection import Module, adefine_scope, mod from injection.exceptions import ScopeAlreadyDefinedError +from typing_extensions import TypeForm from cq import ( AnyIORelatedEvents, @@ -37,8 +38,8 @@ def command_scope(self) -> Middleware[Concatenate[Command, ...], Any]: threadsafe=self.threadsafe, ) - def lazy[T](self, tp: type[T], /) -> Callable[[], Awaitable[T]]: - awaitable = self.module.aget_lazy_instance(tp, threadsafe=self.threadsafe) + def lazy[T](self, type_: TypeForm[T], /) -> Callable[[], Awaitable[T]]: + awaitable = self.module.aget_lazy_instance(type_, threadsafe=self.threadsafe) return lambda: awaitable def register_defaults( @@ -47,7 +48,7 @@ def register_defaults( event_bus: Callable[..., EventBus], query_bus: Callable[..., QueryBus[Any]], ) -> None: - self.module.injectable( + self.module.injectable( # type: ignore[call-overload] command_bus, ignore_type_hint=True, inject=False, @@ -61,7 +62,7 @@ def register_defaults( on=EventBus, mode="fallback", ) - self.module.injectable( + self.module.injectable( # type: ignore[call-overload] query_bus, ignore_type_hint=True, inject=False, @@ -73,8 +74,8 @@ def register_defaults( mode="fallback", )(self.__new_related_events) - def wire[T](self, tp: type[T], /) -> Callable[..., Awaitable[T]]: - return self.module.make_async_factory(tp, self.threadsafe) + def wire[T](self, type_: type[T], /) -> Callable[..., Awaitable[T]]: + return self.module.make_async_factory(type_, self.threadsafe) @staticmethod async def __new_related_events(event_bus: EventBus) -> AsyncIterator[RelatedEvents]: diff --git a/docs/routing/di.md b/docs/routing/di.md index a4efe67..049283e 100644 --- a/docs/routing/di.md +++ b/docs/routing/di.md @@ -18,6 +18,8 @@ from collections.abc import Awaitable, Callable from cq import Command, CommandBus, DIAdapter, EventBus, Middleware, QueryBus, Router from typing import Any, Concatenate +from typing_extensions import TypeForm + class MyDIAdapter(DIAdapter): def command_scope(self) -> Middleware[Concatenate[Command, ...], Any] | None: @@ -33,9 +35,9 @@ class MyDIAdapter(DIAdapter): """ ... - def lazy[T](self, tp: type[T]) -> Callable[[], Awaitable[T]]: + def lazy[T](self, type_: TypeForm[T]) -> Callable[[], Awaitable[T]]: """ - Return a callable that, when called and awaited, resolves `tp` from + Return a callable that, when called and awaited, resolves `type_` from the container. Pipelines call the returned callable on every message they dispatch, so that buses registered later in the import graph are picked up. @@ -56,9 +58,9 @@ class MyDIAdapter(DIAdapter): """ ... - def wire[T](self, tp: type[T]) -> Callable[..., Awaitable[T]]: + def wire[T](self, type_: type[T]) -> Callable[..., Awaitable[T]]: """ - Return an async factory that instantiates `tp` with its dependencies + Return an async factory that instantiates `type_` with its dependencies injected. Called once per handler class at registration, and the factory is awaited on every dispatch. """ diff --git a/pyproject.toml b/pyproject.toml index 6c99cec..fd9c931 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ classifiers = [ dependencies = [ "anyio", "type-analyzer", - "typing-extensions; python_version < '3.13'", + "typing-extensions", ] [project.optional-dependencies] diff --git a/tests/_core/routing/dispatchers/test_lazy.py b/tests/_core/routing/dispatchers/test_lazy.py index 85940af..73c4b64 100644 --- a/tests/_core/routing/dispatchers/test_lazy.py +++ b/tests/_core/routing/dispatchers/test_lazy.py @@ -22,7 +22,7 @@ class Handler: async def handle(self, query: _Query) -> str: return "query handled" - dispatcher = LazyDispatcher[_Query, Any](QueryBus, router.di) + dispatcher = LazyDispatcher[_Query, Any](QueryBus, router.di) # type: ignore[arg-type] router.register_defaults() assert await dispatcher.dispatch(_Query()) == "query handled" diff --git a/tests/_core/routing/test_handler.py b/tests/_core/routing/test_handler.py index 65b03f8..32a6b6b 100644 --- a/tests/_core/routing/test_handler.py +++ b/tests/_core/routing/test_handler.py @@ -130,7 +130,7 @@ def test_handlers_from_with_unknown_message_type_returns_nothing(self) -> None: def test_message_types_with_success_returns_subscribed_types(self) -> None: registry = MultipleHandlerRegistry[Any, str]() registry.subscribe( - _Message | _OtherMessage, # type: ignore[arg-type] + _Message | _OtherMessage, HandlerEntry.from_function(_handle), ) @@ -162,7 +162,7 @@ def test_subscribe_with_union_containing_subscribed_type_raises_runtime_error( entry = HandlerEntry.from_function(_other_handle) with pytest.raises(RuntimeError): - registry.subscribe(_OtherMessage | _Message, entry) # type: ignore[arg-type] + registry.subscribe(_OtherMessage | _Message, entry) assert set(registry.message_types) == {_Message} @@ -183,7 +183,7 @@ def test_handlers_from_with_unknown_message_type_returns_nothing(self) -> None: def test_message_types_with_success_returns_subscribed_types(self) -> None: registry = SingleHandlerRegistry[Any, str]() registry.subscribe( - _Message | _OtherMessage, # type: ignore[arg-type] + _Message | _OtherMessage, HandlerEntry.from_function(_handle), ) diff --git a/tests/ext/test_injection.py b/tests/ext/test_injection.py index 6db747c..bbf44c3 100644 --- a/tests/ext/test_injection.py +++ b/tests/ext/test_injection.py @@ -62,7 +62,7 @@ def test_register_defaults_with_success_registers_buses( router.register_defaults() for bus_type in (AnyCommandBus, EventBus, QueryBus[Any]): - assert isinstance(injection_module.find_instance(bus_type), Bus) + assert isinstance(injection_module.find_instance(bus_type), Bus) # type: ignore[arg-type] async def test_command_scope_with_success_provides_related_events_to_command_handlers( self, diff --git a/uv.lock b/uv.lock index ea27bd4..d9c4a7a 100644 --- a/uv.lock +++ b/uv.lock @@ -471,20 +471,20 @@ wheels = [ [[package]] name = "httpcore2" -version = "2.16.0" +version = "2.16.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "h11" }, { name = "truststore" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c0/61/afa9d6b7452f9eca73f73d45324eb0bb52f098fd5e6049bf6b8263be9b4e/httpcore2-2.16.0.tar.gz", hash = "sha256:c72cd0413563b17e1cd8354677dff887466f8ec2551679759e93126534428643", size = 69886, upload-time = "2026-10-21T07:09:45.31Z" } +sdist = { url = "https://files.pythonhosted.org/packages/31/74/902fb5889cdf87345caacfa286d7dfdca6bd1315c6b32173848b0e4d98dc/httpcore2-2.16.1.tar.gz", hash = "sha256:3daab6418ea53dd0f3de37bb6a5b15d8d334570d9781b9d64bc1fb8b6527a6df", size = 70058, upload-time = "2026-11-16T08:51:41.976Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/af/c2/ce417c397afa5181f0e3c6ff01a4d01639414e1adef08730d97571297151/httpcore2-2.16.0-py3-none-any.whl", hash = "sha256:5c4358319f2602d984ad93182c9fee5160f22e9da7babdda870a5e7c4e2dc34f", size = 85070, upload-time = "2026-10-21T07:09:42.802Z" }, + { url = "https://files.pythonhosted.org/packages/01/be/fdafbb964a5e8fa373c66a3037cbe35216cad794ec9370aee72890efe5a7/httpcore2-2.16.1-py3-none-any.whl", hash = "sha256:11f097034886b99d6f5829dde0a0f3bc0169c38935474ce1333bb10b3e4a0093", size = 85548, upload-time = "2026-11-16T08:51:38.763Z" }, ] [[package]] name = "httpx2" -version = "2.16.0" +version = "2.16.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "anyio", marker = "sys_platform != 'emscripten'" }, @@ -494,9 +494,9 @@ dependencies = [ { name = "truststore", marker = "sys_platform != 'emscripten'" }, { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/43/73/5ca2cedf5e4e50423d1c258877865a6b62793633b561c58499f8aeb33b7e/httpx2-2.16.0.tar.gz", hash = "sha256:0d54c98128e8f2ff7fbbde0fca8c359e5f032edeaaaac443cdb7f31f685bcd7f", size = 103116, upload-time = "2026-10-21T07:09:46.348Z" } +sdist = { url = "https://files.pythonhosted.org/packages/40/c9/50553244c50e7833e5d19788a9a32dfd19dd53e8738b4795fe8ff82affcb/httpx2-2.16.1.tar.gz", hash = "sha256:a344d3f2f1ee08990f69675d191e3213a25ec4bf1c5be9e6bb1b3960946747bc", size = 103455, upload-time = "2026-11-16T08:51:43.096Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7b/3d/2e4bc4fd1ef9770871669adb348d612a6e4786b303a23f9935b81c48dd60/httpx2-2.16.0-py3-none-any.whl", hash = "sha256:fd2c5d7909e8d86fe92d53020c310ca0e4e431b838c207c5754b9bbf0308d49a", size = 97880, upload-time = "2026-10-21T07:09:44.01Z" }, + { url = "https://files.pythonhosted.org/packages/4c/03/f98fa91b1c47dd265e94fe80ca1074cd739f81b97f4d6c532b2d6f05ebf8/httpx2-2.16.1-py3-none-any.whl", hash = "sha256:29e8566f8ab355075e7590643e04756361fcdb7d5f2be4d9cb959bde7d33d215", size = 98070, upload-time = "2026-11-16T08:51:40.288Z" }, ] [[package]] @@ -1073,7 +1073,7 @@ default-groups = ["dev", "docs", "test"] dependencies = [ { name = "anyio" }, { name = "type-analyzer" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, + { name = "typing-extensions" }, ] [package.optional-dependencies] @@ -1102,7 +1102,7 @@ requires-dist = [ { name = "anyio" }, { name = "python-injection", extras = ["async"], marker = "extra == 'injection'" }, { name = "type-analyzer" }, - { name = "typing-extensions", marker = "python_full_version < '3.13'" }, + { name = "typing-extensions" }, ] provides-extras = ["injection"] @@ -1148,14 +1148,15 @@ wheels = [ [[package]] name = "python-injection" -version = "0.27.0.post0" +version = "0.27.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "type-analyzer" }, + { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/1a/25/453919ff9672d71399bcd45af99c7c829ba1b6f6c013b78aab51d4838cf3/python_injection-0.27.0.post0.tar.gz", hash = "sha256:823cca34e91bee767b43e9f59029724f59542d0cc73dfd2c463d9bdcf1a9651a", size = 25141, upload-time = "2026-11-14T20:11:38.797Z" } +sdist = { url = "https://files.pythonhosted.org/packages/59/17/b8e7979edaa41ee696bcd8c9fd3692737f616628535202d048f25a928d24/python_injection-0.27.1.tar.gz", hash = "sha256:8b2a75646c34f4e50d40c15e328a731161242c134361b5a0dc6908704a37ddc8", size = 25103, upload-time = "2026-11-16T08:45:10.355Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2e/8c/c7db200b0623500852fd49096a3a156a73f9299be82889425d29325ce880/python_injection-0.27.0.post0-py3-none-any.whl", hash = "sha256:8a4c79762a16da43faf99b16f28f4339e15efe0dc2aea1a06a626a212a512129", size = 31957, upload-time = "2026-11-14T20:11:37.769Z" }, + { url = "https://files.pythonhosted.org/packages/cf/5b/83e132f309fd03fa4d9ee1f0972890466eccf41948927eb434ad82c2659f/python_injection-0.27.1-py3-none-any.whl", hash = "sha256:056cf604c82823a7484a7cd315133e98c73c555ac4178d7aff5b4f677b5b5023", size = 31891, upload-time = "2026-11-16T08:45:09.253Z" }, ] [package.optional-dependencies]