withToolCalls

Author: CharlesDuboisSAP

orchestration/src/main/java/com/sap/ai/sdk/orchestration/AssistantMessage.java

@@ -8,6 +8,7 @@
 import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.MessageToolCall;
 import com.sap.ai.sdk.orchestration.model.TextContent;
+import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -57,23 +58,32 @@ public AssistantMessage(@Nonnull final String singleMessage) {
    * Creates a new assistant message with the given tool calls.
    *
    * @param toolCalls list of tool call objects
+   * @deprecated Please use {@link #withToolCalls(List)} instead.
    */
+  @Deprecated
   public AssistantMessage(@Nonnull final List<MessageToolCall> toolCalls) {
     content = new MessageContent(List.of());
     this.toolCalls = toolCalls;
   }
 
+  private AssistantMessage(
+      @Nonnull final MessageContent content, @Nullable final List<MessageToolCall> toolCalls) {
+    this.content = content;
+    this.toolCalls = toolCalls;
+  }
+
   /**
-   * Creates a new assistant message with the given message and tool calls.
+   * Returns a new AssistantMessage instance with the provided tool calls added to the existing
+   * ones.
    *
-   * @param singleMessage the message content.
-   * @param toolCalls list of tool call objects
-   * @since 1.11.0
+   * @param toolCalls the list of tool calls to add.
+   * @return a new AssistantMessage instance with the combined tool calls.
    */
-  public AssistantMessage(
-      @Nonnull final String singleMessage, @Nullable final List<MessageToolCall> toolCalls) {
-    this.content = new MessageContent(List.of(new TextItem(singleMessage)));
-    this.toolCalls = toolCalls;
+  @Nonnull
+  public AssistantMessage withToolCalls(@Nonnull final List<MessageToolCall> toolCalls) {
+    val newToolcalls = new ArrayList<>(this.toolCalls != null ? this.toolCalls : List.of());
+    newToolcalls.addAll(toolCalls);
+    return new AssistantMessage(this.content, newToolcalls);
   }
 
   @Nonnull

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModel.java

@@ -126,16 +126,17 @@ private static com.sap.ai.sdk.orchestration.Message[] toOrchestrationMessages(
               case USER:
                 yield List.of(new UserMessage(msg.getText()));
               case ASSISTANT:
+                val assistantMessage = new AssistantMessage(msg.getText());
                 val springToolCalls =
                     ((org.springframework.ai.chat.messages.AssistantMessage) msg).getToolCalls();
                 if (springToolCalls != null && !springToolCalls.isEmpty()) {
                   final List<MessageToolCall> sdkToolCalls =
                       springToolCalls.stream()
                           .map(OrchestrationChatModel::toOrchestrationToolCall)
                           .toList();
-                  yield List.of(new AssistantMessage(msg.getText(), sdkToolCalls));
+                  yield List.of(assistantMessage.withToolCalls(sdkToolCalls));
                 }
-                yield List.of(new AssistantMessage(msg.getText()));
+                yield List.of(assistantMessage);
               case TOOL:
                 val toolResponses = ((ToolResponseMessage) msg).getResponses();
                 yield toolResponses.stream()