Merge main

Author: CharlesDuboisSAP

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

@@ -168,12 +168,10 @@ public OrchestrationChatResponse executeRequestFromJsonModuleConfig(
           "Prompt must not contain any messages when using a JSON module configuration, as the template is already defined in the JSON.");
     }
 
-    final var request =
-        new CompletionPostRequest()
-            .messagesHistory(prompt.getMessagesHistory())
-            .inputParams(prompt.getTemplateParameters());
+    final ObjectNode requestJson = JACKSON.createObjectNode();
+    requestJson.set("messages_history", JACKSON.valueToTree(prompt.getMessagesHistory()));
+    requestJson.set("input_params", JACKSON.valueToTree(prompt.getTemplateParameters()));
 
-    final ObjectNode requestJson = JACKSON.valueToTree(request);
     final JsonNode moduleConfigJson;
     try {
       moduleConfigJson = JACKSON.readTree(moduleConfig);

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

@@ -386,7 +386,9 @@ void testErrorHandling() {
   void testExecuteRequestFromJson() {
     stubFor(post(anyUrl()).willReturn(okJson("{}")));
 
-    prompt = new OrchestrationPrompt(Map.of());
+    prompt =
+        new OrchestrationPrompt(Map.of("foo", "bar"))
+            .messageHistory(List.of(ChatMessage.create().role("user").content("Hello World!")));
     final var configJson =
         """
         {
@@ -402,8 +404,13 @@ void testExecuteRequestFromJson() {
     final var expectedJson =
         """
         {
-          "messages_history": [],
-          "input_params": {},
+          "messages_history": [{
+            "role" : "user",
+            "content" : "Hello World!"
+          }],
+          "input_params": {
+            "foo" : "bar"
+          },
           "orchestration_config": {
             "module_configurations": {
               "llm_module_config": {