fix(review): Address feedback from PR #665

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

Author: muscariello

pyproject.toml

@@ -148,14 +148,14 @@ follow_imports = "skip"
 
 [tool.pyright]
 include = ["src"]
-ignore = ["src/a2a/types"]
 exclude = [
   "**/__pycache__",
   "**/dist",
   "**/build",
   "**/node_modules",
   "**/venv",
   "**/.venv",
+  "src/a2a/types",
 ]
 venvPath = "."
 venv = ".venv"

src/a2a/client/transports/rest.py

@@ -233,7 +233,7 @@ async def get_task(
             del params['id']  # id is part of the URL path, not query params
 
         response_data = await self._send_get_request(
-            f'/v1/{request.id}',
+            f'/v1/tasks/{request.id}',
             params,
             modified_kwargs,
         )
@@ -259,7 +259,7 @@ async def cancel_task(
             context,
         )
         response_data = await self._send_post_request(
-            f'/v1/{request.id}:cancel', payload, modified_kwargs
+            f'/v1/tasks/{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/{request.task_id}/pushNotificationConfigs',
+            f'/v1/tasks/{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/{request.task_id}/pushNotificationConfigs/{request.id}',
+            f'/v1/tasks/{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/{request.id}:subscribe',
+            f'{self.url}/v1/tasks/{request.id}:subscribe',
             **modified_kwargs,
         ) as event_source:
             try:

src/a2a/server/models.py

@@ -65,7 +65,7 @@ def process_bind_param(
         if isinstance(value, ProtoMessage):
             return MessageToDict(value, preserving_proto_field_name=False)
         if isinstance(value, BaseModel):
-            return cast('BaseModel', value).model_dump(mode='json')
+            return value.model_dump(mode='json')
         return value  # type: ignore[return-value]
 
     def process_result_value(

src/a2a/server/request_handlers/default_request_handler.py

@@ -474,19 +474,19 @@ async def _cleanup_producer(
         async with self._running_agents_lock:
             self._running_agents.pop(task_id, None)
 
-    async def on_set_task_push_notification_config(
+    async def on_create_task_push_notification_config(
         self,
         params: CreateTaskPushNotificationConfigRequest,
         context: ServerCallContext | None = None,
     ) -> TaskPushNotificationConfig:
-        """Default handler for 'tasks/pushNotificationConfig/set'.
+        """Default handler for 'tasks/pushNotificationConfig/create'.
 
         Requires a `PushNotifier` to be configured.
         """
         if not self._push_config_store:
             raise ServerError(error=UnsupportedOperationError())
 
-        task_id = _extract_task_id(params.task_id)
+        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 = _extract_task_id(params.task_id)
+        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 = _extract_task_id(params.id)
+        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 = _extract_task_id(params.task_id)
+        task_id = params.task_id
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise ServerError(error=TaskNotFoundError())

src/a2a/server/request_handlers/grpc_handler.py

@@ -284,11 +284,9 @@ async def CreateTaskPushNotificationConfig(
         """
         try:
             server_context = self.context_builder.build(context)
-            return (
-                await self.request_handler.on_set_task_push_notification_config(
-                    request,
-                    server_context,
-                )
+            return await self.request_handler.on_create_task_push_notification_config(
+                request,
+                server_context,
             )
         except ServerError as e:
             await self.abort_context(e, context)

src/a2a/server/request_handlers/jsonrpc_handler.py

@@ -341,10 +341,8 @@ async def set_push_notification_config(
         request_id = self._get_request_id(context)
         try:
             # Pass the full request to the handler
-            result_config = (
-                await self.request_handler.on_set_task_push_notification_config(
-                    request, context
-                )
+            result_config = await self.request_handler.on_create_task_push_notification_config(
+                request, context
             )
             result = MessageToDict(
                 result_config, preserving_proto_field_name=False

src/a2a/server/request_handlers/request_handler.py

@@ -107,12 +107,12 @@ async def on_message_send_stream(
         yield
 
     @abstractmethod
-    async def on_set_task_push_notification_config(
+    async def on_create_task_push_notification_config(
         self,
         params: CreateTaskPushNotificationConfigRequest,
         context: ServerCallContext | None = None,
     ) -> TaskPushNotificationConfig:
-        """Handles the 'tasks/pushNotificationConfig/set' method.
+        """Handles the 'tasks/pushNotificationConfig/create' method.
 
         Sets or updates the push notification configuration for a task.
 

src/a2a/server/request_handlers/rest_handler.py

@@ -181,7 +181,7 @@ async def get_push_notification(
         task_id = request.path_params['id']
         push_id = request.path_params['push_id']
         params = GetTaskPushNotificationConfigRequest(
-            task_id=f'tasks/{task_id}',
+            task_id=task_id,
             id=push_id,
         )
         config = (
@@ -221,9 +221,9 @@ async def set_push_notification(
         params = a2a_pb2.CreateTaskPushNotificationConfigRequest()
         Parse(body, params)
         # Set the parent to the task resource name format
-        params.task_id = f'tasks/{task_id}'
+        params.task_id = task_id
         config = (
-            await self.request_handler.on_set_task_push_notification_config(
+            await self.request_handler.on_create_task_push_notification_config(
                 params, context
             )
         )

src/a2a/utils/parts.py

@@ -22,7 +22,7 @@ def get_text_parts(parts: Sequence[Part]) -> list[str]:
     return [part.text for part in parts if part.HasField('text')]
 
 
-def get_data_parts(parts: Sequence[Part]) -> list[dict[str, Any]]:
+def get_data_parts(parts: Sequence[Part]) -> list[Any]:
     """Extracts dictionary data from all data Parts in a list of Parts.
 
     Args:

tests/client/transports/test_grpc_client.py

@@ -177,7 +177,7 @@ def sample_task_push_notification_config(
 ) -> TaskPushNotificationConfig:
     """Provides a sample TaskPushNotificationConfig object."""
     return TaskPushNotificationConfig(
-        task_id='tasks/task-1',
+        task_id='task-1',
         id=sample_push_notification_config.id,
         push_notification_config=sample_push_notification_config,
     )