green

Author: CharlesDuboisSAP

orchestration/pom.xml

@@ -31,10 +31,10 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
-    <coverage.complexity>84%</coverage.complexity>
+    <coverage.complexity>83%</coverage.complexity>
     <coverage.line>94%</coverage.line>
     <coverage.instruction>95%</coverage.instruction>
-    <coverage.branch>79%</coverage.branch>
+    <coverage.branch>78%</coverage.branch>
     <coverage.method>94%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>

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

@@ -1,5 +1,6 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -48,6 +49,7 @@ public class OrchestrationTemplate extends TemplateConfig {
   @With(onMethod_ = {@Deprecated})
   List<ChatMessage> template;
 
+  @JsonIgnore
   @Nullable
   @With(AccessLevel.PRIVATE)
   List<Message> messages;

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

@@ -4,6 +4,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.ai.sdk.orchestration.model.ChatCompletionTool;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.FunctionObject;
@@ -126,7 +128,9 @@ void testConfigWithResponseSchema() {
 
   @Test
   void testTemplateConstruction() {
-    List<ChatMessage> templateMessages =
+    List<Message> templateMessages =
+        List.of(Message.user("message"));
+    List<ChatMessage> templateMessagesLowLevel =
         List.of(
             UserChatMessage.create().content(UserChatMessageContent.create("message")).role(USER));
     var defaults = Map.of("key", "value");
@@ -137,14 +141,14 @@ void testTemplateConstruction() {
                 .function(FunctionObject.create().name("func")));
     var template =
         TemplateConfig.create()
-            .withTemplate(templateMessages)
+            .withTemplateMessages(templateMessages)
             .withDefaults(defaults)
             .withTools(tools)
             .withJsonResponse();
 
     var templateLowLevel =
         Template.create()
-            .template(templateMessages)
+            .template(templateMessagesLowLevel)
             .defaults(defaults)
             .responseFormat(
                 ResponseFormatJsonObject.create()
@@ -233,7 +237,12 @@ void testTemplateFromLocalFileWithJsonSchemaAndTools() throws IOException {
                                             "wordToTranslate", Map.of("type", "string"))))
                                 .description("Translate a word.")
                                 .strict(true))));
-    assertThat(templateWithJsonSchemaTools).isEqualTo(expectedTemplateWithJsonSchemaTools);
+
+    var jackson = new ObjectMapper();
+    JsonNode template = jackson.readTree(jackson.writeValueAsString(templateWithJsonSchemaTools));
+    JsonNode expectedTemplate =
+        jackson.readTree(jackson.writeValueAsString(expectedTemplateWithJsonSchemaTools));
+    assertThat(template).isEqualTo(expectedTemplate);
   }
 
   @Test
@@ -265,6 +274,11 @@ void testTemplateFromLocalFileWithJsonObject() throws IOException {
                     Message.user("Whats {{ ?word }} in {{ ?language }}?")))
             .withDefaults(Map.of("word", "apple"))
             .withJsonResponse();
-    assertThat(templateWithJsonObject).isEqualTo(expectedTemplateWithJsonObject);
+
+    var jackson = new ObjectMapper();
+    JsonNode template = jackson.readTree(jackson.writeValueAsString(templateWithJsonObject));
+    JsonNode expectedTemplate =
+        jackson.readTree(jackson.writeValueAsString(expectedTemplateWithJsonObject));
+    assertThat(template).isEqualTo(expectedTemplate);
   }
 }

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

@@ -413,7 +413,11 @@ void messagesHistory() throws IOException {
     final List<Message> messagesHistory =
         List.of(
             new UserMessage("What is the capital of France?"),
-            new AssistantMessage("The capital of France is Paris."));
+            new AssistantMessage(
+                new MessageContent(
+                    List.of(
+                        new TextItem("The capital of France is Paris."),
+                        new TextItem("Paris is known for its art, fashion, and culture.")))));
     final var message = new UserMessage("What is the typical food there?");
 
     prompt = new OrchestrationPrompt(message).messageHistory(messagesHistory);

orchestration/src/test/resources/messagesHistoryRequest.json

@@ -8,8 +8,8 @@
           "frequency_penalty": 0,
           "max_tokens": 50,
           "temperature": 0.1,
-          "top_p" : 1,
-          "n" : 1
+          "top_p": 1,
+          "n": 1
         },
         "model_version": "latest"
       },
@@ -20,8 +20,8 @@
             "content": "What is the typical food there?"
           }
         ],
-        "defaults" : { },
-        "tools" : [ ]
+        "defaults": {},
+        "tools": []
       }
     },
     "stream": false
@@ -34,8 +34,17 @@
     },
     {
       "role": "assistant",
-      "content": "The capital of France is Paris.",
-      "tool_calls" : [ ]
+      "content": [
+        {
+          "type": "text",
+          "text": "The capital of France is Paris."
+        },
+        {
+          "type": "text",
+          "text": "Paris is known for its art, fashion, and culture."
+        }
+      ],
+      "tool_calls": []
     }
   ]
 }