Skip to content

Commit 565d65f

Browse files
committed
Python: End GitHubCopilotAgent stream only on the root agent's idle event
1 parent 3d1e5c8 commit 565d65f

2 files changed

Lines changed: 36 additions & 1 deletion

File tree

‎python/packages/github_copilot/agent_framework_github_copilot/_agent.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,9 @@ def event_handler(event: SessionEvent) -> None:
12631263
)
12641264
queue.put_nowait(update)
12651265
elif event.type == SessionEventType.SESSION_IDLE:
1266-
queue.put_nowait(None)
1266+
# A sub-agent going idle must not end the run; only the root agent's idle does.
1267+
if not getattr(event, "agent_id", None):
1268+
queue.put_nowait(None)
12671269
elif event.type == SessionEventType.SESSION_ERROR:
12681270
error_data: Any = event.data
12691271
error_msg = error_data.message or "Unknown error"

‎python/packages/github_copilot/tests/test_github_copilot_agent.py‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,39 @@ def mock_on(handler: Any) -> Any:
13631363
assert "child chatter" in "".join(texts)
13641364
assert response.value == self.Answer(value=9)
13651365

1366+
async def test_streaming_ignores_subagent_idle_before_root_answer(
1367+
self,
1368+
mock_client: MagicMock,
1369+
mock_session: MagicMock,
1370+
) -> None:
1371+
"""A sub-agent idle event does not end the stream or drop the root structured answer."""
1372+
child_idle = create_session_event(SessionEventType.SESSION_IDLE)
1373+
child_idle.agent_id = "sub-agent"
1374+
events = [
1375+
create_session_event(SessionEventType.ASSISTANT_MESSAGE_DELTA, delta_content="preamble", message_id="pre"),
1376+
child_idle,
1377+
create_session_event(
1378+
SessionEventType.ASSISTANT_MESSAGE_DELTA, delta_content='{"value": 11}', message_id="root"
1379+
),
1380+
create_session_event(SessionEventType.SESSION_IDLE),
1381+
]
1382+
1383+
def mock_on(handler: Any) -> Any:
1384+
for event in events:
1385+
handler(event)
1386+
return lambda: None
1387+
1388+
mock_session.on = mock_on
1389+
1390+
agent = GitHubCopilotAgent(client=mock_client)
1391+
stream = agent.run("Hi", stream=True, options=cast(Any, {"response_format": self.Answer}))
1392+
texts = [u.text async for u in stream]
1393+
response = await stream.get_final_response()
1394+
1395+
assert '{"value": 11}' in "".join(texts)
1396+
assert response.value is not None
1397+
assert response.value.value == 11
1398+
13661399
async def test_streaming_passes_response_format_and_parses_value(
13671400
self,
13681401
mock_client: MagicMock,

0 commit comments

Comments
 (0)