new ToolCall class

Author: CharlesDuboisSAP

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

@@ -3,7 +3,6 @@
 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;
 import lombok.Getter;
@@ -24,16 +23,6 @@ public final class AssistantMessage implements Message {
   /** Tool call if there is any. */
   @Nullable List<ToolCall> toolCalls = null;
 
-  /**
-   * Represents a tool call.
-   *
-   * @param id call id
-   * @param type "function" or "tool"
-   * @param name the name of the function to call
-   * @param arguments the arguments to pass to the function
-   */
-  public record ToolCall(String id, String type, String name, String arguments) {}
-
   /**
    * Creates a new assistant message with the given text content.
    *
@@ -57,20 +46,12 @@ public AssistantMessage(@Nonnull final List<ToolCall> toolCalls) {
   @Override
   public ChatMessage createChatMessage() {
     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();
-
       // content shouldn't be required for tool calls 🤷
       val message = SingleChatMessage.create().role(role).content("");
-      message.setCustomField("tool_calls", toolCallList);
+
+      val maps = toolCalls().stream().map(ToolCall::map).toList();
+      message.setCustomField("tool_calls", maps);
+
       return message;
     }
     return Message.super.createChatMessage();

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

@@ -0,0 +1,44 @@
+package com.sap.ai.sdk.orchestration;
+
+import com.google.common.annotations.Beta;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.val;
+
+/**
+ * Represents a tool call.
+ *
+ * @since 1.3.0
+ */
+@NoArgsConstructor(onConstructor_ = @Beta)
+@Accessors(fluent = true)
+@Getter
+@Setter
+public class ToolCall {
+  /** call id */
+  private String id;
+
+  /** "function" or "tool" */
+  private String type;
+
+  /** the name of the function to call */
+  private String name;
+
+  /** the arguments to pass to the function */
+  private String arguments;
+
+  /**
+   * Creates a Map representation of the tool call.
+   *
+   * @return a Map representation of the tool call.
+   */
+  @Nonnull
+  public Map<String, Object> map() {
+    val function = Map.of("name", name, "arguments", arguments);
+    return Map.of("id", id, "type", type, type, function);
+  }
+}

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

@@ -6,7 +6,11 @@
 import lombok.Value;
 import lombok.experimental.Accessors;
 
-/** Represents a chat message as 'tool' to the orchestration service. */
+/**
+ * Represents a chat message as 'tool' to the orchestration service.
+ *
+ * @since 1.3.0
+ */
 @Value
 @Accessors(fluent = true)
 public class ToolMessage implements Message {

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

@@ -8,6 +8,7 @@
 import com.sap.ai.sdk.orchestration.OrchestrationClient;
 import com.sap.ai.sdk.orchestration.OrchestrationPrompt;
 import com.sap.ai.sdk.orchestration.SystemMessage;
+import com.sap.ai.sdk.orchestration.ToolCall;
 import com.sap.ai.sdk.orchestration.ToolMessage;
 import com.sap.ai.sdk.orchestration.UserMessage;
 import java.util.List;
@@ -17,7 +18,6 @@
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import org.springframework.ai.chat.messages.AssistantMessage.ToolCall;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.ToolResponseMessage;
 import org.springframework.ai.chat.model.AbstractToolCallSupport;
@@ -131,20 +131,20 @@ private static com.sap.ai.sdk.orchestration.Message[] toOrchestrationMessages(
               case USER:
                 yield List.of(new UserMessage(msg.getText()));
               case ASSISTANT:
-                final List<ToolCall> toolCalls =
+                val springToolCalls =
                     ((org.springframework.ai.chat.messages.AssistantMessage) msg).getToolCalls();
-                if (toolCalls != null) {
-                  final List<AssistantMessage.ToolCall> toolCallList =
-                      toolCalls.stream()
+                if (springToolCalls != null) {
+                  final List<ToolCall> sdkToolCalls =
+                      springToolCalls.stream()
                           .map(
                               toolCall ->
-                                  new AssistantMessage.ToolCall(
-                                      toolCall.id(),
-                                      toolCall.type(),
-                                      toolCall.name(),
-                                      toolCall.arguments()))
+                                  new ToolCall()
+                                      .id(toolCall.id())
+                                      .type(toolCall.type())
+                                      .name(toolCall.name())
+                                      .arguments(toolCall.arguments()))
                           .toList();
-                  yield List.of(new AssistantMessage(toolCallList));
+                  yield List.of(new AssistantMessage(sdkToolCalls));
                 }
                 yield List.of(new AssistantMessage(msg.getText()));
               case TOOL: