fix(tests): resolve failing tests after review feedback

Signed-off-by: Luca Muscariello <muscariello@ieee.org>

Author: muscariello

src/a2a/client/transports/rest.py

@@ -259,7 +259,7 @@ async def cancel_task(
             context,
         )
         response_data = await self._send_post_request(
-            f'/v1/tasks/{request.id}:cancel', payload, modified_kwargs
+            f'/v1/{request.id}:cancel', payload, modified_kwargs
         )
         response: Task = ParseDict(response_data, Task())
         return response
@@ -281,7 +281,7 @@ async def set_task_callback(
             payload, modified_kwargs, context
         )
         response_data = await self._send_post_request(
-            f'/v1/tasks/{request.task_id}/pushNotificationConfigs',
+            f'/v1/{request.task_id}/pushNotificationConfigs',
             payload,
             modified_kwargs,
         )
@@ -313,7 +313,7 @@ async def get_task_callback(
         if 'task_id' in params:
             del params['task_id']
         response_data = await self._send_get_request(
-            f'/v1/tasks/{request.task_id}/pushNotificationConfigs/{request.id}',
+            f'/v1/{request.task_id}/pushNotificationConfigs/{request.id}',
             params,
             modified_kwargs,
         )
@@ -339,7 +339,7 @@ async def subscribe(
         async with aconnect_sse(
             self.httpx_client,
             'GET',
-            f'{self.url}/v1/tasks/{request.id}:subscribe',
+            f'{self.url}/v1/{request.id}:subscribe',
             **modified_kwargs,
         ) as event_source:
             try:

src/a2a/server/request_handlers/default_request_handler.py

@@ -486,7 +486,7 @@ async def on_create_task_push_notification_config(
         if not self._push_config_store:
             raise ServerError(error=UnsupportedOperationError())
 
-        task_id = params.task_id
+        task_id = _extract_task_id(params.task_id)
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise ServerError(error=TaskNotFoundError())
@@ -514,7 +514,7 @@ async def on_get_task_push_notification_config(
         if not self._push_config_store:
             raise ServerError(error=UnsupportedOperationError())
 
-        task_id = params.task_id
+        task_id = _extract_task_id(params.task_id)
         config_id = params.id
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
@@ -546,7 +546,7 @@ async def on_subscribe_to_task(
         Allows a client to re-attach to a running streaming task's event stream.
         Requires the task and its queue to still be active.
         """
-        task_id = params.id
+        task_id = _extract_task_id(params.id)
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise ServerError(error=TaskNotFoundError())
@@ -588,7 +588,7 @@ async def on_list_task_push_notification_config(
         if not self._push_config_store:
             raise ServerError(error=UnsupportedOperationError())
 
-        task_id = params.task_id
+        task_id = _extract_task_id(params.task_id)
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise ServerError(error=TaskNotFoundError())

tests/integration/test_client_server_integration.py

@@ -467,7 +467,7 @@ async def test_http_transport_cancel_task(
     handler = transport_setup.handler
 
     # Use CancelTaskRequest with name (AIP resource format)
-    params = CancelTaskRequest(id=CANCEL_TASK_RESPONSE.id)
+    params = CancelTaskRequest(id=f'tasks/{CANCEL_TASK_RESPONSE.id}')
     result = await transport.cancel_task(request=params)
 
     assert result.id == CANCEL_TASK_RESPONSE.id
@@ -519,7 +519,7 @@ async def test_http_transport_set_task_callback(
 
     # Create CreateTaskPushNotificationConfigRequest with required fields
     params = CreateTaskPushNotificationConfigRequest(
-        task_id='task-callback-123',
+        task_id='tasks/task-callback-123',
         config_id='pnc-abc',
         config=CALLBACK_CONFIG.push_notification_config,
     )
@@ -596,7 +596,7 @@ async def test_http_transport_get_task_callback(
 
     # Use GetTaskPushNotificationConfigRequest with name field (resource name)
     params = GetTaskPushNotificationConfigRequest(
-        task_id=CALLBACK_CONFIG.task_id, id=CALLBACK_CONFIG.id
+        task_id=f'tasks/{CALLBACK_CONFIG.task_id}', id=CALLBACK_CONFIG.id
     )
     result = await transport.get_task_callback(request=params)
 
@@ -668,7 +668,7 @@ async def test_http_transport_resubscribe(
     handler = transport_setup.handler
 
     # Use SubscribeToTaskRequest with name (AIP resource format)
-    params = SubscribeToTaskRequest(id=RESUBSCRIBE_EVENT.task_id)
+    params = SubscribeToTaskRequest(id=f'tasks/{RESUBSCRIBE_EVENT.task_id}')
     stream = transport.subscribe(request=params)
     first_event = await anext(stream)
 

tests/server/request_handlers/test_default_request_handler.py

@@ -1853,7 +1853,7 @@ async def noop_coro_for_task():
 
 @pytest.mark.asyncio
 async def test_set_task_push_notification_config_no_notifier():
-    """Test on_set_task_push_notification_config when _push_config_store is None."""
+    """Test on_create_task_push_notification_config when _push_config_store is None."""
     request_handler = DefaultRequestHandler(
         agent_executor=MockAgentExecutor(),
         task_store=AsyncMock(spec=TaskStore),
@@ -1867,15 +1867,15 @@ async def test_set_task_push_notification_config_no_notifier():
     from a2a.utils.errors import ServerError  # Local import
 
     with pytest.raises(ServerError) as exc_info:
-        await request_handler.on_set_task_push_notification_config(
+        await request_handler.on_create_task_push_notification_config(
             params, create_server_call_context()
         )
     assert isinstance(exc_info.value.error, UnsupportedOperationError)
 
 
 @pytest.mark.asyncio
 async def test_set_task_push_notification_config_task_not_found():
-    """Test on_set_task_push_notification_config when task is not found."""
+    """Test on_create_task_push_notification_config when task is not found."""
     mock_task_store = AsyncMock(spec=TaskStore)
     mock_task_store.get.return_value = None  # Task not found
     mock_push_store = AsyncMock(spec=PushNotificationConfigStore)
@@ -1896,7 +1896,7 @@ async def test_set_task_push_notification_config_task_not_found():
 
     context = create_server_call_context()
     with pytest.raises(ServerError) as exc_info:
-        await request_handler.on_set_task_push_notification_config(
+        await request_handler.on_create_task_push_notification_config(
             params, context
         )
 
@@ -2010,7 +2010,7 @@ async def test_get_task_push_notification_config_info_with_config():
         ),
     )
     context = create_server_call_context()
-    await request_handler.on_set_task_push_notification_config(
+    await request_handler.on_create_task_push_notification_config(
         set_config_params, context
     )
 
@@ -2049,7 +2049,7 @@ async def test_get_task_push_notification_config_info_with_config_no_id():
         config_id='default',
         config=PushNotificationConfig(url='http://1.example.com'),
     )
-    await request_handler.on_set_task_push_notification_config(
+    await request_handler.on_create_task_push_notification_config(
         set_config_params, create_server_call_context()
     )
 
@@ -2292,7 +2292,7 @@ async def test_list_task_push_notification_config_info_with_config_and_no_id():
         config_id='default',
         config=PushNotificationConfig(url='http://1.example.com'),
     )
-    await request_handler.on_set_task_push_notification_config(
+    await request_handler.on_create_task_push_notification_config(
         set_config_params1, create_server_call_context()
     )
 
@@ -2301,7 +2301,7 @@ async def test_list_task_push_notification_config_info_with_config_and_no_id():
         config_id='default',
         config=PushNotificationConfig(url='http://2.example.com'),
     )
-    await request_handler.on_set_task_push_notification_config(
+    await request_handler.on_create_task_push_notification_config(
         set_config_params2, create_server_call_context()
     )
 

tests/server/test_integration.py

@@ -533,7 +533,9 @@ def test_set_push_notification_config(
             url='https://example.com', token='secret-token'
         ),
     )
-    handler.on_set_task_push_notification_config.return_value = task_push_config
+    handler.on_create_task_push_notification_config.return_value = (
+        task_push_config
+    )
 
     # Send request
     response = client.post(
@@ -559,7 +561,7 @@ def test_set_push_notification_config(
     assert data['result']['pushNotificationConfig']['token'] == 'secret-token'
 
     # Verify handler was called
-    handler.on_set_task_push_notification_config.assert_awaited_once()
+    handler.on_create_task_push_notification_config.assert_awaited_once()
 
 
 def test_get_push_notification_config(