Prepare draft

Author: Jonas-Isr

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

@@ -13,8 +13,7 @@ public class AssistantMessage implements Message {
   @Nonnull String role = "assistant";
 
   /** The content of the message. */
-  @Nonnull
-  MessageContentSingle content;
+  @Nonnull MessageContentSingle content;
 
   @Override
   @Nonnull

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

@@ -34,9 +34,6 @@ static UserMessage user(@Nonnull final MessageContent msg) {
     return new UserMessage(msg);
   }
 
-//  TODO: discuss whether we want a static AssistantMessage user(@Nonnull final MessageContent msg)
-//    pro: consistency
-//    con: Only works if exactly one string is in there
   /**
    * A convenience method to create an assistant message.
    *
@@ -78,7 +75,9 @@ static SystemMessage system(@Nonnull final MessageContent msg) {
   @Nonnull
   default ChatMessagesInner createChatMessage() {
     if (this.content() instanceof MessageContentSingle) {
-      return ChatMessage.create().role(role()).content(((MessageContentSingle) content()).content());
+      return ChatMessage.create()
+          .role(role())
+          .content(((MessageContentSingle) content()).content());
     } else if (this.content() instanceof MessageContentMulti mCMulti) {
       return MultiChatMessage.create()
           .role(role())

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

@@ -5,11 +5,10 @@
 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 javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public record MessageContentMulti(List<MultiMessageContent> multiContentList)
     implements MessageContent {

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

@@ -76,14 +76,22 @@ public List<Message> getAllMessages() throws IllegalArgumentException {
             };
         messages.add(message);
       } else if (chatMessage instanceof MultiChatMessage mCMessage) {
-          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.");
-              }
-          );
+        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");

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

@@ -1,11 +1,7 @@
 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 com.sap.ai.sdk.orchestration.model.TextContent;
 import lombok.Value;
 import lombok.experimental.Accessors;
 
@@ -32,12 +28,15 @@ public SystemMessage(String singleMessage) {
 
   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");
-          });
+      ((MessageContentMulti) messageContent)
+          .multiContentList().stream()
+              .filter(mCMC -> !(mCMC instanceof MultiMessageTextContent))
+              .findAny()
+              .ifPresent(
+                  mCMC -> {
+                    throw new IllegalArgumentException(
+                        "Only TextContent is supported for SystemMessage");
+                  });
     }
     content = messageContent;
   }

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

@@ -1,6 +1,5 @@
 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;

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

@@ -179,12 +179,14 @@ void testTemplating() throws IOException {
     assertThat(response.getRequestId()).isEqualTo("26ea36b5-c196-4806-a9a6-a686f0c6ad91");
     final var messageList = result.getAllMessages();
 
-    assertThat(((MessageContentSingle) messageList.get(0).content()).content()).isEqualTo("You are a multi language translator");
+    assertThat(((MessageContentSingle) messageList.get(0).content()).content())
+        .isEqualTo("You are a multi language translator");
     assertThat(messageList.get(0).role()).isEqualTo("system");
     assertThat(((MessageContentSingle) messageList.get(1).content()).content())
         .isEqualTo("Reply with 'Orchestration Service is working!' in German");
     assertThat(messageList.get(1).role()).isEqualTo("user");
-    assertThat(((MessageContentSingle) messageList.get(2).content()).content()).isEqualTo("Orchestration Service funktioniert!");
+    assertThat(((MessageContentSingle) messageList.get(2).content()).content())
+        .isEqualTo("Orchestration Service funktioniert!");
     assertThat(messageList.get(2).role()).isEqualTo("assistant");
 
     var llm = (LLMModuleResultSynchronous) response.getModuleResults().getLlm();