Datasets:
File size: 15,106 Bytes
4e3f22a | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | diff --git a/tests/server/request_handlers/test_default_request_handler.py b/tests/server/request_handlers/test_default_request_handler.py
index f1408e362..f96ce5e65 100644
--- a/tests/server/request_handlers/test_default_request_handler.py
+++ b/tests/server/request_handlers/test_default_request_handler.py
@@ -954,6 +954,14 @@ async def test_on_message_send_stream_with_push_notification():
configuration=message_config,
)
+ # Latch to ensure background execute is scheduled before asserting
+ execute_called = asyncio.Event()
+
+ async def exec_side_effect(*args, **kwargs):
+ execute_called.set()
+
+ mock_agent_executor.execute.side_effect = exec_side_effect
+
# Mock ResultAggregator and its consume_and_emit
mock_result_aggregator_instance = MagicMock(
spec=ResultAggregator
@@ -1167,6 +1175,8 @@ def sync_get_event_stream_gen_for_prop_test(*args, **kwargs):
):
pass
+ await asyncio.wait_for(execute_called.wait(), timeout=0.1)
+
# Assertions
# 1. set_info called once at the beginning if task exists (or after task is created from message)
mock_push_config_store.set_info.assert_any_call(task_id, push_config)
@@ -1179,6 +1189,323 @@ def sync_get_event_stream_gen_for_prop_test(*args, **kwargs):
mock_agent_executor.execute.assert_awaited_once()
+@pytest.mark.asyncio
+async def test_stream_disconnect_then_resubscribe_receives_future_events():
+ """Start streaming, disconnect, then resubscribe and ensure subsequent events are streamed."""
+ # Arrange
+ mock_task_store = AsyncMock(spec=TaskStore)
+ mock_agent_executor = AsyncMock(spec=AgentExecutor)
+
+ # Use a real queue manager so taps receive future events
+ queue_manager = InMemoryQueueManager()
+
+ task_id = 'reconn_task_1'
+ context_id = 'reconn_ctx_1'
+
+ # Task exists and is non-final
+ task_for_resub = create_sample_task(
+ task_id=task_id, context_id=context_id, status_state=TaskState.working
+ )
+ mock_task_store.get.return_value = task_for_resub
+
+ request_handler = DefaultRequestHandler(
+ agent_executor=mock_agent_executor,
+ task_store=mock_task_store,
+ queue_manager=queue_manager,
+ )
+
+ params = MessageSendParams(
+ message=Message(
+ role=Role.user,
+ message_id='msg_reconn',
+ parts=[],
+ task_id=task_id,
+ context_id=context_id,
+ )
+ )
+
+ # Producer behavior: emit one event, then later emit second event
+ exec_started = asyncio.Event()
+ allow_second_event = asyncio.Event()
+ allow_finish = asyncio.Event()
+
+ first_event = create_sample_task(
+ task_id=task_id, context_id=context_id, status_state=TaskState.working
+ )
+ second_event = create_sample_task(
+ task_id=task_id, context_id=context_id, status_state=TaskState.completed
+ )
+
+ async def exec_side_effect(_request, queue: EventQueue):
+ exec_started.set()
+ await queue.enqueue_event(first_event)
+ await allow_second_event.wait()
+ await queue.enqueue_event(second_event)
+ await allow_finish.wait()
+
+ mock_agent_executor.execute.side_effect = exec_side_effect
+
+ # Start streaming and consume first event
+ agen = request_handler.on_message_send_stream(
+ params, create_server_call_context()
+ )
+ first = await agen.__anext__()
+ assert first == first_event
+
+ # Simulate client disconnect
+ await asyncio.wait_for(agen.aclose(), timeout=0.1)
+
+ # Resubscribe and start consuming future events
+ resub_gen = request_handler.on_resubscribe_to_task(
+ TaskIdParams(id=task_id), create_server_call_context()
+ )
+
+ # Allow producer to emit the next event
+ allow_second_event.set()
+
+ received = await resub_gen.__anext__()
+ assert received == second_event
+
+ # Finish producer to allow cleanup paths to complete
+ allow_finish.set()
+
+
+@pytest.mark.asyncio
+async def test_on_message_send_stream_client_disconnect_triggers_background_cleanup_and_producer_continues():
+ """Simulate client disconnect: stream stops early, cleanup is scheduled in background,
+ producer keeps running, and cleanup completes after producer finishes."""
+ # Arrange
+ mock_task_store = AsyncMock(spec=TaskStore)
+ mock_queue_manager = AsyncMock(spec=QueueManager)
+ mock_agent_executor = AsyncMock(spec=AgentExecutor)
+ mock_request_context_builder = AsyncMock(spec=RequestContextBuilder)
+
+ task_id = 'disc_task_1'
+ context_id = 'disc_ctx_1'
+
+ # RequestContext with IDs
+ mock_request_context = MagicMock(spec=RequestContext)
+ mock_request_context.task_id = task_id
+ mock_request_context.context_id = context_id
+ mock_request_context_builder.build.return_value = mock_request_context
+
+ # Queue used by _run_event_stream; must support close()
+ mock_queue = AsyncMock(spec=EventQueue)
+ mock_queue_manager.create_or_tap.return_value = mock_queue
+
+ request_handler = DefaultRequestHandler(
+ agent_executor=mock_agent_executor,
+ task_store=mock_task_store,
+ queue_manager=mock_queue_manager,
+ request_context_builder=mock_request_context_builder,
+ )
+
+ params = MessageSendParams(
+ message=Message(
+ role=Role.user,
+ message_id='mid',
+ parts=[],
+ task_id=task_id,
+ context_id=context_id,
+ )
+ )
+
+ # Agent executor runs in background until we allow it to finish
+ execute_started = asyncio.Event()
+ execute_finish = asyncio.Event()
+
+ async def exec_side_effect(*_args, **_kwargs):
+ execute_started.set()
+ await execute_finish.wait()
+
+ mock_agent_executor.execute.side_effect = exec_side_effect
+
+ # ResultAggregator emits one Task event (so the stream yields once)
+ first_event = create_sample_task(task_id=task_id, context_id=context_id)
+
+ async def single_event_stream():
+ yield first_event
+ # will never yield again; client will disconnect
+
+ mock_result_aggregator_instance = MagicMock(spec=ResultAggregator)
+ mock_result_aggregator_instance.consume_and_emit.return_value = (
+ single_event_stream()
+ )
+
+ produced_task: asyncio.Task | None = None
+ cleanup_task: asyncio.Task | None = None
+
+ orig_create_task = asyncio.create_task
+
+ def create_task_spy(coro):
+ nonlocal produced_task, cleanup_task
+ task = orig_create_task(coro)
+ # Inspect the coroutine name to make the spy more robust
+ if coro.__name__ == '_run_event_stream':
+ produced_task = task
+ elif coro.__name__ == '_cleanup_producer':
+ cleanup_task = task
+ return task
+
+ with (
+ patch(
+ 'a2a.server.request_handlers.default_request_handler.ResultAggregator',
+ return_value=mock_result_aggregator_instance,
+ ),
+ patch('asyncio.create_task', side_effect=create_task_spy),
+ ):
+ # Act: start stream and consume only the first event, then disconnect
+ agen = request_handler.on_message_send_stream(
+ params, create_server_call_context()
+ )
+ first = await agen.__anext__()
+ assert first == first_event
+ # Simulate client disconnect
+ await asyncio.wait_for(agen.aclose(), timeout=0.1)
+
+ # Assert cleanup was scheduled and producer was started
+ assert produced_task is not None
+ assert cleanup_task is not None
+
+ # execute should have started
+ await asyncio.wait_for(execute_started.wait(), timeout=0.1)
+
+ # Producer should still be running (not finished immediately on disconnect)
+ assert not produced_task.done()
+
+ # Allow executor to finish, which should complete producer and then cleanup
+ execute_finish.set()
+ await asyncio.wait_for(produced_task, timeout=0.2)
+ await asyncio.wait_for(cleanup_task, timeout=0.2)
+
+ # Queue close awaited by _run_event_stream
+ mock_queue.close.assert_awaited_once()
+ # QueueManager close called by _cleanup_producer
+ mock_queue_manager.close.assert_awaited_once_with(task_id)
+ # Running agents is cleared
+ assert task_id not in request_handler._running_agents
+
+
+async def wait_until(predicate, timeout: float = 0.2, interval: float = 0.0):
+ """Await until predicate() is True or timeout elapses."""
+ loop = asyncio.get_running_loop()
+ end = loop.time() + timeout
+ while True:
+ if predicate():
+ return
+ if loop.time() >= end:
+ raise AssertionError('condition not met within timeout')
+ await asyncio.sleep(interval)
+
+
+@pytest.mark.asyncio
+async def test_background_cleanup_task_is_tracked_and_cleared():
+ """Ensure background cleanup task is tracked while pending and removed when done."""
+ # Arrange
+ mock_task_store = AsyncMock(spec=TaskStore)
+ mock_queue_manager = AsyncMock(spec=QueueManager)
+ mock_agent_executor = AsyncMock(spec=AgentExecutor)
+ mock_request_context_builder = AsyncMock(spec=RequestContextBuilder)
+
+ task_id = 'track_task_1'
+ context_id = 'track_ctx_1'
+
+ # RequestContext with IDs
+ mock_request_context = MagicMock(spec=RequestContext)
+ mock_request_context.task_id = task_id
+ mock_request_context.context_id = context_id
+ mock_request_context_builder.build.return_value = mock_request_context
+
+ mock_queue = AsyncMock(spec=EventQueue)
+ mock_queue_manager.create_or_tap.return_value = mock_queue
+
+ request_handler = DefaultRequestHandler(
+ agent_executor=mock_agent_executor,
+ task_store=mock_task_store,
+ queue_manager=mock_queue_manager,
+ request_context_builder=mock_request_context_builder,
+ )
+
+ params = MessageSendParams(
+ message=Message(
+ role=Role.user,
+ message_id='mid_track',
+ parts=[],
+ task_id=task_id,
+ context_id=context_id,
+ )
+ )
+
+ # Agent executor runs in background until we allow it to finish
+ execute_started = asyncio.Event()
+ execute_finish = asyncio.Event()
+
+ async def exec_side_effect(*_args, **_kwargs):
+ execute_started.set()
+ await execute_finish.wait()
+
+ mock_agent_executor.execute.side_effect = exec_side_effect
+
+ # ResultAggregator emits one Task event (so the stream yields once)
+ first_event = create_sample_task(task_id=task_id, context_id=context_id)
+
+ async def single_event_stream():
+ yield first_event
+
+ mock_result_aggregator_instance = MagicMock(spec=ResultAggregator)
+ mock_result_aggregator_instance.consume_and_emit.return_value = (
+ single_event_stream()
+ )
+
+ produced_task: asyncio.Task | None = None
+ cleanup_task: asyncio.Task | None = None
+
+ orig_create_task = asyncio.create_task
+
+ def create_task_spy(coro):
+ nonlocal produced_task, cleanup_task
+ task = orig_create_task(coro)
+ if coro.__name__ == '_run_event_stream':
+ produced_task = task
+ elif coro.__name__ == '_cleanup_producer':
+ cleanup_task = task
+ return task
+
+ with (
+ patch(
+ 'a2a.server.request_handlers.default_request_handler.ResultAggregator',
+ return_value=mock_result_aggregator_instance,
+ ),
+ patch('asyncio.create_task', side_effect=create_task_spy),
+ ):
+ # Act: start stream and consume only the first event, then disconnect
+ agen = request_handler.on_message_send_stream(
+ params, create_server_call_context()
+ )
+ first = await agen.__anext__()
+ assert first == first_event
+ # Simulate client disconnect
+ await asyncio.wait_for(agen.aclose(), timeout=0.1)
+
+ assert produced_task is not None
+ assert cleanup_task is not None
+
+ # Background cleanup task should be tracked while producer is still running
+ await asyncio.wait_for(execute_started.wait(), timeout=0.1)
+ assert cleanup_task in request_handler._background_tasks
+
+ # Allow executor to finish; this should complete producer, then cleanup
+ execute_finish.set()
+ await asyncio.wait_for(produced_task, timeout=0.1)
+ await asyncio.wait_for(cleanup_task, timeout=0.1)
+
+ # Wait for callback to remove task from tracking
+ await wait_until(
+ lambda: cleanup_task not in request_handler._background_tasks,
+ timeout=0.1,
+ )
+
+
@pytest.mark.asyncio
async def test_on_message_send_stream_task_id_mismatch():
"""Test on_message_send_stream raises error if yielded task ID mismatches."""
diff --git a/tests/server/request_handlers/test_jsonrpc_handler.py b/tests/server/request_handlers/test_jsonrpc_handler.py
index 616cf1318..d1ead0211 100644
--- a/tests/server/request_handlers/test_jsonrpc_handler.py
+++ b/tests/server/request_handlers/test_jsonrpc_handler.py
@@ -1,3 +1,4 @@
+import asyncio
import unittest
import unittest.async_case
@@ -366,6 +367,14 @@ async def streaming_coro():
for event in events:
yield event
+ # Latch to ensure background execute is scheduled before asserting
+ execute_called = asyncio.Event()
+
+ async def exec_side_effect(*args, **kwargs):
+ execute_called.set()
+
+ mock_agent_executor.execute.side_effect = exec_side_effect
+
with patch(
'a2a.server.request_handlers.default_request_handler.EventConsumer.consume_all',
return_value=streaming_coro(),
@@ -387,6 +396,7 @@ async def streaming_coro():
event.root, SendStreamingMessageSuccessResponse
)
assert event.root.result == events[i]
+ await asyncio.wait_for(execute_called.wait(), timeout=0.1)
mock_agent_executor.execute.assert_called_once()
async def test_on_message_stream_new_message_existing_task_success(
@@ -423,6 +433,14 @@ async def streaming_coro():
for event in events:
yield event
+ # Latch to ensure background execute is scheduled before asserting
+ execute_called = asyncio.Event()
+
+ async def exec_side_effect(*args, **kwargs):
+ execute_called.set()
+
+ mock_agent_executor.execute.side_effect = exec_side_effect
+
with patch(
'a2a.server.request_handlers.default_request_handler.EventConsumer.consume_all',
return_value=streaming_coro(),
@@ -443,6 +461,7 @@ async def streaming_coro():
assert isinstance(response, AsyncGenerator)
collected_events = [item async for item in response]
assert len(collected_events) == len(events)
+ await asyncio.wait_for(execute_called.wait(), timeout=0.1)
mock_agent_executor.execute.assert_called_once()
assert mock_task.history is not None and len(mock_task.history) == 1
|