Reset client changes

Author: holtskinner

src/a2a/client/client.py

@@ -1,54 +1,35 @@
 import json
 import logging
+
 from collections.abc import AsyncGenerator
 from typing import Any
 from uuid import uuid4
 
 import httpx
+
 from httpx_sse import SSEError, aconnect_sse
 from pydantic import ValidationError
 
 from a2a.client.errors import A2AClientHTTPError, A2AClientJSONError
-from a2a.types import (AgentCard, CancelTaskRequest, CancelTaskResponse,
-                       GetTaskPushNotificationConfigRequest,
-                       GetTaskPushNotificationConfigResponse, GetTaskRequest,
-                       GetTaskResponse, SendMessageRequest,
-                       SendMessageResponse, SendStreamingMessageRequest,
-                       SendStreamingMessageResponse,
-                       SetTaskPushNotificationConfigRequest,
-                       SetTaskPushNotificationConfigResponse)
+from a2a.types import (
+    AgentCard,
+    CancelTaskRequest,
+    CancelTaskResponse,
+    GetTaskPushNotificationConfigRequest,
+    GetTaskPushNotificationConfigResponse,
+    GetTaskRequest,
+    GetTaskResponse,
+    SendMessageRequest,
+    SendMessageResponse,
+    SendStreamingMessageRequest,
+    SendStreamingMessageResponse,
+    SetTaskPushNotificationConfigRequest,
+    SetTaskPushNotificationConfigResponse,
+)
 from a2a.utils.telemetry import SpanKind, trace_class
 
-logger = logging.getLogger(__name__)
 
-async def _make_httpx_request(
-    client: httpx.AsyncClient,
-    method: str,
-    url: str,
-    json_payload: dict[str, Any] | None = None,
-    http_kwargs: dict[str, Any] | None = None,
-) -> dict[str, Any]:
-    """Makes an HTTP request and handles common errors, returning parsed JSON."""
-    try:
-        if method.upper() == 'GET':
-            response = await client.get(url, **(http_kwargs or {}))
-        elif method.upper() == 'POST':
-            response = await client.post(
-                url, json=json_payload, **(http_kwargs or {})
-            )
-        else:
-            raise ValueError(f'Unsupported HTTP method: {method}')
-
-        response.raise_for_status()
-        return response.json()
-    except httpx.HTTPStatusError as e:
-        raise A2AClientHTTPError(e.response.status_code, str(e)) from e
-    except json.JSONDecodeError as e:
-        raise A2AClientJSONError(str(e)) from e
-    except httpx.RequestError as e:
-        raise A2AClientHTTPError(
-            503, f'Network communication error: {e}'
-        ) from e
+logger = logging.getLogger(__name__)
 
 
 class A2ACardResolver:
@@ -135,6 +116,7 @@ async def get_agent_card(
             raise A2AClientJSONError(
                 f'Failed to validate agent card structure from {target_url}: {e.json()}'
             ) from e
+
         return agent_card
 
 
@@ -189,6 +171,7 @@ async def get_client_from_agent_card_url(
             agent_card_path: The path to the agent card endpoint, relative to the base URL.
             http_kwargs: Optional dictionary of keyword arguments to pass to the
                 underlying httpx.get request when fetching the agent card.
+
         Returns:
             An initialized `A2AClient` instance.
 
@@ -198,7 +181,9 @@ async def get_client_from_agent_card_url(
         """
         agent_card: AgentCard = await A2ACardResolver(
             httpx_client, base_url=base_url, agent_card_path=agent_card_path
-        ).get_agent_card(http_kwargs=http_kwargs) # Fetches public card by default
+        ).get_agent_card(
+            http_kwargs=http_kwargs
+        )  # Fetches public card by default
         return A2AClient(httpx_client=httpx_client, agent_card=agent_card)
 
     async def send_message(
@@ -304,13 +289,20 @@ async def _send_request(
             A2AClientHTTPError: If an HTTP error occurs during the request.
             A2AClientJSONError: If the response body cannot be decoded as JSON.
         """
-        return await _make_httpx_request(
-            client=self.httpx_client,
-            method='POST',
-            url=self.url,
-            json_payload=rpc_request_payload,
-            http_kwargs=http_kwargs,
-        )
+        try:
+            response = await self.httpx_client.post(
+                self.url, json=rpc_request_payload, **(http_kwargs or {})
+            )
+            response.raise_for_status()
+            return response.json()
+        except httpx.HTTPStatusError as e:
+            raise A2AClientHTTPError(e.response.status_code, str(e)) from e
+        except json.JSONDecodeError as e:
+            raise A2AClientJSONError(str(e)) from e
+        except httpx.RequestError as e:
+            raise A2AClientHTTPError(
+                503, f'Network communication error: {e}'
+            ) from e
 
     async def get_task(
         self,