Skip to content

Commit 93675e1

Browse files
committed
Rename fields to camel_case, fix grpc import
1 parent edf38c1 commit 93675e1

3 files changed

Lines changed: 20 additions & 26 deletions

File tree

src/a2a/server/request_handlers/grpc_handler.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
# ruff: noqa: N802
22
import contextlib
33
import logging
4-
54
from abc import ABC, abstractmethod
65
from collections.abc import AsyncIterable, Sequence
76

8-
97
try:
108
import grpc
119
import grpc.aio
10+
from grpc.aio import Metadata
1211
except ImportError as e:
1312
raise ImportError(
1413
'GrpcHandler requires grpcio and grpcio-tools to be installed. '
1514
'Install with: '
1615
"'pip install a2a-sdk[grpc]'"
1716
) from e
1817

19-
from grpc.aio import Metadata
20-
2118
import a2a.grpc.a2a_pb2_grpc as a2a_grpc
22-
2319
from a2a import types
2420
from a2a.auth.user import UnauthenticatedUser
2521
from a2a.extensions.common import (
@@ -34,7 +30,6 @@
3430
from a2a.utils.errors import ServerError
3531
from a2a.utils.helpers import validate, validate_async_generator
3632

37-
3833
logger = logging.getLogger(__name__)
3934

4035
# For now we use a trivial wrapper on the grpc context object

tests/extensions/test_common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def test_find_extension_by_uri():
3333
version='1.0',
3434
url='http://test.com',
3535
skills=[],
36-
defaultInputModes=['text/plain'],
37-
defaultOutputModes=['text/plain'],
36+
default_input_modes=['text/plain'],
37+
default_output_modes=['text/plain'],
3838
capabilities=AgentCapabilities(extensions=[ext1, ext2]),
3939
)
4040

@@ -50,8 +50,8 @@ def test_find_extension_by_uri_no_extensions():
5050
version='1.0',
5151
url='http://test.com',
5252
skills=[],
53-
defaultInputModes=['text/plain'],
54-
defaultOutputModes=['text/plain'],
53+
default_input_modes=['text/plain'],
54+
default_output_modes=['text/plain'],
5555
capabilities=AgentCapabilities(extensions=None),
5656
)
5757

tests/server/apps/jsonrpc/test_jsonrpc_app.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from unittest.mock import AsyncMock, MagicMock
22

33
import pytest
4-
from starlette.applications import Starlette
54
from starlette.testclient import TestClient
65

76
# Attempt to import StarletteBaseUser, fallback to MagicMock if not available
@@ -21,10 +20,10 @@
2120
RequestHandler,
2221
) # For mock spec
2322
from a2a.types import (
24-
AgentCapabilities,
2523
AgentCard,
2624
Message,
2725
MessageSendParams,
26+
Part,
2827
Role,
2928
SendMessageRequest,
3029
SendMessageResponse,
@@ -107,9 +106,9 @@ def mock_handler(self):
107106
root=SendMessageSuccessResponse(
108107
id='1',
109108
result=Message(
110-
messageId='test',
109+
message_id='test',
111110
role=Role.agent,
112-
parts=[TextPart(text='response message')],
111+
parts=[Part(TextPart(text='response message'))],
113112
),
114113
)
115114
)
@@ -138,9 +137,9 @@ def test_request_with_single_extension(self, client, mock_handler):
138137
id='1',
139138
params=MessageSendParams(
140139
message=Message(
141-
messageId='1',
140+
message_id='1',
142141
role=Role.user,
143-
parts=[TextPart(text='hi')],
142+
parts=[Part(TextPart(text='hi'))],
144143
)
145144
),
146145
).model_dump(),
@@ -163,9 +162,9 @@ def test_request_with_comma_separated_extensions(
163162
id='1',
164163
params=MessageSendParams(
165164
message=Message(
166-
messageId='1',
165+
message_id='1',
167166
role=Role.user,
168-
parts=[TextPart(text='hi')],
167+
parts=[Part(TextPart(text='hi'))],
169168
)
170169
),
171170
).model_dump(),
@@ -190,9 +189,9 @@ def test_request_with_comma_separated_extensions_no_space(
190189
id='1',
191190
params=MessageSendParams(
192191
message=Message(
193-
messageId='1',
192+
message_id='1',
194193
role=Role.user,
195-
parts=[TextPart(text='hi')],
194+
parts=[Part(TextPart(text='hi'))],
196195
)
197196
),
198197
).model_dump(),
@@ -217,9 +216,9 @@ def test_request_with_multiple_extension_headers(
217216
id='1',
218217
params=MessageSendParams(
219218
message=Message(
220-
messageId='1',
219+
message_id='1',
221220
role=Role.user,
222-
parts=[TextPart(text='hi')],
221+
parts=[Part(TextPart(text='hi'))],
223222
)
224223
),
225224
).model_dump(),
@@ -238,9 +237,9 @@ def side_effect(request, context: ServerCallContext):
238237
root=SendMessageSuccessResponse(
239238
id='1',
240239
result=Message(
241-
messageId='test',
240+
message_id='test',
242241
role=Role.agent,
243-
parts=[TextPart(text='response message')],
242+
parts=[Part(TextPart(text='response message'))],
244243
),
245244
)
246245
)
@@ -253,9 +252,9 @@ def side_effect(request, context: ServerCallContext):
253252
id='1',
254253
params=MessageSendParams(
255254
message=Message(
256-
messageId='1',
255+
message_id='1',
257256
role=Role.user,
258-
parts=[TextPart(text='hi')],
257+
parts=[Part(TextPart(text='hi'))],
259258
)
260259
),
261260
).model_dump(),

0 commit comments

Comments
 (0)