A programming framework for agentic AI
Make parenthesis optional for type routed agent message handler (#74)
Jack Gerrits8dad8b053670
diff --git a/src/agnext/components/_type_routed_agent.py b/src/agnext/components/_type_routed_agent.pyindex 2d62bc735..10c50c0a2 100644--- a/src/agnext/components/_type_routed_agent.py+++ b/src/agnext/components/_type_routed_agent.py@@ -18,6 +18,7 @@ from typing import (get_args,get_origin,get_type_hints,+ overload,runtime_checkable,)@@ -74,12 +75,36 @@ class MessageHandler(Protocol[ReceivesT, ProducesT]):# NOTE: this works on concrete types and not inheritance# TODO: Use a protocl for the outer function to check checked arg names+++@overloaddef message_handler(- strict: bool = True,+ func: Callable[[Any, ReceivesT, CancellationToken], Coroutine[Any, Any, ProducesT]],+) -> MessageHandler[ReceivesT, ProducesT]: ...+++@overload+def message_handler(+ func: None = None,+ *,+ strict: bool = ...,) -> Callable[[Callable[[Any, ReceivesT, CancellationToken], Coroutine[Any, Any, ProducesT]]],MessageHandler[ReceivesT, ProducesT],-]:+]: ...+++def message_handler(+ func: None | Callable[[Any, ReceivesT, CancellationToken], Coroutine[Any, Any, ProducesT]] = None,+ *,+ strict: bool = True,+) -> (+ Callable[+ [Callable[[Any, ReceivesT, CancellationToken], Coroutine[Any, Any, ProducesT]]],+ MessageHandler[ReceivesT, ProducesT],+ ]+ | MessageHandler[ReceivesT, ProducesT]+):def decorator(func: Callable[[Any, ReceivesT, CancellationToken], Coroutine[Any, Any, ProducesT]],) -> MessageHandler[ReceivesT, ProducesT]:@@ -128,7 +153,12 @@ def message_handler(return wrapper_handler- return decorator+ if func is None and not callable(func):+ return decorator+ elif callable(func):+ return decorator(func)+ else:+ raise ValueError("Invalid arguments")class TypeRoutedAgent(BaseAgent):diff --git a/tests/test_cancellation.py b/tests/test_cancellation.pyindex ab0a61bc6..feb928ef6 100644--- a/tests/test_cancellation.py+++ b/tests/test_cancellation.py@@ -17,11 +17,11 @@ class MessageType:class LongRunningAgent(TypeRoutedAgent): # type: ignoredef __init__(self, name: str, router: AgentRuntime) -> None: # type: ignore- super().__init__(name, "A long running agent", router)+ super().__init__(name, "A long running agent", router)self.called = Falseself.cancelled = False- @message_handler() # type: ignore+ @message_handlerasync def on_new_message(self, message: MessageType, cancellation_token: CancellationToken) -> MessageType: # type: ignoreself.called = Truesleep = asyncio.ensure_future(asyncio.sleep(100))@@ -40,7 +40,7 @@ class NestingLongRunningAgent(TypeRoutedAgent): # type: ignoreself.cancelled = Falseself._nested_agent = nested_agent- @message_handler() # type: ignore+ @message_handlerasync def on_new_message(self, message: MessageType, cancellation_token: CancellationToken) -> MessageType: # type: ignoreself.called = Trueresponse = self._send_message(message, self._nested_agent, cancellation_token=cancellation_token)