Better separate convenience for chat message in OrchestrationPrompt

Author: rpanackal

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

@@ -31,7 +31,7 @@ static CompletionPostRequest toCompletionPostRequest(
         .orchestrationConfig(
             OrchestrationConfig.create().moduleConfigurations(toModuleConfigs(configCopy)))
         .inputParams(prompt.getTemplateParameters())
-        .messagesHistory(prompt.getMessagesHistory());
+        .messagesHistory(prompt.getMessagesHistory().stream().map(Message::toChatMessage).toList());
   }
 
   @Nonnull
@@ -46,7 +46,7 @@ static TemplatingModuleConfig toTemplateModuleConfig(
      */
     val messages = template instanceof Template t ? t.getTemplate() : List.<ChatMessage>of();
     val messagesWithPrompt = new ArrayList<>(messages);
-    messagesWithPrompt.addAll(prompt.getMessages());
+    messagesWithPrompt.addAll(prompt.getMessages().stream().map(Message::toChatMessage).toList());
     if (messagesWithPrompt.isEmpty()) {
       throw new IllegalStateException(
           "A prompt is required. Pass at least one message or configure a template with messages or a template reference.");

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

@@ -169,7 +169,10 @@ public OrchestrationChatResponse executeRequestFromJsonModuleConfig(
     }
 
     final ObjectNode requestJson = JACKSON.createObjectNode();
-    requestJson.set("messages_history", JACKSON.valueToTree(prompt.getMessagesHistory()));
+    requestJson.set(
+        "messages_history",
+        JACKSON.valueToTree(
+            prompt.getMessagesHistory().stream().map(Message::toChatMessage).toList()));
     requestJson.set("input_params", JACKSON.valueToTree(prompt.getTemplateParameters()));
 
     final JsonNode moduleConfigJson;

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

@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.orchestration;
 
-import com.sap.ai.sdk.orchestration.client.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.client.model.OrchestrationConfig;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,17 +21,17 @@
 @Value
 @Getter(AccessLevel.PACKAGE)
 public class OrchestrationPrompt {
-  @Nonnull List<ChatMessage> messages = new ArrayList<>();
+  @Nonnull List<Message> messages = new ArrayList<>();
   @Nonnull Map<String, String> templateParameters = new TreeMap<>();
-  @Nonnull List<ChatMessage> messagesHistory = new ArrayList<>();
+  @Nonnull List<Message> messagesHistory = new ArrayList<>();
 
   /**
    * Initialize a prompt with the given user message.
    *
    * @param message A user message.
    */
   public OrchestrationPrompt(@Nonnull final String message) {
-    messages.add(new UserMessage(message).toChatMessage());
+    messages.add(new UserMessage(message));
   }
 
   /**
@@ -42,8 +41,8 @@ public OrchestrationPrompt(@Nonnull final String message) {
    * @param messages Optionally, more messages.
    */
   public OrchestrationPrompt(@Nonnull final Message message, @Nonnull final Message... messages) {
-    this.messages.add(message.toChatMessage());
-    this.messages.addAll(Arrays.stream(messages).map(Message::toChatMessage).toList());
+    this.messages.add(message);
+    this.messages.addAll(Arrays.asList(messages));
   }
 
   /**
@@ -54,7 +53,7 @@ public OrchestrationPrompt(@Nonnull final Message message, @Nonnull final Messag
   public OrchestrationPrompt(
       @Nonnull final Map<String, String> inputParams, @Nonnull final Message... messages) {
     this.templateParameters.putAll(inputParams);
-    this.messages.addAll(Arrays.stream(messages).map(Message::toChatMessage).toList());
+    this.messages.addAll(Arrays.asList(messages));
   }
 
   /**
@@ -65,7 +64,7 @@ public OrchestrationPrompt(
   @Nonnull
   public OrchestrationPrompt messageHistory(@Nonnull final List<Message> messagesHistory) {
     this.messagesHistory.clear();
-    this.messagesHistory.addAll(messagesHistory.stream().map(Message::toChatMessage).toList());
+    this.messagesHistory.addAll(messagesHistory);
     return this;
   }
 }