Merge branch 'main' into orchestration/minor-syntax

Author: newtork

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

@@ -55,20 +55,29 @@ static TemplatingModuleConfig toTemplateModuleConfig(
     if (config instanceof TemplateRef) {
       return config;
     }
+
     val template = config instanceof Template t ? t : Template.create().template();
     val messages = template.getTemplate();
     val messagesWithPrompt = new ArrayList<>(messages);
+
     messagesWithPrompt.addAll(
         prompt.getMessages().stream().map(Message::createChatMessage).toList());
     if (messagesWithPrompt.isEmpty()) {
       throw new IllegalStateException(
           "A prompt is required. Pass at least one message or configure a template with messages or a template reference.");
     }
 
-    return Template.create()
-        .template(messagesWithPrompt)
-        .tools(template.getTools())
-        .responseFormat(template.getResponseFormat());
+    val result =
+        Template.create()
+            .template(messagesWithPrompt)
+            .tools(template.getTools())
+            .defaults(template.getDefaults())
+            .responseFormat(template.getResponseFormat());
+
+    for (val customFieldName : template.getCustomFieldNames()) {
+      result.setCustomField(customFieldName, template.getCustomField(customFieldName));
+    }
+    return result;
   }
 
   @Nonnull

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

@@ -62,12 +62,16 @@ void testMergingTemplateConfig() {
                 List.of(
                     systemMessage.createChatMessage(),
                     userMessage.createChatMessage(),
-                    userMessage2.createChatMessage()));
+                    userMessage2.createChatMessage()))
+            .defaults(Map.of("city", "Paris"));
+    expected.setCustomField("country", "France");
 
     var prompt = new OrchestrationPrompt(userMessage2);
     var templateConfig =
         Template.create()
-            .template(List.of(systemMessage.createChatMessage(), userMessage.createChatMessage()));
+            .template(List.of(systemMessage.createChatMessage(), userMessage.createChatMessage()))
+            .defaults(Map.of("city", "Paris"));
+    templateConfig.setCustomField("country", "France");
     var actual = ConfigToRequestTransformer.toTemplateModuleConfig(prompt, templateConfig);
 
     assertThat(actual).isEqualTo(expected);

sample-code/spring-app/pom.xml

@@ -33,8 +33,8 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <spring-boot.version>3.4.1</spring-boot.version>
-    <logback.version>1.5.17</logback.version>
+    <spring-boot.version>3.4.3</spring-boot.version>
+    <logback.version>1.5.18</logback.version>
     <cf-logging.version>3.8.4</cf-logging.version>
     <!-- Skip end-to-end tests by default, can be overridden with -DskipTests=false -->
     <skipTests>true</skipTests>

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java

@@ -83,6 +83,30 @@ Object messagesHistory(
     return response.getContent();
   }
 
+  @GetMapping("/image")
+  @Nonnull
+  Object imageInput(@RequestParam(value = "format", required = false) final String format) {
+    final var response =
+        service.imageInput(
+            "https://upload.wikimedia.org/wikipedia/commons/thumb/5/59/SAP_2011_logo.svg/440px-SAP_2011_logo.svg.png");
+    if ("json".equals(format)) {
+      return response;
+    }
+    return response.getContent();
+  }
+
+  @GetMapping("/multiString")
+  @Nonnull
+  Object multiStringInput(@RequestParam(value = "format", required = false) final String format) {
+    final var response =
+        service.multiStringInput(
+            List.of("What is the capital of France?", "What is Chess about?", "What is 2+2?"));
+    if ("json".equals(format)) {
+      return response;
+    }
+    return response.getContent();
+  }
+
   @GetMapping("/inputFiltering/{policy}")
   @Nonnull
   Object inputFiltering(
@@ -203,30 +227,6 @@ Object groundingHelpSapCom(
     return response.getContent();
   }
 
-  @GetMapping("/image")
-  @Nonnull
-  Object imageInput(@RequestParam(value = "format", required = false) final String format) {
-    final var response =
-        service.imageInput(
-            "https://upload.wikimedia.org/wikipedia/commons/thumb/5/59/SAP_2011_logo.svg/440px-SAP_2011_logo.svg.png");
-    if ("json".equals(format)) {
-      return response;
-    }
-    return response.getContent();
-  }
-
-  @GetMapping("/multiString")
-  @Nonnull
-  Object multiStringInput(@RequestParam(value = "format", required = false) final String format) {
-    final var response =
-        service.multiStringInput(
-            List.of("What is the capital of France?", "What is Chess about?", "What is 2+2?"));
-    if ("json".equals(format)) {
-      return response;
-    }
-    return response.getContent();
-  }
-
   @GetMapping("/responseFormatJsonSchema")
   @Nonnull
   Object responseFormatJsonSchema(