A programming framework for agentic AI
Handle messages in a queue for team one base agent (#284)
Jack Gerrits6437374f63ec
diff --git a/python/teams/team-one/src/team_one/agents/base_agent.py b/python/teams/team-one/src/team_one/agents/base_agent.pyindex 7e9aa475f..d24348479 100644--- a/python/teams/team-one/src/team_one/agents/base_agent.py+++ b/python/teams/team-one/src/team_one/agents/base_agent.py@@ -1,6 +1,6 @@+import asyncioimport logging-from asyncio import Lock-from typing import List, Tuple+from typing import Any, List, Tuplefrom agnext.application.logging import EVENT_LOGGER_NAMEfrom agnext.components import TypeRoutedAgent, message_handler@@ -24,6 +24,9 @@ from team_one.utils import message_content_to_strlogger = logging.getLogger(EVENT_LOGGER_NAME + ".orchestrator")+PossibleMessages = RequestReplyMessage | BroadcastMessage | ResetMessage | DeactivateMessage++class BaseAgent(TypeRoutedAgent):"""An agent that handles the RequestReply and Broadcast messages"""@@ -33,94 +36,86 @@ class BaseAgent(TypeRoutedAgent):handle_messages_concurrently: bool = False,) -> None:super().__init__(description)- self._lock: Lock | None = None if handle_messages_concurrently else Lock()self._chat_history: List[LLMMessage] = []self._enabled: bool = True+ self._handle_messages_concurrently = handle_messages_concurrently++ if not self._handle_messages_concurrently:+ # TODO: make it possible to stop+ self._message_queue = asyncio.Queue[tuple[PossibleMessages, CancellationToken, asyncio.Future[Any]]]()+ self._processing_task = asyncio.create_task(self._process())++ async def _process(self) -> None:+ while True:+ message, cancellation_token, future = await self._message_queue.get()+ if cancellation_token.is_cancelled():+ # TODO: Do we need to resolve the future here?+ continue++ if isinstance(message, RequestReplyMessage):+ await self.handle_request_reply(message, cancellation_token)+ elif isinstance(message, BroadcastMessage):+ await self.handle_broadcast(message, cancellation_token)+ elif isinstance(message, ResetMessage):+ await self.handle_reset(message, cancellation_token)+ elif isinstance(message, DeactivateMessage):+ await self.handle_deactivate(message, cancellation_token)+ else:+ raise ValueError("Unknown message type.")++ future.set_result(None)+@message_handler- async def handle_broadcast(self, message: BroadcastMessage, cancellation_token: CancellationToken) -> None:- """Handle an incoming broadcast message."""+ async def handle_incoming_message(+ self,+ message: BroadcastMessage | ResetMessage | DeactivateMessage | RequestReplyMessage,+ cancellation_token: CancellationToken,+ ) -> None:if not self._enabled:return- assert isinstance(message.content, UserMessage)- try:- if self._lock is not None:- await self._lock.acquire()+ if self._handle_messages_concurrently:+ if isinstance(message, RequestReplyMessage):+ await self.handle_request_reply(message, cancellation_token)+ elif isinstance(message, BroadcastMessage):+ await self.handle_broadcast(message, cancellation_token)+ elif isinstance(message, ResetMessage):+ await self.handle_reset(message, cancellation_token)+ elif isinstance(message, DeactivateMessage):+ await self.handle_deactivate(message, cancellation_token)+ else:+ future = asyncio.Future[Any]()+ await self._message_queue.put((message, cancellation_token, future))+ await future- ### CRITICAL SECTION- self._chat_history.append(message.content)- ###-- finally:- if self._lock is not None:- self._lock.release()+ async def handle_broadcast(self, message: BroadcastMessage, cancellation_token: CancellationToken) -> None:+ assert isinstance(message.content, UserMessage)+ self._chat_history.append(message.content)- @message_handlerasync def handle_reset(self, message: ResetMessage, cancellation_token: CancellationToken) -> None:"""Handle a reset message."""- if not self._enabled:- return-- try:- if self._lock is not None:- await self._lock.acquire()+ await self._reset(cancellation_token)- ### CRITICAL SECTION- await self._reset(cancellation_token)- ###-- finally:- if self._lock is not None:- self._lock.release()-- @message_handlerasync def handle_deactivate(self, message: DeactivateMessage, cancellation_token: CancellationToken) -> None:"""Handle a deactivate message."""- if not self._enabled:- return-- try:- if self._lock is not None:- await self._lock.acquire()-- ### CRITICAL SECTION- self._enabled = False- logger.info(- AgentEvent(- f"{self.metadata['name']} (deactivated)",- "",- )+ self._enabled = False+ logger.info(+ AgentEvent(+ f"{self.metadata['name']} (deactivated)",+ "",)- ###-- finally:- if self._lock is not None:- self._lock.release()+ )- @message_handlerasync def handle_request_reply(self, message: RequestReplyMessage, cancellation_token: CancellationToken) -> None:"""Respond to a reply request."""- if not self._enabled:- return-- try:- if self._lock is not None:- await self._lock.acquire()-- ### CRITICAL SECTION- request_halt, response = await self._generate_reply(cancellation_token)-- assistant_message = AssistantMessage(content=message_content_to_str(response), source=self.metadata["name"])- self._chat_history.append(assistant_message)+ request_halt, response = await self._generate_reply(cancellation_token)- user_message = UserMessage(content=response, source=self.metadata["name"])- await self.publish_message(BroadcastMessage(content=user_message, request_halt=request_halt))- ###+ assistant_message = AssistantMessage(content=message_content_to_str(response), source=self.metadata["name"])+ self._chat_history.append(assistant_message)- finally:- if self._lock is not None:- self._lock.release()+ user_message = UserMessage(content=response, source=self.metadata["name"])+ await self.publish_message(BroadcastMessage(content=user_message, request_halt=request_halt))async def _generate_reply(self, cancellation_token: CancellationToken) -> Tuple[bool, UserContent]:"""Returns (request_halt, response_message)"""