Updates

Author: n-o-u-r-h-a-n

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

@@ -34,8 +34,7 @@
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class DpiMasking implements MaskingProvider {
   @Nonnull DPIConfig.MethodEnum maskingMethod;
-  @Nonnull List<DPIEntities> entities;
-  @Nonnull List<DPICustomEntity> customEntities;
+  @Nonnull List<DPIEntityConfig> entitiesDTO;
   @With boolean maskGroundingInput;
   @Nonnull List<String> allowList;
 
@@ -81,7 +80,13 @@ public DpiMasking withEntities(
       val entitiesList = new ArrayList<DPIEntities>();
       entitiesList.add(entity);
       entitiesList.addAll(Arrays.asList(entities));
-      return new DpiMasking(maskingMethod, entitiesList, List.of(), false, List.of());
+
+      val entitiesDTO =
+          new ArrayList<>(
+              entitiesList.stream()
+                  .map(it -> (DPIEntityConfig) DPIStandardEntity.create().type(it))
+                  .toList());
+      return new DpiMasking(maskingMethod, entitiesDTO, false, List.of());
     }
 
     /**
@@ -101,7 +106,7 @@ public DpiMasking withRegex(@Nonnull final String regex, @Nonnull final String r
                       .method(DPIMethodConstant.MethodEnum.CONSTANT)
                       .value(replacement));
 
-      return new DpiMasking(maskingMethod, List.of(), List.of(customEntity), false, List.of());
+      return new DpiMasking(maskingMethod, List.of(customEntity), false, List.of());
     }
   }
 
@@ -114,7 +119,7 @@ public DpiMasking withRegex(@Nonnull final String regex, @Nonnull final String r
    */
   @Nonnull
   public DpiMasking withRegex(@Nonnull final String regex, @Nonnull final String replacement) {
-    return new DpiMasking(maskingMethod, entities, customEntities, maskGroundingInput, allowList);
+    return new DpiMasking(maskingMethod, entitiesDTO, maskGroundingInput, allowList);
   }
 
   /**
@@ -125,18 +130,12 @@ public DpiMasking withRegex(@Nonnull final String regex, @Nonnull final String r
    */
   @Nonnull
   public DpiMasking withAllowList(@Nonnull final List<String> allowList) {
-    return new DpiMasking(maskingMethod, entities, customEntities, maskGroundingInput, allowList);
+    return new DpiMasking(maskingMethod, entitiesDTO, maskGroundingInput, allowList);
   }
 
   @Nonnull
   @Override
   public DPIConfig createConfig() {
-    val entitiesDTO =
-        new ArrayList<>(
-            entities.stream()
-                .map(it -> (DPIEntityConfig) DPIStandardEntity.create().type(it))
-                .toList());
-    entitiesDTO.addAll(customEntities);
     return DPIConfig.create()
         .type(SAP_DATA_PRIVACY_INTEGRATION)
         .method(maskingMethod)

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

@@ -218,14 +218,14 @@ Object maskingAnonymization(
 
   @GetMapping("/maskingRegex")
   @Nonnull
-    Object maskingRegex(
-        @Nullable @RequestParam(value = "format", required = false) final String format) {
-        final var response = service.maskingRegex();
-        if ("json".equals(format)) {
-        return response;
-        }
-        return response.getContent();
+  Object maskingRegex(
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
+    final var response = service.maskingRegex();
+    if ("json".equals(format)) {
+      return response;
     }
+    return response.getContent();
+  }
 
   @GetMapping("/completion/{resourceGroup}")
   @Nonnull

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

@@ -274,16 +274,15 @@ public OrchestrationChatResponse maskingAnonymization(@Nonnull final DPIEntities
 
     return client.chatCompletion(prompt, configWithMasking);
   }
-    /**
-     * Let the orchestration service evaluate the feedback on the AI SDK provided by a hypothetical
-     * user. Mask any patient IDs given as they are not relevant for judging the sentiment of the
-     * feedback.
-     *
-     * @link <a
-     *     href="https://help.sap.com/docs/sap-ai-core/sap-ai-core-service-guide/data-masking">SAP AI
-     *     Core: Orchestration - Data Masking</a>
-     * @return the assistant response object
-     */
+
+  /**
+   * Let the LLM respond with a masked repeated phrase of patient IDs.
+   *
+   * @link <a
+   *     href="https://help.sap.com/docs/sap-ai-core/sap-ai-core-service-guide/data-masking">SAP AI
+   *     Core: Orchestration - Data Masking</a>
+   * @return the assistant response object
+   */
   @Nonnull
   public OrchestrationChatResponse maskingRegex() {
     val systemMessage = Message.system("Repeat following messages");
@@ -292,7 +291,10 @@ public OrchestrationChatResponse maskingRegex() {
     val prompt = new OrchestrationPrompt(systemMessage, userMessage);
     val regex = "patient_id_[0-9]+";
     val replacement = "REDACTED_ID";
-    val maskingConfig = DpiMasking.anonymization().withRegex(regex, replacement);
+    val maskingConfig =
+        DpiMasking.anonymization()
+            .withRegex(regex, replacement)
+            .withRegex("student_id_[0-9]+", "student_id");
     val configWithMasking = config.withMaskingConfig(maskingConfig);
 
     return client.chatCompletion(prompt, configWithMasking);

sample-code/spring-app/src/main/resources/static/index.html

@@ -388,12 +388,7 @@ <h2>Orchestration</h2>
                                             <code>/orchestration/maskingRegex</code>
                                         </button>
                                         <div class="tooltip-content">
-                                            Let the orchestration service evaluate the feedback on
-                                            the AI SDK provided by a
-                                            hypothetical
-                                            user. Mask any patient IDs given as they are not relevant for judging the
-                                            sentiment of the
-                                            feedback.
+                                            Let the LLM respond with a masked repeated phrase of patient IDs.
                                         </div>
                                     </div>
                                 </li>