begin refactor to cover UUIDs

Author: holtskinner

scripts/generate_types.sh

@@ -10,7 +10,7 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-REMOTE_URL="https://raw.githubusercontent.com/a2aproject/A2A/refs/heads/main/specification/json/a2a.json"
+REMOTE_URL="https://raw.githubusercontent.com/a2aproject/A2A/refs/heads/uuid-fields/specification/json/a2a.json"
 GENERATED_FILE="$1"
 
 echo "Running datamodel-codegen..."
@@ -39,6 +39,7 @@ uv run datamodel-codegen \
   --no-alias
 
 echo "Formatting generated file with ruff..."
+uv run ruff check --fix-only "$GENERATED_FILE"
 uv run ruff format "$GENERATED_FILE"
 
 echo "Codegen finished successfully."

src/a2a/types.py

@@ -1,10 +1,11 @@
 # generated by datamodel-codegen:
-#   filename:  https://raw.githubusercontent.com/a2aproject/A2A/refs/heads/main/specification/json/a2a.json
+#   filename:  https://raw.githubusercontent.com/a2aproject/A2A/refs/heads/uuid-fields/specification/json/a2a.json
 
 from __future__ import annotations
 
 from enum import Enum
 from typing import Any, Literal
+from uuid import UUID
 
 from pydantic import Field, RootModel
 
@@ -293,15 +294,15 @@ class DeleteTaskPushNotificationConfigParams(A2ABaseModel):
     Defines parameters for deleting a specific push notification configuration for a task.
     """
 
-    id: str
+    id: UUID
     """
     The unique identifier of the task.
     """
     metadata: dict[str, Any] | None = None
     """
     Optional metadata associated with the request.
     """
-    push_notification_config_id: str
+    push_notification_config_id: UUID
     """
     The ID of the push notification configuration to delete.
     """
@@ -430,15 +431,15 @@ class GetTaskPushNotificationConfigParams(A2ABaseModel):
     Defines parameters for fetching a specific push notification configuration for a task.
     """
 
-    id: str
+    id: UUID
     """
     The unique identifier of the task.
     """
     metadata: dict[str, Any] | None = None
     """
     Optional metadata associated with the request.
     """
-    push_notification_config_id: str | None = None
+    push_notification_config_id: UUID | None = None
     """
     The ID of the push notification configuration to retrieve.
     """
@@ -675,7 +676,7 @@ class ListTaskPushNotificationConfigParams(A2ABaseModel):
     Defines parameters for listing all push notification configurations associated with a task.
     """
 
-    id: str
+    id: UUID
     """
     The unique identifier of the task.
     """
@@ -828,7 +829,7 @@ class PushNotificationConfig(A2ABaseModel):
     """
     Optional authentication details for the agent to use when calling the notification URL.
     """
-    id: str | None = None
+    id: UUID | None = None
     """
     A unique ID for the push notification configuration, set by the client
     to support multiple notification callbacks.
@@ -879,7 +880,7 @@ class TaskIdParams(A2ABaseModel):
     Defines parameters containing a task ID, used for simple task operations.
     """
 
-    id: str
+    id: UUID
     """
     The unique identifier of the task.
     """
@@ -938,7 +939,7 @@ class TaskPushNotificationConfig(A2ABaseModel):
     """
     The push notification configuration for this task.
     """
-    task_id: str
+    task_id: UUID
     """
     The ID of the task.
     """
@@ -953,7 +954,7 @@ class TaskQueryParams(A2ABaseModel):
     """
     The number of most recent messages from the task's history to retrieve.
     """
-    id: str
+    id: UUID
     """
     The unique identifier of the task.
     """
@@ -1374,7 +1375,7 @@ class Artifact(A2ABaseModel):
     Represents a file, data structure, or other resource generated by an agent during a task.
     """
 
-    artifact_id: str
+    artifact_id: UUID
     """
     A unique identifier for the artifact within the scope of the task.
     """
