Initial

Author: a-d

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

@@ -22,20 +22,24 @@ final class ConfigToRequestTransformer {
   static CompletionPostRequest toCompletionPostRequest(
       @Nonnull final OrchestrationPrompt prompt, @Nonnull final OrchestrationModuleConfig config) {
     val template = toTemplateModuleConfig(prompt, config.getTemplateConfig());
+
     // note that the config is immutable and implicitly copied here
     // copying is required here, to not alter the original config object, which might be reused for
     // subsequent requests
     val configCopy = config.withTemplateConfig(template);
 
+    val messageHistory =
+        prompt.getMessagesHistory().stream()
+            .map(Message::createChatMessage)
+            .map(ChatMessage.class::cast)
+            .toList();
+
+    val moduleConfigs = toModuleConfigs(configCopy);
+
     return CompletionPostRequest.create()
-        .orchestrationConfig(
-            OrchestrationConfig.create().moduleConfigurations(toModuleConfigs(configCopy)))
+        .orchestrationConfig(OrchestrationConfig.create().moduleConfigurations(moduleConfigs))
         .inputParams(prompt.getTemplateParameters())
-        .messagesHistory(
-            prompt.getMessagesHistory().stream()
-                .map(Message::createChatMessage)
-                .map(ChatMessage.class::cast)
-                .toList());
+        .messagesHistory(messageHistory);
   }
 
   @Nonnull
@@ -53,18 +57,18 @@ static TemplatingModuleConfig toTemplateModuleConfig(
     }
     val template = config instanceof Template t ? t : Template.create().template();
     val messages = template.getTemplate();
-    val responseFormat = template.getResponseFormat();
     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(responseFormat);
+        .responseFormat(template.getResponseFormat());
   }
 
   @Nonnull

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

@@ -95,7 +95,8 @@ public OrchestrationChatResponse chatCompletion(
       throws OrchestrationClientException {
 
     val request = toCompletionPostRequest(prompt, config);
-    return new OrchestrationChatResponse(executeRequest(request));
+    val response = executeRequest(request);
+    return new OrchestrationChatResponse(response);
   }
 
   /**