Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/a2a/client/base_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,21 @@ def _apply_client_config(self, request: SendMessageRequest) -> None:

async def _process_stream(
self,
stream: AsyncIterator[StreamResponse],
stream: AsyncGenerator[StreamResponse],
before_args: BeforeArgs,
) -> AsyncGenerator[StreamResponse, None]:
async for stream_response in stream:
after_args = AfterArgs(
result=stream_response,
method=before_args.method,
agent_card=self._card,
context=before_args.context,
)
await self._intercept_after(after_args)
yield after_args.result
if after_args.result.HasField('message'):
return
async with aclosing(stream) as responses:
async for stream_response in responses:
after_args = AfterArgs(
result=stream_response,
method=before_args.method,
agent_card=self._card,
context=before_args.context,
)
await self._intercept_after(after_args)
yield after_args.result
if after_args.result.HasField('message'):
return

async def get_task(
self,
Expand Down Expand Up @@ -496,7 +497,7 @@ async def _execute_stream_with_interceptors(
method: str,
context: ClientCallContext | None,
transport_call: Callable[
[Any, ClientCallContext | None], AsyncIterator[StreamResponse]
[Any, ClientCallContext | None], AsyncGenerator[StreamResponse]
],
) -> AsyncGenerator[StreamResponse, None]:
"""Runs a streaming call through plugins, interceptors and the transport.
Expand Down Expand Up @@ -551,7 +552,7 @@ async def _stream_through_interceptors(
method: str,
context: ClientCallContext | None,
transport_call: Callable[
[Any, ClientCallContext | None], AsyncIterator[StreamResponse]
[Any, ClientCallContext | None], AsyncGenerator[StreamResponse]
],
) -> AsyncGenerator[StreamResponse, None]:
before_args = BeforeArgs(
Expand All @@ -576,8 +577,11 @@ async def _stream_through_interceptors(

stream = transport_call(before_args.input, before_args.context)

async for client_event in self._process_stream(stream, before_args):
yield client_event
async with aclosing(
self._process_stream(stream, before_args)
) as events:
async for client_event in events:
yield client_event

async def _intercept_before(
self,
Expand Down
68 changes: 39 additions & 29 deletions src/a2a/client/transports/jsonrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import logging

from collections.abc import AsyncGenerator
from contextlib import aclosing
from typing import Any, NoReturn
from uuid import uuid4

Expand Down Expand Up @@ -93,17 +94,20 @@
) -> AsyncGenerator[StreamResponse]:
"""Sends a streaming message request to the agent and yields responses as they arrive."""
rpc_request = JSONRPC20Request(
method='SendStreamingMessage',
params=json_format.MessageToDict(request),
_id=str(uuid4()),
)
async for event in self._send_stream_request(
dict(rpc_request.data),
context,
):
yield event
async with aclosing(

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also apply those changes to compat layer

self._send_stream_request(
dict(rpc_request.data),
context,
)
) as events:
async for event in events:
yield event

async def get_task(

Check notice on line 110 in src/a2a/client/transports/jsonrpc.py

View workflow job for this annotation

GitHub Actions / Lint Code Base

Copy/pasted code

see src/a2a/client/transports/jsonrpc.py (248-261)
self,
request: GetTaskRequest,
*,
Expand Down Expand Up @@ -241,17 +245,20 @@
) -> AsyncGenerator[StreamResponse]:
"""Reconnects to get task updates."""
rpc_request = JSONRPC20Request(
method='SubscribeToTask',
params=json_format.MessageToDict(request),
_id=str(uuid4()),
)
async for event in self._send_stream_request(
dict(rpc_request.data),
context,
):
yield event
async with aclosing(
self._send_stream_request(
dict(rpc_request.data),
context,
)
) as events:
async for event in events:
yield event

async def get_extended_agent_card(

Check notice on line 261 in src/a2a/client/transports/jsonrpc.py

View workflow job for this annotation

GitHub Actions / Lint Code Base

Copy/pasted code

see src/a2a/client/transports/jsonrpc.py (97-110)
self,
request: GetExtendedAgentCardRequest,
*,
Expand Down Expand Up @@ -364,26 +371,29 @@
) -> AsyncGenerator[StreamResponse]:
http_kwargs = get_http_args(context)

async for sse_data in send_http_stream_request(
self.httpx_client,
'POST',
self.url,
None,
self._handle_sse_error,
json=rpc_request_payload,
**http_kwargs,
):
try:
response_data = json.loads(sse_data)
except json.JSONDecodeError as e:
raise A2AClientError(
f'Invalid JSON-RPC response in SSE stream: {e}'
) from e
response_data = self._check_jsonrpc_response(response_data)
response: StreamResponse = parse_lenient(
response_data['result'], StreamResponse()
async with aclosing(
send_http_stream_request(
self.httpx_client,
'POST',
self.url,
None,
self._handle_sse_error,
json=rpc_request_payload,
**http_kwargs,
)
yield response
) as data:
async for sse_data in data:
try:
response_data = json.loads(sse_data)
except json.JSONDecodeError as e:
raise A2AClientError(
f'Invalid JSON-RPC response in SSE stream: {e}'
) from e
response_data = self._check_jsonrpc_response(response_data)
response: StreamResponse = parse_lenient(
response_data['result'], StreamResponse()
)
yield response

def _handle_sse_error(self, sse_data: str) -> NoReturn:
"""Handles SSE error events by parsing JSON-RPC error payload and raising the appropriate domain error."""
Expand Down
68 changes: 40 additions & 28 deletions src/a2a/client/transports/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import logging

from collections.abc import AsyncGenerator
from contextlib import aclosing
from typing import Any, NoReturn
from urllib.parse import quote

Expand Down Expand Up @@ -142,14 +143,17 @@ async def send_message_streaming(
"""Sends a streaming message request to the agent and yields responses as they arrive."""
payload = MessageToDict(request)

async for event in self._send_stream_request(
'POST',
'/message:stream',
request.tenant,
context=context,
json=payload,
):
yield event
async with aclosing(
self._send_stream_request(
'POST',
'/message:stream',
request.tenant,
context=context,
json=payload,
)
) as events:
async for event in events:
yield event

async def get_task(
self,
Expand Down Expand Up @@ -327,13 +331,16 @@ async def subscribe(
context: ClientCallContext | None = None,
) -> AsyncGenerator[StreamResponse]:
"""Reconnects to get task updates."""
async for event in self._send_stream_request(
'POST',
f'/tasks/{_quote_id(request.id)}:subscribe',
request.tenant,
context=context,
):
yield event
async with aclosing(
self._send_stream_request(
'POST',
f'/tasks/{_quote_id(request.id)}:subscribe',
request.tenant,
context=context,
)
) as events:
async for event in events:
yield event

async def get_extended_agent_card(
self,
Expand Down Expand Up @@ -409,19 +416,24 @@ async def _send_stream_request(
path = self._get_path(target, tenant)
http_kwargs = get_http_args(context)

async for sse_data in send_http_stream_request(
self.httpx_client,
method,
f'{self.url}{path}',
self._handle_http_error,
self._handle_sse_error,
json=json,
**http_kwargs,
):
event: StreamResponse = parse_lenient(sse_data, StreamResponse())
if event.WhichOneof('payload') is None:
self._raise_in_band_error(sse_data)
yield event
async with aclosing(
send_http_stream_request(
self.httpx_client,
method,
f'{self.url}{path}',
self._handle_http_error,
self._handle_sse_error,
json=json,
**http_kwargs,
)
) as data:
async for sse_data in data:
event: StreamResponse = parse_lenient(
sse_data, StreamResponse()
)
if event.WhichOneof('payload') is None:
self._raise_in_band_error(sse_data)
yield event

def _raise_in_band_error(self, sse_data: str) -> None:
"""Raises the error carried by a data event, if it carries one.
Expand Down
17 changes: 11 additions & 6 deletions src/a2a/client/transports/tenant_decorator.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import copy

from collections.abc import AsyncGenerator
from contextlib import aclosing

from a2a.client.client import ClientCallContext
from a2a.client.transports.base import ClientTransport
Expand Down Expand Up @@ -59,10 +60,11 @@ async def send_message_streaming(
"""Sends a streaming message request to the agent and yields responses."""
request = copy.deepcopy(request)
request.tenant = self._resolve_tenant(request.tenant)
async for event in self._base.send_message_streaming(
request, context=context
):
yield event
async with aclosing(
self._base.send_message_streaming(request, context=context)
) as events:
async for event in events:
yield event

async def get_task(
self,
Expand Down Expand Up @@ -158,8 +160,11 @@ async def subscribe(
"""Reconnects to get task updates."""
request = copy.deepcopy(request)
request.tenant = self._resolve_tenant(request.tenant)
async for event in self._base.subscribe(request, context=context):
yield event
async with aclosing(
self._base.subscribe(request, context=context)
) as events:
async for event in events:
yield event

async def get_extended_agent_card(
self,
Expand Down
Loading
Loading