feat: Move the sendMessage with a MessageSendParams to the AbstractClient

jmesnil · jmesnil · commit 8c34bf589007 · 2026-02-17T17:56:58.000+01:00
and made it public. Thought it might not be widely used, it allows full control of the parameters sent by the request (including the tenant). This fixes #663 Signed-off-by: Jeff Mesnil <jmesnil@ibm.com>
diff --git a/client/base/src/main/java/io/a2a/client/AbstractClient.java b/client/base/src/main/java/io/a2a/client/AbstractClient.java
@@ -17,6 +17,7 @@
 import io.a2a.spec.ListTaskPushNotificationConfigResult;
 import io.a2a.spec.ListTasksParams;
 import io.a2a.spec.Message;
+import io.a2a.spec.MessageSendParams;
 import io.a2a.spec.PushNotificationConfig;
 import io.a2a.spec.Task;
 import io.a2a.spec.TaskIdParams;
@@ -160,6 +161,26 @@ public abstract void sendMessage(@NonNull Message request,
                                      @Nullable Map<String, Object> metadata,
                                      @Nullable ClientCallContext context) throws A2AClientException;
 
+    /**
+     * Send a message to the remote agent. This method will automatically use
+     * the streaming or non-streaming approach as determined by the server's
+     * agent card and the client configuration. The specified client consumers
+     * will be used to handle messages, tasks, and update events received
+     * from the remote agent. The specified streaming error handler will be used
+     * if an error occurs during streaming. The configured client push notification
+     * configuration will get used for streaming.
+     *
+     * @param params the request parameters
+     * @param consumers a list of consumers to pass responses from the remote agent to
+     * @param streamingErrorHandler an error handler that should be used for the streaming case if an error occurs
+     * @param context optional client call context for the request
+     * @throws A2AClientException if sending the message fails for any reason
+     */
+    public abstract void sendMessage(@NonNull MessageSendParams params,
+                                     @NonNull List<BiConsumer<ClientEvent, AgentCard>> consumers,
+                                     @Nullable Consumer<Throwable> streamingErrorHandler,
+                                     @Nullable ClientCallContext context) throws A2AClientException;
+
     /**
      * Retrieve the current state and history of a specific task.
      *
diff --git a/client/base/src/main/java/io/a2a/client/Client.java b/client/base/src/main/java/io/a2a/client/Client.java
@@ -234,7 +234,13 @@ public void sendMessage(@NonNull Message request,
                             @NonNull List<BiConsumer<ClientEvent, AgentCard>> consumers,
                             @Nullable Consumer<Throwable> streamingErrorHandler,
                             @Nullable ClientCallContext context) throws A2AClientException {
-        MessageSendParams messageSendParams = getMessageSendParams(request, clientConfig);
+        MessageSendConfiguration messageSendConfiguration = createMessageSendConfiguration(clientConfig.getPushNotificationConfig());
+
+        MessageSendParams messageSendParams = MessageSendParams.builder()
+                .message(request)
+                .configuration(messageSendConfiguration)
+                .metadata(clientConfig.getMetadata())
+                .build();
         sendMessage(messageSendParams, consumers, streamingErrorHandler, context);
     }
 
@@ -289,7 +295,6 @@ public void sendMessage(@NonNull Message request,
                             @Nullable Map<String, Object> metadata,
                             @Nullable ClientCallContext context) throws A2AClientException {
         MessageSendConfiguration messageSendConfiguration = createMessageSendConfiguration(pushNotificationConfiguration);
-
         MessageSendParams messageSendParams = MessageSendParams.builder()
                 .message(request)
                 .configuration(messageSendConfiguration)
@@ -299,6 +304,37 @@ public void sendMessage(@NonNull Message request,
         sendMessage(messageSendParams, consumers, streamingErrorHandler, context);
     }
 
+    @Override
+    public void sendMessage(@NonNull MessageSendParams messageSendParams,
+                            @NonNull List<BiConsumer<ClientEvent, AgentCard>> consumers,
+                            @Nullable Consumer<Throwable> streamingErrorHandler,
+                            @Nullable ClientCallContext context) throws A2AClientException {
+        if (! clientConfig.isStreaming() || ! agentCard.capabilities().streaming()) {
+            EventKind eventKind = clientTransport.sendMessage(messageSendParams, context);
+            ClientEvent clientEvent;
+            if (eventKind instanceof Task task) {
+                clientEvent = new TaskEvent(task);
+            } else {
+                // must be a message
+                clientEvent = new MessageEvent((Message) eventKind);
+            }
+            consume(clientEvent, agentCard, consumers);
+        } else {
+            ClientTaskManager tracker = new ClientTaskManager();
+            Consumer<Throwable> overriddenErrorHandler = getOverriddenErrorHandler(streamingErrorHandler);
+            Consumer<StreamingEventKind> eventHandler = event -> {
+                try {
+                    ClientEvent clientEvent = getClientEvent(event, tracker);
+                    consume(clientEvent, agentCard, consumers);
+                } catch (A2AClientError e) {
+                    overriddenErrorHandler.accept(e);
+                }
+            };
+            clientTransport.sendMessageStreaming(messageSendParams, eventHandler, overriddenErrorHandler, context);
+        }
+    }
+
+
     /**
      * Retrieve a specific task by ID.
      * <p>
@@ -666,33 +702,6 @@ private MessageSendConfiguration createMessageSendConfiguration(@Nullable PushNo
                 .build();
     }
 
-    private void sendMessage(@NonNull MessageSendParams messageSendParams, @NonNull List<BiConsumer<ClientEvent, AgentCard>> consumers,
-                             @Nullable Consumer<Throwable> errorHandler, @Nullable ClientCallContext context) throws A2AClientException {
-        if (! clientConfig.isStreaming() || ! agentCard.capabilities().streaming()) {
-            EventKind eventKind = clientTransport.sendMessage(messageSendParams, context);
-            ClientEvent clientEvent;
-            if (eventKind instanceof Task task) {
-                clientEvent = new TaskEvent(task);
-            } else {
-                // must be a message
-                clientEvent = new MessageEvent((Message) eventKind);
-            }
-            consume(clientEvent, agentCard, consumers);
-        } else {
-            ClientTaskManager tracker = new ClientTaskManager();
-            Consumer<Throwable> overriddenErrorHandler = getOverriddenErrorHandler(errorHandler);
-            Consumer<StreamingEventKind> eventHandler = event -> {
-                try {
-                    ClientEvent clientEvent = getClientEvent(event, tracker);
-                    consume(clientEvent, agentCard, consumers);
-                } catch (A2AClientError e) {
-                    overriddenErrorHandler.accept(e);
-                }
-            };
-            clientTransport.sendMessageStreaming(messageSendParams, eventHandler, overriddenErrorHandler, context);
-        }
-    }
-
     private @NonNull Consumer<Throwable> getOverriddenErrorHandler(@Nullable Consumer<Throwable> errorHandler) {
         return e -> {
             if (errorHandler != null) {
@@ -710,14 +719,4 @@ private void consume(ClientEvent clientEvent, AgentCard agentCard, @NonNull List
             consumer.accept(clientEvent, agentCard);
         }
     }
-
-    private MessageSendParams getMessageSendParams(Message request, ClientConfig clientConfig) {
-        MessageSendConfiguration messageSendConfiguration = createMessageSendConfiguration(clientConfig.getPushNotificationConfig());
-
-        return MessageSendParams.builder()
-                .message(request)
-                .configuration(messageSendConfiguration)
-                .metadata(clientConfig.getMetadata())
-                .build();
-    }
 }
