Rename type to itemType

Author: kthota-g

.gitignore

@@ -8,3 +8,4 @@ __pycache__
 .venv
 coverage.xml
 .nox
+spec.json

src/a2a/types.py

@@ -133,13 +133,13 @@ class DataPart(BaseModel):
     """
     Structured data content
     """
-    metadata: dict[str, Any] | None = None
+    itemType: Literal['data'] = 'data'
     """
-    Optional metadata associated with the part.
+    Part type - data for DataParts
     """
-    type: Literal['data'] = 'data'
+    metadata: dict[str, Any] | None = None
     """
-    Part type - data for DataParts
+    Optional metadata associated with the part.
     """
 
 
@@ -577,11 +577,11 @@ class TaskState(Enum):
     submitted = 'submitted'
     working = 'working'
     input_required = 'input-required'
-    auth_required = 'auth-required'
     completed = 'completed'
     canceled = 'canceled'
     failed = 'failed'
     rejected = 'rejected'
+    auth_required = 'auth-required'
     unknown = 'unknown'
 
 
@@ -590,6 +590,10 @@ class TextPart(BaseModel):
     Represents a text segment within parts.
     """
 
+    itemType: Literal['text'] = 'text'
+    """
+    Part type - text for TextParts
+    """
     metadata: dict[str, Any] | None = None
     """
     Optional metadata associated with the part.
@@ -598,10 +602,6 @@ class TextPart(BaseModel):
     """
     Text content
     """
-    type: Literal['text'] = 'text'
-    """
-    Part type - text for TextParts
-    """
 
 
 class UnsupportedOperationError(BaseModel):
@@ -745,13 +745,13 @@ class FilePart(BaseModel):
     """
     File content either as url or bytes
     """
-    metadata: dict[str, Any] | None = None
+    itemType: Literal['file'] = 'file'
     """
-    Optional metadata associated with the part.
+    Part type - file for FileParts
     """
-    type: Literal['file'] = 'file'
+    metadata: dict[str, Any] | None = None
     """
-    Part type - file for FileParts
+    Optional metadata associated with the part.
     """
 
 
@@ -933,7 +933,7 @@ class SetTaskPushNotificationConfigSuccessResponse(BaseModel):
 
 class Artifact(BaseModel):
     """
-    Represents an artifact generated for a task.
+    Represents an artifact generated for a task task.
     """
 
     artifactId: str
@@ -959,9 +959,7 @@ class Artifact(BaseModel):
 
 
 class GetTaskPushNotificationConfigResponse(
-    RootModel[
-        JSONRPCErrorResponse | GetTaskPushNotificationConfigSuccessResponse
-    ]
+    RootModel[JSONRPCErrorResponse | GetTaskPushNotificationConfigSuccessResponse]
 ):
     root: JSONRPCErrorResponse | GetTaskPushNotificationConfigSuccessResponse
     """
@@ -982,6 +980,10 @@ class Message(BaseModel):
     """
     indicates the end of the event stream
     """
+    itemType: Literal['message'] = 'message'
+    """
+    event type
+    """
     messageId: str
     """
     identifier created by the message creator
@@ -1002,10 +1004,6 @@ class Message(BaseModel):
     """
     identifier of task the message is related to
     """
-    type: Literal['message'] = 'message'
-    """
-    event type
-    """
 
 
 class MessageSendParams(BaseModel):
@@ -1076,9 +1074,7 @@ class SendStreamingMessageRequest(BaseModel):
 
 
 class SetTaskPushNotificationConfigResponse(
-    RootModel[
-        JSONRPCErrorResponse | SetTaskPushNotificationConfigSuccessResponse
-    ]
+    RootModel[JSONRPCErrorResponse | SetTaskPushNotificationConfigSuccessResponse]
 ):
     root: JSONRPCErrorResponse | SetTaskPushNotificationConfigSuccessResponse
     """
@@ -1103,6 +1099,10 @@ class TaskArtifactUpdateEvent(BaseModel):
     """
     the context the task is associated with
     """
+    itemType: Literal['artifact-update'] = 'artifact-update'
+    """
+    event type
+    """
     lastChunk: bool | None = None
     """
     Indicates if this is the last chunk of the artifact
@@ -1115,10 +1115,6 @@ class TaskArtifactUpdateEvent(BaseModel):
     """
     Task id
     """
-    type: Literal['artifact-update'] = 'artifact-update'
-    """
-    event type
-    """
 
 
 class TaskStatus(BaseModel):
@@ -1150,6 +1146,10 @@ class TaskStatusUpdateEvent(BaseModel):
     """
     indicates the end of the event stream
     """
+    itemType: Literal['status-update'] = 'status-update'
+    """
+    event type
+    """
     metadata: dict[str, Any] | None = None
     """
     extension metadata
@@ -1162,10 +1162,6 @@ class TaskStatusUpdateEvent(BaseModel):
     """
     Task id
     """
-    type: Literal['status-update'] = 'status-update'
-    """
-    event type
-    """
 
 
 class A2ARequest(
@@ -1207,6 +1203,10 @@ class Task(BaseModel):
     """
     unique identifier for the task
     """
+    itemType: Literal['task'] = 'task'
+    """
+    event type
+    """
     metadata: dict[str, Any] | None = None
     """
     extension metadata
@@ -1215,10 +1215,6 @@ class Task(BaseModel):
     """
     current status of the task
     """
-    type: Literal['task'] = 'task'
-    """
-    event type
-    """
 
 
 class CancelTaskSuccessResponse(BaseModel):
