fix: [Orchestration] Added location to server errors (#365)

* fix: [Orchestration] Added location to server errors

* location only

* reduce coverage for error 500

* Added test

Author: CharlesDuboisSAP

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiError.java

@@ -8,7 +8,6 @@
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Delegate;
 
 /**
  * Represents an error response from the OpenAI API.
@@ -20,7 +19,6 @@
 @AllArgsConstructor(onConstructor = @__({@JsonCreator}), access = AccessLevel.PROTECTED)
 public class OpenAiError implements ClientError {
   /** The original error response from the OpenAI API. */
-  @Delegate(types = {ClientError.class})
   ErrorResponse originalResponse;
 
   /**

orchestration/pom.xml

@@ -34,7 +34,7 @@
     <coverage.complexity>82%</coverage.complexity>
     <coverage.line>93%</coverage.line>
     <coverage.instruction>94%</coverage.instruction>
-    <coverage.branch>76%</coverage.branch>
+    <coverage.branch>75%</coverage.branch>
     <coverage.method>93%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>

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

@@ -4,10 +4,10 @@
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientError;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
+import javax.annotation.Nonnull;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Delegate;
 
 /**
  * Orchestration error response.
@@ -18,6 +18,17 @@
 @Value
 @Beta
 public class OrchestrationError implements ClientError {
-  @Delegate(types = {ClientError.class})
   ErrorResponse originalResponse;
+
+  /**
+   * Gets the error message from the contained original response.
+   *
+   * @return the error message
+   */
+  @Nonnull
+  public String getMessage() {
+    return originalResponse.getCode() == 500
+        ? originalResponse.getMessage() + " located in " + originalResponse.getLocation()
+        : originalResponse.getMessage();
+  }
 }

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

@@ -126,6 +126,21 @@ void testCompletion() {
     assertThat(result.getContent()).isNotEmpty();
   }
 
+  @Test
+  void testCompletionError() {
+    stubFor(
+        post(urlPathEqualTo("/completion"))
+            .willReturn(
+                aResponse()
+                    .withStatus(500)
+                    .withBodyFile("error500Response.json")
+                    .withHeader("Content-Type", "application/json")));
+
+    assertThatThrownBy(() -> client.chatCompletion(prompt, config))
+        .hasMessage(
+            "Request failed with status 500 Server Error and error message: 'Internal Server Error located in Masking Module - Masking'");
+  }
+
   @Test
   void testGrounding() throws IOException {
     stubFor(
@@ -185,9 +200,10 @@ void testGrounding() throws IOException {
             "First chunk```Second chunk```Last found chunk");
     assertThat(groundingModule.getData()).isEqualTo(groundingData);
 
-    final String requestBody = new String(fileLoader.apply("groundingRequest.json").readAllBytes());
-    verify(
-        postRequestedFor(urlPathEqualTo("/completion")).withRequestBody(equalToJson(requestBody)));
+    try (var requestInputStream = fileLoader.apply("groundingRequest.json")) {
+      final String request = new String(requestInputStream.readAllBytes());
+      verify(postRequestedFor(urlPathEqualTo("/completion")).withRequestBody(equalToJson(request)));
+    }
   }
 
   @Test

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

@@ -0,0 +1,14 @@
+{
+  "request_id": "d647775b-725b-428a-90b7-348cbf30f7f4",
+  "code": 500,
+  "message": "Internal Server Error",
+  "location": "Masking Module - Masking",
+  "module_results": {
+    "templating": [
+      {
+        "role": "user",
+        "content": "yo"
+      }
+    ]
+  }
+}