Skip to content

Commit 4b21f38

Browse files
eavanvalkenburgCopilotCopilot
authored
Python: Fix A2AAgent to invoke context providers before and after run (#4757)
* Fix A2AAgent to invoke context providers before and after run A2AAgent.run() bypassed the context provider lifecycle (before_run/after_run) that BaseAgent defines as a contract for all agents. This caused A2AAgent to violate the semantic definition of BaseAgent, resulting in inconsistency with other agent implementations. The fix follows the same pattern used by WorkflowAgent: - Create SessionContext and run before_run on all context providers before processing the A2A stream - Collect response updates and run after_run on all context providers after the stream is fully consumed - Auto-create a session when context providers are configured but no session is explicitly passed Fixes #4754 Co-authored-by: Copilot <[email protected]> * Apply pre-commit auto-fixes * Remove reproduction report from repository Co-authored-by: Copilot <[email protected]> * Address PR review feedback for #4754 - Validate messages when no continuation_token: raise ValueError if normalized_messages is empty, preventing IndexError on messages[-1] - Import BaseContextProvider/SessionContext from public agent_framework package instead of internal agent_framework._sessions module - Add test for ValueError on run(None) without continuation_token Co-authored-by: Copilot <[email protected]> * Improve test coverage for empty-messages guard in A2AAgent.run (#4754) - Parameterize test to cover both messages=None and messages=[] inputs - Add test verifying run(None, continuation_token=...) does not raise Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent bf8d967 commit 4b21f38

2 files changed

Lines changed: 243 additions & 4 deletions

File tree

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

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
AgentResponseUpdate,
3636
AgentSession,
3737
BaseAgent,
38+
BaseHistoryProvider,
3839
Content,
3940
ContinuationToken,
4041
Message,
4142
ResponseStream,
43+
SessionContext,
4244
normalize_messages,
4345
prepend_agent_framework_to_user_agent,
4446
)
@@ -284,17 +286,36 @@ def run( # pyright: ignore[reportIncompatibleMethodOverride]
284286
When stream=True: A ResponseStream of AgentResponseUpdate items.
285287
"""
286288
del function_invocation_kwargs, client_kwargs, kwargs
289+
normalized_messages = normalize_messages(messages)
290+
287291
if continuation_token is not None:
288292
a2a_stream: AsyncIterable[A2AStreamItem] = self.client.resubscribe(
289293
TaskIdParams(id=continuation_token["task_id"])
290294
)
291295
else:
292-
normalized_messages = normalize_messages(messages)
296+
if not normalized_messages:
297+
raise ValueError("At least one message is required when starting a new task (no continuation_token).")
293298
a2a_message = self._prepare_message_for_a2a(normalized_messages[-1])
294299
a2a_stream = self.client.send_message(a2a_message)
295300

301+
provider_session = session
302+
if provider_session is None and self.context_providers:
303+
provider_session = AgentSession()
304+
305+
session_context = SessionContext(
306+
session_id=provider_session.session_id if provider_session else None,
307+
service_session_id=provider_session.service_session_id if provider_session else None,
308+
input_messages=normalized_messages or [],
309+
options={},
310+
)
311+
296312
response = ResponseStream(
297-
self._map_a2a_stream(a2a_stream, background=background),
313+
self._map_a2a_stream(
314+
a2a_stream,
315+
background=background,
316+
session=provider_session,
317+
session_context=session_context,
318+
),
298319
finalizer=AgentResponse.from_updates,
299320
)
300321
if stream:
@@ -306,6 +327,8 @@ async def _map_a2a_stream(
306327
a2a_stream: AsyncIterable[A2AStreamItem],
307328
*,
308329
background: bool = False,
330+
session: AgentSession | None = None,
331+
session_context: SessionContext | None = None,
309332
) -> AsyncIterable[AgentResponseUpdate]:
310333
"""Map raw A2A protocol items to AgentResponseUpdates.
311334
@@ -316,24 +339,52 @@ async def _map_a2a_stream(
316339
background: When False, in-progress task updates are silently
317340
consumed (the stream keeps iterating until a terminal state).
318341
When True, they are yielded with a continuation token.
342+
session: The agent session for context providers.
343+
session_context: The session context for context providers.
319344
"""
345+
if session_context is None:
346+
session_context = SessionContext(input_messages=[], options={})
347+
348+
# Run before_run providers (forward order)
349+
for provider in self.context_providers:
350+
if isinstance(provider, BaseHistoryProvider) and not provider.load_messages:
351+
continue
352+
if session is None:
353+
raise RuntimeError("Provider session must be available when context providers are configured.")
354+
await provider.before_run(
355+
agent=self, # type: ignore[arg-type]
356+
session=session,
357+
context=session_context,
358+
state=session.state.setdefault(provider.source_id, {}),
359+
)
360+
361+
all_updates: list[AgentResponseUpdate] = []
320362
async for item in a2a_stream:
321363
if isinstance(item, A2AMessage):
322364
# Process A2A Message
323365
contents = self._parse_contents_from_a2a(item.parts)
324-
yield AgentResponseUpdate(
366+
update = AgentResponseUpdate(
325367
contents=contents,
326368
role="assistant" if item.role == A2ARole.agent else "user",
327369
response_id=str(getattr(item, "message_id", uuid.uuid4())),
328370
raw_representation=item,
329371
)
372+
all_updates.append(update)
373+
yield update
330374
elif isinstance(item, tuple) and len(item) == 2 and isinstance(item[0], Task):
331375
task, _update_event = item
332376
for update in self._updates_from_task(task, background=background):
377+
all_updates.append(update)
333378
yield update
334379
else:
335380
raise NotImplementedError("Only Message and Task responses are supported")
336381

382+
# Set the response on the context for after_run providers
383+
if all_updates:
384+
session_context._response = AgentResponse.from_updates(all_updates) # type: ignore[assignment]
385+
386+
await self._run_after_providers(session=session, context=session_context)
387+
337388
# ------------------------------------------------------------------
338389
# Task helpers
339390
# ------------------------------------------------------------------

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

Lines changed: 189 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
from agent_framework import (
2424
AgentResponse,
2525
AgentResponseUpdate,
26+
AgentSession,
27+
BaseContextProvider,
2628
Content,
2729
Message,
30+
SessionContext,
2831
)
2932
from agent_framework.a2a import A2AAgent
30-
from pytest import fixture, raises
33+
from pytest import fixture, mark, raises
3134

3235
from agent_framework_a2a import A2AContinuationToken
3336
from agent_framework_a2a._agent import _get_uri_data # type: ignore
@@ -851,3 +854,188 @@ async def test_poll_task_completed(a2a_agent: A2AAgent, mock_a2a_client: MockA2A
851854

852855

853856
# endregion
857+
858+
859+
# region Context Provider Tests
860+
861+
862+
class TrackingContextProvider(BaseContextProvider):
863+
"""A context provider that records when before_run and after_run are called."""
864+
865+
def __init__(self) -> None:
866+
super().__init__(source_id="tracking-provider")
867+
self.before_run_called = False
868+
self.after_run_called = False
869+
self.before_run_context: SessionContext | None = None
870+
self.after_run_context: SessionContext | None = None
871+
872+
async def before_run(
873+
self,
874+
*,
875+
agent: Any,
876+
session: AgentSession,
877+
context: SessionContext,
878+
state: dict[str, Any],
879+
) -> None:
880+
self.before_run_called = True
881+
self.before_run_context = context
882+
883+
async def after_run(
884+
self,
885+
*,
886+
agent: Any,
887+
session: AgentSession,
888+
context: SessionContext,
889+
state: dict[str, Any],
890+
) -> None:
891+
self.after_run_called = True
892+
self.after_run_context = context
893+
894+
895+
async def test_run_invokes_context_providers(mock_a2a_client: MockA2AClient) -> None:
896+
"""Test that context providers are invoked during non-streaming run."""
897+
provider = TrackingContextProvider()
898+
agent = A2AAgent(
899+
name="Test Agent",
900+
client=mock_a2a_client,
901+
context_providers=[provider],
902+
http_client=None,
903+
)
904+
mock_a2a_client.add_message_response("msg-1", "Hello from A2A")
905+
session = agent.create_session()
906+
907+
response = await agent.run("Hello", session=session)
908+
909+
assert provider.before_run_called
910+
assert provider.after_run_called
911+
assert response.text == "Hello from A2A"
912+
913+
914+
async def test_run_streaming_invokes_context_providers(mock_a2a_client: MockA2AClient) -> None:
915+
"""Test that context providers are invoked during streaming run."""
916+
provider = TrackingContextProvider()
917+
agent = A2AAgent(
918+
name="Test Agent",
919+
client=mock_a2a_client,
920+
context_providers=[provider],
921+
http_client=None,
922+
)
923+
mock_a2a_client.add_message_response("msg-1", "Streamed response")
924+
session = agent.create_session()
925+
926+
stream = agent.run("Hello", stream=True, session=session)
927+
updates = []
928+
async for update in stream:
929+
updates.append(update)
930+
931+
assert provider.before_run_called
932+
assert provider.after_run_called
933+
assert len(updates) == 1
934+
assert updates[0].text == "Streamed response"
935+
936+
937+
async def test_context_providers_receive_response(mock_a2a_client: MockA2AClient) -> None:
938+
"""Test that after_run providers can access the response via session context."""
939+
provider = TrackingContextProvider()
940+
agent = A2AAgent(
941+
name="Test Agent",
942+
client=mock_a2a_client,
943+
context_providers=[provider],
944+
http_client=None,
945+
)
946+
mock_a2a_client.add_message_response("msg-1", "Response text")
947+
session = agent.create_session()
948+
949+
await agent.run("Hello", session=session)
950+
951+
assert provider.after_run_context is not None
952+
assert provider.after_run_context.response is not None
953+
assert provider.after_run_context.response.text == "Response text"
954+
955+
956+
async def test_context_providers_receive_input_messages(mock_a2a_client: MockA2AClient) -> None:
957+
"""Test that before_run providers can access input messages via session context."""
958+
provider = TrackingContextProvider()
959+
agent = A2AAgent(
960+
name="Test Agent",
961+
client=mock_a2a_client,
962+
context_providers=[provider],
963+
http_client=None,
964+
)
965+
mock_a2a_client.add_message_response("msg-1", "Reply")
966+
session = agent.create_session()
967+
968+
await agent.run("Hello world", session=session)
969+
970+
assert provider.before_run_context is not None
971+
assert len(provider.before_run_context.input_messages) > 0
972+
assert provider.before_run_context.input_messages[-1].text == "Hello world"
973+
974+
975+
async def test_run_without_context_providers(mock_a2a_client: MockA2AClient) -> None:
976+
"""Test that run works normally when no context providers are configured."""
977+
agent = A2AAgent(
978+
name="Test Agent",
979+
client=mock_a2a_client,
980+
http_client=None,
981+
)
982+
mock_a2a_client.add_message_response("msg-1", "Hello")
983+
984+
response = await agent.run("Hello")
985+
986+
assert response.text == "Hello"
987+
988+
989+
async def test_run_creates_session_for_providers_when_none_provided(mock_a2a_client: MockA2AClient) -> None:
990+
"""Test that a session is auto-created when context providers are configured but no session is passed."""
991+
provider = TrackingContextProvider()
992+
agent = A2AAgent(
993+
name="Test Agent",
994+
client=mock_a2a_client,
995+
context_providers=[provider],
996+
http_client=None,
997+
)
998+
mock_a2a_client.add_message_response("msg-1", "Hello")
999+
1000+
await agent.run("Hello")
1001+
1002+
assert provider.before_run_called
1003+
assert provider.after_run_called
1004+
1005+
1006+
@mark.parametrize("messages", [None, []])
1007+
async def test_run_raises_when_no_messages_and_no_continuation_token(
1008+
mock_a2a_client: MockA2AClient, messages: list[str] | None
1009+
) -> None:
1010+
"""Test that run() raises ValueError when messages is None/empty and no continuation_token is provided."""
1011+
agent = A2AAgent(
1012+
name="Test Agent",
1013+
client=mock_a2a_client,
1014+
http_client=None,
1015+
)
1016+
1017+
with raises(ValueError, match="At least one message is required"):
1018+
await agent.run(messages)
1019+
1020+
1021+
async def test_run_with_continuation_token_does_not_require_messages(mock_a2a_client: MockA2AClient) -> None:
1022+
"""Test that run() does not raise when messages is None but a continuation_token is provided."""
1023+
task = Task(
1024+
id="task-cont",
1025+
context_id="ctx-cont",
1026+
status=TaskStatus(state=TaskState.completed, message=None),
1027+
)
1028+
mock_a2a_client.resubscribe_responses.append((task, None))
1029+
1030+
agent = A2AAgent(
1031+
name="Test Agent",
1032+
client=mock_a2a_client,
1033+
http_client=None,
1034+
)
1035+
1036+
token = A2AContinuationToken(task_id="task-cont", context_id="ctx-cont")
1037+
response = await agent.run(None, continuation_token=token)
1038+
assert response is not None
1039+
1040+
1041+
# endregion

0 commit comments

Comments
 (0)