@@ -1301,9 +1297,7 @@ class SendStreamingMessageSuccessResponse(BaseModel):
     """
 
 
-class CancelTaskResponse(
-    RootModel[JSONRPCErrorResponse | CancelTaskSuccessResponse]
-):
+class CancelTaskResponse(RootModel[JSONRPCErrorResponse | CancelTaskSuccessResponse]):
     root: JSONRPCErrorResponse | CancelTaskSuccessResponse
     """
     JSON-RPC response for the 'tasks/cancel' method.
@@ -1342,9 +1336,7 @@ class JSONRPCResponse(
     """
 
 
-class SendMessageResponse(
-    RootModel[JSONRPCErrorResponse | SendMessageSuccessResponse]
-):
+class SendMessageResponse(RootModel[JSONRPCErrorResponse | SendMessageSuccessResponse]):
     root: JSONRPCErrorResponse | SendMessageSuccessResponse
     """
     JSON-RPC response model for the 'message/send' method.

tests/client/test_client.py

@@ -63,14 +63,14 @@
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': {'state': 'working'},
-    'type': 'task',
+    'itemType': 'task',
 }
 
 MINIMAL_CANCELLED_TASK: dict[str, Any] = {
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': {'state': 'canceled'},
-    'type': 'task',
+    'itemType': 'task',
 }
 
 

tests/test_types.py

@@ -106,22 +106,22 @@
     'version': '1.0',
 }
 
-TEXT_PART_DATA: dict[str, Any] = {'type': 'text', 'text': 'Hello'}
+TEXT_PART_DATA: dict[str, Any] = {'itemType': 'text', 'text': 'Hello'}
 FILE_URI_PART_DATA: dict[str, Any] = {
-    'type': 'file',
+    'itemType': 'file',
     'file': {'uri': 'file:///path/to/file.txt', 'mimeType': 'text/plain'},
 }
 FILE_BYTES_PART_DATA: dict[str, Any] = {
-    'type': 'file',
+    'itemType': 'file',
     'file': {'bytes': 'aGVsbG8=', 'name': 'hello.txt'},  # base64 for "hello"
 }
-DATA_PART_DATA: dict[str, Any] = {'type': 'data', 'data': {'key': 'value'}}
+DATA_PART_DATA: dict[str, Any] = {'itemType': 'data', 'data': {'key': 'value'}}
 
 MINIMAL_MESSAGE_USER: dict[str, Any] = {
     'role': 'user',
     'parts': [TEXT_PART_DATA],
     'messageId': 'msg-123',
-    'type': 'message',
+    'itemType': 'message',
 }
 
 AGENT_MESSAGE_WITH_FILE: dict[str, Any] = {
@@ -142,7 +142,7 @@
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': MINIMAL_TASK_STATUS,
-    'type': 'task',
+    'itemType': 'task',
 }
 FULL_TASK: dict[str, Any] = {
     'id': 'task-abc',
@@ -157,7 +157,7 @@
         }
     ],
     'metadata': {'priority': 'high'},
-    'type': 'task',
+    'itemType': 'task',
 }
 
 MINIMAL_TASK_ID_PARAMS: dict[str, Any] = {'id': 'task-123'}
@@ -269,15 +269,15 @@ def test_agent_card_invalid():
 
 def test_text_part():
     part = TextPart(**TEXT_PART_DATA)
-    assert part.type == 'text'
+    assert part.itemType == 'text'
     assert part.text == 'Hello'
     assert part.metadata is None
 
     with pytest.raises(ValidationError):
         TextPart(type='text')  # Missing text # type: ignore
     with pytest.raises(ValidationError):
         TextPart(
-            type='file',  # type: ignore
+            itemType='file',  # type: ignore
             text='hello',
         )  # Wrong type literal
 
@@ -287,15 +287,15 @@ def test_file_part_variants():
     file_uri = FileWithUri(
         uri='file:///path/to/file.txt', mimeType='text/plain'
     )
-    part_uri = FilePart(type='file', file=file_uri)
+    part_uri = FilePart(itemType='file', file=file_uri)
     assert isinstance(part_uri.file, FileWithUri)
     assert part_uri.file.uri == 'file:///path/to/file.txt'
     assert part_uri.file.mimeType == 'text/plain'
     assert not hasattr(part_uri.file, 'bytes')
 
     # Bytes variant
     file_bytes = FileWithBytes(bytes='aGVsbG8=', name='hello.txt')
-    part_bytes = FilePart(type='file', file=file_bytes)
+    part_bytes = FilePart(itemType='file', file=file_bytes)
     assert isinstance(part_bytes.file, FileWithBytes)
     assert part_bytes.file.bytes == 'aGVsbG8='
     assert part_bytes.file.name == 'hello.txt'
@@ -312,14 +312,14 @@ def test_file_part_variants():
 
     # Invalid - wrong type literal
     with pytest.raises(ValidationError):
-        FilePart(type='text', file=file_uri)  # type: ignore
+        FilePart(itemType='text', file=file_uri)  # type: ignore
 
     FilePart(**FILE_URI_PART_DATA, extra='extra')  # type: ignore
 
 
 def test_data_part():
     part = DataPart(**DATA_PART_DATA)
-    assert part.type == 'data'
+    assert part.itemType == 'data'
     assert part.data == {'key': 'value'}
 
     with pytest.raises(ValidationError):
@@ -656,7 +656,7 @@ def test_send_message_streaming_status_update_response() -> None:
         'taskId': '1',
         'contextId': '2',
         'final': False,
-        'type': 'status-update',
+        'itemType': 'status-update',
     }
 
     event_data: dict[str, Any] = {
@@ -716,7 +716,7 @@ def test_send_message_streaming_artifact_update_response() -> None:
         'contextId': '2',
         'append': False,
         'lastChunk': True,
-        'type': 'artifact-update',
+        'itemType': 'artifact-update',
     }
     event_data: dict[str, Any] = {
         'jsonrpc': '2.0',