feat: Orchestration image support

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

@@ -1,7 +1,5 @@
 package com.sap.ai.sdk.orchestration;
 
-import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
-import java.util.List;
 import javax.annotation.Nonnull;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -15,42 +13,15 @@ public class AssistantMessage implements Message {
   @Nonnull String role = "assistant";
 
   /** The content of the message. */
-  MessageContent content;
-
-  @Nonnull
-  @Override
-  public String content() {
-    return MessageContent.toString(content);
-  }
+  @Nonnull MessageContentSingle content;
 
   @Override
   @Nonnull
-  public MessageContent getContent() {
-    return content != null ? content : new MessageContentSingle("");
+  public MessageContent content() {
+    return content;
   }
 
   public AssistantMessage(String singleMessage) {
     content = new MessageContentSingle(singleMessage);
   }
-
-  public AssistantMessage(MessageContent messageContent) {
-    content = messageContent;
-  }
-
-  public AssistantMessage(List<MultiChatMessageContent> multiChatMessageContentList) {
-    content =
-        new MessageContentMulti(
-            multiChatMessageContentList.toArray(MultiChatMessageContent[]::new));
-  }
-
-  @Nonnull
-  public AssistantMessage addTextMessages(@Nonnull String... messages) {
-    return ((AssistantMessage) Message.addTextMessages(content, role, messages));
-  }
-
-  @Nonnull
-  public AssistantMessage addImage(
-      @Nonnull String imageUrl, MultiMessageImageContent.DetailLevel detailLevel) {
-    return ((AssistantMessage) Message.addImage(content, role, imageUrl, detailLevel));
-  }
 }

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

@@ -7,11 +7,7 @@
 import com.sap.ai.sdk.orchestration.model.ImageContentImageUrl;
 import com.sap.ai.sdk.orchestration.model.MultiChatMessage;
 import com.sap.ai.sdk.orchestration.model.TextContent;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /** Interface representing convenience wrappers of chat message to the orchestration service. */
 public sealed interface Message permits UserMessage, AssistantMessage, SystemMessage {
@@ -27,6 +23,17 @@ static UserMessage user(@Nonnull final String msg) {
     return new UserMessage(msg);
   }
 
+  /**
+   * A convenience method to create a user message.
+   *
+   * @param msg the message content.
+   * @return the user message.
+   */
+  @Nonnull
+  static UserMessage user(@Nonnull final MessageContent msg) {
+    return new UserMessage(msg);
+  }
+
   /**
    * A convenience method to create an assistant message.
    *
@@ -49,16 +56,29 @@ static SystemMessage system(@Nonnull final String msg) {
     return new SystemMessage(msg);
   }
 
+  /**
+   * A convenience method to create a system message.
+   *
+   * @param msg the message content.
+   * @return the system message.
+   */
+  @Nonnull
+  static SystemMessage system(@Nonnull final MessageContent msg) {
+    return new SystemMessage(msg);
+  }
+
   /**
    * Converts the message to a serializable ChatMessage object.
    *
    * @return the corresponding {@code ChatMessage} object.
    */
   @Nonnull
   default ChatMessagesInner createChatMessage() {
-    if (this.getContent() instanceof MessageContentSingle) {
-      return ChatMessage.create().role(role()).content(content());
-    } else if (this.getContent() instanceof MessageContentMulti mCMulti) {
+    if (this.content() instanceof MessageContentSingle) {
+      return ChatMessage.create()
+          .role(role())
+          .content(((MessageContentSingle) content()).content());
+    } else if (this.content() instanceof MessageContentMulti mCMulti) {
       return MultiChatMessage.create()
           .role(role())
           .content(
@@ -85,66 +105,8 @@ default ChatMessagesInner createChatMessage() {
                       })
                   .toList());
     } else {
-      throw new IllegalArgumentException("Unknown content type: " + this.getContent().getClass());
-    }
-  }
-
-  static Message addTextMessages(
-      @Nullable MessageContent oldContent, @Nonnull String role, @Nonnull String... messages) {
-    if (oldContent == null && messages.length == 1) {
-      return switch (role) {
-        case "user" -> new UserMessage(messages[0]);
-        case "assistant" -> new AssistantMessage(messages[0]);
-        case "system" -> new SystemMessage(messages[0]);
-        default -> throw new IllegalArgumentException("Unknown role: " + role);
-      };
-    }
-    var messagesAsMultiMessageContents =
-        Stream.of(messages).map(MultiMessageTextContent::new).toList();
-    return switch (role) {
-      case "user" ->
-          new UserMessage(createMultiContent(messagesAsMultiMessageContents, oldContent));
-      case "assistant" ->
-          new AssistantMessage(createMultiContent(messagesAsMultiMessageContents, oldContent));
-      case "system" ->
-          new SystemMessage(createMultiContent(messagesAsMultiMessageContents, oldContent));
-      default -> throw new IllegalArgumentException("Unknown role: " + role);
-    };
-  }
-
-  static Message addImage(
-      @Nullable MessageContent oldContent,
-      @Nonnull String role,
-      @Nonnull String imageUrl,
-      @Nonnull MultiMessageImageContent.DetailLevel detailLevel) {
-    return switch (role) {
-      case "user" ->
-          new UserMessage(
-              createMultiContent(
-                  List.of(new MultiMessageImageContent(imageUrl, detailLevel)), oldContent));
-      case "assistant" ->
-          new AssistantMessage(
-              createMultiContent(
-                  List.of(new MultiMessageImageContent(imageUrl, detailLevel)), oldContent));
-      case "system" ->
-          new SystemMessage(
-              createMultiContent(
-                  List.of(new MultiMessageImageContent(imageUrl, detailLevel)), oldContent));
-      default -> throw new IllegalArgumentException("Unknown role: " + role);
-    };
-  }
-
-  private static MessageContentMulti createMultiContent(
-      @Nonnull List<? extends MultiMessageContent> newContent,
-      @Nullable MessageContent oldContent) {
-    var multiContentList = new ArrayList<MultiMessageContent>();
-    if (oldContent instanceof MessageContentSingle mCSingle) {
-      multiContentList.add(new MultiMessageTextContent(mCSingle.content()));
-    } else if (oldContent != null) {
-      multiContentList.addAll(((MessageContentMulti) oldContent).multiContentList());
+      throw new IllegalArgumentException("Unknown content type: " + this.content().getClass());
     }
-    multiContentList.addAll(newContent);
-    return new MessageContentMulti(multiContentList);
   }
 
   /**
@@ -162,17 +124,5 @@ private static MessageContentMulti createMultiContent(
    */
   @Nonnull
   @Beta
-  String content();
-
-  @Nonnull
-  @Beta
-  MessageContent getContent();
-
-  @Nonnull
-  @Beta
-  Message addTextMessages(@Nonnull String... messages);
-
-  @Nonnull
-  @Beta
-  Message addImage(@Nonnull String imageUrl, MultiMessageImageContent.DetailLevel detailLevel);
+  Object content();
 }

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

@@ -5,11 +5,13 @@
 import com.sap.ai.sdk.orchestration.model.ImageContent;
 import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.TextContent;
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public record MessageContentMulti(List<MultiMessageContent> multiContentList)
     implements MessageContent {
-  public MessageContentMulti {}
 
   public MessageContentMulti(MultiChatMessageContent... multiChatContents) {
     this(convertIntoMultiMessageList(multiChatContents));
@@ -33,4 +35,23 @@ private static List<MultiMessageContent> convertIntoMultiMessageList(
     }
     return multiContentList;
   }
+
+  MessageContentMulti(
+      @Nonnull List<? extends MultiMessageContent> newContent,
+      @Nullable MessageContent oldContent) {
+    this(mergeContent(newContent, oldContent));
+  }
+
+  private static List<MultiMessageContent> mergeContent(
+      @Nonnull List<? extends MultiMessageContent> newContent,
+      @Nullable MessageContent oldContent) {
+    var multiContentList = new ArrayList<MultiMessageContent>();
+    if (oldContent instanceof MessageContentSingle mCSingle) {
+      multiContentList.add(new MultiMessageTextContent(mCSingle.content()));
+    } else if (oldContent != null) {
+      multiContentList.addAll(((MessageContentMulti) oldContent).multiContentList());
+    }
+    multiContentList.addAll(newContent);
+    return multiContentList;
+  }
 }

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

@@ -1,3 +1,3 @@
 package com.sap.ai.sdk.orchestration;
 
-public record MessageContentSingle(String content) implements MessageContent{}
+public record MessageContentSingle(String content) implements MessageContent {}

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

@@ -8,6 +8,7 @@
 import com.sap.ai.sdk.orchestration.model.LLMChoice;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
 import com.sap.ai.sdk.orchestration.model.MultiChatMessage;
+import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.TokenUsage;
 import java.util.ArrayList;
 import java.util.List;
@@ -64,22 +65,40 @@ public List<Message> getAllMessages() throws IllegalArgumentException {
       if (chatMessage instanceof ChatMessage simpleMsg) {
         final var message =
             switch (simpleMsg.getRole()) {
-              case "user" -> new UserMessage(simpleMsg.getContent());
-              case "assistant" -> new AssistantMessage(simpleMsg.getContent());
-              case "system" -> new SystemMessage(simpleMsg.getContent());
+              case "user" -> Message.user(simpleMsg.getContent());
+              case "assistant" -> Message.assistant(simpleMsg.getContent());
+              case "system" -> Message.system(simpleMsg.getContent());
               default ->
-                  throw new IllegalArgumentException("Unexpected role: " + simpleMsg.getRole());
+                  throw new IllegalArgumentException(
+                      "Unexpected role: "
+                          + simpleMsg.getRole()
+                          + ". Only 'user', 'assistant' and 'system' are supported.");
             };
         messages.add(message);
       } else if (chatMessage instanceof MultiChatMessage mCMessage) {
-        messages.add(new UserMessage(mCMessage.getContent()));
+        messages.add(
+            switch (mCMessage.getRole()) {
+              case "user" ->
+                  Message.user(
+                      new MessageContentMulti(
+                          mCMessage.getContent().toArray(MultiChatMessageContent[]::new)));
+              case "system" ->
+                  Message.system(
+                      new MessageContentMulti(
+                          mCMessage.getContent().toArray(MultiChatMessageContent[]::new)));
+              default ->
+                  throw new IllegalArgumentException(
+                      "Unexpected role using MultiChatMessage: "
+                          + mCMessage.getRole()
+                          + ". Only 'user' and 'system' are supported.");
+            });
       } else {
         throw new IllegalArgumentException(
             "Messages of type " + chatMessage.getClass() + " are not supported by convenience API");
       }
     }
 
-    messages.add(new AssistantMessage(getChoice().getMessage().getContent()));
+    messages.add(Message.assistant(getChoice().getMessage().getContent()));
     return messages;
   }
 

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

