wip

Author: CharlesDuboisSAP

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

@@ -8,7 +8,6 @@
 import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.MessageToolCall;
 import com.sap.ai.sdk.orchestration.model.TextContent;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -69,16 +68,13 @@ public ChatMessage createChatMessage() {
     if (toolCalls() != null) {
       return AssistantChatMessage.create().role(ASSISTANT).toolCalls(toolCalls);
     }
-    var textContents = new ArrayList<TextContent>();
-    for (var item : content.items()) {
-      if (item
-          instanceof TextItem textItem) { // TODO: throw exception if we have ImageItem instead?
-        textContents.add(
-            TextContent.create().type(TextContent.TypeEnum.TEXT).text(textItem.text()));
-      }
-    }
-    return AssistantChatMessage.create()
-        .role(ASSISTANT)
-        .content(ChatMessageContent.create(textContents));
+    var texts =
+        content.items().stream()
+            .filter(item -> item instanceof TextItem) // TODO: images are ignored
+            .map(item -> (TextItem) item)
+            .map(item -> TextContent.create().type(TextContent.TypeEnum.TEXT).text(item.text()))
+            .toList();
+
+    return AssistantChatMessage.create().role(ASSISTANT).content(ChatMessageContent.create(texts));
   }
 }

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

@@ -7,7 +7,6 @@
 import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.SystemChatMessage;
 import com.sap.ai.sdk.orchestration.model.TextContent;
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -59,14 +58,13 @@ public SystemMessage withText(@Nonnull final String message) {
   @Nonnull
   @Override
   public ChatMessage createChatMessage() {
-    var textContents = new ArrayList<TextContent>();
-    for (var item : content.items()) {
-      if (item
-          instanceof TextItem textItem) { // TODO: throw exception if we have ImageItem instead?
-        textContents.add(
-            TextContent.create().type(TextContent.TypeEnum.TEXT).text(textItem.text()));
-      }
-    }
-    return SystemChatMessage.create().role(SYSTEM).content(ChatMessageContent.create(textContents));
+
+    var texts =
+        content.items().stream()
+            .filter(item -> item instanceof TextItem) // TODO: images are ignored
+            .map(item -> (TextItem) item)
+            .map(item -> TextContent.create().type(TextContent.TypeEnum.TEXT).text(item.text()))
+            .toList();
+    return SystemChatMessage.create().role(SYSTEM).content(ChatMessageContent.create(texts));
   }
 }

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

@@ -5,10 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sap.ai.sdk.orchestration.model.ChatCompletionTool;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
+import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.FunctionObject;
 import com.sap.ai.sdk.orchestration.model.ResponseFormatJsonObject;
 import com.sap.ai.sdk.orchestration.model.ResponseFormatJsonSchema;
 import com.sap.ai.sdk.orchestration.model.ResponseFormatJsonSchemaJsonSchema;
+import com.sap.ai.sdk.orchestration.model.SystemChatMessage;
+import com.sap.ai.sdk.orchestration.model.SystemChatMessage.RoleEnum;
 import com.sap.ai.sdk.orchestration.model.Template;
 import com.sap.ai.sdk.orchestration.model.TemplateRef;
 import com.sap.ai.sdk.orchestration.model.TemplateRefByID;
@@ -206,12 +209,14 @@ void testTemplateFromLocalFileWithJsonSchemaAndTools() throws IOException {
         OrchestrationTemplate.create()
             .withTemplate(
                 List.of(
-                    SingleChatMessage.create()
-                        .role("system")
-                        .content("You are a language translator."),
-                    SingleChatMessage.create()
-                        .role("user")
-                        .content("Whats {{ ?word }} in {{ ?language }}?")))
+                    SystemChatMessage.create()
+                        .role(RoleEnum.SYSTEM)
+                        .content(ChatMessageContent.create("You are a language translator.")),
+                    (ChatMessage)
+                        UserChatMessage.create()
+                            .content(
+                                UserChatMessageContent.create(
+                                    "Whats {{ ?word }} in {{ ?language }}?"))))
             .withDefaults(Map.of("word", "apple"))
             .withJsonSchemaResponse(
                 ResponseJsonSchema.fromMap(schema, "translation-schema")
@@ -266,12 +271,14 @@ void testTemplateFromLocalFileWithJsonObject() throws IOException {
         OrchestrationTemplate.create()
             .withTemplate(
                 List.of(
-                    SingleChatMessage.create()
-                        .role("system")
-                        .content("You are a language translator."),
-                    SingleChatMessage.create()
-                        .role("user")
-                        .content("Whats {{ ?word }} in {{ ?language }}?")))
+                    SystemChatMessage.create()
+                        .role(RoleEnum.SYSTEM)
+                        .content(ChatMessageContent.create("You are a language translator.")),
+                    (ChatMessage)
+                        UserChatMessage.create()
+                            .content(
+                                UserChatMessageContent.create(
+                                    "Whats {{ ?word }} in {{ ?language }}?"))))
             .withDefaults(Map.of("word", "apple"))
             .withJsonResponse();
     assertThat(templateWithJsonObject).isEqualTo(expectedTemplateWithJsonObject);