Adopting suggestions

- streamline error handling at endpoint
- extends docs

Author: rpanackal

docs/guides/ORCHESTRATION_CHAT_COMPLETION.md

@@ -164,10 +164,16 @@ var result =
 ```
 #### Behavior of Input and Output Filters
 
-- **Input Filter**: Triggers a `400 Bad Request` in response during the `chatCompletion` call if the input message violates the filter policy.
-- **Output Filter**: Allows the request to complete but throws an exception when accessing filtered content via `result.getContent()`.
+- **Input Filter**:
+  If the input message violates the filter policy, a `400 (Bad Request)` response will be received during the `chatCompletion` call.
+  An `OrchestrationClientException` will be thrown.
 
-You will find [some examples](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java)  in our Spring Boot application demonstrating response handling with filters.
+- **Output Filter**:
+  If the response message violates the output filter policy, the `chatCompletion` call will complete without exception.
+  The convenience method `getContent()` on the resulting object will throw an `OrchestrationClientException` upon invocation.
+  The low level API under `getOriginalResponse()` will not throw an exception.
+
+You will find [some examples](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java) in our Spring Boot application demonstrating response handling with filters.
 
 ### Data masking
 

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

@@ -8,10 +8,10 @@
 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.OrchestrationChatResponse;
 import com.sap.ai.sdk.orchestration.OrchestrationClientException;
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import com.sap.cloud.sdk.cloudplatform.thread.ThreadContextExecutors;
-import java.util.Map;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -142,13 +142,22 @@ ResponseEntity<String> inputFiltering(
       @RequestHeader(value = "accept", required = false) final String accept,
       @Nonnull @PathVariable("policy") final AzureFilterThreshold policy)
       throws JsonProcessingException {
-    final var response = service.inputFiltering(policy);
-    if ("application/json".equals(accept)) {
+
+    final OrchestrationChatResponse response;
+    try {
+      response = service.inputFiltering(policy);
+    } catch (OrchestrationClientException e) {
+      final var msg = "Failed to obtain a response as the content was flagged by input filter.";
+      log.debug(msg, e);
+      return ResponseEntity.internalServerError().body(msg);
+    }
+
+    if (accept.equals("application/json")) {
       return ResponseEntity.ok()
           .contentType(MediaType.APPLICATION_JSON)
           .body(mapper.writeValueAsString(response));
     }
-    return ResponseEntity.ok(response.getContent());
+    return ResponseEntity.ok().body(response.getContent());
   }
 
   /**
@@ -173,21 +182,19 @@ ResponseEntity<String> outputFiltering(
       @Nonnull @PathVariable("policy") final AzureFilterThreshold policy)
       throws JsonProcessingException, OrchestrationClientException {
 
-    String content;
+    final var response = service.outputFiltering(policy);
     try {
-      content = service.outputFiltering(policy).getContent();
+      if (accept.equals("application/json")) {
+        return ResponseEntity.ok()
+            .contentType(MediaType.APPLICATION_JSON)
+            .body(mapper.writeValueAsString(response));
+      }
+      return ResponseEntity.ok().body(response.getContent());
     } catch (OrchestrationClientException e) {
-      content = "Failed to obtain a response as the content was flagged by output filter.";
-      log.debug(content, e);
+      final var msg = "Failed to obtain a response as the content was flagged by output filter.";
+      log.debug(msg, e);
+      return ResponseEntity.internalServerError().body(msg);
     }
-
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok()
-          .contentType(MediaType.APPLICATION_JSON)
-          .body(mapper.writeValueAsString(Map.of("content", content)));
-    }
-
-    return ResponseEntity.ok(content);
   }
 
   /**