Skip to content

Commit d753627

Browse files
holtskinnerholtskinner
committed
Fix types
1 parent 6a7f8ff commit d753627

19 files changed

+76
-76
lines changed

‎src/a2a/server/request_handlers/default_request_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,5 +494,5 @@ async def on_delete_task_push_notification_config(
494494
raise ServerError(error=TaskNotFoundError())
495495

496496
await self._push_config_store.delete_info(
497-
params.id, params.push_notification_configId
497+
params.id, params.push_notification_config_id
498498
)

‎src/a2a/server/tasks/task_updater.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ async def add_artifact( # noqa: PLR0913
118118
metadata=metadata,
119119
),
120120
append=append,
121-
lastChunk=last_chunk,
121+
last_chunk=last_chunk,
122122
)
123123
)
124124

@@ -199,7 +199,7 @@ def new_agent_message(
199199
role=Role.agent,
200200
task_id=self.task_id,
201201
context_id=self.context_id,
202-
messageId=str(uuid.uuid4()),
202+
message_id=str(uuid.uuid4()),
203203
metadata=metadata,
204204
parts=parts,
205205
)

‎src/a2a/utils/proto_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ class FromProto:
436436
@classmethod
437437
def message(cls, message: a2a_pb2.Message) -> types.Message:
438438
return types.Message(
439-
messageId=message.message_id,
439+
message_id=message.message_id,
440440
parts=[FromProto.part(p) for p in message.content],
441441
context_id=message.context_id,
442442
task_id=message.task_id,
@@ -534,7 +534,7 @@ def task_artifact_update_event(
534534
artifact=FromProto.artifact(event.artifact),
535535
metadata=FromProto.metadata(event.metadata),
536536
append=event.append,
537-
lastChunk=event.last_chunk,
537+
last_chunk=event.last_chunk,
538538
)
539539

540540
@classmethod

‎tests/client/test_grpc_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def sample_message_send_params() -> MessageSendParams:
6464
return MessageSendParams(
6565
message=Message(
6666
role=Role.user,
67-
messageId='msg-1',
67+
message_id='msg-1',
6868
parts=[Part(root=TextPart(text='Hello'))],
6969
)
7070
)
@@ -85,7 +85,7 @@ def sample_message() -> Message:
8585
"""Provides a sample Message object."""
8686
return Message(
8787
role=Role.agent,
88-
messageId='msg-response',
88+
message_id='msg-response',
8989
parts=[Part(root=TextPart(text='Hi there'))],
9090
)
9191

‎tests/server/agent_execution/test_simple_request_context_builder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def create_sample_message(
3232
reference_task_ids=None,
3333
):
3434
return Message(
35-
messageId=msg_id,
35+
message_id=msg_id,
3636
role=role,
3737
parts=[Part(root=TextPart(text=content))],
3838
referenceTaskIds=reference_task_ids if reference_task_ids else [],
@@ -211,7 +211,7 @@ async def test_build_populate_true_reference_ids_empty_or_none(self):
211211
# To explicitly test None in Message, we'd have to bypass Pydantic default or modify helper.
212212
# For now, this covers the "no IDs to process" case.
213213
msg_with_no_refs = Message(
214-
messageId='m2', role=Role.user, parts=[], referenceTaskIds=None
214+
message_id='m2', role=Role.user, parts=[], referenceTaskIds=None
215215
)
216216
params_none_refs = MessageSendParams(message=msg_with_no_refs)
217217
request_context_none = await builder.build(

‎tests/server/apps/jsonrpc/test_serialization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def test_handle_unicode_characters(agent_card_with_api_key: AgentCard):
163163
'message': {
164164
'role': 'user',
165165
'parts': [{'kind': 'text', 'text': unicode_text}],
166-
'messageId': 'msg-unicode',
166+
'message_id': 'msg-unicode',
167167
}
168168
},
169169
}
@@ -172,7 +172,7 @@ def test_handle_unicode_characters(agent_card_with_api_key: AgentCard):
172172
handler.on_message_send.return_value = Message(
173173
role=Role.agent,
174174
parts=[Part(root=TextPart(text=f'Received: {unicode_text}'))],
175-
messageId='response-unicode',
175+
message_id='response-unicode',
176176
)
177177

178178
response = client.post('/', json=unicode_payload)

‎tests/server/events/test_event_consumer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
MESSAGE_PAYLOAD: dict[str, Any] = {
3737
'role': 'agent',
3838
'parts': [{'text': 'test message'}],
39-
'messageId': '111',
39+
'message_id': '111',
4040
}
4141

4242

@@ -276,7 +276,7 @@ async def test_consume_all_continues_on_queue_empty_if_not_really_closed(
276276
):
277277
"""Test that QueueClosed with is_closed=False allows loop to continue via timeout."""
278278
payload = MESSAGE_PAYLOAD.copy()
279-
payload['messageId'] = 'final_event_id'
279+
payload['message_id'] = 'final_event_id'
280280
final_event = Message(**payload)
281281

282282
# Setup dequeue_event behavior:

‎tests/server/events/test_event_queue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
MESSAGE_PAYLOAD: dict[str, Any] = {
3636
'role': 'agent',
3737
'parts': [{'text': 'test message'}],
38-
'messageId': '111',
38+
'message_id': '111',
3939
}
4040

4141

‎tests/server/request_handlers/test_default_request_handler.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ async def test_on_cancel_task_invalid_result_type():
276276
# Mock ResultAggregator to return a Message
277277
mock_result_aggregator_instance = AsyncMock(spec=ResultAggregator)
278278
mock_result_aggregator_instance.consume_all.return_value = Message(
279-
messageId='unexpected_msg', role=Role.agent, parts=[]
279+
message_id='unexpected_msg', role=Role.agent, parts=[]
280280
)
281281

282282
request_handler = DefaultRequestHandler(
@@ -349,7 +349,7 @@ async def test_on_message_send_with_push_notification():
349349
params = MessageSendParams(
350350
message=Message(
351351
role=Role.user,
352-
messageId='msg_push',
352+
message_id='msg_push',
353353
parts=[],
354354
task_id=task_id,
355355
context_id=context_id,
@@ -435,7 +435,7 @@ async def test_on_message_send_with_push_notification_no_existing_Task():
435435
accepted_output_modes=['text/plain'], # Added required field
436436
)
437437
params = MessageSendParams(
438-
message=Message(role=Role.user, messageId='msg_push', parts=[]),
438+
message=Message(role=Role.user, message_id='msg_push', parts=[]),
439439
configuration=message_config,
440440
)
441441

@@ -498,7 +498,7 @@ async def test_on_message_send_no_result_from_aggregator():
498498
request_context_builder=mock_request_context_builder,
499499
)
500500
params = MessageSendParams(
501-
message=Message(role=Role.user, messageId='msg_no_res', parts=[])
501+
message=Message(role=Role.user, message_id='msg_no_res', parts=[])
502502
)
503503

504504
mock_result_aggregator_instance = AsyncMock(spec=ResultAggregator)
@@ -548,7 +548,7 @@ async def test_on_message_send_task_id_mismatch():
548548
request_context_builder=mock_request_context_builder,
549549
)
550550
params = MessageSendParams(
551-
message=Message(role=Role.user, messageId='msg_id_mismatch', parts=[])
551+
message=Message(role=Role.user, message_id='msg_id_mismatch', parts=[])
552552
)
553553

554554
mock_result_aggregator_instance = AsyncMock(spec=ResultAggregator)
@@ -598,7 +598,7 @@ async def test_on_message_send_interrupted_flow():
598598
request_context_builder=mock_request_context_builder,
599599
)
600600
params = MessageSendParams(
601-
message=Message(role=Role.user, messageId='msg_interrupt', parts=[])
601+
message=Message(role=Role.user, message_id='msg_interrupt', parts=[])
602602
)
603603

