Rename itemType to kind

kthota-g · kthota-g · commit be0d7086608d · 2025-05-19T11:38:43.000-07:00
diff --git a/examples/helloworld/test_client.py b/examples/helloworld/test_client.py
@@ -18,7 +18,7 @@ async def main() -> None:
             'message': {
                 'role': 'user',
                 'parts': [
-                    {'itemType': 'text', 'text': 'how much is 10 USD in INR?'}
+                    {'kind': 'text', 'text': 'how much is 10 USD in INR?'}
                 ],
                 'messageId': uuid4().hex,
             },
diff --git a/examples/langgraph/test_client.py b/examples/langgraph/test_client.py
@@ -26,7 +26,7 @@ def create_send_message_payload(
     payload: dict[str, Any] = {
         'message': {
             'role': 'user',
-            'parts': [{'itemType': 'text', 'text': text}],
+            'parts': [{'kind': 'text', 'text': text}],
             'messageId': uuid4().hex,
         },
     }
diff --git a/src/a2a/types.py b/src/a2a/types.py
@@ -133,7 +133,7 @@ class DataPart(BaseModel):
     """
     Structured data content
     """
-    itemType: Literal['data'] = 'data'
+    kind: Literal['data'] = 'data'
     """
     Part type - data for DataParts
     """
@@ -590,7 +590,7 @@ class TextPart(BaseModel):
     Represents a text segment within parts.
     """
 
-    itemType: Literal['text'] = 'text'
+    kind: Literal['text'] = 'text'
     """
     Part type - text for TextParts
     """
@@ -745,7 +745,7 @@ class FilePart(BaseModel):
     """
     File content either as url or bytes
     """
-    itemType: Literal['file'] = 'file'
+    kind: Literal['file'] = 'file'
     """
     Part type - file for FileParts
     """
@@ -976,7 +976,7 @@ class Message(BaseModel):
     """
     the context the message is associated with
     """
-    itemType: Literal['message'] = 'message'
+    kind: Literal['message'] = 'message'
     """
     event type
     """
@@ -1095,7 +1095,7 @@ class TaskArtifactUpdateEvent(BaseModel):
     """
     the context the task is associated with
     """
-    itemType: Literal['artifact-update'] = 'artifact-update'
+    kind: Literal['artifact-update'] = 'artifact-update'
     """
     event type
     """
@@ -1142,7 +1142,7 @@ class TaskStatusUpdateEvent(BaseModel):
     """
     indicates the end of the event stream
     """
-    itemType: Literal['status-update'] = 'status-update'
+    kind: Literal['status-update'] = 'status-update'
     """
     event type
     """
@@ -1199,7 +1199,7 @@ class Task(BaseModel):
     """
     unique identifier for the task
     """
-    itemType: Literal['task'] = 'task'
+    kind: Literal['task'] = 'task'
     """
     event type
     """
diff --git a/tests/client/test_client.py b/tests/client/test_client.py
@@ -63,14 +63,14 @@
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': {'state': 'working'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 
 MINIMAL_CANCELLED_TASK: dict[str, Any] = {
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': {'state': 'canceled'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 
 
diff --git a/tests/server/events/test_event_consumer.py b/tests/server/events/test_event_consumer.py
@@ -28,7 +28,7 @@
     'id': '123',
     'contextId': 'session-xyz',
     'status': {'state': 'submitted'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 
 MESSAGE_PAYLOAD: dict[str, Any] = {
diff --git a/tests/server/events/test_event_queue.py b/tests/server/events/test_event_queue.py
@@ -21,7 +21,7 @@
     'id': '123',
     'contextId': 'session-xyz',
     'status': {'state': 'submitted'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 MESSAGE_PAYLOAD: dict[str, Any] = {
     'role': 'agent',
diff --git a/tests/server/request_handlers/test_jsonrpc_handler.py b/tests/server/request_handlers/test_jsonrpc_handler.py
@@ -62,7 +62,7 @@
     'id': 'task_123',
     'contextId': 'session-xyz',
     'status': {'state': 'submitted'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 MESSAGE_PAYLOAD: dict[str, Any] = {
     'role': 'agent',
diff --git a/tests/server/tasks/test_inmemory_task_store.py b/tests/server/tasks/test_inmemory_task_store.py
@@ -10,7 +10,7 @@
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': {'state': 'submitted'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 
 
diff --git a/tests/server/tasks/test_task_manager.py b/tests/server/tasks/test_task_manager.py
@@ -22,7 +22,7 @@
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': {'state': 'submitted'},
-    'itemType': 'task',
+    'kind': 'task',
 }
 
 
@@ -205,7 +205,7 @@ async def test_save_task_event_new_task_no_task_id(
         'id': 'new-task-id',
         'contextId': 'some-context',
         'status': {'state': 'working'},
-        'itemType': 'task',
+        'kind': 'task',
     }
     task = Task(**task_data)
     await task_manager_without_id.save_task_event(task)
diff --git a/tests/test_types.py b/tests/test_types.py
@@ -106,22 +106,22 @@
     'version': '1.0',
 }
 
-TEXT_PART_DATA: dict[str, Any] = {'itemType': 'text', 'text': 'Hello'}
+TEXT_PART_DATA: dict[str, Any] = {'kind': 'text', 'text': 'Hello'}
 FILE_URI_PART_DATA: dict[str, Any] = {
-    'itemType': 'file',
+    'kind': 'file',
     'file': {'uri': 'file:///path/to/file.txt', 'mimeType': 'text/plain'},
 }
 FILE_BYTES_PART_DATA: dict[str, Any] = {
-    'itemType': 'file',
+    'kind': 'file',
     'file': {'bytes': 'aGVsbG8=', 'name': 'hello.txt'},  # base64 for "hello"
 }
-DATA_PART_DATA: dict[str, Any] = {'itemType': 'data', 'data': {'key': 'value'}}
+DATA_PART_DATA: dict[str, Any] = {'kind': 'data', 'data': {'key': 'value'}}
 
 MINIMAL_MESSAGE_USER: dict[str, Any] = {
     'role': 'user',
     'parts': [TEXT_PART_DATA],
     'messageId': 'msg-123',
-    'itemType': 'message',
+    'kind': 'message',
 }
 
 AGENT_MESSAGE_WITH_FILE: dict[str, Any] = {
@@ -142,7 +142,7 @@
     'id': 'task-abc',
     'contextId': 'session-xyz',
     'status': MINIMAL_TASK_STATUS,
-    'itemType': 'task',
+    'kind': 'task',
 }
 FULL_TASK: dict[str, Any] = {
     'id': 'task-abc',
@@ -157,7 +157,7 @@
         }
     ],
     'metadata': {'priority': 'high'},
-    'itemType': 'task',
+    'kind': '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.itemType == 'text'
+    assert part.kind == '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(
-            itemType='file',  # type: ignore
+            kind='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(itemType='file', file=file_uri)
+    part_uri = FilePart(kind='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(itemType='file', file=file_bytes)
+    part_bytes = FilePart(kind='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(itemType='text', file=file_uri)  # type: ignore
+        FilePart(kind='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.itemType == 'data'
+    assert part.kind == '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,
-        'itemType': 'status-update',
+        'kind': '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,
-        'itemType': 'artifact-update',
+        'kind': 'artifact-update',
     }
     event_data: dict[str, Any] = {
         'jsonrpc': '2.0',

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ def create_send_message_payload(`
`26`	`26`	`payload: dict[str, Any] = {`
`27`	`27`	`'message': {`
`28`	`28`	`'role': 'user',`
`29`		`- 'parts': [{'itemType': 'text', 'text': text}],`
	`29`	`+ 'parts': [{'kind': 'text', 'text': text}],`
`30`	`30`	`'messageId': uuid4().hex,`
`31`	`31`	`},`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,14 @@`
`63`	`63`	`'id': 'task-abc',`
`64`	`64`	`'contextId': 'session-xyz',`
`65`	`65`	`'status': {'state': 'working'},`
`66`		`- 'itemType': 'task',`
	`66`	`+ 'kind': 'task',`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`MINIMAL_CANCELLED_TASK: dict[str, Any] = {`
`70`	`70`	`'id': 'task-abc',`
`71`	`71`	`'contextId': 'session-xyz',`
`72`	`72`	`'status': {'state': 'canceled'},`
`73`		`- 'itemType': 'task',`
	`73`	`+ 'kind': 'task',`
`74`	`74`	`}`
`75`	`75`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`'id': '123',`
`29`	`29`	`'contextId': 'session-xyz',`
`30`	`30`	`'status': {'state': 'submitted'},`
`31`		`- 'itemType': 'task',`
	`31`	`+ 'kind': 'task',`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`MESSAGE_PAYLOAD: dict[str, Any] = {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`'id': '123',`
`22`	`22`	`'contextId': 'session-xyz',`
`23`	`23`	`'status': {'state': 'submitted'},`
`24`		`- 'itemType': 'task',`
	`24`	`+ 'kind': 'task',`
`25`	`25`	`}`
`26`	`26`	`MESSAGE_PAYLOAD: dict[str, Any] = {`
`27`	`27`	`'role': 'agent',`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`'id': 'task_123',`
`63`	`63`	`'contextId': 'session-xyz',`
`64`	`64`	`'status': {'state': 'submitted'},`
`65`		`- 'itemType': 'task',`
	`65`	`+ 'kind': 'task',`
`66`	`66`	`}`
`67`	`67`	`MESSAGE_PAYLOAD: dict[str, Any] = {`
`68`	`68`	`'role': 'agent',`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`'id': 'task-abc',`
`11`	`11`	`'contextId': 'session-xyz',`
`12`	`12`	`'status': {'state': 'submitted'},`
`13`		`- 'itemType': 'task',`
	`13`	`+ 'kind': 'task',`
`14`	`14`	`}`
`15`	`15`
`16`	`16`