add unit tests

Author: Jonas-Isr

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

@@ -24,9 +24,11 @@
 import javax.annotation.Nullable;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 
 /** Factory to create all data objects from an orchestration configuration. */
+@Slf4j
 @NoArgsConstructor(access = AccessLevel.NONE)
 final class ConfigToRequestTransformer {
   @Nonnull
@@ -129,6 +131,10 @@ static CompletionPostRequest fromReferenceToCompletionPostRequest(
     List<ChatMessage> messageHistory = List.of();
     Map<String, String> placeholders = Map.of();
     if (prompt != null) {
+      if (!prompt.getMessages().isEmpty()) {
+        log.debug(
+            "Messages in prompts are ignored when using Orchestration configs via reference. Change the Orchestration config instead.");
+      }
       messageHistory =
           prompt.getMessagesHistory().stream().map(Message::createChatMessage).toList();
       placeholders = prompt.getTemplateParameters();

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

@@ -25,6 +25,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -168,7 +170,7 @@ public CompletionPostResponse executeRequest(@Nonnull final CompletionPostReques
 
   @Beta
   public OrchestrationChatResponse executeRequestFromReference(
-      final OrchestrationPrompt prompt, final OrchestrationConfigReference reference) {
+      @Nullable final OrchestrationPrompt prompt, @Nonnull final OrchestrationConfigReference reference) {
     var request =
         ConfigToRequestTransformer.fromReferenceToCompletionPostRequest(prompt, reference);
     var response = executeRequest(request);

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

@@ -1347,6 +1347,58 @@ void testTemplateFromInputThrows() {
         .hasMessageContaining("Failed to deserialize");
   }
 
+  @Test
+  void testExecuteFromReferenceById() {
+    stubFor(
+        post(anyUrl())
+            .willReturn(
+                aResponse()
+                    .withBodyFile("templatingResponse.json")
+                    .withHeader("Content-Type", "application/json")));
+
+    var reference = OrchestrationConfigReference.fromId("test-id");
+    final var response = client.executeRequestFromReference(null, reference);
+
+    final String expectedRequest = fileLoaderStr.apply("orchConfigByIdRequest.json");
+    verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(expectedRequest)));
+  }
+
+  @Test
+  void testExecuteFromReferenceBySNV() {
+    stubFor(
+        post(anyUrl())
+            .willReturn(
+                aResponse()
+                    .withBodyFile("templatingResponse.json")
+                    .withHeader("Content-Type", "application/json")));
+
+    var reference =
+        OrchestrationConfigReference.fromScenarioNameVersion("scenario", "name", "0.0.1");
+    final var response = client.executeRequestFromReference(null, reference);
+
+    final String expectedRequest = fileLoaderStr.apply("orchConfigBySNVRequest.json");
+    verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(expectedRequest)));
+  }
+
+  @Test
+  void testExecuteFromReferenceWithMessageHistoryAndInputParams() {
+    stubFor(
+        post(anyUrl())
+            .willReturn(
+                aResponse()
+                    .withBodyFile("templatingResponse.json")
+                    .withHeader("Content-Type", "application/json")));
+
+    var reference =
+        OrchestrationConfigReference.fromScenarioNameVersion("scenario", "name", "0.0.1");
+    List<Message> history = List.of(new SystemMessage("System Message"));
+    var prompt = new OrchestrationPrompt(Map.of("placeholder", "value")).messageHistory(history);
+    final var response = client.executeRequestFromReference(prompt, reference);
+
+    final String expectedRequest = fileLoaderStr.apply("orchConfigByRequestHistoryParams.json");
+    verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(expectedRequest)));
+  }
+
   @Test
   void testGetAllMessages() {
     stubFor(

orchestration/src/test/resources/orchConfigByIdRequest.json

@@ -0,0 +1,7 @@
+{
+  "config_ref": {
+    "id": "test-id"
+  },
+  "placeholder_values": {},
+  "messages_history": []
+}

orchestration/src/test/resources/orchConfigByRequestHistoryParams.json

@@ -0,0 +1,14 @@
+{
+  "config_ref" : {
+    "scenario" : "scenario",
+    "name" : "name",
+    "version" : "0.0.1"
+  },
+  "placeholder_values" : {
+    "placeholder" : "value"
+  },
+  "messages_history" : [ {
+    "role" : "system",
+    "content" : "System Message"
+  } ]
+}

orchestration/src/test/resources/orchConfigBySNVRequest.json

@@ -0,0 +1,9 @@
+{
+  "config_ref": {
+    "scenario": "scenario",
+    "name": "name",
+    "version": "0.0.1"
+  },
+  "placeholder_values": {},
+  "messages_history": []
+}

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sap.ai.sdk.core.AiCoreService;
+import com.sap.ai.sdk.orchestration.AssistantMessage;
 import com.sap.ai.sdk.orchestration.AzureContentFilter;
 import com.sap.ai.sdk.orchestration.AzureFilterThreshold;
 import com.sap.ai.sdk.orchestration.DpiMasking;
@@ -23,6 +24,7 @@
 import com.sap.ai.sdk.orchestration.OrchestrationModuleConfig;
 import com.sap.ai.sdk.orchestration.OrchestrationPrompt;
 import com.sap.ai.sdk.orchestration.ResponseJsonSchema;
+import com.sap.ai.sdk.orchestration.SystemMessage;
 import com.sap.ai.sdk.orchestration.TemplateConfig;
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import com.sap.ai.sdk.orchestration.model.DataRepositoryType;
@@ -37,6 +39,7 @@
 import com.sap.ai.sdk.orchestration.model.SAPDocumentTranslationOutputTargetLanguage;
 import com.sap.ai.sdk.orchestration.model.SearchDocumentKeyValueListPair;
 import com.sap.ai.sdk.orchestration.model.SearchSelectOptionEnum;
+import com.sap.ai.sdk.orchestration.model.SystemChatMessage;
 import com.sap.ai.sdk.orchestration.model.Template;
 import java.io.IOException;
 import java.util.List;
@@ -676,7 +679,8 @@ public OrchestrationChatResponse executeConfigFromReference() {
     var testReference =
         OrchestrationConfigReference.fromScenarioNameVersion(
             "sdk-test-scenario", "test-config-for-OrchestrationTest", "0.0.1");
-    OrchestrationPrompt testPrompt = new OrchestrationPrompt(Map.of("phrase", "Hello World"));
+    List<Message> history = List.of(new SystemMessage("Start every sentence with an emoji."));
+    OrchestrationPrompt testPrompt = new OrchestrationPrompt(Map.of("phrase", "Hello World")).messageHistory(history);
     return client.executeRequestFromReference(testPrompt, testReference);
   }