Add constructor for multiple strings for UserMessage and MessageContent

Author: Jonas-Isr

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

@@ -8,64 +8,68 @@
 import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
 import com.sap.ai.sdk.orchestration.model.TextContent;
 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 {
 
   /**
-   * A convenience method to create a user message.
+   * A convenience method to create a user message from one or more strings.
    *
-   * @param msg the message content.
+   * @param message the message content.
+   * @param additionalMessages the additional messages.
    * @return the user message.
    */
   @Nonnull
-  static UserMessage user(@Nonnull final String msg) {
-    return new UserMessage(msg);
+  static UserMessage user(
+      @Nonnull final String message, @Nullable final String... additionalMessages) {
+    return new UserMessage(message, additionalMessages);
   }
 
   /**
    * A convenience method to create a user message.
    *
-   * @param msg the message content.
+   * @param message the message content.
    * @return the user message.
    */
   @Nonnull
-  static UserMessage user(@Nonnull final MessageContent msg) {
-    return new UserMessage(msg);
+  static UserMessage user(@Nonnull final MessageContent message) {
+    return new UserMessage(message);
   }
 
   /**
    * A convenience method to create an assistant message.
    *
-   * @param msg the message content.
+   * @param message the message content.
    * @return the assistant message.
    */
   @Nonnull
-  static AssistantMessage assistant(@Nonnull final String msg) {
-    return new AssistantMessage(msg);
+  static AssistantMessage assistant(@Nonnull final String message) {
+    return new AssistantMessage(message);
   }
 
   /**
-   * A convenience method to create a system message.
+   * A convenience method to create a system message from one or more strings.
    *
-   * @param msg the message content.
+   * @param message the message content.
    * @return the system message.
    */
   @Nonnull
-  static SystemMessage system(@Nonnull final String msg) {
-    return new SystemMessage(msg);
+  static SystemMessage system(
+      @Nonnull final String message, @Nullable final String... additionalMessages) {
+    return new SystemMessage(message, additionalMessages);
   }
 
   /**
    * A convenience method to create a system message. As of now, only text content is supported for
    * system messages by most AIs.
    *
-   * @param msg the message content.
+   * @param message the message content.
    * @return the system message.
    */
   @Nonnull
-  static SystemMessage system(@Nonnull final MessageContent msg) {
-    return new SystemMessage(msg);
+  static SystemMessage system(@Nonnull final MessageContent message) {
+    return new SystemMessage(message);
   }
 
   /**

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

@@ -5,6 +5,7 @@
 import com.sap.ai.sdk.orchestration.model.TextContent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -45,26 +46,21 @@ public static MessageContent image(@Nonnull final String imageUrl) {
   }
 
   /**
-   * Creates a new message content containing one {@link TextItem} with the given text.
+   * Creates a new message content containing one or more {@link TextItem}s with the given texts.
    *
-   * @param text the text of the message
+   * @param firstInput the first text of the message
+   * @param moreInputs additional texts of the message
    * @return the new message content
    */
   @Nonnull
-  public static MessageContent text(@Nonnull final String text) {
-    return new MessageContent(List.of(new TextItem(text)));
-  }
-
-  /**
-   * Creates a new message content containing multiple {@link TextItem}s with the given texts.
-   *
-   * @param texts the texts of the messages
-   * @return the new message content
-   */
-  @Nonnull
-  public static MessageContent text(@Nonnull final String... texts) {
+  public static MessageContent text(
+      @Nonnull final String firstInput, @Nullable final String... moreInputs) {
     return new MessageContent(
-        Arrays.stream(texts).map(text -> ((ContentItem) new TextItem(text))).toList());
+        Stream.concat(
+                Stream.of(firstInput),
+                moreInputs == null ? Stream.empty() : Arrays.stream(moreInputs))
+            .map(text -> (ContentItem) new TextItem(text))
+            .toList());
   }
 
   /**

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

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.Value;
 import lombok.experimental.Accessors;
 
@@ -24,12 +25,14 @@ public MessageContent content() {
   }
 
   /**
-   * Creates a new system message with the given single message.
+   * Creates a new system message from one or more strings.
    *
-   * @param singleMessage the single message.
+   * @param message the first message.
+   * @param additionalMessages the additional messages.
    */
-  public SystemMessage(@Nonnull final String singleMessage) {
-    content = new MessageContent(singleMessage);
+  public SystemMessage(
+      @Nonnull final String message, @Nullable final String... additionalMessages) {
+    content = MessageContent.text(message, additionalMessages);
   }
 
   /**

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

@@ -25,12 +25,13 @@ public MessageContent content() {
   }
 
   /**
-   * Creates a new user message with the given single message.
+   * Creates a new user message from one or more strings.
    *
-   * @param singleMessage the single message.
+   * @param message the first message.
+   * @param additionalMessages the additional messages.
    */
-  public UserMessage(@Nonnull final String singleMessage) {
-    content = new MessageContent(singleMessage);
+  public UserMessage(@Nonnull final String message, @Nullable final String... additionalMessages) {
+    content = MessageContent.text(message, additionalMessages);
   }
 
   /**

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java

@@ -681,8 +681,7 @@ void streamChatCompletionDeltas() throws IOException {
   void testMultiMessage() throws IOException {
     stubFor(
         post("/completion")
-            .willReturn(
-                aResponse().withStatus(SC_OK).withBodyFile("multiMessageResponse.json")));
+            .willReturn(aResponse().withStatus(SC_OK).withBodyFile("multiMessageResponse.json")));
 
     OrchestrationAiModel customGpt4o =
         GPT_4O_MINI
@@ -791,9 +790,11 @@ void testMultiMessage() throws IOException {
 
   @Test
   void testMessageConstruction() {
+    var userMessageTwoTexts = Message.user("Text 1", "Text 2");
     var userMessageTwoTextsAddText = Message.user("Text 1").addText("Text 2");
     var userMessageTwoTextsAdd = Message.user("Text 1").add(MessageContent.text("Text 2"));
     var userMessageTwoTextsContent = Message.user(MessageContent.text("Text 1", "Text 2"));
+    assertThat(userMessageTwoTexts).isEqualTo(userMessageTwoTextsAddText);
     assertThat(userMessageTwoTextsAddText).isEqualTo(userMessageTwoTextsAdd);
     assertThat(userMessageTwoTextsAdd).isEqualTo(userMessageTwoTextsContent);
 
@@ -807,9 +808,11 @@ void testMessageConstruction() {
         Message.user("Text 1").add(MessageContent.image("url", ImageItem.DetailLevel.low));
     assertThat(userMessageWithImageDetailAddImage).isEqualTo(userMessageWithImageDetailAdd);
 
+    var systemMessageTwoTexts = Message.system("Text 1", "Text 2");
     var systemMessageTwoTextsAddText = Message.system("Text 1").addText("Text 2");
     var systemMessageTwoTextsAdd = Message.system("Text 1").add(MessageContent.text("Text 2"));
     var systemMessageTwoTextsContent = Message.system(MessageContent.text("Text 1", "Text 2"));
+    assertThat(systemMessageTwoTexts).isEqualTo(systemMessageTwoTextsAddText);
     assertThat(systemMessageTwoTextsAddText).isEqualTo(systemMessageTwoTextsAdd);
     assertThat(systemMessageTwoTextsAdd).isEqualTo(systemMessageTwoTextsContent);
   }