Updates to types

Author: holtskinner

src/a2a/client/helpers.py

@@ -15,7 +15,7 @@ def create_text_message_object(
         content: The text content of the message. Defaults to an empty string.
 
     Returns:
-        A `Message` object with a new UUID messageId.
+        A `Message` object with a new UUID message_id.
     """
     return Message(
         role=role, parts=[Part(TextPart(text=content))], message_id=str(uuid4())

src/a2a/server/request_handlers/default_request_handler.py

@@ -184,7 +184,7 @@ async def _setup_message_execution(
         """
         # Create task manager and validate existing task
         task_manager = TaskManager(
-            task_id=params.message.taskId,
+            task_id=params.message.task_id,
             context_id=params.message.context_id,
             task_store=self.task_store,
             initial_message=params.message,
@@ -218,10 +218,10 @@ async def _setup_message_execution(
         if (
             self._push_config_store
             and params.configuration
-            and params.configuration.pushNotificationConfig
+            and params.configuration.push_notification_config
         ):
             await self._push_config_store.set_info(
-                task_id, params.configuration.pushNotificationConfig
+                task_id, params.configuration.push_notification_config
             )
 
         queue = await self._queue_manager.create_or_tap(task_id)
@@ -366,13 +366,13 @@ async def on_set_task_push_notification_config(
         if not self._push_config_store:
             raise ServerError(error=UnsupportedOperationError())
 
-        task: Task | None = await self.task_store.get(params.taskId)
+        task: Task | None = await self.task_store.get(params.task_id)
         if not task:
             raise ServerError(error=TaskNotFoundError())
 
         await self._push_config_store.set_info(
-            params.taskId,
-            params.pushNotificationConfig,
+            params.task_id,
+            params.push_notification_config,
         )
 
         return params
@@ -404,7 +404,8 @@ async def on_get_task_push_notification_config(
             )
 
         return TaskPushNotificationConfig(
-            taskId=params.id, pushNotificationConfig=push_notification_config[0]
+            task_id=params.id,
+            pushNotificationConfig=push_notification_config[0],
         )
 
     async def on_resubscribe_to_task(
@@ -470,7 +471,7 @@ async def on_list_task_push_notification_config(
             for config in push_notification_config_list:
                 task_push_notification_config.append(
                     TaskPushNotificationConfig(
-                        taskId=params.id, pushNotificationConfig=config
+                        task_id=params.id, pushNotificationConfig=config
                     )
                 )
 
@@ -493,5 +494,5 @@ async def on_delete_task_push_notification_config(
             raise ServerError(error=TaskNotFoundError())
 
         await self._push_config_store.delete_info(
-            params.id, params.pushNotificationConfigId
+            params.id, params.push_notification_configId
         )

src/a2a/server/request_handlers/grpc_handler.py

@@ -224,7 +224,7 @@ async def GetTaskPushNotificationConfig(
         return a2a_pb2.TaskPushNotificationConfig()
 
     @validate(
-        lambda self: self.agent_card.capabilities.pushNotifications,
+        lambda self: self.agent_card.capabilities.push_notifications,
         'Push notifications are not supported by the agent',
     )
     async def CreateTaskPushNotificationConfig(

src/a2a/server/request_handlers/jsonrpc_handler.py

@@ -255,7 +255,7 @@ async def get_push_notification_config(
             )
 
     @validate(
-        lambda self: self.agent_card.capabilities.pushNotifications,
+        lambda self: self.agent_card.capabilities.push_notifications,
         'Push notifications are not supported by the agent',
     )
     async def set_push_notification_config(

src/a2a/server/tasks/task_manager.py

@@ -99,7 +99,7 @@ async def save_task_event(
                          when the TaskManager's ID is already set.
         """
         task_id_from_event = (
-            event.id if isinstance(event, Task) else event.taskId
+            event.id if isinstance(event, Task) else event.task_id
         )
         # If task id is known, make sure it is matched
         if self.task_id and self.task_id != task_id_from_event:
@@ -172,12 +172,12 @@ async def ensure_task(
         if not task:
             logger.info(
                 'Task not found or task_id not set. Creating new task for event (task_id: %s, context_id: %s).',
-                event.taskId,
+                event.task_id,
                 event.context_id,
             )
             # streaming agent did not previously stream task object.
             # Create a task object with the available information and persist the event
-            task = self._init_task_obj(event.taskId, event.context_id)
+            task = self._init_task_obj(event.task_id, event.context_id)
             await self._save_task(task)
 
         return task

src/a2a/server/tasks/task_updater.py

@@ -74,7 +74,7 @@ async def update_status(
             )
             await self.event_queue.enqueue_event(
                 TaskStatusUpdateEvent(
-                    taskId=self.task_id,
+                    task_id=self.task_id,
                     context_id=self.context_id,
                     final=final,
                     status=TaskStatus(
@@ -109,7 +109,7 @@ async def add_artifact(  # noqa: PLR0913
 
         await self.event_queue.enqueue_event(
             TaskArtifactUpdateEvent(
-                taskId=self.task_id,
+                task_id=self.task_id,
                 context_id=self.context_id,
                 artifact=Artifact(
                     artifactId=artifact_id,
@@ -197,7 +197,7 @@ def new_agent_message(
         """
         return Message(
             role=Role.agent,
-            taskId=self.task_id,
+            task_id=self.task_id,
             context_id=self.context_id,
             messageId=str(uuid.uuid4()),
             metadata=metadata,

src/a2a/utils/helpers.py

@@ -62,15 +62,15 @@ def append_artifact_to_task(task: Task, event: TaskArtifactUpdateEvent) -> None:
         task.artifacts = []
 
     new_artifact_data: Artifact = event.artifact
-    artifact_id: str = new_artifact_data.artifactId
+    artifact_id: str = new_artifact_data.artifact_id
     append_parts: bool = event.append or False
 
     existing_artifact: Artifact | None = None
     existing_artifact_list_index: int | None = None
 
     # Find existing artifact by its id
     for i, art in enumerate(task.artifacts):
-        if art.artifactId == artifact_id:
+        if art.artifact_id == artifact_id:
             existing_artifact = art
             existing_artifact_list_index = i
             break

src/a2a/utils/message.py

@@ -34,8 +34,8 @@ def new_agent_text_message(
     return Message(
         role=Role.agent,
         parts=[Part(root=TextPart(text=text))],
-        messageId=str(uuid.uuid4()),
-        taskId=task_id,
+        message_id=str(uuid.uuid4()),
+        task_id=task_id,
         context_id=context_id,
     )
 
@@ -58,8 +58,8 @@ def new_agent_parts_message(
     return Message(
         role=Role.agent,
         parts=parts,
-        messageId=str(uuid.uuid4()),
-        taskId=task_id,
+        message_id=str(uuid.uuid4()),
+        task_id=task_id,
         context_id=context_id,
     )