Format

Author: newtork

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

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationOutputFilterException;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Output;
 import com.sap.ai.sdk.orchestration.model.AssistantChatMessage;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
@@ -36,16 +36,16 @@ public class OrchestrationChatResponse {
    * <p>Note: If there are multiple choices only the first one is returned
    *
    * @return the message content or empty string.
-   * @throws OrchestrationOutputFilterException if the content filter filtered the output.
+   * @throws Output if the content filter filtered the output.
    */
   @Nonnull
-  public String getContent() throws OrchestrationOutputFilterException {
+  public String getContent() throws Output {
     final var choice = getChoice();
 
     if ("content_filter".equals(choice.getFinishReason())) {
       final var filterDetails = Try.of(this::getOutputFilteringChoices).getOrElseGet(e -> Map.of());
       final var message = "Content filter filtered the output.";
-      throw new OrchestrationOutputFilterException(message, filterDetails);
+      throw new Output(message, filterDetails);
     }
     return choice.getMessage().getContent();
   }

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

@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.AiCoreService;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationOutputFilterException;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Output;
 import com.sap.ai.sdk.orchestration.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.model.CompletionPostResponse;
 import com.sap.ai.sdk.orchestration.model.EmbeddingsPostRequest;
@@ -115,13 +115,13 @@ public Stream<String> streamChatCompletion(
   }
 
   private static void throwOnContentFilter(@Nonnull final OrchestrationChatCompletionDelta delta)
-      throws OrchestrationOutputFilterException {
+      throws Output {
     final String finishReason = delta.getFinishReason();
     if (finishReason != null && finishReason.equals("content_filter")) {
       final var filterDetails =
           Try.of(() -> getOutputFilteringChoices(delta)).getOrElseGet(e -> Map.of());
       final var message = "Content filter filtered the output.";
-      throw new OrchestrationOutputFilterException(message, filterDetails);
+      throw new Output(message, filterDetails);
     }
   }
 

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

@@ -2,7 +2,7 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientExceptionFactory;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationInputFilterException;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Input;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
 import com.sap.ai.sdk.orchestration.model.GenericModuleResult;
 import com.sap.ai.sdk.orchestration.model.ModuleResults;
@@ -29,7 +29,7 @@ public OrchestrationClientException buildFromClientError(
 
     final var inputFilterDetails = extractInputFilterDetails(clientError);
     if (!inputFilterDetails.isEmpty()) {
-      return new OrchestrationInputFilterException(message, clientError, inputFilterDetails);
+      return new Input(message, clientError, inputFilterDetails);
     }
 
     return new OrchestrationClientException(message, clientError);

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

@@ -37,15 +37,15 @@ public LlamaGuard38b getLlamaGuard38b() {
   }
 
   /** Exception thrown when an error occurs during input filtering. */
-  public static class OrchestrationInputFilterException extends OrchestrationFilterException {
+  public static class Input extends OrchestrationFilterException {
     /**
      * Constructs a new OrchestrationInputFilterException.
      *
      * @param message The detail message.
      * @param clientError The specific client error.
      * @param filterDetails Details about the filter that caused the exception.
      */
-    OrchestrationInputFilterException(
+    Input(
         @Nonnull final String message,
         @Nonnull final OrchestrationError clientError,
         @Nonnull final Map<String, Object> filterDetails) {
@@ -75,15 +75,14 @@ public AzureContentSafetyInput getAzureContentSafetyInput() {
    * Exception thrown when an error occurs during output filtering, specifically when the finish
    * reason is a content filter.
    */
-  public static class OrchestrationOutputFilterException extends OrchestrationFilterException {
+  public static class Output extends OrchestrationFilterException {
     /**
      * Constructs a new OrchestrationOutputFilterException.
      *
      * @param message The detail message.
      * @param filterDetails Details about the filter that caused the exception.
      */
-    OrchestrationOutputFilterException(
-        @Nonnull final String message, @Nonnull final Map<String, Object> filterDetails) {
+    Output(@Nonnull final String message, @Nonnull final Map<String, Object> filterDetails) {
       super(message);
       this.filterDetails = filterDetails;
     }

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

@@ -40,8 +40,6 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.github.tomakehurst.wiremock.stubbing.Scenario;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationInputFilterException;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationOutputFilterException;
 import com.sap.ai.sdk.orchestration.model.ChatDelta;
 import com.sap.ai.sdk.orchestration.model.DPIConfig;
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
@@ -424,7 +422,7 @@ void inputFilteringStrict() {
 
     try {
       client.chatCompletion(prompt, configWithFilter);
-    } catch (OrchestrationInputFilterException e) {
+    } catch (OrchestrationFilterException.Input e) {
       assertThat(e.getMessage())
           .isEqualTo(
               "Request failed with status 400 (Bad Request): 400 - Filtering Module - Input Filter: Prompt filtered due to safety violations. Please modify the prompt and try again.");
@@ -477,7 +475,7 @@ void outputFilteringStrict() {
 
     try {
       client.chatCompletion(prompt, configWithFilter).getContent();
-    } catch (OrchestrationOutputFilterException e) {
+    } catch (Output e) {
       assertThat(e.getMessage()).isEqualTo("Content filter filtered the output.");
       assertThat(e.getFilterDetails())
           .isEqualTo(
@@ -730,9 +728,9 @@ void testThrowsOnContentFilter() {
     // this must not throw, since the stream is lazily evaluated
     var stream = mock.streamChatCompletion(new OrchestrationPrompt(""), config);
     assertThatThrownBy(stream::toList)
-        .isInstanceOf(OrchestrationOutputFilterException.class)
+        .isInstanceOf(Output.class)
         .hasMessage("Content filter filtered the output.")
-        .extracting(e -> ((OrchestrationOutputFilterException) e).getFilterDetails())
+        .extracting(e -> ((Output) e).getFilterDetails())
         .isEqualTo(Map.of("azure_content_safety", Map.of("hate", 0, "self_harm", 0)));
   }
 
@@ -754,7 +752,7 @@ void streamChatCompletionOutputFilterErrorHandling() throws IOException {
 
       try (Stream<String> stream = client.streamChatCompletion(prompt, config)) {
         assertThatThrownBy(() -> stream.forEach(System.out::println))
-            .isInstanceOf(OrchestrationOutputFilterException.class)
+            .isInstanceOf(Output.class)
             .hasMessage("Content filter filtered the output.");
       }
 

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

@@ -5,8 +5,8 @@
 import com.sap.ai.sdk.app.services.OrchestrationService;
 import com.sap.ai.sdk.orchestration.AzureFilterThreshold;
 import com.sap.ai.sdk.orchestration.OrchestrationChatResponse;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationInputFilterException;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationOutputFilterException;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Input;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Output;
 import com.sap.ai.sdk.orchestration.model.AzureContentSafetyInput;
 import com.sap.ai.sdk.orchestration.model.AzureContentSafetyOutput;
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
@@ -128,7 +128,7 @@ Object inputFiltering(
     final OrchestrationChatResponse response;
     try {
       response = service.inputFiltering(policy);
-    } catch (OrchestrationInputFilterException e) {
+    } catch (Input e) {
       final var msg =
           new StringBuilder(
               "[Http %d] Failed to obtain a response as the content was flagged by input filter. "
@@ -160,7 +160,7 @@ Object outputFiltering(
     final String content;
     try {
       content = response.getContent();
-    } catch (OrchestrationOutputFilterException e) {
+    } catch (Output e) {
       final var msg =
           new StringBuilder(
               "Failed to obtain a response as the content was flagged by output filter. ");
@@ -189,7 +189,7 @@ Object llamaGuardInputFiltering(
     final OrchestrationChatResponse response;
     try {
       response = service.llamaGuardInputFilter(enabled);
-    } catch (OrchestrationInputFilterException e) {
+    } catch (Input e) {
       var msg =
           "[Http %d] Failed to obtain a response as the content was flagged by input filter. "
               .formatted(e.getStatusCode());

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

@@ -15,8 +15,8 @@
 import com.sap.ai.sdk.orchestration.Message;
 import com.sap.ai.sdk.orchestration.OrchestrationClient;
 import com.sap.ai.sdk.orchestration.OrchestrationClientException;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationInputFilterException;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationOutputFilterException;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Input;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Output;
 import com.sap.ai.sdk.orchestration.OrchestrationModuleConfig;
 import com.sap.ai.sdk.orchestration.OrchestrationPrompt;
 import com.sap.ai.sdk.orchestration.TemplateConfig;
@@ -221,7 +221,7 @@ void testInputFilteringStrict() {
             "Prompt filtered due to safety violations. Please modify the prompt and try again.")
         .hasMessageContaining("400 (Bad Request)")
         .isInstanceOfSatisfying(
-            OrchestrationInputFilterException.class,
+            Input.class,
             e -> {
               var actualAzureContentSafety = e.getAzureContentSafetyInput();
               assertThat(actualAzureContentSafety).isNotNull();
@@ -253,7 +253,7 @@ void testOutputFilteringStrict() {
     assertThatThrownBy(response::getContent)
         .hasMessageContaining("Content filter filtered the output.")
         .isInstanceOfSatisfying(
-            OrchestrationOutputFilterException.class,
+            Output.class,
             e -> {
               var actualAzureContentSafety = e.getAzureContentSafetyOutput();
               assertThat(actualAzureContentSafety).isNotNull();
@@ -280,12 +280,12 @@ void testOutputFilteringLenient() {
   @Test
   void testLlamaGuardEnabled() {
     assertThatThrownBy(() -> service.llamaGuardInputFilter(true))
-        .isInstanceOf(OrchestrationInputFilterException.class)
+        .isInstanceOf(Input.class)
         .hasMessageContaining(
             "Prompt filtered due to safety violations. Please modify the prompt and try again.")
         .hasMessageContaining("400 (Bad Request)")
         .isInstanceOfSatisfying(
-            OrchestrationInputFilterException.class,
+            Input.class,
             e -> {
               var llamaGuard38b = e.getLlamaGuard38b();
               assertThat(llamaGuard38b).isNotNull();
@@ -419,7 +419,7 @@ void testStreamingErrorHandlingInputFilter() {
     val configWithFilter = config.withInputFiltering(filterConfig);
 
     assertThatThrownBy(() -> client.streamChatCompletion(prompt, configWithFilter))
-        .isInstanceOf(OrchestrationInputFilterException.class)
+        .isInstanceOf(Input.class)
         .hasMessageContaining("status 400 (Bad Request)")
         .hasMessageContaining("Filtering Module - Input Filter");
   }