Merge branch 'main' into jbu/eval

Author: holtskinner

src/a2a/client/transports/grpc.py

@@ -138,7 +138,10 @@ async def get_task(
     ) -> Task:
         """Retrieves the current state and history of a specific task."""
         task = await self.stub.GetTask(
-            a2a_pb2.GetTaskRequest(name=f'tasks/{request.id}')
+            a2a_pb2.GetTaskRequest(
+                name=f'tasks/{request.id}',
+                history_length=request.history_length,
+            )
         )
         return proto_utils.FromProto.task(task)
 

src/a2a/grpc/a2a_pb2_grpc.py

@@ -17,9 +17,6 @@ class A2AServiceStub(object):
     - TaskPushNotificationConfig are a resource whose parent is a task.
     They have get, list and create methods.
     - AgentCard is a static resource with only a get method.
-    fields are not present as they don't comply with AIP rules, and the
-    optional history_length on the get task method is not present as it also
-    violates AIP-127 and AIP-131.
     """
 
     def __init__(self, channel):
@@ -91,9 +88,6 @@ class A2AServiceServicer(object):
     - TaskPushNotificationConfig are a resource whose parent is a task.
     They have get, list and create methods.
     - AgentCard is a static resource with only a get method.
-    fields are not present as they don't comply with AIP rules, and the
-    optional history_length on the get task method is not present as it also
-    violates AIP-127 and AIP-131.
     """
 
     def SendMessage(self, request, context):
@@ -244,9 +238,6 @@ class A2AService(object):
     - TaskPushNotificationConfig are a resource whose parent is a task.
     They have get, list and create methods.
     - AgentCard is a static resource with only a get method.
-    fields are not present as they don't comply with AIP rules, and the
-    optional history_length on the get task method is not present as it also
-    violates AIP-127 and AIP-131.
     """
 
     @staticmethod

src/a2a/server/events/event_consumer.py

@@ -160,5 +160,5 @@ def agent_task_callback(self, agent_task: asyncio.Task[None]) -> None:
             agent_task: The asyncio.Task that completed.
         """
         logger.debug('Agent task callback triggered.')
-        if agent_task.exception() is not None:
+        if not agent_task.cancelled() and agent_task.done():
             self._exception = agent_task.exception()

tests/client/test_grpc_client.py

@@ -145,11 +145,31 @@ async def test_get_task(
     response = await grpc_transport.get_task(params)
 
     mock_grpc_stub.GetTask.assert_awaited_once_with(
-        a2a_pb2.GetTaskRequest(name=f'tasks/{sample_task.id}')
+        a2a_pb2.GetTaskRequest(
+            name=f'tasks/{sample_task.id}', history_length=None
+        )
     )
     assert response.id == sample_task.id
 
 
+@pytest.mark.asyncio
+async def test_get_task_with_history(
+    grpc_transport: GrpcTransport, mock_grpc_stub: AsyncMock, sample_task: Task
+):
+    """Test retrieving a task with history."""
+    mock_grpc_stub.GetTask.return_value = proto_utils.ToProto.task(sample_task)
+    history_len = 10
+    params = TaskQueryParams(id=sample_task.id, history_length=history_len)
+
+    await grpc_transport.get_task(params)
+
+    mock_grpc_stub.GetTask.assert_awaited_once_with(
+        a2a_pb2.GetTaskRequest(
+            name=f'tasks/{sample_task.id}', history_length=history_len
+        )
+    )
+
+
 @pytest.mark.asyncio
 async def test_cancel_task(
     grpc_transport: GrpcTransport, mock_grpc_stub: AsyncMock, sample_task: Task

tests/server/events/test_event_consumer.py

@@ -327,18 +327,22 @@ async def test_consume_all_continues_on_queue_empty_if_not_really_closed(
 def test_agent_task_callback_sets_exception(event_consumer: EventConsumer):
     """Test that agent_task_callback sets _exception if the task had one."""
     mock_task = MagicMock(spec=asyncio.Task)
+    mock_task.cancelled.return_value = False
+    mock_task.done.return_value = True
     sample_exception = ValueError('Task failed')
     mock_task.exception.return_value = sample_exception
 
     event_consumer.agent_task_callback(mock_task)
 
     assert event_consumer._exception == sample_exception
-    # mock_task.exception.assert_called_once() # Removing this, as exception() might be called internally by the check
+    mock_task.exception.assert_called_once()
 
 
 def test_agent_task_callback_no_exception(event_consumer: EventConsumer):
     """Test that agent_task_callback does nothing if the task has no exception."""
     mock_task = MagicMock(spec=asyncio.Task)
+    mock_task.cancelled.return_value = False
+    mock_task.done.return_value = True
     mock_task.exception.return_value = None  # No exception
 
     event_consumer.agent_task_callback(mock_task)
@@ -347,6 +351,34 @@ def test_agent_task_callback_no_exception(event_consumer: EventConsumer):
     mock_task.exception.assert_called_once()
 
 
+def test_agent_task_callback_cancelled_task(event_consumer: EventConsumer):
+    """Test that agent_task_callback does nothing if the task has no exception."""
+    mock_task = MagicMock(spec=asyncio.Task)
+    mock_task.cancelled.return_value = True
+    mock_task.done.return_value = True
+    sample_exception = ValueError('Task still running')
+    mock_task.exception.return_value = sample_exception
+
+    event_consumer.agent_task_callback(mock_task)
+
+    assert event_consumer._exception is None  # Should remain None
+    mock_task.exception.assert_not_called()
+
+
+def test_agent_task_callback_not_done_task(event_consumer: EventConsumer):
+    """Test that agent_task_callback does nothing if the task has no exception."""
+    mock_task = MagicMock(spec=asyncio.Task)
+    mock_task.cancelled.return_value = False
+    mock_task.done.return_value = False
+    sample_exception = ValueError('Task is cancelled')
+    mock_task.exception.return_value = sample_exception
+
+    event_consumer.agent_task_callback(mock_task)
+
+    assert event_consumer._exception is None  # Should remain None
+    mock_task.exception.assert_not_called()
+
+
 @pytest.mark.asyncio
 async def test_consume_all_handles_validation_error(
     event_consumer: EventConsumer, mock_event_queue: AsyncMock