fix: [Orchestration] Fixed getting OrchestrationFilterException.Input for bad requests with input filter. (#577)

* fix: [Orchestration] Fixed getting `OrchestrationFilterException.Input` for bad requests with input filter.

* Update openai old test

* Removed isError

Author: CharlesDuboisSAP

core/src/main/java/com/sap/ai/sdk/core/common/ClientStreamingHandler.java

@@ -1,5 +1,7 @@
 package com.sap.ai.sdk.core.common;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.Beta;
 import java.io.IOException;
@@ -77,12 +79,26 @@ public Stream<D> handleStreamingResponse(@Nonnull final ClassicHttpResponse resp
             line -> {
               final String data = line.substring(5); // remove "data: "
               try {
-                return objectMapper.readValue(data, successType);
-              } catch (final IOException e) { // exception message e gets lost
+                final JsonNode jsonNode = objectMapper.readTree(data);
+                if (jsonNode.has("error")) {
+                  throwErrorType(response, data);
+                }
+                return objectMapper.treeToValue(jsonNode, successType);
+              } catch (final IOException e) {
                 log.error("Failed to parse delta chunk to type {}", successType);
                 final String message = "Failed to parse delta chunk";
                 throw exceptionFactory.build(message, e).setHttpResponse(response);
               }
             });
   }
+
+  private void throwErrorType(final @Nonnull ClassicHttpResponse response, final String data)
+      throws JsonProcessingException, E {
+    final R error = objectMapper.readValue(data, errorType);
+    final String msg =
+        (error != null && error.getMessage() != null)
+            ? error.getMessage()
+            : "Error, unable to parse http response.";
+    throw exceptionFactory.build(msg).setHttpResponse(response);
+  }
 }

docs/release_notes.md

@@ -40,4 +40,4 @@
 
 ### 🐛 Fixed Issues
 
--
+- [Orchestration] Fixed getting `OrchestrationFilterException.Input` for bad requests with input filter.

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientGeneratedTest.java

