Skip to content

Commit caba0a2

Browse files
sokolivasokoliva
committed
refactor: rename client_extensions to extensions in JsonRpcTransport and RestTransport
1 parent 97eec52 commit caba0a2

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎src/a2a/client/transports/jsonrpc.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __init__(
6363
agent_card: AgentCard | None = None,
6464
url: str | None = None,
6565
interceptors: list[ClientCallInterceptor] | None = None,
66-
client_extensions: list[str] | None = None,
66+
extensions: list[str] | None = None,
6767
):
6868
"""Initializes the JsonRpcTransport."""
6969
if url:
@@ -81,12 +81,12 @@ def __init__(
8181
if agent_card
8282
else True
8383
)
84-
self.client_extensions = client_extensions
84+
self.extensions = extensions
8585

8686
def _update_extension_header(
8787
self, http_kwargs: dict[str, Any]
8888
) -> dict[str, Any]:
89-
if not self.client_extensions:
89+
if not self.extensions:
9090
return http_kwargs
9191

9292
headers = http_kwargs.setdefault('headers', {})
@@ -96,10 +96,10 @@ def _update_extension_header(
9696
e.strip() for e in existing_extensions_str.split(',') if e.strip()
9797
]
9898

99-
all_extensions = set(self.client_extensions)
99+
all_extensions = set(self.extensions)
100100
all_extensions.update(existing_extensions)
101101

102-
headers[HTTP_EXTENSION_HEADER] = ', '.join(list(all_extensions))
102+
headers[HTTP_EXTENSION_HEADER] = ','.join(list(all_extensions))
103103
return http_kwargs
104104

