Skip to content

Commit a198c58

Browse files
CopilotCopilot
andcommitted
Fix A2AAgent context_providers not triggered (microsoft#4754)
A2AAgent.run() overrode BaseAgent.run() without calling before_run/after_run on context_providers. Added _run_before_providers() to invoke before_run on each provider before the A2A call, and _run_after_providers() after the response completes, in both streaming and non-streaming paths. Co-authored-by: Copilot <[email protected]>
1 parent 1e6f890 commit a198c58

2 files changed

Lines changed: 219 additions & 14 deletions

File tree

‎python/packages/a2a/agent_framework_a2a/_agent.py‎

Lines changed: 99 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
ContinuationToken,
4040
Message,
4141
ResponseStream,
42+
SessionContext,
4243
normalize_messages,
4344
prepend_agent_framework_to_user_agent,
4445
)
@@ -284,22 +285,106 @@ def run( # pyright: ignore[reportIncompatibleMethodOverride]
284285
When stream=True: A ResponseStream of AgentResponseUpdate items.
285286
"""
286287
del function_invocation_kwargs, client_kwargs, kwargs
287-
if continuation_token is not None:
288-
a2a_stream: AsyncIterable[A2AStreamItem] = self.client.resubscribe(
289-
TaskIdParams(id=continuation_token["task_id"])
288+
normalized_messages = normalize_messages(messages) if continuation_token is None else None
289+
290+
if not stream:
291+
292+
async def _run_non_streaming() -> AgentResponse[Any]:
293+
active_session, session_context = await self._run_before_providers(
294+
session=session, input_messages=normalized_messages,
295+
)
296+
if continuation_token is not None:
297+
a2a_stream: AsyncIterable[A2AStreamItem] = self.client.resubscribe(
298+
TaskIdParams(id=continuation_token["task_id"])
299+
)
300+
else:
301+
a2a_message = self._prepare_message_for_a2a(normalized_messages[-1]) # type: ignore[index]
302+
a2a_stream = self.client.send_message(a2a_message)
303+
304+
response_stream = ResponseStream(
305+
self._map_a2a_stream(a2a_stream, background=background),
306+
finalizer=AgentResponse.from_updates,
307+
)
308+
result = await response_stream.get_final_response()
309+
session_context._response = result
310+
await self._run_after_providers(session=active_session, context=session_context)
311+
return result
312+
313+
return _run_non_streaming()
314+
315+
# Streaming path
316+
active_session_holder: dict[str, AgentSession | None] = {"session": None}
317+
context_holder: dict[str, SessionContext | None] = {"ctx": None}
318+
319+
async def _post_hook(response: AgentResponse) -> None:
320+
session_context = context_holder["ctx"]
321+
if session_context is None:
322+
return
323+
session_context._response = response
324+
await self._run_after_providers(session=active_session_holder["session"], context=session_context)
325+
326+
async def _get_stream() -> ResponseStream[AgentResponseUpdate, AgentResponse[Any]]:
327+
active_session, session_context = await self._run_before_providers(
328+
session=session, input_messages=normalized_messages,
290329
)
291-
else:
292-
normalized_messages = normalize_messages(messages)
293-
a2a_message = self._prepare_message_for_a2a(normalized_messages[-1])
294-
a2a_stream = self.client.send_message(a2a_message)
295-
296-
response = ResponseStream(
297-
self._map_a2a_stream(a2a_stream, background=background),
298-
finalizer=AgentResponse.from_updates,
330+
active_session_holder["session"] = active_session
331+
context_holder["ctx"] = session_context
332+
333+
if continuation_token is not None:
334+
a2a_stream: AsyncIterable[A2AStreamItem] = self.client.resubscribe(
335+
TaskIdParams(id=continuation_token["task_id"])
336+
)
337+
else:
338+
a2a_message = self._prepare_message_for_a2a(normalized_messages[-1]) # type: ignore[index]
339+
a2a_stream = self.client.send_message(a2a_message)
340+
341+
return ResponseStream(
342+
self._map_a2a_stream(a2a_stream, background=background),
343+
finalizer=AgentResponse.from_updates,
344+
)
345+
346+
return (
347+
ResponseStream
348+
.from_awaitable(_get_stream())
349+
.with_result_hook(_post_hook)
299350
)
300-
if stream:
301-
return response
302-
return response.get_final_response()
351+
352+
async def _run_before_providers(
353+
self,
354+
*,
355+
session: AgentSession | None,
356+
input_messages: list[Message] | None,
357+
) -> tuple[AgentSession | None, SessionContext]:
358+
"""Run before_run on all context providers and return the active session and context.
359+
360+
Keyword Args:
361+
session: The conversation session (None for stateless invocation).
362+
input_messages: Messages to process.
363+
364+
Returns:
365+
A tuple of (active_session, session_context).
366+
"""
367+
active_session = session
368+
if active_session is None and self.context_providers:
369+
active_session = AgentSession()
370+
371+
session_context = SessionContext(
372+
session_id=active_session.session_id if active_session else None,
373+
service_session_id=active_session.service_session_id if active_session else None,
374+
input_messages=input_messages or [],
375+
)
376+
377+
for provider in self.context_providers:
378+
if active_session is None:
379+
raise RuntimeError("Provider session must be available when context providers are configured.")
380+
await provider.before_run(
381+
agent=self,
382+
session=active_session,
383+
context=session_context,
384+
state=active_session.state.setdefault(provider.source_id, {}),
385+
)
386+
387+
return active_session, session_context
303388

304389
async def _map_a2a_stream(
305390
self,

‎python/packages/a2a/tests/test_a2a_agent.py‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
from agent_framework import (
2424
AgentResponse,
2525
AgentResponseUpdate,
26+
AgentSession,
27+
BaseContextProvider,
2628
Content,
2729
Message,
2830
)
@@ -850,4 +852,122 @@ async def test_poll_task_completed(a2a_agent: A2AAgent, mock_a2a_client: MockA2A
850852
assert response.messages[0].text == "Poll result"
851853

852854

855+
# region context_providers
856+
857+
858+
class TrackingContextProvider(BaseContextProvider):
859+
"""Context provider that tracks before_run/after_run calls."""
860+
861+
def __init__(self, source_id: str = "tracking") -> None:
862+
super().__init__(source_id=source_id)
863+
self.before_run_called = False
864+
self.after_run_called = False
865+
self.before_run_session: AgentSession | None = None
866+
self.after_run_session: AgentSession | None = None
867+
self.after_run_response: AgentResponse | None = None
868+
869+
async def before_run(self, *, agent, session, context, state) -> None:
870+
self.before_run_called = True
871+
self.before_run_session = session
872+
873+
async def after_run(self, *, agent, session, context, state) -> None:
874+
self.after_run_called = True
875+
self.after_run_session = session
876+
self.after_run_response = context.response
877+
878+
879+
async def test_run_invokes_context_providers(mock_a2a_client: MockA2AClient) -> None:
880+
"""Test that run() calls before_run and after_run on context providers."""
881+
provider = TrackingContextProvider()
882+
agent = A2AAgent(name="Test Agent", client=mock_a2a_client, http_client=None, context_providers=[provider])
883+
884+
mock_a2a_client.add_message_response("msg-ctx", "Hello!", "agent")
885+
886+
response = await agent.run("Hi")
887+
888+
assert provider.before_run_called
889+
assert provider.after_run_called
890+
assert provider.after_run_response is not None
891+
assert isinstance(response, AgentResponse)
892+
assert response.messages[0].text == "Hello!"
893+
894+
895+
async def test_run_invokes_context_providers_with_session(mock_a2a_client: MockA2AClient) -> None:
896+
"""Test that context providers receive the provided session."""
897+
provider = TrackingContextProvider()
898+
agent = A2AAgent(name="Test Agent", client=mock_a2a_client, http_client=None, context_providers=[provider])
899+
session = AgentSession(session_id="test-session")
900+
901+
mock_a2a_client.add_message_response("msg-sess", "With session", "agent")
902+
903+
await agent.run("Hi", session=session)
904+
905+
assert provider.before_run_session is session
906+
assert provider.after_run_session is session
907+
908+
909+
async def test_run_creates_session_for_providers_when_none(mock_a2a_client: MockA2AClient) -> None:
910+
"""Test that a session is auto-created when context_providers are set but no session is passed."""
911+
provider = TrackingContextProvider()
912+
agent = A2AAgent(name="Test Agent", client=mock_a2a_client, http_client=None, context_providers=[provider])
913+
914+
mock_a2a_client.add_message_response("msg-auto", "Auto session", "agent")
915+
916+
await agent.run("Hi")
917+
918+
assert provider.before_run_session is not None
919+
assert provider.after_run_session is not None
920+
921+
922+
async def test_streaming_invokes_context_providers(mock_a2a_client: MockA2AClient) -> None:
923+
"""Test that streaming run() calls before_run and after_run on context providers."""
924+
provider = TrackingContextProvider()
925+
agent = A2AAgent(name="Test Agent", client=mock_a2a_client, http_client=None, context_providers=[provider])
926+
927+
mock_a2a_client.add_message_response("msg-stream-ctx", "Streamed!", "agent")
928+
929+
response = await agent.run("Hi", stream=True).get_final_response()
930+
931+
assert provider.before_run_called
932+
assert provider.after_run_called
933+
assert provider.after_run_response is not None
934+
assert response.messages[0].text == "Streamed!"
935+
936+
937+
async def test_run_without_providers_still_works(mock_a2a_client: MockA2AClient) -> None:
938+
"""Test that run() without context_providers still works correctly."""
939+
agent = A2AAgent(name="Test Agent", client=mock_a2a_client, http_client=None)
940+
941+
mock_a2a_client.add_message_response("msg-no-ctx", "No providers", "agent")
942+
943+
response = await agent.run("Hi")
944+
945+
assert isinstance(response, AgentResponse)
946+
assert response.messages[0].text == "No providers"
947+
948+
949+
async def test_multiple_providers_invoked_in_order(mock_a2a_client: MockA2AClient) -> None:
950+
"""Test that multiple context providers are called in forward/reverse order."""
951+
call_order: list[str] = []
952+
953+
class OrderTrackingProvider(BaseContextProvider):
954+
async def before_run(self, *, agent, session, context, state) -> None:
955+
call_order.append(f"before:{self.source_id}")
956+
957+
async def after_run(self, *, agent, session, context, state) -> None:
958+
call_order.append(f"after:{self.source_id}")
959+
960+
provider_a = OrderTrackingProvider(source_id="a")
961+
provider_b = OrderTrackingProvider(source_id="b")
962+
agent = A2AAgent(
963+
name="Test Agent", client=mock_a2a_client, http_client=None, context_providers=[provider_a, provider_b]
964+
)
965+
966+
mock_a2a_client.add_message_response("msg-order", "Ordered", "agent")
967+
968+
await agent.run("Hi")
969+
970+
assert call_order == ["before:a", "before:b", "after:b", "after:a"]
971+
972+
853973
# endregion

0 commit comments

Comments
 (0)