Best effort

Author: CharlesDuboisSAP

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

@@ -1,17 +1,55 @@
 package com.sap.ai.sdk.orchestration;
 
+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 lombok.Value;
+import javax.annotation.Nullable;
+import lombok.Getter;
 import lombok.experimental.Accessors;
+import org.springframework.ai.chat.messages.AssistantMessage.ToolCall;
 
 /** Represents a chat message as 'assistant' to the orchestration service. */
-@Value
+@Getter
 @Accessors(fluent = true)
-public class AssistantMessage implements Message {
+public final class AssistantMessage implements Message {
 
   /** The role of the assistant. */
   @Nonnull String role = "assistant";
 
   /** The content of the message. */
   @Nonnull String content;
+
+  @Nullable ToolCall toolCalls = null;
+
+  public AssistantMessage(@Nonnull final String content) {
+    this.content = content;
+  }
+
+  public AssistantMessage(@Nonnull final List<ToolCall> toolCalls) {
+    content = "";
+    this.toolCalls = toolCalls.get(0);
+  }
+
+  @Nonnull
+  @Override
+  public ChatMessage createChatMessage() {
+    if (toolCalls != null) {
+      final SingleChatMessage message = SingleChatMessage.create().role(role).content(null);
+      Map<String, String> map =
+          Map.of(
+              "id",
+              toolCalls().id(),
+              "name",
+              toolCalls().name(),
+              "type",
+              toolCalls().type(),
+              "arguments",
+              toolCalls().arguments());
+      message.setCustomField("tool_calls", map);
+      return message;
+    }
+    return Message.super.createChatMessage();
+  }
 }

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

@@ -1,29 +1,28 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.sap.ai.sdk.orchestration.model.ChatMessage;
+import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
+import javax.annotation.Nonnull;
 import lombok.Value;
 import lombok.experimental.Accessors;
-import org.springframework.ai.chat.messages.ToolResponseMessage;
-
-import javax.annotation.Nonnull;
 
-/** Represents a chat message as 'system' to the orchestration service. */
+/** Represents a chat message as 'tool' to the orchestration service. */
 @Value
 @Accessors(fluent = true)
 public class ToolMessage implements Message {
 
   /** The role of the assistant. */
-  @Nonnull
-  String role = "tool";
+  @Nonnull String role = "tool";
 
-  /** The content of the message. */
-  @Nonnull
-  ToolResponseMessage message;
+  @Nonnull String id;
+
+  @Nonnull String content;
 
   @Nonnull
   @Override
-  public String content()
-  {
-    return "";
+  public ChatMessage createChatMessage() {
+    SingleChatMessage message = SingleChatMessage.create().role(role()).content(content);
+    message.setCustomField("tool_call_id", id);
+    return message;
   }
 }
-

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

@@ -17,8 +17,10 @@
 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.messages.ToolResponseMessage.ToolResponse;
 import org.springframework.ai.chat.model.AbstractToolCallSupport;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.model.ChatResponse;
@@ -59,13 +61,11 @@ public OrchestrationChatModel(OrchestrationClient client) {
   @Nonnull
   @Override
   public ChatResponse call(@Nonnull final Prompt prompt) {
-    return internalCall(prompt, null);
-  }
-
-  public ChatResponse internalCall(Prompt prompt, ChatResponse previousChatResponse) {
-
     if (prompt.getOptions() instanceof OrchestrationChatOptions options) {
-      runtimeFunctionCallbackConfigurations(FunctionCallingOptions.builder().functionCallbacks(options.getFunctionCallbacks()).build());
+      runtimeFunctionCallbackConfigurations(
+          FunctionCallingOptions.builder()
+              .functionCallbacks(options.getFunctionCallbacks())
+              .build());
       val orchestrationPrompt = toOrchestrationPrompt(prompt);
       val response =
           new OrchestrationSpringChatResponse(
@@ -76,7 +76,7 @@ && isToolCall(response, Set.of("tool_calls", "stop"))) {
         var toolCallConversation = handleToolCalls(prompt, response);
         // Recursively call the call method with the tool call message
         // conversation that contains the call responses.
-        return internalCall(new Prompt(toolCallConversation, prompt.getOptions()), response);
+        return call(new Prompt(toolCallConversation, prompt.getOptions()));
       }
       return response;
     }
@@ -128,9 +128,16 @@ private static com.sap.ai.sdk.orchestration.Message[] toOrchestrationMessages(
               case USER:
                 yield new UserMessage(msg.getText());
               case ASSISTANT:
+                final List<ToolCall> toolCalls =
+                    ((org.springframework.ai.chat.messages.AssistantMessage) msg).getToolCalls();
+                if(toolCalls != null) {
+                  yield new AssistantMessage(toolCalls);
+                }
                 yield new AssistantMessage(msg.getText());
               case TOOL:
-                yield new ToolMessage((ToolResponseMessage) msg);
+                val responses = ((ToolResponseMessage) msg).getResponses();
+                ToolResponse response = responses.get(0);
+                yield new ToolMessage(response.id(), response.responseData());
             };
     return messages.stream().map(mapper).toArray(com.sap.ai.sdk.orchestration.Message[]::new);
   }