A programming framework for agentic AI
Add request_id parameter (#4384)
Jack Gerritscf80b1bc14c2
diff --git a/python/packages/autogen-core/src/autogen_core/application/_single_threaded_agent_runtime.py b/python/packages/autogen-core/src/autogen_core/application/_single_threaded_agent_runtime.pyindex 52d24c64d..3d81f15eb 100644--- a/python/packages/autogen-core/src/autogen_core/application/_single_threaded_agent_runtime.py+++ b/python/packages/autogen-core/src/autogen_core/application/_single_threaded_agent_runtime.py@@ -4,6 +4,7 @@ import asyncioimport inspectimport loggingimport threading+import uuidimport warningsfrom asyncio import CancelledError, Future, Taskfrom collections.abc import Sequence@@ -53,6 +54,7 @@ class PublishMessageEnvelope:sender: AgentId | Nonetopic_id: TopicIdmetadata: EnvelopeMetadata | None = None+ message_id: str@dataclass(kw_only=True)@@ -256,6 +258,7 @@ class SingleThreadedAgentRuntime(AgentRuntime):*,sender: AgentId | None = None,cancellation_token: CancellationToken | None = None,+ message_id: str | None = None,) -> None:with self._tracer_helper.trace_block("create",@@ -268,6 +271,9 @@ class SingleThreadedAgentRuntime(AgentRuntime):content = message.__dict__ if hasattr(message, "__dict__") else messagelogger.info(f"Publishing message of type {type(message).__name__} to all subscribers: {content}")+ if message_id is None:+ message_id = str(uuid.uuid4())+# event_logger.info(# MessageEvent(# payload=message,@@ -285,6 +291,7 @@ class SingleThreadedAgentRuntime(AgentRuntime):sender=sender,topic_id=topic_id,metadata=get_telemetry_envelope_metadata(),+ message_id=message_id,))@@ -327,6 +334,8 @@ class SingleThreadedAgentRuntime(AgentRuntime):topic_id=None,is_rpc=True,cancellation_token=message_envelope.cancellation_token,+ # Will be fixed when send API removed+ message_id="NOT_DEFINED_TODO_FIX",)with MessageHandlerContext.populate_context(recipient_agent.id):response = await recipient_agent.on_message(@@ -385,6 +394,7 @@ class SingleThreadedAgentRuntime(AgentRuntime):topic_id=message_envelope.topic_id,is_rpc=False,cancellation_token=message_envelope.cancellation_token,+ message_id=message_envelope.message_id,)agent = await self._get_agent(agent_id)diff --git a/python/packages/autogen-core/src/autogen_core/application/_worker_runtime.py b/python/packages/autogen-core/src/autogen_core/application/_worker_runtime.pyindex f8ad4bbd1..0e5fb933a 100644--- a/python/packages/autogen-core/src/autogen_core/application/_worker_runtime.py+++ b/python/packages/autogen-core/src/autogen_core/application/_worker_runtime.py@@ -3,6 +3,7 @@ import inspectimport jsonimport loggingimport signal+import uuidimport warningsfrom asyncio import Future, Taskfrom collections import defaultdict@@ -371,11 +372,17 @@ class WorkerAgentRuntime(AgentRuntime):*,sender: AgentId | None = None,cancellation_token: CancellationToken | None = None,+ message_id: str | None = None,) -> None:if not self._running:raise ValueError("Runtime must be running when publishing message.")if self._host_connection is None:raise RuntimeError("Host connection is not set.")+ if message_id is None:+ message_id = str(uuid.uuid4())++ # TODO: consume message_id+message_type = self._serialization_registry.type_name(message)with self._trace_helper.trace_block("create", topic_id, parent=None, extraAttributes={"message_type": message_type}@@ -447,6 +454,7 @@ class WorkerAgentRuntime(AgentRuntime):topic_id=None,is_rpc=True,cancellation_token=CancellationToken(),+ message_id=request.request_id,)# Call the receiving agent.@@ -530,11 +538,13 @@ class WorkerAgentRuntime(AgentRuntime):for agent_id in recipients:if agent_id == sender:continue+ # TODO: consume message_idmessage_context = MessageContext(sender=sender,topic_id=topic_id,is_rpc=False,cancellation_token=CancellationToken(),+ message_id="NOT_DEFINED_TODO_FIX",)agent = await self._get_agent(agent_id)with MessageHandlerContext.populate_context(agent.id):diff --git a/python/packages/autogen-core/src/autogen_core/base/_agent_runtime.py b/python/packages/autogen-core/src/autogen_core/base/_agent_runtime.pyindex a8e7f0096..27c37ad9f 100644--- a/python/packages/autogen-core/src/autogen_core/base/_agent_runtime.py+++ b/python/packages/autogen-core/src/autogen_core/base/_agent_runtime.py@@ -55,6 +55,7 @@ class AgentRuntime(Protocol):*,sender: AgentId | None = None,cancellation_token: CancellationToken | None = None,+ message_id: str | None = None,) -> None:"""Publish a message to all agents in the given namespace, or if no namespace is provided, the namespace of the sender.@@ -64,7 +65,8 @@ class AgentRuntime(Protocol):message (Any): The message to publish.topic (TopicId): The topic to publish the message to.sender (AgentId | None, optional): The agent which sent the message. Defaults to None.- cancellation_token (CancellationToken | None, optional): Token used to cancel an in progress . Defaults to None.+ cancellation_token (CancellationToken | None, optional): Token used to cancel an in progress. Defaults to None.+ message_id (str | None, optional): The message id. If None, a new message id will be generated. Defaults to None. This message id must be unique. and is recommended to be a UUID.Raises:UndeliverableException: If the message cannot be delivered.diff --git a/python/packages/autogen-core/src/autogen_core/base/_message_context.py b/python/packages/autogen-core/src/autogen_core/base/_message_context.pyindex 0a2c2973b..c5c00559e 100644--- a/python/packages/autogen-core/src/autogen_core/base/_message_context.py+++ b/python/packages/autogen-core/src/autogen_core/base/_message_context.py@@ -11,3 +11,4 @@ class MessageContext:topic_id: TopicId | Noneis_rpc: boolcancellation_token: CancellationToken+ message_id: str