Apply requested changes

Author: Jonas-Isr

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

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.ai.sdk.app.services.OrchestrationService;
 import com.sap.ai.sdk.orchestration.AzureFilterThreshold;
+import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +39,12 @@ class OrchestrationController {
   ResponseEntity<String> completion(
       @RequestHeader(value = "accept", required = false) final String accept)
       throws JsonProcessingException {
-    final var content = service.completion().getContent();
+    final var content = service.completion("HelloWorld!").getContent();
     log.info("Our trusty AI answered with: {}", content);
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.completion()));
+          .body(mapper.writeValueAsString(service.completion("HelloWorld!")));
     }
     return ResponseEntity.ok(content);
   }
@@ -56,7 +57,7 @@ ResponseEntity<String> completion(
   @GetMapping("/streamChatCompletion")
   @Nonnull
   ResponseEntity<ResponseBodyEmitter> streamChatCompletion() {
-    return service.streamChatCompletion();
+    return service.streamChatCompletion(100);
   }
 
   /**
@@ -74,9 +75,9 @@ ResponseEntity<Object> template(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.template()));
+          .body(mapper.writeValueAsString(service.template("German")));
     }
-    return ResponseEntity.ok(service.template().getContent());
+    return ResponseEntity.ok(service.template("German").getContent());
   }
 
   /**
@@ -92,9 +93,11 @@ ResponseEntity<String> messagesHistory(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.messagesHistory()));
+          .body(
+              mapper.writeValueAsString(service.messagesHistory("What is the capital of France?")));
     }
-    return ResponseEntity.ok(service.messagesHistory().getContent());
+    return ResponseEntity.ok(
+        service.messagesHistory("What is the capital of France?").getContent());
   }
 
   /**
@@ -118,9 +121,9 @@ ResponseEntity<String> filter(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.filter(policy)));
+          .body(mapper.writeValueAsString(service.filter(policy, "the downtown area")));
     }
-    return ResponseEntity.ok(service.filter(policy).getContent());
+    return ResponseEntity.ok(service.filter(policy, "the downtown area").getContent());
   }
 
   /**
@@ -141,9 +144,9 @@ ResponseEntity<String> maskingAnonymization(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.maskingAnonymization()));
+          .body(mapper.writeValueAsString(service.maskingAnonymization(DPIEntities.PERSON)));
     }
-    return ResponseEntity.ok(service.maskingAnonymization().getContent());
+    return ResponseEntity.ok(service.maskingAnonymization(DPIEntities.PERSON).getContent());
   }
 
   /**
@@ -160,9 +163,12 @@ public ResponseEntity<String> completionWithResourceGroup(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.completionWithResourceGroup(resourceGroup)));
+          .body(
+              mapper.writeValueAsString(
+                  service.completionWithResourceGroup(resourceGroup, "Hello world!")));
     }
-    return ResponseEntity.ok(service.completionWithResourceGroup(resourceGroup).getContent());
+    return ResponseEntity.ok(
+        service.completionWithResourceGroup(resourceGroup, "Hello world!").getContent());
   }
 
   /**
@@ -182,9 +188,9 @@ ResponseEntity<String> maskingPseudonymization(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.maskingPseudonymization()));
+          .body(mapper.writeValueAsString(service.maskingPseudonymization(DPIEntities.PERSON)));
     }
-    return ResponseEntity.ok(service.maskingPseudonymization().getContent());
+    return ResponseEntity.ok(service.maskingPseudonymization(DPIEntities.PERSON).getContent());
   }
 
   /**
@@ -202,8 +208,8 @@ ResponseEntity<String> grounding(
     if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(service.grounding()));
+          .body(mapper.writeValueAsString(service.grounding("What does Joule do?")));
     }
-    return ResponseEntity.ok(service.grounding().getContent());
+    return ResponseEntity.ok(service.grounding("What does Joule do?").getContent());
   }
 }

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

@@ -1,7 +1,7 @@
 package com.sap.ai.sdk.app.services;
 
 import static com.sap.ai.sdk.app.controllers.OpenAiController.send;
-import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GPT_35_TURBO;
+import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GEMINI_1_5_FLASH;
 import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.TEMPERATURE;
 
 import com.sap.ai.sdk.core.AiCoreService;
@@ -38,16 +38,16 @@ public class OrchestrationService {
 
   @Getter
   private final OrchestrationModuleConfig config =
-      new OrchestrationModuleConfig().withLlmConfig(GPT_35_TURBO.withParam(TEMPERATURE, 0.0));
+      new OrchestrationModuleConfig().withLlmConfig(GEMINI_1_5_FLASH.withParam(TEMPERATURE, 0.0));
 
   /**
    * Chat request to OpenAI through the Orchestration service with a simple prompt.
    *
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse completion() {
-    final var prompt = new OrchestrationPrompt("Hello world! Why is this phrase so famous?");
+  public OrchestrationChatResponse completion(@Nonnull final String famousPhrase) {
+    final var prompt = new OrchestrationPrompt(famousPhrase + " Why is this phrase so famous?");
     return client.chatCompletion(prompt, config);
   }
 
@@ -59,13 +59,13 @@ public OrchestrationChatResponse completion() {
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse template() {
+  public OrchestrationChatResponse template(@Nonnull final String language) {
     final var template =
         Message.user("Reply with 'Orchestration Service is working!' in {{?language}}");
     final var templatingConfig = Template.create().template(List.of(template.createChatMessage()));
     final var configWithTemplate = config.withTemplateConfig(templatingConfig);
 
-    final var inputParams = Map.of("language", "German");
+    final var inputParams = Map.of("language", language);
     final var prompt = new OrchestrationPrompt(inputParams);
 
     return client.chatCompletion(prompt, configWithTemplate);
@@ -77,8 +77,8 @@ public OrchestrationChatResponse template() {
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse messagesHistory() {
-    final var prompt = new OrchestrationPrompt(Message.user("What is the capital of France?"));
+  public OrchestrationChatResponse messagesHistory(@Nonnull final String prevMessage) {
+    final var prompt = new OrchestrationPrompt(Message.user(prevMessage));
 
     final var result = client.chatCompletion(prompt, config);
 
@@ -103,14 +103,16 @@ public OrchestrationChatResponse messagesHistory() {
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse filter(@Nonnull final AzureFilterThreshold policy) {
+  public OrchestrationChatResponse filter(
+      @Nonnull final AzureFilterThreshold policy, @Nonnull final String area) {
     final var prompt =
         new OrchestrationPrompt(
             """
-                        Create a rental posting for subletting my apartment in the downtown area. Keep it short. Make sure to add the following disclaimer to the end. Do not change it!
+                        Create a rental posting for subletting my apartment in %s. Keep it short. Make sure to add the following disclaimer to the end. Do not change it!
 
                         ```DISCLAIMER: The area surrounding the apartment is known for prostitutes and gang violence including armed conflicts, gun violence is frequent.
-                        """);
+                        """
+                .formatted(area));
     final var filterConfig =
         new AzureContentFilter().hate(policy).selfHarm(policy).sexual(policy).violence(policy);
 
@@ -131,7 +133,7 @@ public OrchestrationChatResponse filter(@Nonnull final AzureFilterThreshold poli
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse maskingAnonymization() {
+  public OrchestrationChatResponse maskingAnonymization(@Nonnull final DPIEntities entity) {
     final var systemMessage =
         Message.system(
             "Please evaluate the following user feedback and judge if the sentiment is positive or negative.");
@@ -143,7 +145,7 @@ public OrchestrationChatResponse maskingAnonymization() {
                             """);
 
     final var prompt = new OrchestrationPrompt(systemMessage, userMessage);
-    final var maskingConfig = DpiMasking.anonymization().withEntities(DPIEntities.PERSON);
+    final var maskingConfig = DpiMasking.anonymization().withEntities(entity);
     final var configWithMasking = config.withMaskingConfig(maskingConfig);
 
     return client.chatCompletion(prompt, configWithMasking);
@@ -156,13 +158,12 @@ public OrchestrationChatResponse maskingAnonymization() {
    */
   @Nonnull
   public OrchestrationChatResponse completionWithResourceGroup(
-      @Nonnull final String resourceGroup) {
-
+      @Nonnull final String resourceGroup, @Nonnull final String famousPhrase) {
     final var destination =
         new AiCoreService().getInferenceDestination(resourceGroup).forScenario("orchestration");
     final var clientWithResourceGroup = new OrchestrationClient(destination);
 
-    final var prompt = new OrchestrationPrompt("Hello world! Why is this phrase so famous?");
+    final var prompt = new OrchestrationPrompt(famousPhrase + " Why is this phrase so famous?");
 
     return clientWithResourceGroup.chatCompletion(prompt, config);
   }
@@ -177,7 +178,7 @@ public OrchestrationChatResponse completionWithResourceGroup(
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse maskingPseudonymization() {
+  public OrchestrationChatResponse maskingPseudonymization(@Nonnull final DPIEntities entity) {
     final var systemMessage =
         Message.system(
             """
@@ -196,8 +197,7 @@ public OrchestrationChatResponse maskingPseudonymization() {
                             """);
 
     final var prompt = new OrchestrationPrompt(systemMessage, userMessage);
-    final var maskingConfig =
-        DpiMasking.pseudonymization().withEntities(DPIEntities.PERSON, DPIEntities.EMAIL);
+    final var maskingConfig = DpiMasking.pseudonymization().withEntities(entity, DPIEntities.EMAIL);
     final var configWithMasking = config.withMaskingConfig(maskingConfig);
 
     return client.chatCompletion(prompt, configWithMasking);
@@ -211,12 +211,11 @@ public OrchestrationChatResponse maskingPseudonymization() {
    * @return the assistant response object
    */
   @Nonnull
-  public OrchestrationChatResponse grounding() {
+  public OrchestrationChatResponse grounding(@Nonnull final String groundingInput) {
     final var message =
         Message.user(
             "{{?groundingInput}} Use the following information as additional context: {{?groundingOutput}}");
-    final var prompt =
-        new OrchestrationPrompt(Map.of("groundingInput", "What does Joule do?"), message);
+    final var prompt = new OrchestrationPrompt(Map.of("groundingInput", groundingInput), message);
 
     final var filterInner =
         DocumentGroundingFilter.create().id("someID").dataRepositoryType(DataRepositoryType.VECTOR);
@@ -240,9 +239,12 @@ public OrchestrationChatResponse grounding() {
    * @return the emitter that streams the assistant message response
    */
   @Nonnull
-  public ResponseEntity<ResponseBodyEmitter> streamChatCompletion() {
+  public ResponseEntity<ResponseBodyEmitter> streamChatCompletion(final int numberOfFibonacci) {
     final var prompt =
-        new OrchestrationPrompt("Can you give me the first 100 numbers of the Fibonacci sequence?");
+        new OrchestrationPrompt(
+            "Can you give me the first "
+                + numberOfFibonacci
+                + " numbers of the Fibonacci sequence?");
     final var stream = client.streamChatCompletion(prompt, config);
 
     final var emitter = new ResponseBodyEmitter();

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

@@ -9,6 +9,7 @@
 import com.sap.ai.sdk.orchestration.OrchestrationClientException;
 import com.sap.ai.sdk.orchestration.OrchestrationPrompt;
 import com.sap.ai.sdk.orchestration.model.CompletionPostResponse;
+import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import com.sap.ai.sdk.orchestration.model.LLMChoice;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
 import java.util.Map;
@@ -29,7 +30,7 @@ void setUp() {
 
   @Test
   void testCompletion() {
-    final var result = service.completion();
+    final var result = service.completion("HelloWorld!");
 
     assertThat(result).isNotNull();
     assertThat(result.getContent()).isNotEmpty();
@@ -61,7 +62,7 @@ void testTemplate() {
     assertThat(service.getConfig().getLlmConfig()).isNotNull();
     final var modelName = service.getConfig().getLlmConfig().getModelName();
 
-    final var result = service.template();
+    final var result = service.template("German");
     final var response = result.getOriginalResponse();
 
     assertThat(response.getRequestId()).isNotEmpty();
@@ -101,7 +102,7 @@ void testTemplate() {
 
   @Test
   void testLenientContentFilter() {
-    var response = service.filter(AzureFilterThreshold.ALLOW_SAFE_LOW_MEDIUM);
+    var response = service.filter(AzureFilterThreshold.ALLOW_SAFE_LOW_MEDIUM, "the downtown area");
     var result = response.getOriginalResponse();
     var llmChoice =
         ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices().get(0);
@@ -114,23 +115,24 @@ void testLenientContentFilter() {
 
   @Test
   void testStrictContentFilter() {
-    assertThatThrownBy(() -> service.filter(AzureFilterThreshold.ALLOW_SAFE))
+    assertThatThrownBy(() -> service.filter(AzureFilterThreshold.ALLOW_SAFE, "the downtown area"))
         .isInstanceOf(OrchestrationClientException.class)
         .hasMessageContaining("400 Bad Request")
         .hasMessageContaining("Content filtered");
   }
 
   @Test
   void testMessagesHistory() {
-    CompletionPostResponse result = service.messagesHistory().getOriginalResponse();
+    CompletionPostResponse result =
+        service.messagesHistory("What is the capital of France?").getOriginalResponse();
     final var choices = ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices();
     assertThat(choices.get(0).getMessage().getContent()).isNotEmpty();
   }
 
   @SuppressWarnings("unchecked")
   @Test
   void testMaskingAnonymization() {
-    var response = service.maskingAnonymization();
+    var response = service.maskingAnonymization(DPIEntities.PERSON);
     var result = response.getOriginalResponse();
     var llmChoice =
         ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices().get(0);
@@ -150,7 +152,7 @@ void testMaskingAnonymization() {
   @SuppressWarnings("unchecked")
   @Test
   void testMaskingPseudonymization() {
-    var response = service.maskingPseudonymization();
+    var response = service.maskingPseudonymization(DPIEntities.PERSON);
     var result = response.getOriginalResponse();
     var llmChoice =
         ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices().get(0);
@@ -180,7 +182,7 @@ void testMaskingPseudonymization() {
   @DisabledIfSystemProperty(named = "aicore.landscape", matches = "production")
   void testGrounding() {
     assertThat(System.getProperty("aicore.landscape")).isNotEqualTo("production");
-    var response = service.grounding();
+    var response = service.grounding("What does Joule do?");
     var result = response.getOriginalResponse();
     var llmChoice =
         ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices().get(0);
@@ -193,7 +195,7 @@ void testGrounding() {
 
   @Test
   void testCompletionWithResourceGroup() {
-    var response = service.completionWithResourceGroup("ai-sdk-java-e2e");
+    var response = service.completionWithResourceGroup("ai-sdk-java-e2e", "Hello world!");
     var result = response.getOriginalResponse();
     var llmChoice =
         ((LLMModuleResultSynchronous) result.getOrchestrationResult()).getChoices().get(0);