Merge branch 'main' into poc/mcp

Author: MatKuhr

docs/release_notes.md

@@ -24,4 +24,4 @@
 
 ### 🐛 Fixed Issues
 
--
+- OpenAi: Fix AssistantMessage Bug by now being able to send Assistant Messages using our API Client. 

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

@@ -72,7 +72,8 @@ public class OpenAiAssistantMessage implements OpenAiMessage {
   ChatCompletionRequestAssistantMessage createChatCompletionRequestMessage() {
     final var message =
         new ChatCompletionRequestAssistantMessage()
-            .role(ChatCompletionRequestAssistantMessage.RoleEnum.fromValue(role()));
+            .role(ChatCompletionRequestAssistantMessage.RoleEnum.fromValue(role()))
+            .toolCalls(null);
 
     final var items = content().items();
     if (!items.isEmpty() && items.get(0) instanceof OpenAiTextItem textItem) {

pom.xml

@@ -60,27 +60,27 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.outputTimestamp>2025-04-03T13:23:00Z</project.build.outputTimestamp>
     <cloud-sdk.version>5.20.0</cloud-sdk.version>
-    <junit-jupiter.version>5.13.3</junit-jupiter.version>
+    <junit-jupiter.version>5.13.4</junit-jupiter.version>
     <wiremock.version>3.13.1</wiremock.version>
     <assertj-core.version>3.27.3</assertj-core.version>
     <slf4j.version>2.0.17</slf4j.version>
     <checkstyle.version>10.26.1</checkstyle.version>
     <system-stubs.version>2.1.3</system-stubs.version>
     <surefire.version>3.5.3</surefire.version>
-    <springframework.version>6.2.8</springframework.version>
+    <springframework.version>6.2.9</springframework.version>
     <spring-ai.version>1.0.0</spring-ai.version>
-    <reactor-core.version>3.6.12</reactor-core.version>
+    <reactor-core.version>3.7.8</reactor-core.version>
     <dotenv-java.version>3.2.0</dotenv-java.version>
     <mockito.version>5.18.0</mockito.version>
     <javaparser.version>3.27.0</javaparser.version>
     <jsonschema-generator.version>4.38.0</jsonschema-generator.version>
     <jackson.version>2.19.2</jackson.version>
     <!-- conflicts resolution -->
-    <micrometer.version>1.14.2</micrometer.version>
+    <micrometer.version>1.15.2</micrometer.version>
     <json.version>20250517</json.version>
     <snakeyaml.version>2.4</snakeyaml.version>
     <!-- Formatting -->
-    <spotless.version>2.46.0</spotless.version>
+    <spotless.version>2.46.1</spotless.version>
     <spotless.skip>false</spotless.skip>
     <!--  Quality assurance  -->
     <enforcer.skip>false</enforcer.skip>

sample-code/spring-app/pom.xml

@@ -33,7 +33,7 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <spring-boot.version>3.5.0</spring-boot.version>
+    <spring-boot.version>3.5.4</spring-boot.version>
     <logback.version>1.5.18</logback.version>
     <cf-logging.version>3.8.5</cf-logging.version>
     <apache-tomcat-embed.version>11.0.9</apache-tomcat-embed.version>

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

@@ -19,6 +19,7 @@
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.springframework.stereotype.Service;
 
 /** Service class for OpenAI service using latest convenience api */
@@ -37,6 +38,28 @@ public OpenAiChatCompletionResponse chatCompletion(@Nonnull final String prompt)
         .chatCompletion(new OpenAiChatCompletionRequest(prompt));
   }
 
+  /**
+   * Chat requests to OpenAI and updating the messages history
+   *
+   * @param previousMessage The request to send to the assistant
+   * @return the assistant message response
+   */
+  @Nonnull
+  public OpenAiChatCompletionResponse messagesHistory(@Nonnull final String previousMessage) {
+    val messagesList = new ArrayList<OpenAiMessage>();
+    messagesList.add(OpenAiMessage.user(previousMessage));
+
+    final OpenAiChatCompletionResponse result =
+        OpenAiClient.forModel(GPT_4O_MINI)
+            .chatCompletion(new OpenAiChatCompletionRequest(messagesList));
+
+    messagesList.add(result.getMessage());
+    messagesList.add(OpenAiMessage.user("What is the typical food there?"));
+
+    return OpenAiClient.forModel(GPT_4O_MINI)
+        .chatCompletion(new OpenAiChatCompletionRequest(messagesList));
+  }
+
   /**
    * Asynchronous stream of an OpenAI chat request
    *

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OpenAiV2Test.java

@@ -33,6 +33,11 @@ void chatCompletion() {
     assertThat(completion.getContent()).isNotEmpty();
   }
 
+  @Test
+  void testMessagesHistory() {
+    assertThat(service.messagesHistory("What is the capital of France?").getContent()).isNotEmpty();
+  }
+
   @Test
   void chatCompletionImage() {
     final var completion =