604604
mock_result_aggregator_instance = AsyncMock(spec=ResultAggregator)
@@ -691,7 +691,7 @@ async def test_on_message_send_stream_with_push_notification():
691691
params = MessageSendParams(
692692
message=Message(
693693
role=Role.user,
694-
messageId='msg_stream_push',
694+
message_id='msg_stream_push',
695695
parts=[],
696696
task_id=task_id,
697697
context_id=context_id,
@@ -947,7 +947,7 @@ async def test_on_message_send_stream_task_id_mismatch():
947947
)
948948
params = MessageSendParams(
949949
message=Message(
950-
role=Role.user, messageId='msg_stream_mismatch', parts=[]
950+
role=Role.user, message_id='msg_stream_mismatch', parts=[]
951951
)
952952
)
953953

@@ -1293,7 +1293,7 @@ async def test_on_message_send_stream():
12931293
message_params = MessageSendParams(
12941294
message=Message(
12951295
role=Role.user,
1296-
messageId='msg-123',
1296+
message_id='msg-123',
12971297
parts=[Part(root=TextPart(text='How are you?'))],
12981298
),
12991299
)
@@ -1675,7 +1675,7 @@ async def test_on_message_send_task_in_terminal_state(terminal_state):
16751675
params = MessageSendParams(
16761676
message=Message(
16771677
role=Role.user,
1678-
messageId='msg_terminal',
1678+
message_id='msg_terminal',
16791679
parts=[],
16801680
task_id=task_id,
16811681
)
@@ -1719,7 +1719,7 @@ async def test_on_message_send_stream_task_in_terminal_state(terminal_state):
17191719
params = MessageSendParams(
17201720
message=Message(
17211721
role=Role.user,
1722-
messageId='msg_terminal_stream',
1722+
message_id='msg_terminal_stream',
17231723
parts=[],
17241724
task_id=task_id,
17251725
)

‎tests/server/request_handlers/test_jsonrpc_handler.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
MINIMAL_TASK: dict[str, Any] = {
7878
'id': 'task_123',
79-
'context_id': 'session-xyz',
79+
'contextId': 'session-xyz',
8080
'status': {'state': 'submitted'},
8181
'kind': 'task',
8282
}
@@ -595,7 +595,7 @@ async def streaming_coro():
595595
call(
596596
'http://example.com',
597597
json={
598-
'context_id': 'session-xyz',
598+
'contextId': 'session-xyz',
599599
'id': 'task_123',
600600
'kind': 'task',
601601
'status': {'state': 'submitted'},
@@ -616,7 +616,7 @@ async def streaming_coro():
616616
],
617617
}
618618
],
619-
'context_id': 'session-xyz',
619+
'contextId': 'session-xyz',
620620
'id': 'task_123',
621621
'kind': 'task',
622622
'status': {'state': 'submitted'},
@@ -637,7 +637,7 @@ async def streaming_coro():
637637
],
638638
}
639639
],
640-
'context_id': 'session-xyz',
640+
'contextId': 'session-xyz',
641641
'id': 'task_123',
642642
'kind': 'task',
643643
'status': {'state': 'completed'},

0 commit comments

Comments
 (0)