List of tool calls supported

Author: CharlesDuboisSAP

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

@@ -2,6 +2,7 @@
 
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
+import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -21,7 +22,7 @@ public final class AssistantMessage implements Message {
   @Nonnull String content;
 
   /** Tool call if there is any. */
-  @Nullable ToolCall toolCall = null;
+  @Nullable List<ToolCall> toolCalls = null;
 
   /**
    * Represents a tool call.
@@ -43,24 +44,33 @@ public AssistantMessage(@Nonnull final String content) {
   }
 
   /**
-   * Creates a new assistant message with the given tool call.
+   * Creates a new assistant message with the given tool calls.
    *
-   * @param toolCall the tool call object
+   * @param toolCalls list of tool call objects
    */
-  public AssistantMessage(@Nonnull final ToolCall toolCall) {
+  public AssistantMessage(@Nonnull final List<ToolCall> toolCalls) {
     content = "";
-    this.toolCall = toolCall;
+    this.toolCalls = toolCalls;
   }
 
   @Nonnull
   @Override
   public ChatMessage createChatMessage() {
-    if (toolCall() != null) {
-      val function = Map.of("name", toolCall().name(), "arguments", toolCall().arguments());
-      val toolCallMap = Map.of("id", toolCall().id(), toolCall().type(), function);
+    if (toolCalls() != null) {
+      final List<Map<String, Object>> toolCallList =
+          toolCalls().stream()
+              .map(
+                  toolCall -> {
+                    val function =
+                        Map.of("name", toolCall.name(), "arguments", toolCall.arguments());
+                    return Map.of(
+                        "id", toolCall.id(), "type", toolCall.type(), toolCall.type(), function);
+                  })
+              .toList();
 
-      val message = SingleChatMessage.create().role(role).content(""); // content shouldn't be set
-      message.setCustomField("tool_calls", toolCallMap);
+      // content shouldn't be required for tool calls 🤷
+      val message = SingleChatMessage.create().role(role).content("");
+      message.setCustomField("tool_calls", toolCallList);
       return message;
     }
     return Message.super.createChatMessage();

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

@@ -123,28 +123,42 @@ private OrchestrationPrompt toOrchestrationPrompt(@Nonnull final Prompt prompt)
   @Nonnull
   private static com.sap.ai.sdk.orchestration.Message[] toOrchestrationMessages(
       @Nonnull final List<Message> messages) {
-    final Function<Message, com.sap.ai.sdk.orchestration.Message> mapper =
+    final Function<Message, List<com.sap.ai.sdk.orchestration.Message>> mapper =
         msg ->
             switch (msg.getMessageType()) {
               case SYSTEM:
-                yield new SystemMessage(msg.getText());
+                yield List.of(new SystemMessage(msg.getText()));
               case USER:
-                yield new UserMessage(msg.getText());
+                yield List.of(new UserMessage(msg.getText()));
               case ASSISTANT:
                 final List<ToolCall> toolCalls =
                     ((org.springframework.ai.chat.messages.AssistantMessage) msg).getToolCalls();
                 if (toolCalls != null) {
-                  val toolCall = toolCalls.get(0);
-                  yield new AssistantMessage(
-                      new AssistantMessage.ToolCall(
-                          toolCall.id(), toolCall.type(), toolCall.name(), toolCall.arguments()));
+                  final List<AssistantMessage.ToolCall> toolCallList =
+                      toolCalls.stream()
+                          .map(
+                              toolCall ->
+                                  new AssistantMessage.ToolCall(
+                                      toolCall.id(),
+                                      toolCall.type(),
+                                      toolCall.name(),
+                                      toolCall.arguments()))
+                          .toList();
+                  yield List.of(new AssistantMessage(toolCallList));
                 }
-                yield new AssistantMessage(msg.getText());
+                yield List.of(new AssistantMessage(msg.getText()));
               case TOOL:
-                val responses = ((ToolResponseMessage) msg).getResponses();
-                val response = responses.get(0);
-                yield new ToolMessage(response.id(), response.responseData());
+                val toolResponses = ((ToolResponseMessage) msg).getResponses();
+                yield toolResponses.stream()
+                    .map(
+                        r ->
+                            (com.sap.ai.sdk.orchestration.Message)
+                                new ToolMessage(r.id(), r.responseData()))
+                    .toList();
             };
-    return messages.stream().map(mapper).toArray(com.sap.ai.sdk.orchestration.Message[]::new);
+    return messages.stream()
+        .map(mapper)
+        .flatMap(List::stream)
+        .toArray(com.sap.ai.sdk.orchestration.Message[]::new);
   }
 }

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java

@@ -42,7 +42,7 @@ public ChatResponse completion() {
                 .description("Get the weather in location") // (2) function description
                 .inputType(MockWeatherService.Request.class) // (3) function input type
                 .build()));
-    val prompt = new Prompt("What is the weather in Potsdam?", defaultOptions);
+    val prompt = new Prompt("What is the weather in Potsdam and in Toulouse?", defaultOptions);
 
     return client.call(prompt);
   }