105105
async def _apply_interceptors(

‎src/a2a/client/transports/rest.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def __init__(
4444
agent_card: AgentCard | None = None,
4545
url: str | None = None,
4646
interceptors: list[ClientCallInterceptor] | None = None,
47-
client_extensions: list[str] | None = None,
47+
extensions: list[str] | None = None,
4848
):
4949
"""Initializes the RestTransport."""
5050
if url:
@@ -63,12 +63,12 @@ def __init__(
6363
if agent_card
6464
else True
6565
)
66-
self.client_extensions = client_extensions
66+
self.extensions = extensions
6767

6868
def _update_extension_header(
6969
self, http_kwargs: dict[str, Any]
7070
) -> dict[str, Any]:
71-
if not self.client_extensions:
71+
if not self.extensions:
7272
return http_kwargs
7373

7474
headers = http_kwargs.setdefault('headers', {})
@@ -78,10 +78,10 @@ def _update_extension_header(
7878
e.strip() for e in existing_extensions_str.split(',') if e.strip()
7979
]
8080

81-
all_extensions = set(self.client_extensions)
81+
all_extensions = set(self.extensions)
8282
all_extensions.update(existing_extensions)
8383

84-
headers[HTTP_EXTENSION_HEADER] = ', '.join(list(all_extensions))
84+
headers[HTTP_EXTENSION_HEADER] = ','.join(list(all_extensions))
8585
return http_kwargs
8686

8787
async def _apply_interceptors(

‎tests/client/test_jsonrpc_client.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ def test_update_extension_header_no_initial_headers(
796796
client = JsonRpcTransport(
797797
httpx_client=mock_httpx_client,
798798
agent_card=mock_agent_card,
799-
client_extensions=extensions,
799+
extensions=extensions,
800800
)
801801
http_kwargs = {}
802802
result_kwargs = client._update_extension_header(http_kwargs)
@@ -818,7 +818,7 @@ def test_update_extension_header_with_existing_other_headers(
818818
client = JsonRpcTransport(
819819
httpx_client=mock_httpx_client,
820820
agent_card=mock_agent_card,
821-
client_extensions=extensions,
821+
extensions=extensions,
822822
)
823823
http_kwargs = {'headers': {'X_Other': 'Test'}}
824824
result_kwargs = client._update_extension_header(http_kwargs)
@@ -847,7 +847,7 @@ def test_update_extension_header_merge_with_existing_extensions(
847847
client = JsonRpcTransport(
848848
httpx_client=mock_httpx_client,
849849
agent_card=mock_agent_card,
850-
client_extensions=extensions,
850+
extensions=extensions,
851851
)
852852
http_kwargs = {'headers': {HTTP_EXTENSION_HEADER: existing_header}}
853853
result_kwargs = client._update_extension_header(http_kwargs)
@@ -864,26 +864,26 @@ def test_update_extension_header_merge_with_existing_extensions(
864864
assert len(actual_extensions_list) == 3
865865
assert actual_extensions == expected_extensions
866866

867-
def test_update_extension_header_no_client_extensions(
867+
def test_update_extension_header_no_extensions(
868868
self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
869869
):
870870
client = JsonRpcTransport(
871871
httpx_client=mock_httpx_client,
872872
agent_card=mock_agent_card,
873-
client_extensions=None,
873+
extensions=None,
874874
)
875875
http_kwargs = {'headers': {'X_Other': 'Test'}}
876876
result_kwargs = client._update_extension_header(http_kwargs)
877877
assert HTTP_EXTENSION_HEADER not in result_kwargs['headers']
878878
assert result_kwargs['headers']['X_Other'] == 'Test'
879879

880-
def test_update_extension_header_empty_client_extensions(
880+
def test_update_extension_header_empty_extensions(
881881
self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
882882
):
883883
client = JsonRpcTransport(
884884
httpx_client=mock_httpx_client,
885885
agent_card=mock_agent_card,
886-
client_extensions=[],
886+
extensions=[],
887887
)
888888
http_kwargs = {'headers': {'X_Other': 'Test'}}
889889
result_kwargs = client._update_extension_header(http_kwargs)
@@ -894,12 +894,12 @@ def test_update_extension_header_empty_client_extensions(
894894
async def test_send_message_with_extensions(
895895
self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
896896
):
897-
"""Test that send_message adds extension headers when client_extensions are provided."""
897+
"""Test that send_message adds extension headers when extensions are provided."""
898898
extensions = ['test_extension_1', 'test_extension_2']
899899
client = JsonRpcTransport(
900900
httpx_client=mock_httpx_client,
901901
agent_card=mock_agent_card,
902-
client_extensions=extensions,
902+
extensions=extensions,
903903
)
904904
params = MessageSendParams(
905905
message=create_text_message_object(content='Hello')
@@ -947,7 +947,7 @@ async def test_send_message_streaming_with_extensions(
947947
client = JsonRpcTransport(
948948
httpx_client=mock_httpx_client,
949949
agent_card=mock_agent_card,
950-
client_extensions=extensions,
950+
extensions=extensions,
951951
)
952952
params = MessageSendParams(
953953
message=create_text_message_object(content='Hello stream')

‎tests/client/test_rest_client.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_update_extension_header_no_initial_headers(
4040
client = RestTransport(
4141
httpx_client=mock_httpx_client,
4242
agent_card=mock_agent_card,
43-
client_extensions=extensions,
43+
extensions=extensions,
4444
)
4545
http_kwargs = {}
4646
result_kwargs = client._update_extension_header(http_kwargs)
@@ -74,7 +74,7 @@ def test_update_extension_header_merge_with_existing_extensions(
7474
client = RestTransport(
7575
httpx_client=mock_httpx_client,
7676
agent_card=mock_agent_card,
77-
client_extensions=extensions,
77+
extensions=extensions,
7878
)
7979
http_kwargs = {'headers': {HTTP_EXTENSION_HEADER: existing_header}}
8080
result_kwargs = client._update_extension_header(http_kwargs)
@@ -98,7 +98,7 @@ def test_update_extension_header_with_other_headers(
9898
client = RestTransport(
9999
httpx_client=mock_httpx_client,
100100
agent_card=mock_agent_card,
101-
client_extensions=extensions,
101+
extensions=extensions,
102102
)
103103
http_kwargs = {'headers': {'X_Other': 'Test'}}
104104
result_kwargs = client._update_extension_header(http_kwargs)
@@ -111,11 +111,11 @@ def test_update_extension_header_with_other_headers(
111111
async def test_send_message_with_extensions(
112112
self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
113113
):
114-
"""Test that send_message adds client_extensions to headers."""
114+
"""Test that send_message adds extensions to headers."""
115115
extensions = ['test_extension_1', 'test_extension_2']
116116
client = RestTransport(
117117
httpx_client=mock_httpx_client,
118-
client_extensions=extensions,
118+
extensions=extensions,
119119
agent_card=mock_agent_card,
120120
)
121121
params = MessageSendParams(
@@ -164,7 +164,7 @@ async def test_send_message_streaming_with_extensions(
164164
client = RestTransport(
165165
httpx_client=mock_httpx_client,
166166
agent_card=mock_agent_card,
167-
client_extensions=extensions,
167+
extensions=extensions,
168168
)
169169
params = MessageSendParams(
170170
message=create_text_message_object(content='Hello stream')

0 commit comments

Comments
 (0)