Work in progress

Author: Jonas-Isr

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

@@ -3,12 +3,14 @@
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleConfig;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.Getter;
 
 /** Large language models available in Orchestration. */
 // https://help.sap.com/docs/sap-ai-core/sap-ai-core-service-guide/models-and-scenarios-in-generative-ai-hub
+@Getter
 public class OrchestrationAiModel {
-  @Getter private final LLMModuleConfig config;
+  private final LLMModuleConfig config;
 
   /** IBM Granite 13B chat completions model */
   public static final OrchestrationAiModel IBM_GRANITE_13B_CHAT =
@@ -116,15 +118,64 @@ public class OrchestrationAiModel {
       new OrchestrationAiModel("gemini-1.5-flash");
 
   OrchestrationAiModel(@Nonnull final String modelName) {
-    config = LLMModuleConfig.create().modelName(modelName).modelParams(Map.of());
+    config = new LLMModuleConfig().modelName(modelName).modelParams(Map.of());
   }
 
-  private OrchestrationAiModel(
-      @Nonnull final String modelName, Map<String, ? extends Number> modelParams) {
-    config = LLMModuleConfig.create().modelName(modelName).modelParams(modelParams);
+  //  private OrchestrationAiModel(
+  //      @Nonnull final String modelName, @Nonnull final Map<String, ? extends Number> modelParams)
+  // {
+  //    config = new LLMModuleConfig().modelName(modelName).modelParams(modelParams);
+  //  }
+
+  private OrchestrationAiModel(@Nonnull final String modelName, @Nonnull final Object modelParams) {
+    config = new LLMModuleConfig().modelName(modelName).modelParams(modelParams);
+  }
+
+  /**
+   * Set model version on this model.
+   *
+   * <pre>{@code
+   * .modelVersion("latest)
+   * }</pre>
+   *
+   * @param version The new version.
+   * @return New instance of this class with new version.
+   */
+  @Nonnull
+  public OrchestrationAiModel modelVersion(@Nullable final String version) {
+    //    Question: I need a map but only got an object as modelParams. How are modelParams
+    // structured?
+    final var model = new OrchestrationAiModel(config.getModelName(), config.getModelParams());
+    model.config.setModelVersion(version);
+    //    Question: Is modelVersion not lost as soon as we call modelParams?
+    //              Do we need to propagate this in that function as well?
+    return model;
   }
 
-  public OrchestrationAiModel modelParams(Map<String, ? extends Number> modelParams) {
-    return new OrchestrationAiModel(config.getModelName(), modelParams);
+  /**
+   * Set model parameters on this model.
+   *
+   * <pre>{@code
+   * .modelParams(
+   *    Map.of(
+   *        "max_tokens", 50,
+   *        "temperature", 0.1,
+   *        "frequency_penalty", 0,
+   *        "presence_penalty", 0));
+   * }</pre>
+   *
+   * @param modelParams Map of parameters.
+   * @return New instance of this class.
+   */
+  @Nonnull
+  public OrchestrationAiModel modelParams(@Nonnull final Object modelParams) {
+    return new OrchestrationAiModel(config.getModelName(), modelParams)
+        .modelVersion(config.getModelVersion());
   }
+
+  //  @Nonnull
+  //  public OrchestrationAiModel modelParams(
+  //          @Nonnull final Map<String, ? extends Number> modelParams) {
+  //    return new OrchestrationAiModel(config.getModelName(), modelParams);
+  //  }
 }

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

@@ -70,6 +70,7 @@ class OrchestrationUnitTest {
                   "temperature", 0.1,
                   "frequency_penalty", 0,
                   "presence_penalty", 0))
+          .modelVersion("latest")
           .getConfig();
   private final Function<String, InputStream> fileLoader =
       filename -> Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream(filename));
@@ -146,6 +147,7 @@ void testTemplating() throws IOException {
         .isEqualTo("Reply with 'Orchestration Service is working!' in German");
     assertThat(result.getModuleResults().getTemplating().get(0).getRole()).isEqualTo("user");
     var llm = (LLMModuleResultSynchronous) result.getModuleResults().getLlm();
+    assertThat(llm).isNotNull();
     assertThat(llm.getId()).isEqualTo("chatcmpl-9lzPV4kLrXjFckOp2yY454wksWBoj");
     assertThat(llm.getObject()).isEqualTo("chat.completion");
     assertThat(llm.getCreated()).isEqualTo(1721224505);
@@ -313,6 +315,7 @@ void maskingAnonymization() throws IOException {
 
     assertThat(result).isNotNull();
     GenericModuleResult inputMasking = result.getModuleResults().getInputMasking();
+    assertThat(inputMasking).isNotNull();
     assertThat(inputMasking.getMessage()).isEqualTo("Input to LLM is masked successfully.");
     assertThat(inputMasking.getData()).isNotNull();
     final var choices = ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices();

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

@@ -32,7 +32,8 @@
 @RequestMapping("/orchestration")
 class OrchestrationController {
   private final OrchestrationClient client = new OrchestrationClient();
-  OrchestrationModuleConfig config = new OrchestrationModuleConfig().withLlmConfig(GPT_35_TURBO.getConfig());
+  OrchestrationModuleConfig config =
+      new OrchestrationModuleConfig().withLlmConfig(GPT_35_TURBO.getConfig());
 
   /**
    * Chat request to OpenAI through the Orchestration service with a simple prompt.

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OrchestrationTest.java

@@ -67,7 +67,8 @@ void testTemplate() {
     var orchestrationResult = ((LLMModuleResultSynchronous) result.getOrchestrationResult());
     assertThat(orchestrationResult.getObject()).isEqualTo("chat.completion");
     assertThat(orchestrationResult.getCreated()).isGreaterThan(1);
-    assertThat(result.getOrchestrationResult().getModel()).isEqualTo(model);
+    assertThat(((LLMModuleResultSynchronous) result.getOrchestrationResult()).getModel())
+        .isEqualTo(model);
     choices = ((LLMModuleResultSynchronous) orchestrationResult).getChoices();
     assertThat(choices.get(0).getIndex()).isZero();
     assertThat(choices.get(0).getMessage().getContent()).isNotEmpty();