partial merge fix

Author: rpanackal

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

@@ -51,7 +51,7 @@ public String getContent() throws OrchestrationFilterException.Output {
 
   @SuppressWarnings("unchecked")
   private Map<String, Object> getOutputFilteringChoices() {
-    final var f = getOriginalResponse().getModuleResults().getOutputFiltering();
+    final var f = getOriginalResponse().getIntermediateResults().getOutputFiltering();
     return ((List<Map<String, Object>>) ((Map<String, Object>) f.getData()).get("choices")).get(0);
   }
 

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

@@ -129,7 +129,7 @@ private static void throwOnContentFilter(@Nonnull final OrchestrationChatComplet
   @SuppressWarnings("unchecked")
   private static Map<String, Object> getOutputFilteringChoices(
       @Nonnull final OrchestrationChatCompletionDelta delta) {
-    final var f = delta.getModuleResults().getOutputFiltering();
+    final var f = delta.getIntermediateResults().getOutputFiltering();
     return ((List<Map<String, Object>>) ((Map<String, Object>) f.getData()).get("choices")).get(0);
   }
 

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

@@ -2,6 +2,7 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientException;
+import com.sap.ai.sdk.orchestration.model.Error;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
 import java.util.Optional;
 import javax.annotation.Nonnull;
@@ -41,6 +42,9 @@ public ErrorResponse getErrorResponse() {
   @Beta
   @Nullable
   public Integer getStatusCode() {
-    return Optional.ofNullable(getErrorResponse()).map(ErrorResponse::getCode).orElse(null);
+    return Optional.ofNullable(getErrorResponse())
+        .map(ErrorResponse::getError)
+        .map(Error::getCode)
+        .orElse(null);
   }
 }

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

@@ -2,6 +2,7 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientExceptionFactory;
+import com.sap.ai.sdk.orchestration.model.Error;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
 import com.sap.ai.sdk.orchestration.model.GenericModuleResult;
 import com.sap.ai.sdk.orchestration.model.ModuleResults;
@@ -39,7 +40,8 @@ public OrchestrationClientException buildFromClientError(
   private Map<String, Object> extractInputFilterDetails(@Nonnull final OrchestrationError error) {
 
     return Optional.of(error.getErrorResponse())
-        .map(ErrorResponse::getModuleResults)
+        .map(ErrorResponse::getError)
+        .map(Error::getIntermediateResults)
         .map(ModuleResults::getInputFiltering)
         .map(GenericModuleResult::getData)
         .filter(Map.class::isInstance)

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

@@ -455,8 +455,8 @@ void inputFilteringStrict() {
       final var errorResponse = e.getErrorResponse();
       assertThat(errorResponse).isNotNull();
       assertThat(errorResponse).isInstanceOf(ErrorResponse.class);
-      assertThat(errorResponse.getCode()).isEqualTo(SC_BAD_REQUEST);
-      assertThat(errorResponse.getMessage())
+      assertThat(errorResponse.getError().getCode()).isEqualTo(SC_BAD_REQUEST);
+      assertThat(errorResponse.getError().getCode())
           .isEqualTo(
               "400 - Filtering Module - Input Filter: Prompt filtered due to safety violations. Please modify the prompt and try again.");
 
@@ -726,7 +726,7 @@ void testThrowsOnContentFilter() {
     when(deltaWithContentFilter.getFinishReason()).thenReturn("content_filter");
 
     var moduleResults = mock(ModuleResultsStreaming.class);
-    when(deltaWithContentFilter.getModuleResults()).thenReturn(moduleResults);
+    when(deltaWithContentFilter.getIntermediateResults()).thenReturn(moduleResults);
 
     var outputFiltering = mock(GenericModuleResult.class);
     when(moduleResults.getOutputFiltering()).thenReturn(outputFiltering);

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

@@ -1,31 +0,0 @@
-{
-  "request_id": "7ed0869f-05be-406b-8124-e9d94516c190",
-  "code": 400,
-  "message": "400 - Filtering Module - Input Filter: Prompt filtered due to safety violations. Please modify the prompt and try again.",
-  "location": "Filtering Module - Input Filter",
-  "module_results": {
-    "templating": [
-      {
-        "content": "Let us paint the parliament red with blood of our enemies.",
-        "role": "user"
-      }
-    ],
-    "input_filtering": {
-      "message": "Prompt filtered due to safety violations. Please modify the prompt and try again.",
-      "data": {
-        "azure_content_safety": {
-          "Hate": 6,
-          "SelfHarm": 0,
-          "Sexual": 0,
-          "Violence": 6,
-          "userPromptAnalysis": {
-            "attackDetected": false
-          }
-        },
-        "llama_guard_3_8b": {
-          "violent_crimes": true
-        }
-      }
-    }
-  }
-}