Merge branch 'refs/heads/main' into llama🦙guard

# Conflicts:
#	sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java
#	sample-code/spring-app/src/main/resources/static/index.html

Author: CharlesDuboisSAP

docs/guides/OPENAI_CHAT_COMPLETION.md

@@ -122,7 +122,7 @@ var result = OpenAiClient.forModel(GPT_35_TURBO).chatCompletion(request);
 String resultMessage = result.getContent();
 ```
 
-See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java)
+See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java)
 
 ## Chat Completion with Specific Model Version
 
@@ -205,7 +205,7 @@ Integer tokensUsed = totalOutput.getUsage().getCompletionTokens();
 System.out.println("Tokens used: " + tokensUsed);
 ```
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java). It shows the usage of Spring
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java). It shows the usage of Spring
 Boot's `ResponseBodyEmitter` to stream the chat completion delta messages to the frontend in real-time.
 
 ## Embedding
@@ -218,4 +218,4 @@ var request = new OpenAiEmbeddingParameters().setInput("Hello World");
 OpenAiEmbeddingOutput embedding = OpenAiClient.forModel(TEXT_EMBEDDING_ADA_002).embedding(request);
 ```
 
-See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java)
+See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java)

docs/guides/ORCHESTRATION_CHAT_COMPLETION.md

@@ -83,7 +83,7 @@ var config = new OrchestrationModuleConfig()
         .withLlmConfig(OrchestrationAiModel.GPT_4O);
 ```
 
-Please also refer to [our sample code](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java) for this and all following code examples.
+Please also refer to [our sample code](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java) for this and all following code examples.
 
 ## Chat Completion
 
@@ -179,7 +179,7 @@ var result =
   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.
+You will find [some examples](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java) in our Spring Boot application demonstrating response handling with filters.
 
 ## Data masking
 
@@ -256,7 +256,7 @@ try (Stream<String> stream = client.streamChatCompletion(prompt, config)) {
 }
 ```
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java).
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java).
 It shows the usage of Spring Boot's `ResponseBodyEmitter` to stream the chat completion delta messages to the frontend in real-time.
 
 ## Set model parameters

docs/guides/SPRING_AI_INTEGRATION.md

@@ -50,7 +50,7 @@ Prompt prompt = new Prompt("What is the capital of France?", opts);
 ChatResponse response = client.call(prompt);
 ```
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java).
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java).
 
 ## Orchestration Masking
 
