Skip to content

Commit a8f7796

Browse files
CopilotCopilot
andcommitted
Address PR review feedback for microsoft#4754: fast-path and stronger test
- Add fast-path in run() to skip provider hooks when no context_providers are configured, avoiding unnecessary SessionContext allocation - Add FailingHistoryProvider test: before_run raises AssertionError if called, proving load_messages=False skip logic works correctly - Previous commit already fixed pyright ignore syntax on line 350 Co-authored-by: Copilot <[email protected]>
1 parent 430069a commit a8f7796

2 files changed

Lines changed: 49 additions & 12 deletions

File tree

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,11 @@ def run( # pyright: ignore[reportIncompatibleMethodOverride]
291291
if not stream:
292292

293293
async def _run_non_streaming() -> AgentResponse[Any]:
294-
active_session, session_context = await self._run_before_providers(
295-
session=session,
296-
input_messages=normalized_messages,
297-
)
294+
if self.context_providers:
295+
active_session, session_context = await self._run_before_providers(
296+
session=session,
297+
input_messages=normalized_messages,
298+
)
298299
if continuation_token is not None:
299300
a2a_stream: AsyncIterable[A2AStreamItem] = self.client.resubscribe(
300301
TaskIdParams(id=continuation_token["task_id"])
@@ -308,8 +309,9 @@ async def _run_non_streaming() -> AgentResponse[Any]:
308309
finalizer=AgentResponse.from_updates,
309310
)
310311
result = await response_stream.get_final_response()
311-
session_context._response = result # type: ignore[assignment] # pyright: ignore[reportPrivateUsage]
312-
await self._run_after_providers(session=active_session, context=session_context)
312+
if self.context_providers:
313+
session_context._response = result # type: ignore[assignment] # pyright: ignore[reportPrivateUsage]
314+
await self._run_after_providers(session=active_session, context=session_context)
313315
return result
314316

315317
return _run_non_streaming()
@@ -319,19 +321,22 @@ async def _run_non_streaming() -> AgentResponse[Any]:
319321
context_holder: dict[str, SessionContext | None] = {"ctx": None}
320322

321323
async def _post_hook(response: AgentResponse) -> None:
324+
if not self.context_providers:
325+
return
322326
session_context = context_holder["ctx"]
323327
if session_context is None:
324328
return
325329
session_context._response = response # type: ignore[assignment] # pyright: ignore[reportPrivateUsage]
326330
await self._run_after_providers(session=active_session_holder["session"], context=session_context)
327331

328332
async def _get_stream() -> ResponseStream[AgentResponseUpdate, AgentResponse[Any]]:
329-
active_session, session_context = await self._run_before_providers(
330-
session=session,
331-
input_messages=normalized_messages,
332-
)
333-
active_session_holder["session"] = active_session
334-
context_holder["ctx"] = session_context
333+
if self.context_providers:
334+
active_session, session_context = await self._run_before_providers(
335+
session=session,
336+
input_messages=normalized_messages,
337+
)
338+
active_session_holder["session"] = active_session
339+
context_holder["ctx"] = session_context
335340

336341
if continuation_token is not None:
337342
a2a_stream: AsyncIterable[A2AStreamItem] = self.client.resubscribe(

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,6 +1005,38 @@ async def test_history_provider_load_messages_false_skips_before_run(mock_a2a_cl
10051005
assert provider.after_run_called
10061006

10071007

1008+
async def test_history_provider_load_messages_false_raises_if_before_run_called(
1009+
mock_a2a_client: MockA2AClient,
1010+
) -> None:
1011+
"""Test with a stub whose before_run raises, proving it is never invoked."""
1012+
1013+
class FailingHistoryProvider(BaseHistoryProvider):
1014+
def __init__(self) -> None:
1015+
super().__init__(source_id="fail-hist", load_messages=False)
1016+
self.after_run_called = False
1017+
1018+
async def before_run(self, *, agent, session, context, state) -> None:
1019+
raise AssertionError("before_run should not be called when load_messages=False")
1020+
1021+
async def after_run(self, *, agent, session, context, state) -> None:
1022+
self.after_run_called = True
1023+
1024+
async def get_messages(self, session_id, **kwargs) -> list[Message]:
1025+
return []
1026+
1027+
async def save_messages(self, session_id, messages, **kwargs) -> None:
1028+
pass
1029+
1030+
provider = FailingHistoryProvider()
1031+
agent = A2AAgent(name="Test Agent", client=mock_a2a_client, http_client=None, context_providers=[provider])
1032+
1033+
mock_a2a_client.add_message_response("msg-fail", "OK", "agent")
1034+
1035+
# Should not raise — before_run is skipped
1036+
await agent.run("Hi")
1037+
assert provider.after_run_called
1038+
1039+
10081040
async def test_history_provider_load_messages_true_calls_before_run(mock_a2a_client: MockA2AClient) -> None:
10091041
"""Test that BaseHistoryProvider with load_messages=True (default) has before_run called."""
10101042
provider = TrackingHistoryProvider(load_messages=True)

0 commit comments

Comments
 (0)