@@ -1438,7 +1439,7 @@ class Message(A2ABaseModel):
     Represents a single message in the conversation between a user and an agent.
     """
 
-    context_id: str | None = None
+    context_id: UUID | None = None
     """
     The context identifier for this message, used to group related interactions.
     """
@@ -1450,7 +1451,7 @@ class Message(A2ABaseModel):
     """
     The type of this object, used as a discriminator. Always 'message' for a Message.
     """
-    message_id: str
+    message_id: UUID
     """
     A unique identifier for the message, typically a UUID, generated by the sender.
     """
@@ -1463,15 +1464,15 @@ class Message(A2ABaseModel):
     An array of content parts that form the message body. A message can be
     composed of multiple parts of different types (e.g., text and files).
     """
-    reference_task_ids: list[str] | None = None
+    reference_task_ids: list[UUID] | None = None
     """
     A list of other task IDs that this message references for additional context.
     """
     role: Role
     """
     Identifies the sender of the message. `user` for the client, `agent` for the service.
     """
-    task_id: str | None = None
+    task_id: UUID | None = None
     """
     The identifier of the task this message is part of. Can be omitted for the first message of a new task.
     """
@@ -1614,7 +1615,7 @@ class TaskArtifactUpdateEvent(A2ABaseModel):
     """
     The artifact that was generated or updated.
     """
-    context_id: str
+    context_id: UUID
     """
     The context ID associated with the task.
     """
@@ -1630,7 +1631,7 @@ class TaskArtifactUpdateEvent(A2ABaseModel):
     """
     Optional metadata for extensions.
     """
-    task_id: str
+    task_id: UUID
     """
     The ID of the task this artifact belongs to.
     """
