replace removed springframework.ai methods

Author: Jonas-Isr

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

@@ -107,7 +107,11 @@ public Flux<ChatResponse> stream(@Nonnull final Prompt prompt) {
             });
     return flux.map(
         delta -> {
-          val assistantMessage = new AssistantMessage(delta.getDeltaContent(), Map.of());
+          val assistantMessage =
+              AssistantMessage.builder()
+                  .content(delta.getDeltaContent())
+                  .properties(Map.of())
+                  .build();
           val metadata =
               ChatGenerationMetadata.builder().finishReason(delta.getFinishReason()).build();
           return new ChatResponse(List.of(new Generation(assistantMessage, metadata)));
@@ -173,7 +177,12 @@ private static Generation toGeneration(
       }
     }
 
-    val assistantMessage = new AssistantMessage(message.getContent(), Map.of(), calls);
+    val assistantMessage =
+        AssistantMessage.builder()
+            .content(message.getContent())
+            .properties(Map.of())
+            .toolCalls(calls)
+            .build();
     return new Generation(assistantMessage, metadata.build());
   }
 

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/spring/EmbeddingModelTest.java

@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.ai.document.Document;
-import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
+import org.springframework.ai.embedding.EmbeddingOptions;
 import org.springframework.ai.embedding.EmbeddingRequest;
 
 class EmbeddingModelTest {
@@ -36,7 +36,7 @@ void setUp() {
   void testCallWithValidEmbeddingRequest() {
     val texts = List.of("Some text");
     val springAiRequest =
-        new EmbeddingRequest(texts, EmbeddingOptionsBuilder.builder().withDimensions(128).build());
+        new EmbeddingRequest(texts, EmbeddingOptions.builder().dimensions(128).build());
 
     val expectedOpenAiResponse =
         new ObjectMapper()
@@ -67,7 +67,7 @@ void testCallWithValidEmbeddingRequest() {
   void testCallWithModelOptionSetThrows() {
     val springAiRequest =
         new EmbeddingRequest(
-            List.of("Some text"), EmbeddingOptionsBuilder.builder().withModel("model").build());
+            List.of("Some text"), EmbeddingOptions.builder().model("model").build());
 
     val model = new OpenAiSpringEmbeddingModel(client);
 

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

@@ -59,7 +59,12 @@ static Generation toGeneration(@Nonnull final LLMChoice choice) {
                         toolCall.getFunction().getArguments()))
             .toList();
 
-    val message = new AssistantMessage(choice.getMessage().getContent(), Map.of(), toolCalls);
+    val message =
+        AssistantMessage.builder()
+            .content(choice.getMessage().getContent())
+            .properties(Map.of())
+            .toolCalls(toolCalls)
+            .build();
     return new Generation(message, metadata.build());
   }
 

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

@@ -24,7 +24,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.ai.document.MetadataMode;
 import org.springframework.ai.embedding.EmbeddingOptions;
-import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
 import org.springframework.ai.embedding.EmbeddingRequest;
 
 @WireMockTest
@@ -37,7 +36,7 @@ class OrchestrationEmbeddingModelTest {
 
   @BeforeEach
   void setup(WireMockRuntimeInfo server) {
-    options = EmbeddingOptionsBuilder.builder().withModel("text-embedding-3-small").build();
+    options = EmbeddingOptions.builder().model("text-embedding-3-small").build();
 
     final var destination = DefaultHttpDestination.builder(server.getHttpBaseUrl()).build();
     final var client = new OrchestrationClient(destination);
@@ -79,7 +78,7 @@ void testEmbeddingText() throws IOException {
   @Description("Tests that model must name must be set and request option precedes over default")
   void testEmbeddingWithMissingModelNameThrows() {
     final var request =
-        new EmbeddingRequest(List.of("Hello World"), EmbeddingOptionsBuilder.builder().build());
+        new EmbeddingRequest(List.of("Hello World"), EmbeddingOptions.builder().build());
 
     assertThatThrownBy(() -> model.call(request))
         .isInstanceOf(NullPointerException.class)

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

@@ -16,7 +16,7 @@
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.document.Document;
-import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
+import org.springframework.ai.embedding.EmbeddingOptions;
 import org.springframework.ai.embedding.EmbeddingRequest;
 import org.springframework.ai.embedding.EmbeddingResponse;
 import org.springframework.ai.model.tool.DefaultToolCallingChatOptions;
@@ -40,7 +40,7 @@ public class SpringAiOpenAiService {
    */
   @Nonnull
   public EmbeddingResponse embedStrings() {
-    final var options = EmbeddingOptionsBuilder.builder().withDimensions(128).build();
+    final var options = EmbeddingOptions.builder().dimensions(128).build();
     final var springAiRequest =
         new EmbeddingRequest(List.of("The quick brown fox jumps over the lazy dog."), options);
 

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

@@ -31,7 +31,7 @@
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.chat.prompt.PromptTemplate;
-import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
+import org.springframework.ai.embedding.EmbeddingOptions;
 import org.springframework.ai.support.ToolCallbacks;
 import org.springframework.ai.tool.ToolCallbackProvider;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -276,8 +276,8 @@ public Translation responseFormat() {
   @Nonnull
   public float[] embed(@Nonnull final String inputText) {
     val embedOptions =
-        EmbeddingOptionsBuilder.builder()
-            .withModel(OrchestrationEmbeddingModel.TEXT_EMBEDDING_3_SMALL.name())
+        EmbeddingOptions.builder()
+            .model(OrchestrationEmbeddingModel.TEXT_EMBEDDING_3_SMALL.name())
             .build();
     return new OrchestrationSpringEmbeddingModel(embedOptions).embed(inputText);
   }