@@ -298,7 +298,7 @@ void streamChatCompletionDeltasErrorHandling() throws IOException {
       try (var stream = client.streamChatCompletionDeltas(request)) {
         assertThatThrownBy(() -> stream.forEach(System.out::println))
             .isInstanceOf(OpenAiClientException.class)
-            .hasMessage("Failed to parse response");
+            .hasMessage("exceeded token rate limit");
       }
 
       Mockito.verify(inputStream, times(1)).close();

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientTest.java

@@ -262,7 +262,7 @@ void streamChatCompletionDeltasErrorHandling() throws IOException {
       try (var stream = client.streamChatCompletionDeltas(request)) {
         assertThatThrownBy(() -> stream.forEach(System.out::println))
             .isInstanceOf(OpenAiClientException.class)
-            .hasMessage("Failed to parse response");
+            .hasMessage("exceeded token rate limit");
       }
 
       Mockito.verify(inputStream, times(1)).close();

foundation-models/openai/src/test/resources/streamChatCompletionError.txt

@@ -1,2 +1,2 @@
 data: {"choices":[],"created":0,"id":"","model":"","object":"","prompt_filter_results":[{"prompt_index":0,"content_filter_results":{"hate":{"filtered":false,"severity":"safe"},"self_harm":{"filtered":false,"severity":"safe"},"sexual":{"filtered":false,"severity":"safe"},"violence":{"filtered":false,"severity":"safe"}}}]}
-{"error":{"code":"429","message":"exceeded token rate limit"}}
+data: {"error":{"code":"429","message":"exceeded token rate limit"}}

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

@@ -39,6 +39,7 @@ static Map<String, Object> extractInputFilterDetails(@Nullable final Orchestrati
           .map(ErrorResponse::getError)
           .map(Error::getIntermediateResults)
           .map(ModuleResults::getInputFiltering)
+          .filter(filter -> !filter.getMessage().equals("Input Filter passed successfully."))
           .map(GenericModuleResult::getData)
           .map(map -> (Map<String, Object>) map)
           .orElseGet(Collections::emptyMap);
@@ -47,6 +48,7 @@ static Map<String, Object> extractInputFilterDetails(@Nullable final Orchestrati
           .map(ErrorResponseStreaming::getError)
           .map(ErrorStreaming::getIntermediateResults)
           .map(ModuleResultsStreaming::getInputFiltering)
+          .filter(filter -> !filter.getMessage().equals("Input Filter passed successfully."))
           .map(GenericModuleResult::getData)
           .filter(Map.class::isInstance)
           .map(map -> (Map<String, Object>) map)

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

@@ -673,33 +673,33 @@ void testErrorHandling(@Nonnull final Runnable request) {
     softly
         .assertThatThrownBy(request::run)
         .describedAs("Server errors should be handled")
-        .isInstanceOf(OrchestrationClientException.class)
+        .isExactlyInstanceOf(OrchestrationClientException.class)
         .hasMessageContaining("500");
 
     softly
         .assertThatThrownBy(request::run)
         .describedAs("Error objects from Orchestration should be interpreted")
-        .isInstanceOf(OrchestrationClientException.class)
+        .isExactlyInstanceOf(OrchestrationClientException.class)
         .hasMessageContaining("'config' is a required property");
 
     softly
         .assertThatThrownBy(request::run)
         .describedAs("Failures while parsing error message should be handled")
-        .isInstanceOf(OrchestrationClientException.class)
+        .isExactlyInstanceOf(OrchestrationClientException.class)
         .hasMessageContaining("400")
         .extracting(e -> e.getSuppressed()[0])
         .isInstanceOf(JsonParseException.class);
 
     softly
         .assertThatThrownBy(request::run)
         .describedAs("Non-JSON responses should be handled")
-        .isInstanceOf(OrchestrationClientException.class)
+        .isExactlyInstanceOf(OrchestrationClientException.class)
         .hasMessageContaining("Failed to parse");
 
     softly
         .assertThatThrownBy(request::run)
         .describedAs("Empty responses should be handled")
-        .isInstanceOf(OrchestrationClientException.class)
+        .isExactlyInstanceOf(OrchestrationClientException.class)
         .hasMessageContaining("HTTP Response is empty");
 
     softly.assertAll();
@@ -839,6 +839,35 @@ void streamChatCompletionOutputFilterErrorHandling() throws IOException {
     }
   }
 
+  @Test
+  void testStreamingErrorHandlingBadRequest() throws IOException {
+    try (var inputStream = fileLoader.apply("streamError.txt")) {
+      final var httpClient = mock(HttpClient.class);
+      ApacheHttpClient5Accessor.setHttpClientFactory(destination -> httpClient);
+
+      // Create a mock response
+      final var mockResponse = new BasicClassicHttpResponse(200, "OK");
+      final var inputStreamEntity = new InputStreamEntity(inputStream, ContentType.TEXT_PLAIN);
+      mockResponse.setEntity(inputStreamEntity);
+      mockResponse.setHeader("Content-Type", "text/event-stream");
+
+      // Configure the HttpClient mock to return the mock response
+      doReturn(mockResponse).when(httpClient).executeOpen(any(), any(), any());
+
+      val wrongConfig =
+          new OrchestrationModuleConfig()
+              .withLlmConfig(GPT_4O_MINI.withVersion("wrong-version"))
+              .withInputFiltering(new AzureContentFilter().hate(AzureFilterThreshold.ALLOW_SAFE));
+      val prompt = new OrchestrationPrompt("HelloWorld!");
+
+      assertThatThrownBy(
+              () -> client.streamChatCompletion(prompt, wrongConfig).forEach(System.out::println))
+          .isExactlyInstanceOf(OrchestrationClientException.class)
+          .hasMessageContaining("400")
+          .hasMessageContaining("Model gpt-5 in version wrong-version not found.");
+    }
+  }
+
   @Test
   void streamChatCompletionDeltas() throws IOException {
     try (var inputStream = spy(fileLoader.apply("streamChatCompletion.txt"))) {

orchestration/src/test/resources/__files/errorResponse.json

@@ -4,6 +4,17 @@
     "code": 400,
     "message": "'config' is a required property",
     "location": "request body",
-    "intermediate_results": {}
+    "intermediate_results": {
+      "input_filtering": {
+        "message": "Input Filter passed successfully.",
+        "data": {
+          "azure_content_safety": {
+            "userPromptAnalysis": {
+              "attackDetected": false
+            }
+          }
+        }
+      }
+    }
   }
-}
+}

orchestration/src/test/resources/__files/toolCallsResponse.json

@@ -88,4 +88,4 @@
       "total_tokens": 121
     }
   }
-}
+}

orchestration/src/test/resources/streamError.txt

@@ -0,0 +1,2 @@
+data: {"request_id": "14424a52-0a8d-4004-a766-c6010d8091c9", "intermediate_results": {"templating": [{"content": "HelloWorld!", "role": "user"}], "input_filtering": {"message": "Input Filter passed successfully.", "data": {"azure_content_safety": {"Hate": 0}}}}, "final_result": {"id": "", "object": "", "created": 0, "model": "", "system_fingerprint": "", "choices": [{"index": 0, "delta": {"content": ""}}]}}
+data: {"error": {"request_id": "ecb33455-6983-4baa-9889-ab391ddcd9b4", "code": 400, "message": "400 - LLM Module: Model gpt-5 in version wrong-version not found.", "location": "LLM Module"}}