|
| 1 | +import json |
| 2 | + |
1 | 3 | from collections.abc import AsyncGenerator |
2 | 4 | from typing import NamedTuple |
3 | 5 |
|
@@ -156,8 +158,19 @@ async def execute(self, context: RequestContext, event_queue: EventQueue): |
156 | 158 | message=task_updater.new_agent_message([Part(text='done')]), |
157 | 159 | ) |
158 | 160 |
|
159 | | - async def cancel(self, context: RequestContext, event_queue: EventQueue): |
160 | | - raise NotImplementedError('Cancellation is not supported') |
| 161 | + async def cancel( |
| 162 | + self, context: RequestContext, event_queue: EventQueue |
| 163 | + ) -> None: |
| 164 | + assert context.task_id is not None |
| 165 | + assert context.context_id is not None |
| 166 | + task_updater = TaskUpdater( |
| 167 | + event_queue, context.task_id, context.context_id |
| 168 | + ) |
| 169 | + await task_updater.cancel( |
| 170 | + message=task_updater.new_agent_message( |
| 171 | + [Part(text=json.dumps(context.metadata, sort_keys=True))] |
| 172 | + ) |
| 173 | + ) |
161 | 174 |
|
162 | 175 |
|
163 | 176 | @pytest.fixture |
@@ -831,3 +844,52 @@ async def test_end_to_end_extensions_propagation(transport_setups, streaming): |
831 | 844 | response.message, Role.ROLE_AGENT, 'extensions echoed' |
832 | 845 | ) |
833 | 846 | assert set(response.message.extensions) == set(SUPPORTED_EXTENSION_URIS) |
| 847 | + |
| 848 | + |
| 849 | +@pytest.mark.asyncio |
| 850 | +@pytest.mark.parametrize( |
| 851 | + 'cancel_metadata', |
| 852 | + [ |
| 853 | + pytest.param( |
| 854 | + {'reason': 'user_aborted', 'nested': {'retryable': False}}, |
| 855 | + id='with_metadata', |
| 856 | + ), |
| 857 | + pytest.param({}, id='without_metadata'), |
| 858 | + ], |
| 859 | +) |
| 860 | +async def test_end_to_end_cancel_task_metadata_propagation( |
| 861 | + transport_setups: ClientSetup, |
| 862 | + cancel_metadata: dict[str, object], |
| 863 | +) -> None: |
| 864 | + """Test CancelTaskRequest.metadata reaches AgentExecutor.cancel on all bindings.""" |
| 865 | + client = transport_setups.client |
| 866 | + client._config.streaming = False |
| 867 | + |
| 868 | + events = [ |
| 869 | + event |
| 870 | + async for event in client.send_message( |
| 871 | + request=SendMessageRequest( |
| 872 | + message=Message( |
| 873 | + role=Role.ROLE_USER, |
| 874 | + message_id='msg-cancel-metadata', |
| 875 | + parts=[Part(text='Need input')], |
| 876 | + ) |
| 877 | + ) |
| 878 | + ) |
| 879 | + ] |
| 880 | + assert len(events) == 1 |
| 881 | + parked_task = events[0].task |
| 882 | + assert parked_task.status.state == TaskState.TASK_STATE_INPUT_REQUIRED |
| 883 | + |
| 884 | + cancel_req = ( |
| 885 | + CancelTaskRequest(id=parked_task.id, metadata=cancel_metadata) |
| 886 | + if cancel_metadata |
| 887 | + else CancelTaskRequest(id=parked_task.id) |
| 888 | + ) |
| 889 | + cancelled_task = await client.cancel_task(request=cancel_req) |
| 890 | + |
| 891 | + assert cancelled_task.id == parked_task.id |
| 892 | + assert cancelled_task.status.state == TaskState.TASK_STATE_CANCELED |
| 893 | + assert json.loads(cancelled_task.status.message.parts[0].text) == ( |
| 894 | + cancel_metadata |
| 895 | + ) |
0 commit comments