@@ -74,7 +74,7 @@ ChatResponse response = client.call(prompt);
 ```
 
 Please
-find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java).
+find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java).
 
 ## Stream chat completion
 
@@ -98,4 +98,4 @@ Flux<String> responseFlux =
 
 _Note: A Spring endpoint can return `Flux` instead of `ResponseEntity`._
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java).
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java).

docs/release-notes/release_notes.md

@@ -22,6 +22,7 @@
   - Grounding input can be masked with `DPIConfig`.
   - [LLama Guard can now be used for content filtering.](../guides/ORCHESTRATION_CHAT_COMPLETION.md#chat-completion-filter)
   - Support for tool calling and response format
+  - Updated the list for supported models (e.g., added amazon nova models).
 
 ### 📈 Improvements
 

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModel.java

@@ -6,14 +6,12 @@
 import com.sap.ai.sdk.orchestration.AssistantMessage;
 import com.sap.ai.sdk.orchestration.OrchestrationChatCompletionDelta;
 import com.sap.ai.sdk.orchestration.OrchestrationClient;
-import com.sap.ai.sdk.orchestration.OrchestrationClientException;
 import com.sap.ai.sdk.orchestration.OrchestrationPrompt;
 import com.sap.ai.sdk.orchestration.SystemMessage;
 import com.sap.ai.sdk.orchestration.UserMessage;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -79,26 +77,12 @@ public Flux<ChatResponse> stream(@Nonnull final Prompt prompt) {
                 }
                 return iterator;
               });
-      return flux.map(
-          delta -> {
-            throwOnContentFilter(stream, delta);
-            return new OrchestrationSpringChatDelta(delta);
-          });
+      return flux.map(OrchestrationSpringChatDelta::new);
     }
     throw new IllegalArgumentException(
         "Please add OrchestrationChatOptions to the Prompt: new Prompt(\"message\", new OrchestrationChatOptions(config))");
   }
 
-  private static void throwOnContentFilter(
-      @Nonnull final Stream<OrchestrationChatCompletionDelta> stream,
-      @Nonnull final OrchestrationChatCompletionDelta delta) {
-    final String finishReason = delta.getFinishReason();
-    if (finishReason != null && finishReason.equals("content_filter")) {
-      stream.close();
-      throw new OrchestrationClientException("Content filter filtered the output.");
-    }
-  }
-
   @Nonnull
   private OrchestrationPrompt toOrchestrationPrompt(@Nonnull final Prompt prompt) {
     val messages = toOrchestrationMessages(prompt.getInstructions());

orchestration/src/test/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModelTest.java

@@ -16,7 +16,6 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.sap.ai.sdk.orchestration.OrchestrationClient;
-import com.sap.ai.sdk.orchestration.OrchestrationClientException;
 import com.sap.ai.sdk.orchestration.OrchestrationModuleConfig;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Cache;
@@ -102,31 +101,6 @@ void testThrowsOnMissingLlmConfig() {
         .hasMessageContaining("LLM config is required");
   }
 
-  @Test
-  void streamChatCompletionOutputFilterErrorHandling() throws IOException {
-    try (var inputStream = spy(fileLoader.apply("streamChatCompletionOutputFilter.txt"))) {
-
-      final var httpClient = mock(HttpClient.class);
-      ApacheHttpClient5Accessor.setHttpClientFactory(destination -> httpClient);
-
-      // Create a mock response
-      final var mockResponse = new BasicClassicHttpResponse(200, "OK");
-      final var inputStreamEntity = new InputStreamEntity(inputStream, ContentType.TEXT_PLAIN);
-      mockResponse.setEntity(inputStreamEntity);
-      mockResponse.setHeader("Content-Type", "text/event-stream");
-
-      // Configure the HttpClient mock to return the mock response
-      doReturn(mockResponse).when(httpClient).executeOpen(any(), any(), any());
-
-      Flux<ChatResponse> flux = client.stream(prompt);
-      assertThatThrownBy(() -> flux.toStream().forEach(System.out::println))
-          .isInstanceOf(OrchestrationClientException.class)
-          .hasMessage("Content filter filtered the output.");
-
-      Mockito.verify(inputStream, times(1)).close();
-    }
-  }
-
   @Test
   void testStreamCompletion() throws IOException {
     try (var inputStream = spy(fileLoader.apply("streamChatCompletion.txt"))) {

sample-code/spring-app/pom.xml

@@ -118,10 +118,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
     <!-- scope "runtime" -->
     <dependency>
       <groupId>ch.qos.logback</groupId>

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

@@ -1,15 +1,34 @@
 package com.sap.ai.sdk.app;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sap.ai.sdk.orchestration.OrchestrationJacksonConfiguration;
+import javax.annotation.Nonnull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Primary;
 
 /** Main class to start the Spring Boot application. */
 @SpringBootApplication
 @ComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 @ServletComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 public class Application {
+
+  /**
+   * Temporary workaround to fix the issue with the Orchestration spec.
+   *
+   * @return a modified object mapper that works for Orchestration.
+   */
+  @Bean
+  @Primary
+  @SuppressWarnings("unused")
+  @Nonnull
+  public ObjectMapper objectMapper() {
+    return OrchestrationJacksonConfiguration.getOrchestrationObjectMapper();
+  }
+
   /**
    * Main method to start the Spring Boot application.
    *

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

@@ -14,7 +14,7 @@
 class ControllerExceptionHandler {
   /** Exceptions thrown by the Spring Boot controllers are turned into a readable text response. */
   @ExceptionHandler(Exception.class)
-  ResponseEntity<String> handleError(final Exception ex) {
+  Object handleError(final Exception ex) {
     final var headers = new HttpHeaders();
     headers.setContentType(MediaType.TEXT_PLAIN);
 

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

@@ -4,9 +4,8 @@
 import com.sap.ai.sdk.core.model.AiConfiguration;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /** Endpoint for Configuration operations */
@@ -16,23 +15,17 @@ class ConfigurationController {
 
   private static final ConfigurationApi CLIENT = new ConfigurationApi();
 
-  /**
-   * Get the list of configurations.
-   *
-   * @param accept the accept header
-   * @return a response entity with a string representation of the list of configurations
-   */
   @GetMapping("/configurations")
-  ResponseEntity<Object> getConfigurations(
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+  Object getConfigurations(
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
     final var configList = CLIENT.query("default");
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(configList);
+    if ("json".equals(format)) {
+      return configList;
     }
     final var items =
         configList.getResources().stream()
             .map(AiConfiguration::getName)
             .collect(Collectors.joining(", "));
-    return ResponseEntity.ok("The following configurations are available: %s.".formatted(items));
+    return "The following configurations are available: %s.".formatted(items);
   }
 }