Updates

Author: MatKuhr

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

@@ -1,16 +1,13 @@
 package com.sap.ai.sdk.orchestration;
 
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostRequest;
-import com.sap.ai.sdk.orchestration.client.model.FilteringModuleConfig;
-import com.sap.ai.sdk.orchestration.client.model.LLMModuleConfig;
 import com.sap.ai.sdk.orchestration.client.model.ModuleConfigs;
 import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
+import io.vavr.control.Option;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import io.vavr.control.Option;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.val;
@@ -23,14 +20,16 @@ static CompletionPostRequest toCompletionPostRequestDto(
       @Nonnull final OrchestrationPrompt prompt, @Nonnull final OrchestrationModuleConfig config) {
     val template = toTemplateModuleConfigDto(prompt, config.getTemplate());
     // 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
+    // copying is required here, to not alter the original config object, which might be reused for
+    // subsequent requests
     val configCopy = config.withTemplate(template);
 
     return CompletionPostRequest.create()
         .orchestrationConfig(
             com.sap.ai.sdk.orchestration.client.model.OrchestrationConfig.create()
                 .moduleConfigurations(toModuleConfigsDto(configCopy)))
-        .inputParams(prompt.getTemplateParameters());
+        .inputParams(prompt.getTemplateParameters())
+        .messagesHistory(prompt.getMessagesHistory());
   }
 
   @Nonnull