@@ -1663,7 +1664,7 @@ class TaskStatusUpdateEvent(A2ABaseModel):
     This is typically used in streaming or subscription models.
     """
 
-    context_id: str
+    context_id: UUID
     """
     The context ID associated with the task.
     """
@@ -1683,7 +1684,7 @@ class TaskStatusUpdateEvent(A2ABaseModel):
     """
     The new status of the task.
     """
-    task_id: str
+    task_id: UUID
     """
     The ID of the task that was updated.
     """
@@ -1861,15 +1862,15 @@ class Task(A2ABaseModel):
     """
     A collection of artifacts generated by the agent during the execution of the task.
     """
-    context_id: str
+    context_id: UUID
     """
     A server-generated identifier for maintaining context across multiple related tasks or interactions.
     """
     history: list[Message] | None = None
     """
     An array of messages exchanged during the task, representing the conversation history.
     """
-    id: str
+    id: UUID
     """
     A unique identifier for the task, generated by the server for a new task.
     """

src/a2a/utils/task.py

@@ -28,22 +28,10 @@ def new_task(request: Message) -> Task:
         if isinstance(part.root, TextPart) and not part.root.text:
             raise ValueError('TextPart content cannot be empty')
 
-    context_id_str = request.context_id
-    if context_id_str is not None:
-        try:
-            uuid.UUID(context_id_str)
-            context_id = context_id_str
-        except (ValueError, AttributeError, TypeError) as e:
-            raise ValueError(
-                f"Invalid context_id: '{context_id_str}' is not a valid UUID."
-            ) from e
-    else:
-        context_id = str(uuid.uuid4())
-
     return Task(
         status=TaskStatus(state=TaskState.submitted),
-        id=(request.task_id if request.task_id else str(uuid.uuid4())),
-        context_id=context_id,
+        id=request.task_id or uuid.uuid4(),
+        context_id=request.context_id or uuid.uuid4(),
         history=[request],
     )
 

tests/client/test_auth_middleware.py

@@ -64,7 +64,7 @@ def build_success_response(request: httpx.Request) -> httpx.Response:
         jsonrpc='2.0',
         result=Message(
             kind='message',
-            message_id='message-id',
+            message_id='c222a603-645e-4c37-8f7b-e49f3ea80e9e',
             role=Role.agent,
             parts=[],
         ),
@@ -75,7 +75,7 @@ def build_success_response(request: httpx.Request) -> httpx.Response:
 def build_message() -> Message:
     """Builds a minimal Message."""
     return Message(
-        message_id='msg1',
+        message_id='87c8541d-f773-4825-bbb1-f518727231f2',
         role=Role.user,
         parts=[],
     )

tests/client/test_base_client.py

@@ -42,7 +42,7 @@ def sample_agent_card():
 def sample_message():
     return Message(
         role=Role.user,
-        message_id='msg-1',
+        message_id='15957e91-63e6-40ac-8205-1d1ffb09a5b2',
         parts=[Part(root=TextPart(text='Hello'))],
     )
 

tests/client/test_client_task_manager.py

@@ -27,8 +27,8 @@ def task_manager():
 @pytest.fixture
 def sample_task():
     return Task(
-        id='task123',
-        context_id='context456',
+        id='eede470e-ae8f-4910-ba05-085d45dc43c6',
+        context_id='9a84655d-3956-4410-ba58-2923639254bd',
         status=TaskStatus(state=TaskState.working),
         history=[],
         artifacts=[],
@@ -38,7 +38,7 @@ def sample_task():
 @pytest.fixture
 def sample_message():
     return Message(
-        message_id='msg1',
+        message_id='87c8541d-f773-4825-bbb1-f518727231f2',
         role=Role.user,
         parts=[Part(root=TextPart(text='Hello'))],
     )

tests/client/test_grpc_client.py

@@ -67,7 +67,7 @@ def sample_message_send_params() -> MessageSendParams:
     return MessageSendParams(
         message=Message(
             role=Role.user,
-            message_id='msg-1',
+            message_id='15957e91-63e6-40ac-8205-1d1ffb09a5b2',
             parts=[Part(root=TextPart(text='Hello'))],
         )
     )

tests/client/test_jsonrpc_client.py

@@ -79,15 +79,15 @@
 )
 
 MINIMAL_TASK: dict[str, Any] = {
-    'id': 'task-abc',
-    'contextId': 'session-xyz',
+    'id': 'ea719c56-e398-425e-b02c-49fd77b7c156',
+    'contextId': '598c0e6f-72c2-48fc-803a-15d693622c6f',
     'status': {'state': 'working'},
     'kind': 'task',
 }
 
 MINIMAL_CANCELLED_TASK: dict[str, Any] = {
-    'id': 'task-abc',
-    'contextId': 'session-xyz',
+    'id': 'ea719c56-e398-425e-b02c-49fd77b7c156',
+    'contextId': '598c0e6f-72c2-48fc-803a-15d693622c6f',
     'status': {'state': 'canceled'},
     'kind': 'task',
 }
@@ -539,7 +539,7 @@ async def test_get_task_success(
         client = JsonRpcTransport(
             httpx_client=mock_httpx_client, agent_card=mock_agent_card
         )
-        params = TaskQueryParams(id='task-abc')
+        params = TaskQueryParams(id='ea719c56-e398-425e-b02c-49fd77b7c156')
         rpc_response = {
             'id': '123',
             'jsonrpc': '2.0',
@@ -567,7 +567,7 @@ async def test_cancel_task_success(
         client = JsonRpcTransport(
             httpx_client=mock_httpx_client, agent_card=mock_agent_card
         )
-        params = TaskIdParams(id='task-abc')
+        params = TaskIdParams(id='ea719c56-e398-425e-b02c-49fd77b7c156')
         rpc_response = {
             'id': '123',
             'jsonrpc': '2.0',
@@ -596,7 +596,7 @@ async def test_set_task_callback_success(
             httpx_client=mock_httpx_client, agent_card=mock_agent_card
         )
         params = TaskPushNotificationConfig(
-            task_id='task-abc',
+            task_id='ea719c56-e398-425e-b02c-49fd77b7c156',
             push_notification_config=PushNotificationConfig(
                 url='http://callback.com'
             ),
@@ -625,9 +625,9 @@ async def test_get_task_callback_success(
         client = JsonRpcTransport(
             httpx_client=mock_httpx_client, agent_card=mock_agent_card
         )
-        params = TaskIdParams(id='task-abc')
+        params = TaskIdParams(id='ea719c56-e398-425e-b02c-49fd77b7c156')
         expected_response = TaskPushNotificationConfig(
-            task_id='task-abc',
+            task_id='ea719c56-e398-425e-b02c-49fd77b7c156',
             push_notification_config=PushNotificationConfig(
                 url='http://callback.com'
             ),

tests/client/test_legacy_client.py

@@ -82,7 +82,7 @@ async def test_a2a_client_send_message(
     client._transport.send_message = AsyncMock(return_value=mock_response_task)
 
     message = Message(
-        message_id='msg-123',
+        message_id='4a90ce5d-eda0-44be-afae-a709621eb63c',
         role=Role.user,
         parts=[Part(root=TextPart(text='Hello'))],
     )