Improve code style

Author: newtork

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

@@ -1,5 +1,6 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import static com.sap.ai.sdk.foundationmodels.openai.OpenAiClientException.FACTORY;
 import static com.sap.ai.sdk.foundationmodels.openai.OpenAiUtils.getOpenAiObjectMapper;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -42,7 +43,8 @@
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public final class OpenAiClient {
   private static final String DEFAULT_API_VERSION = "2024-02-01";
-  static final ObjectMapper JACKSON = getOpenAiObjectMapper();
+
+  private static final ObjectMapper JACKSON = getOpenAiObjectMapper();
 
   @Nullable private String systemPrompt = null;
 
@@ -431,9 +433,7 @@ private <T> T executeRequest(
     try {
       final var client = ApacheHttpClient5Accessor.getHttpClient(destination);
       return client.execute(
-          request,
-          new ClientResponseHandler<>(
-              responseType, OpenAiError.class, new OpenAiExceptionFactory()));
+          request, new ClientResponseHandler<>(responseType, OpenAiError.class, FACTORY));
     } catch (final IOException e) {
       throw new OpenAiClientException("Request to OpenAI model failed", e).setHttpRequest(request);
     }
@@ -444,8 +444,7 @@ private <D extends StreamedDelta> Stream<D> streamRequest(
       final BasicClassicHttpRequest request, @Nonnull final Class<D> deltaType) {
     try {
       final var client = ApacheHttpClient5Accessor.getHttpClient(destination);
-      return new ClientStreamingHandler<>(
-              deltaType, OpenAiError.class, new OpenAiExceptionFactory())
+      return new ClientStreamingHandler<>(deltaType, OpenAiError.class, FACTORY)
           .objectMapper(JACKSON)
           .handleStreamingResponse(client.executeOpen(null, request, null));
     } catch (final IOException e) {

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

@@ -2,6 +2,7 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientException;
+import com.sap.ai.sdk.core.common.ClientExceptionFactory;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ErrorResponse;
 import javax.annotation.Nullable;
 import lombok.experimental.StandardException;
@@ -10,6 +11,9 @@
 @StandardException
 public class OpenAiClientException extends ClientException {
 
+  static final ClientExceptionFactory<OpenAiClientException, OpenAiError> FACTORY =
+      (message, error, cause) -> new OpenAiClientException(message, cause).setClientError(error);
+
   /**
    * Retrieves the {@link ErrorResponse} from the OpenAI service, if available.
    *

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

@@ -2,15 +2,44 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientException;
+import com.sap.ai.sdk.core.common.ClientExceptionFactory;
+import com.sap.ai.sdk.orchestration.OrchestrationFilterException.Input;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
+import com.sap.ai.sdk.orchestration.model.GenericModuleResult;
+import com.sap.ai.sdk.orchestration.model.ModuleResults;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.experimental.StandardException;
 
 /** Exception thrown by the {@link OrchestrationClient} in case of an error. */
 @StandardException
 public class OrchestrationClientException extends ClientException {
 
+  static final ClientExceptionFactory<OrchestrationClientException, OrchestrationError> FACTORY =
+      (message, clientError, cause) -> {
+        final var details = extractInputFilterDetails(clientError);
+        if (details.isEmpty()) {
+          return new OrchestrationClientException(message, cause).setClientError(clientError);
+        }
+        return new Input(message, cause).setFilterDetails(details).setClientError(clientError);
+      };
+
+  @SuppressWarnings("unchecked")
+  @Nonnull
+  static Map<String, Object> extractInputFilterDetails(@Nullable final OrchestrationError error) {
+    return Optional.ofNullable(error)
+        .map(OrchestrationError::getErrorResponse)
+        .map(ErrorResponse::getModuleResults)
+        .map(ModuleResults::getInputFiltering)
+        .map(GenericModuleResult::getData)
+        .filter(Map.class::isInstance)
+        .map(map -> (Map<String, Object>) map)
+        .orElseGet(Collections::emptyMap);
+  }
+
   /**
    * Retrieves the {@link ErrorResponse} from the orchestration service, if available.
    *

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

@@ -1,5 +1,6 @@
 package com.sap.ai.sdk.orchestration;
 
+import static com.sap.ai.sdk.orchestration.OrchestrationClientException.FACTORY;
 import static com.sap.ai.sdk.orchestration.OrchestrationJacksonConfiguration.getOrchestrationObjectMapper;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -26,6 +27,7 @@
 @Slf4j
 class OrchestrationHttpExecutor {
   private final Supplier<HttpDestination> destinationSupplier;
+
   private static final ObjectMapper JACKSON = getOrchestrationObjectMapper();
 
   OrchestrationHttpExecutor(@Nonnull final Supplier<HttpDestination> destinationSupplier)
@@ -47,8 +49,7 @@ <T> T execute(
       val client = getHttpClient();
 
       val handler =
-          new ClientResponseHandler<>(
-                  responseType, OrchestrationError.class, new OrchestrationExceptionFactory())
+          new ClientResponseHandler<>(responseType, OrchestrationError.class, FACTORY)
               .objectMapper(JACKSON);
       return client.execute(request, handler);
 
@@ -74,9 +75,7 @@ Stream<OrchestrationChatCompletionDelta> stream(@Nonnull final Object payload) {
       val client = getHttpClient();
 
       return new ClientStreamingHandler<>(
-              OrchestrationChatCompletionDelta.class,
-              OrchestrationError.class,
-              new OrchestrationExceptionFactory())
+              OrchestrationChatCompletionDelta.class, OrchestrationError.class, FACTORY)
           .objectMapper(JACKSON)
           .handleStreamingResponse(client.executeOpen(null, request, null));