@@ -1,7 +1,6 @@
 package com.sap.ai.sdk.orchestration;
 
-import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
-import java.util.List;
+import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -15,42 +14,37 @@ public class SystemMessage implements Message {
   @Nonnull String role = "system";
 
   /** The content of the message. */
-  MessageContent content;
-
-  @Nonnull
-  @Override
-  public String content() {
-    return MessageContent.toString(content);
-  }
+  @Nonnull MessageContent content;
 
   @Override
   @Nonnull
-  public MessageContent getContent() {
-    return content != null ? content : new MessageContentSingle("");
+  public MessageContent content() {
+    return content;
   }
 
   public SystemMessage(String singleMessage) {
     content = new MessageContentSingle(singleMessage);
   }
 
-  public SystemMessage(MessageContent messageContent) {
+  SystemMessage(MessageContent messageContent) {
+    if (!(messageContent instanceof MessageContentSingle)) {
+      ((MessageContentMulti) messageContent)
+          .multiContentList().stream()
+              .filter(mCMC -> !(mCMC instanceof MultiMessageTextContent))
+              .findAny()
+              .ifPresent(
+                  mCMC -> {
+                    throw new IllegalArgumentException(
+                        "Only TextContent is supported for SystemMessage");
+                  });
+    }
     content = messageContent;
   }
 
-  public SystemMessage(List<MultiChatMessageContent> multiChatMessageContentList) {
-    content =
-        new MessageContentMulti(
-            multiChatMessageContentList.toArray(MultiChatMessageContent[]::new));
-  }
-
   @Nonnull
-  public AssistantMessage addTextMessages(@Nonnull String... messages) {
-    return ((AssistantMessage) Message.addTextMessages(content, role, messages));
-  }
-
-  @Nonnull
-  public AssistantMessage addImage(
-      @Nonnull String imageUrl, MultiMessageImageContent.DetailLevel detailLevel) {
-    return ((AssistantMessage) Message.addImage(content, role, imageUrl, detailLevel));
+  public SystemMessage addText(@Nonnull String... messages) {
+    return new SystemMessage(
+        new MessageContentMulti(
+            Stream.of(messages).map(MultiMessageTextContent::new).toList(), content));
   }
 }