Merge "Client refactoring and other fixes" into main

Author: kthota-g

.vscode/launch.json

@@ -0,0 +1,41 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug HelloWorld Agent",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/examples/helloworld/__main__.py",
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}",
+            },
+            "cwd": "${workspaceFolder}/examples/helloworld",
+            "args": [
+                "--host",
+                "localhost",
+                "--port",
+                "9999"
+            ]
+        },
+        {
+            "name": "Debug Currency Agent",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/examples/langgraph/__main__.py",
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}",
+            },
+            "cwd": "${workspaceFolder}/examples/langgraph",
+            "args": [
+                "--host",
+                "localhost",
+                "--port",
+                "10000"
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -9,7 +9,7 @@
         "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnSave": true,
         "editor.codeActionsOnSave": {
-            "source.organizeImports": "true"
+            "source.organizeImports": "always"
         },
     },
     "ruff.importStrategy": "fromEnvironment"

examples/helloworld/__main__.py

@@ -1,8 +1,8 @@
 from agent_executor import HelloWorldAgentExecutor
 
+from a2a.server.apps import A2AStarletteApplication
 from a2a.server.request_handlers import DefaultRequestHandler
 from a2a.server.tasks import InMemoryTaskStore
-from a2a.server.apps import A2AStarletteApplication
 from a2a.types import (
     AgentAuthentication,
     AgentCapabilities,

examples/helloworld/test_client.py

@@ -2,7 +2,11 @@
 from typing import Any
 import httpx
 from uuid import uuid4
-from a2a.types import SendMessageSuccessResponse, Task
+from a2a.types import (
+    SendMessageRequest,
+    MessageSendParams,
+    SendStreamingMessageRequest,
+)
 
 
 async def main() -> None:
@@ -19,31 +23,18 @@ async def main() -> None:
                 'messageId': uuid4().hex,
             },
         }
+        request = SendMessageRequest(
+            params=MessageSendParams(**send_message_payload)
+        )
 
-        response = await client.send_message(payload=send_message_payload)
+        response = await client.send_message(request)
         print(response.model_dump(mode='json', exclude_none=True))
 
-        if isinstance(response.root, SendMessageSuccessResponse) and isinstance(
-            response.root.result, Task
-        ):
-            task_id: str = response.root.result.id
-            get_task_payload = {'id': task_id}
-            get_response = await client.get_task(payload=get_task_payload)
-            print(get_response.model_dump(mode='json', exclude_none=True))
-
-            cancel_task_payload = {'id': task_id}
-            cancel_response = await client.cancel_task(
-                payload=cancel_task_payload
-            )
-            print(cancel_response.model_dump(mode='json', exclude_none=True))
-        else:
-            print(
-                'Received an instance of Message, getTask and cancelTask are not applicable for invocation'
-            )
-
-        stream_response = client.send_message_streaming(
-            payload=send_message_payload
+        streaming_request = SendStreamingMessageRequest(
+            params=MessageSendParams(**send_message_payload)
         )
+
+        stream_response = client.send_message_streaming(streaming_request)
         async for chunk in stream_response:
             print(chunk.model_dump(mode='json', exclude_none=True))
 

examples/langgraph/__main__.py

@@ -7,10 +7,9 @@
 from agent_executor import CurrencyAgentExecutor
 from dotenv import load_dotenv
 
-
+from a2a.server.apps import A2AStarletteApplication
 from a2a.server.request_handlers import DefaultRequestHandler
 from a2a.server.tasks import InMemoryTaskStore
-from a2a.server.apps import A2AStarletteApplication
 from a2a.types import (
     AgentAuthentication,
     AgentCapabilities,

examples/langgraph/test_client.py

@@ -7,6 +7,11 @@
     SendMessageSuccessResponse,
     Task,
     TaskState,
+    SendMessageRequest,
+    MessageSendParams,
+    GetTaskRequest,
+    TaskQueryParams,
+    SendStreamingMessageRequest,
 )
 import httpx
 import traceback
@@ -49,10 +54,11 @@ async def run_single_turn_test(client: A2AClient) -> None:
     send_payload = create_send_message_payload(
         text='how much is 100 USD in CAD?'
     )
+    request = SendMessageRequest(params=MessageSendParams(**send_payload))
+
+    print('--- Single Turn Request ---')
     # Send Message
-    send_response: SendMessageResponse = await client.send_message(
-        payload=send_payload
-    )
+    send_response: SendMessageResponse = await client.send_message(request)
     print_json_response(send_response, 'Single Turn Request Response')
     if not isinstance(send_response.root, SendMessageSuccessResponse):
         print('received non-success response. Aborting get task ')
@@ -66,9 +72,8 @@ async def run_single_turn_test(client: A2AClient) -> None:
     print('---Query Task---')
     # query the task
     task_id_payload = {'id': task_id}
-    get_response: GetTaskResponse = await client.get_task(
-        payload=task_id_payload
-    )
+    get_request = GetTaskRequest(params=TaskQueryParams(**task_id_payload))
+    get_response: GetTaskResponse = await client.get_task(get_request)
     print_json_response(get_response, 'Query Task Response')
 
 
@@ -79,8 +84,12 @@ async def run_streaming_test(client: A2AClient) -> None:
         text='how much is 50 EUR in JPY?'
     )
 
+    request = SendStreamingMessageRequest(
+        params=MessageSendParams(**send_payload)
+    )
+
     print('--- Single Turn Streaming Request ---')
-    stream_response = client.send_message_streaming(payload=send_payload)
+    stream_response = client.send_message_streaming(request)
     async for chunk in stream_response:
         print_json_response(chunk, 'Streaming Chunk')
 
@@ -93,8 +102,11 @@ async def run_multi_turn_test(client: A2AClient) -> None:
     first_turn_payload = create_send_message_payload(
         text='how much is 100 USD?'
     )
+    request1 = SendMessageRequest(
+        params=MessageSendParams(**first_turn_payload)
+    )
     first_turn_response: SendMessageResponse = await client.send_message(
-        payload=first_turn_payload
+        request1
     )
     print_json_response(first_turn_response, 'Multi-Turn: First Turn Response')
 
@@ -111,9 +123,10 @@ async def run_multi_turn_test(client: A2AClient) -> None:
             second_turn_payload = create_send_message_payload(
                 'in GBP', task.id, context_id
             )
-            second_turn_response = await client.send_message(
-                payload=second_turn_payload
+            request2 = SendMessageRequest(
+                params=MessageSendParams(**second_turn_payload)
             )
+            second_turn_response = await client.send_message(request2)
             print_json_response(
                 second_turn_response, 'Multi-Turn: Second Turn Response'
             )

src/a2a/client/__init__.py

@@ -1,4 +1,17 @@
 from a2a.client.client import A2ACardResolver, A2AClient
+from a2a.client.errors import (
+    A2AClientError,
+    A2AClientHTTPError,
+    A2AClientJSONError,
+)
+from a2a.client.helpers import create_text_message_object
 
 
-__all__ = ['A2ACardResolver', 'A2AClient']
+__all__ = [
+    'A2ACardResolver',
+    'A2AClient',
+    'A2AClientError',
+    'A2AClientHTTPError',
+    'A2AClientJSONError',
+    'create_text_message_object',
+]