Skip to content

Commit 1066b6d

Browse files
committed
fix(server): stamp missing task status timestamps
1 parent a9e1e54 commit 1066b6d

4 files changed

Lines changed: 133 additions & 27 deletions

File tree

‎src/a2a/server/tasks/task_manager.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
TaskStatus,
1616
TaskStatusUpdateEvent,
1717
)
18-
from a2a.utils.constants import TERMINAL_TASK_STATES
1918
from a2a.utils.errors import InvalidAgentResponseError, InvalidParamsError
2019
from a2a.utils.telemetry import trace_function
2120

@@ -222,13 +221,12 @@ async def get_task(self) -> Task | None:
222221
logger.debug('Task %s not found.', self.task_id)
223222
return self._current_task
224223

225-
def _stamp_terminal_timestamp(
224+
def _stamp_status_timestamp(
226225
self, holder: Task | TaskStatusUpdateEvent
227226
) -> None:
228-
"""Auto-stamps a terminal status that arrives without a timestamp."""
229-
if (
230-
holder.status.state in TERMINAL_TASK_STATES
231-
and not holder.status.HasField('timestamp')
227+
"""Supply a timestamp for a status when the agent did not provide one."""
228+
if holder.HasField('status') and not holder.status.HasField(
229+
'timestamp'
232230
):
233231
holder.status.timestamp.FromDatetime(datetime.now(timezone.utc))
234232

@@ -272,7 +270,7 @@ async def save_task_event(
272270
task_id_from_event,
273271
)
274272
if isinstance(event, Task):
275-
self._stamp_terminal_timestamp(event)
273+
self._stamp_status_timestamp(event)
276274
self._pending_event = event
277275
try:
278276
await self._save_task(event)
@@ -294,7 +292,7 @@ async def save_task_event(
294292
# Stamped on the event, not the copy below: the same event object
295293
# is published to subscribers, push notifications and the event
296294
# table, so it has to carry the timestamp too.
297-
self._stamp_terminal_timestamp(event)
295+
self._stamp_status_timestamp(event)
298296
if task.status.HasField('message'):
299297
task.history.append(task.status.message)
300298
if event.metadata:
@@ -400,12 +398,14 @@ def _init_task_obj(self, task_id: str, context_id: str) -> Task:
400398
context_id,
401399
)
402400
history = [self._initial_message] if self._initial_message else []
403-
return Task(
401+
task = Task(
404402
id=task_id,
405403
context_id=context_id,
406404
status=TaskStatus(state=TaskState.TASK_STATE_SUBMITTED),
407405
history=history,
408406
)
407+
self._stamp_status_timestamp(task)
408+
return task
409409

410410
async def _save_task(self, task: Task) -> None:
411411
"""Saves the task and updates the snapshot.

‎tests/server/request_handlers/test_default_request_handler_v2.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,6 +2077,7 @@ async def test_on_message_send_non_blocking():
20772077
assert result is not None
20782078
assert isinstance(result, Task)
20792079
assert result.status.state == TaskState.TASK_STATE_SUBMITTED
2080+
assert result.status.HasField('timestamp')
20802081

20812082

20822083
@pytest.mark.asyncio

‎tests/server/tasks/test_database_task_store.py‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from a2a.compat.v0_3.model_conversions import core_to_compat_task_model
2525
from a2a.server.context import ServerCallContext
2626
from a2a.server.models import Base, TaskModel # Important: To get Base.metadata
27+
from a2a.server.tasks import TaskManager
2728
from a2a.server.tasks.database_task_store import DatabaseTaskStore
2829
from a2a.types.a2a_pb2 import (
2930
Artifact,
@@ -33,6 +34,7 @@
3334
Task,
3435
TaskState,
3536
TaskStatus,
37+
TaskStatusUpdateEvent,
3638
)
3739
from a2a.utils.constants import DEFAULT_LIST_TASKS_PAGE_SIZE
3840
from a2a.utils.errors import InvalidParamsError
@@ -227,6 +229,40 @@ async def test_get_task(db_store_parameterized: DatabaseTaskStore) -> None:
227229
) # Cleanup
228230

229231

232+
@pytest.mark.asyncio
233+
async def test_manager_timestamps_support_database_status_filter(
234+
db_store_parameterized: DatabaseTaskStore,
235+
) -> None:
236+
manager = TaskManager(
237+
task_id='timestamp-filter-task',
238+
context_id='timestamp-filter-context',
239+
task_store=db_store_parameterized,
240+
initial_message=None,
241+
context=TEST_CONTEXT,
242+
)
243+
event = TaskStatusUpdateEvent(
244+
task_id='timestamp-filter-task',
245+
context_id='timestamp-filter-context',
246+
status=TaskStatus(state=TaskState.TASK_STATE_WORKING),
247+
)
248+
await manager.save_task_event(event)
249+
assert event.status.HasField('timestamp')
250+
251+
timestamp = event.status.timestamp.ToDatetime(tzinfo=timezone.utc)
252+
request = ListTasksRequest(status=TaskState.TASK_STATE_WORKING)
253+
request.status_timestamp_after.FromDatetime(
254+
timestamp - timedelta(seconds=1)
255+
)
256+
listed = await db_store_parameterized.list(request, TEST_CONTEXT)
257+
assert [task.id for task in listed.tasks] == ['timestamp-filter-task']
258+
259+
request.status_timestamp_after.FromDatetime(
260+
timestamp + timedelta(seconds=1)
261+
)
262+
listed = await db_store_parameterized.list(request, TEST_CONTEXT)
263+
assert not listed.tasks
264+
265+
230266
@pytest.mark.asyncio
231267
@pytest.mark.parametrize(
232268
'params, expected_ids, total_count, next_cursor',

‎tests/server/tasks/test_task_manager.py‎

Lines changed: 87 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,11 @@ async def test_save_task_event_stamps_terminal_status_without_timestamp(
534534

535535

536536
@pytest.mark.asyncio
537-
async def test_save_task_event_preserves_provided_terminal_timestamp(
538-
task_manager: TaskManager, mock_task_store: AsyncMock
537+
@pytest.mark.parametrize(
538+
'state', [TaskState.TASK_STATE_FAILED, TaskState.TASK_STATE_WORKING]
539+
)
540+
async def test_save_task_event_preserves_provided_timestamp(
541+
task_manager: TaskManager, mock_task_store: AsyncMock, state: int
539542
) -> None:
540543
"""An explicitly provided timestamp is never overwritten (#1331)."""
541544
initial_task = create_minimal_task()
@@ -545,9 +548,7 @@ async def test_save_task_event_preserves_provided_terminal_timestamp(
545548
event = TaskStatusUpdateEvent(
546549
task_id=MINIMAL_TASK_ID,
547550
context_id=MINIMAL_CONTEXT_ID,
548-
status=TaskStatus(
549-
state=TaskState.TASK_STATE_FAILED, timestamp=provided
550-
),
551+
status=TaskStatus(state=state, timestamp=provided),
551552
)
552553

553554
await task_manager.save_task_event(event)
@@ -559,37 +560,105 @@ async def test_save_task_event_preserves_provided_terminal_timestamp(
559560

560561

561562
@pytest.mark.asyncio
562-
async def test_save_task_event_does_not_stamp_non_terminal_status(
563-
task_manager: TaskManager, mock_task_store: AsyncMock
563+
@pytest.mark.parametrize(
564+
'state',
565+
[
566+
TaskState.TASK_STATE_WORKING,
567+
TaskState.TASK_STATE_INPUT_REQUIRED,
568+
TaskState.TASK_STATE_AUTH_REQUIRED,
569+
],
570+
)
571+
async def test_save_task_event_stamps_non_terminal_status(
572+
task_manager: TaskManager, mock_task_store: AsyncMock, state: int
564573
) -> None:
565-
"""Non-terminal states are left alone by the backstop (#1331)."""
574+
"""Non-terminal status updates receive timestamps too."""
566575
initial_task = create_minimal_task()
567576
mock_task_store.get.return_value = initial_task
568577
event = TaskStatusUpdateEvent(
569578
task_id=MINIMAL_TASK_ID,
570579
context_id=MINIMAL_CONTEXT_ID,
571-
status=TaskStatus(state=TaskState.TASK_STATE_WORKING),
580+
status=TaskStatus(state=state),
572581
)
573582

574583
await task_manager.save_task_event(event)
575584

576585
saved_task = mock_task_store.save.call_args[0][0]
577-
assert saved_task.status.state == TaskState.TASK_STATE_WORKING
578-
assert not saved_task.status.HasField('timestamp')
586+
assert saved_task.status.state == state
587+
assert saved_task.status.HasField('timestamp')
588+
assert event.status.timestamp == saved_task.status.timestamp
589+
590+
591+
@pytest.mark.asyncio
592+
async def test_ensure_task_id_stamps_initial_submitted_status(
593+
task_manager: TaskManager, mock_task_store: AsyncMock
594+
) -> None:
595+
mock_task_store.get.return_value = None
596+
597+
task = await task_manager.ensure_task_id(
598+
MINIMAL_TASK_ID, MINIMAL_CONTEXT_ID
599+
)
600+
601+
assert task.status.state == TaskState.TASK_STATE_SUBMITTED
602+
assert task.status.HasField('timestamp')
603+
saved_task = mock_task_store.save.call_args[0][0]
604+
assert saved_task.status.timestamp == task.status.timestamp
579605

580606

581607
@pytest.mark.asyncio
582-
async def test_save_task_event_stamps_raw_failed_task_without_timestamp(
608+
async def test_artifact_first_stamps_initial_status(
583609
task_manager: TaskManager, mock_task_store: AsyncMock
584610
) -> None:
585-
"""The raw-Task path (direct mutation failure sites) is guarded too
586-
(#1331)."""
587-
failing_task = create_minimal_task()
588-
failing_task.status.state = TaskState.TASK_STATE_FAILED
611+
mock_task_store.get.return_value = None
612+
event = TaskArtifactUpdateEvent(
613+
task_id=MINIMAL_TASK_ID,
614+
context_id=MINIMAL_CONTEXT_ID,
615+
artifact=Artifact(
616+
artifact_id='artifact-1', parts=[Part(text='result')]
617+
),
618+
)
619+
620+
task = await task_manager.save_task_event(event)
621+
622+
assert task is not None
623+
assert task.status.state == TaskState.TASK_STATE_SUBMITTED
624+
assert task.status.HasField('timestamp')
625+
assert (
626+
mock_task_store.save.call_args[0][0].status.timestamp
627+
== task.status.timestamp
628+
)
629+
630+
631+
@pytest.mark.asyncio
632+
async def test_raw_working_task_preserves_provided_timestamp(
633+
task_manager: TaskManager,
634+
) -> None:
635+
task = create_minimal_task()
636+
task.status.state = TaskState.TASK_STATE_WORKING
637+
task.status.timestamp.FromDatetime(
638+
datetime(2026, 1, 1, tzinfo=timezone.utc)
639+
)
640+
expected = Timestamp()
641+
expected.CopyFrom(task.status.timestamp)
642+
643+
await task_manager.save_task_event(task)
644+
645+
assert task.status.timestamp == expected
646+
647+
648+
@pytest.mark.asyncio
649+
@pytest.mark.parametrize(
650+
'state', [TaskState.TASK_STATE_FAILED, TaskState.TASK_STATE_WORKING]
651+
)
652+
async def test_save_task_event_stamps_raw_task_without_timestamp(
653+
task_manager: TaskManager, mock_task_store: AsyncMock, state: int
654+
) -> None:
655+
"""Raw task status updates receive timestamps for any state."""
656+
task = create_minimal_task()
657+
task.status.state = state
589658

590-
returned = await task_manager.save_task_event(failing_task)
659+
returned = await task_manager.save_task_event(task)
591660

592-
assert returned.status.state == TaskState.TASK_STATE_FAILED
661+
assert returned.status.state == state
593662
assert returned.status.HasField('timestamp')
594663

595664

0 commit comments

Comments
 (0)