Filter exc classes non static and setter for client error

Author: rpanackal

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

@@ -3,6 +3,7 @@
 import com.google.common.annotations.Beta;
 import javax.annotation.Nullable;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.StandardException;
 
 /**
@@ -20,5 +21,6 @@ public class ClientException extends RuntimeException {
    */
   @Nullable
   @Getter(onMethod_ = @Beta)
-  public ClientError clientError;
+  @Setter(onMethod_ = @Beta)
+  ClientError clientError;
 }

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

@@ -11,7 +11,7 @@
 public class OpenAiClientException extends ClientException {
   OpenAiClientException(@Nonnull final String message, @Nonnull final OpenAiError clientError) {
     super(message);
-    this.clientError = clientError;
+    setClientError(clientError);
   }
 
   @Beta

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

@@ -5,7 +5,6 @@
 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.model.AssistantChatMessage;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.ChatMessageContent;

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

@@ -8,7 +8,6 @@
 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.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.model.CompletionPostResponse;
 import com.sap.ai.sdk.orchestration.model.EmbeddingsPostRequest;

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

@@ -15,7 +15,7 @@ public class OrchestrationClientException extends ClientException {
   OrchestrationClientException(
       @Nonnull final String message, @Nonnull final OrchestrationError clientError) {
     super(message);
-    this.clientError = clientError;
+    setClientError(clientError);
   }
 
   @Beta

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

@@ -2,7 +2,6 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientExceptionFactory;
-import com.sap.ai.sdk.orchestration.OrchestrationFilterException.OrchestrationInputFilterException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;

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

@@ -14,43 +14,9 @@
  * orchestration process.
  */
 @Beta
-@StandardException(access = AccessLevel.PRIVATE)
+@StandardException(access = AccessLevel.PROTECTED)
 public class OrchestrationFilterException extends OrchestrationClientException {
 
   /** Details about the filter that caused the exception. */
   @Getter @Nonnull protected Map<String, Object> filterDetails = Map.of();
-
-  /** Exception thrown when an error occurs during input filtering in orchestration. */
-  public static class OrchestrationInputFilterException 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(
-        @Nonnull final String message,
-        @Nonnull final OrchestrationError clientError,
-        @Nonnull final Map<String, Object> filterDetails) {
-      super(message);
-      this.clientError = clientError;
-      this.filterDetails = filterDetails;
-    }
-  }
-
-  /** Exception thrown output filtering in orchestration when finish reason is content filter */
-  public static class OrchestrationOutputFilterException 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) {
-      super(message);
-      this.filterDetails = filterDetails;
-    }
-  }
 }

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

@@ -0,0 +1,23 @@
+package com.sap.ai.sdk.orchestration;
+
+import java.util.Map;
+import javax.annotation.Nonnull;
+
+/** Exception thrown when an error occurs during input filtering in orchestration. */
+public class OrchestrationInputFilterException 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(
+      @Nonnull final String message,
+      @Nonnull final OrchestrationError clientError,
+      @Nonnull final Map<String, Object> filterDetails) {
+    super(message);
+    setClientError(clientError);
+    this.filterDetails = filterDetails;
+  }
+}

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

@@ -0,0 +1,19 @@
+package com.sap.ai.sdk.orchestration;
+
+import java.util.Map;
+import javax.annotation.Nonnull;
+
+/** Exception thrown output filtering in orchestration when finish reason is content filter */
+public class OrchestrationOutputFilterException 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) {
+    super(message);
+    this.filterDetails = filterDetails;
+  }
+}

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

@@ -38,8 +38,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;