WiP 2

Author: CharlesDuboisSAP

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModel.java

@@ -25,12 +25,11 @@
 @RequiredArgsConstructor
 public class OrchestrationChatModel implements ChatModel {
   @Nonnull private final OrchestrationClient client = new OrchestrationClient();
-  @Nonnull private final OrchestrationModuleConfig config;
 
   @Override
   public ChatResponse call(Prompt prompt) {
     val orchestrationPrompt = toOrchestrationPrompt(prompt);
-    val response = client.chatCompletion(orchestrationPrompt, config);
+    val response = client.chatCompletion(orchestrationPrompt, ((OrchestrationChatOptions) prompt.getOptions()).getConfig());
     return OrchestrationChatResponse.fromOrchestrationResponse(response.getOriginalResponse());
   }
 

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatOptions.java

@@ -28,7 +28,7 @@ public class OrchestrationChatOptions implements ChatOptions {
   @Getter(AccessLevel.PUBLIC)
   @Setter(AccessLevel.PUBLIC)
   @Nonnull
-  OrchestrationModuleConfig config = new OrchestrationModuleConfig();
+  OrchestrationModuleConfig config;
 
   // region satisfy the ChatOptions interface, delegating to the LLM config
   @Nullable
@@ -87,8 +87,7 @@ public Double getTopP() {
 
   @Override
   public OrchestrationChatOptions copy() {
-    var copy = new OrchestrationChatOptions();
-    copy.config = this.config;
+    var copy = new OrchestrationChatOptions(config);
     copy.templateParameters.putAll(this.templateParameters);
     return copy;
   }

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

@@ -24,11 +24,14 @@
 @RequestMapping("/orchestration")
 class OrchestrationController {
 
-  ChatModel client = new OrchestrationChatModel(new OrchestrationModuleConfig().withLlmConfig(GPT_35_TURBO));
+  ChatModel client = new OrchestrationChatModel();
+  private final OrchestrationModuleConfig config =
+  new OrchestrationModuleConfig().withLlmConfig(GPT_35_TURBO);
 
   @GetMapping("/completion")
   ChatResponse completion() {
-    var prompt = new Prompt("What is the capital of France?");
+    var opts = new OrchestrationChatOptions(config);
+    var prompt = new Prompt("What is the capital of France?", opts);
 
     return client.call(prompt);
   }
@@ -59,8 +62,7 @@ ChatResponse masking() {
         DpiMasking.anonymization()
             .withEntities(DPIEntities.EMAIL, DPIEntities.ADDRESS, DPIEntities.LOCATION);
 
-    var opts = new OrchestrationChatOptions();
-    opts.setConfig(new OrchestrationModuleConfig().withMaskingConfig(masking));
+    var opts = new OrchestrationChatOptions(config.withMaskingConfig(masking));
     var prompt =
         new Prompt(
             "Please write 'Hello World!' to me via email. My email address is [email protected]",