@@ -56,22 +55,16 @@ static TemplatingModuleConfig toTemplateModuleConfigDto(
   @Nonnull
   static ModuleConfigs toModuleConfigsDto(@Nonnull final OrchestrationModuleConfig config) {
     val llmConfig =
-        Option.of(config.getLlmConfig()).getOrElseThrow(() -> new IllegalStateException("LLM config is required."));
+        Option.of(config.getLlmConfig())
+            .getOrElseThrow(() -> new IllegalStateException("LLM config is required."));
 
     //noinspection DataFlowIssue the template is always non-null here
     val moduleConfig =
         ModuleConfigs.create()
             .llmModuleConfig(llmConfig)
             .templatingModuleConfig(config.getTemplate());
 
-    val maybeInputFilter = Option.of(config.getInputContentFilter());
-    val maybeOutputFilter = Option.of(config.getOutputContentFilter());
-
-    if (maybeInputFilter.isDefined() || maybeOutputFilter.isDefined()) {
-      val filter = FilteringModuleConfig.create();
-      maybeInputFilter.forEach(filter::input);
-      maybeOutputFilter.forEach(filter::output);
-    }
+    Option.of(config.getFilteringConfig()).forEach(moduleConfig::filteringModuleConfig);
     Option.of(config.getMaskingConfig()).forEach(moduleConfig::maskingModuleConfig);
 
     return moduleConfig;

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

@@ -1,12 +1,10 @@
 package com.sap.ai.sdk.orchestration;
 
-import javax.annotation.Nullable;
-
-import com.sap.ai.sdk.orchestration.client.model.InputFilteringConfig;
+import com.sap.ai.sdk.orchestration.client.model.FilteringModuleConfig;
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleConfig;
 import com.sap.ai.sdk.orchestration.client.model.MaskingModuleConfig;
-import com.sap.ai.sdk.orchestration.client.model.OutputFilteringConfig;
 import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
+import javax.annotation.Nullable;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -37,31 +35,17 @@ public class OrchestrationModuleConfig {
   /**
    * The configured language model settings. This configuration is required when executing requests.
    */
-  @Nullable
-  LLMModuleConfig llmConfig;
+  @Nullable LLMModuleConfig llmConfig;
 
   /**
    * A template to be populated with input parameters. Upon request execution, this template will be
    * enhanced with any messages and parameter values from {@link OrchestrationPrompt}.
    */
-  @Nullable
-  TemplatingModuleConfig template;
-
-  /**
-   * A masking configuration to pseudonymous or anonymize sensitive data in the input.
-   */
-  @Nullable
-  MaskingModuleConfig maskingConfig;
+  @Nullable TemplatingModuleConfig template;
 
-  /**
-   * A content filter to filter the prompt.
-   */
-  @Nullable
-  InputFilteringConfig inputContentFilter;
+  /** A masking configuration to pseudonymous or anonymize sensitive data in the input. */
+  @Nullable MaskingModuleConfig maskingConfig;
 
-  /**
-   * A content filter to filter the language model response.
-   */
-  @Nullable
-  OutputFilteringConfig outputContentFilter;
-}
+  /** A content filter to filter the prompt. */
+  @Nullable FilteringModuleConfig filteringConfig;
+}

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

@@ -6,12 +6,11 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import javax.annotation.Nonnull;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Value;
-import lombok.val;
 
 /**
  * Represents a request that can be sent to the orchestration service, containing messages and
@@ -22,18 +21,18 @@
  */
 @Value
 @Getter(AccessLevel.PACKAGE)
-@AllArgsConstructor
 public class OrchestrationPrompt {
-  @Nonnull List<ChatMessage> messages;
-  @Nonnull Map<String, String> templateParameters;
+  @Nonnull List<ChatMessage> messages = new ArrayList<>();
+  @Nonnull Map<String, String> templateParameters = new TreeMap<>();
+  @Nonnull List<ChatMessage> messagesHistory = new ArrayList<>();
 
   /**
    * Initialize a prompt with the given user message.
    *
    * @param message A user message.
    */
   public OrchestrationPrompt(@Nonnull final String message) {
-    this(List.of(ChatMessage.create().role("user").content(message)), Map.of());
+    messages.add(ChatMessage.create().role("user").content(message));
   }
 
   /**
@@ -44,19 +43,28 @@ public OrchestrationPrompt(@Nonnull final String message) {
    */
   public OrchestrationPrompt(
       @Nonnull final ChatMessage message, @Nonnull final ChatMessage... messages) {
-    val allMessages = new ArrayList<ChatMessage>();
-    allMessages.add(message);
-    allMessages.addAll(Arrays.asList(messages));
-    this.messages = allMessages;
-    this.templateParameters = Map.of();
+    this.messages.add(message);
+    this.messages.addAll(Arrays.asList(messages));
   }
 
   /**
    * Initialize a prompt based on template variables.
    *
    * @param inputParams The input parameters as entries of template variables and their contents.
    */
-  public OrchestrationPrompt(@Nonnull final Map<String, String> inputParams) {
-    this(List.of(), inputParams);
+  public OrchestrationPrompt(
+      @Nonnull final Map<String, String> inputParams, @Nonnull final ChatMessage... messages) {
+    this.templateParameters.putAll(inputParams);
+    this.messages.addAll(Arrays.asList(messages));
+  }
+
+  /**
+   * Add a chat history to this prompt.
+   *
+   * @param messagesHistory The chat history to add.
+   */
+  public void setMessageHistory(@Nonnull final List<ChatMessage> messagesHistory) {
+    this.messagesHistory.clear();
+    this.messagesHistory.addAll(messagesHistory);
   }
 }

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

@@ -1,25 +1,23 @@
 package com.sap.ai.sdk.orchestration;
 
+import static com.sap.ai.sdk.orchestration.OrchestrationUnitTest.LLM_CONFIG;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
 
 import com.sap.ai.sdk.orchestration.client.model.ChatMessage;
-import com.sap.ai.sdk.orchestration.client.model.FilteringModuleConfig;
-import com.sap.ai.sdk.orchestration.client.model.LLMModuleConfig;
-import com.sap.ai.sdk.orchestration.client.model.MaskingModuleConfig;
-import com.sap.ai.sdk.orchestration.client.model.ModuleConfigs;
 import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
+import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 
 class ModuleConfigFactoryTest {
 
   @Test
   void testThrowsOnMissingLlmConfig() {
-    assertThatThrownBy(() -> ModuleConfigFactory.toModuleConfigsDto(new OrchestrationModuleConfig()))
+    assertThatThrownBy(
+            () -> ModuleConfigFactory.toModuleConfigsDto(new OrchestrationModuleConfig()))
         .isInstanceOf(IllegalStateException.class)
-        .hasMessageContaining("A prompt is required");
+        .hasMessageContaining("LLM config is required");
   }
 
   @Test
@@ -65,4 +63,17 @@ void testMergingTemplateConfig() {
 
     assertThat(actual).isEqualTo(expected);
   }
+
+  @Test
+  void testMessagesHistory() {
+    var systemMessage = ChatMessage.create().role("system").content("foo");
+
+    var prompt = new OrchestrationPrompt("bar");
+    prompt.setMessageHistory(List.of(systemMessage));
+    var actual =
+        ModuleConfigFactory.toCompletionPostRequestDto(
+            prompt, new OrchestrationModuleConfig().withLlmConfig(LLM_CONFIG));
+
+    assertThat(actual.getMessagesHistory()).containsExactly(systemMessage);
+  }
 }