Upgrade to Spring AI 1.0.0-RC1

ThomasVitale · ThomasVitale · commit d8275923e7ba · 2025-05-13T22:36:04.000+02:00
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.parallel=true
 
 org.gradle.jvmargs=-Xmx8g
 
-arconiaVersion=0.10.1
-springAiVersion=1.0.0-M8
+arconiaVersion=0.10.3
+springAiVersion=1.0.0-RC1
diff --git a/models/image/image-openai/src/main/java/com/thomasvitale/ai/spring/ImageController.java b/models/image/image-openai/src/main/java/com/thomasvitale/ai/spring/ImageController.java
@@ -30,12 +30,12 @@ String image(String message) {
     @GetMapping("/image/provider-options")
     String imageProviderOptions(String message) {
         var imageResponse = imageModel.call(new ImagePrompt(message, OpenAiImageOptions.builder()
-                .withQuality("standard")
-                .withN(1)
-                .withHeight(1024)
-                .withWidth(1024)
-                .withModel(OpenAiImageApi.ImageModel.DALL_E_3.getValue())
-                .withResponseFormat("url")
+                .quality("standard")
+                .N(1)
+                .height(1024)
+                .width(1024)
+                .model(OpenAiImageApi.ImageModel.DALL_E_3.getValue())
+                .responseFormat("url")
                 .build()));
         return imageResponse.getResult().getOutput().getUrl();
     }
diff --git a/observability/models/observability-models-mistral-ai/src/main/resources/application.yml b/observability/models/observability-models-mistral-ai/src/main/resources/application.yml
@@ -4,8 +4,8 @@ spring:
   ai:
     chat:
       observations:
-        include-completion: true
-        include-prompt: true
+        log-completion: true
+        log-prompt: true
     mistralai:
       api-key: ${MISTRALAI_API_KEY}
       chat:
diff --git a/observability/models/observability-models-ollama/src/main/resources/application.yml b/observability/models/observability-models-ollama/src/main/resources/application.yml
@@ -4,8 +4,8 @@ spring:
   ai:
     chat:
       observations:
-        include-completion: true
-        include-prompt: true
+        log-completion: true
+        log-prompt: true
     ollama:
       init:
         pull-model-strategy: when_missing
diff --git a/observability/models/observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ImageController.java b/observability/models/observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ImageController.java
@@ -36,12 +36,12 @@ String image(String message) {
     String imageProviderOptions(String message) {
         logger.info("Generating image with provider options: {}", message);
         var imageResponse = imageModel.call(new ImagePrompt(message, OpenAiImageOptions.builder()
-                .withQuality("standard")
-                .withN(1)
-                .withHeight(1024)
-                .withWidth(1024)
-                .withModel(OpenAiImageApi.ImageModel.DALL_E_3.getValue())
-                .withResponseFormat("url")
+                .quality("standard")
+                .N(1)
+                .height(1024)
+                .width(1024)
+                .model(OpenAiImageApi.ImageModel.DALL_E_3.getValue())
+                .responseFormat("url")
                 .build()));
         return imageResponse.getResult().getOutput().getUrl();
     }
diff --git a/observability/models/observability-models-openai/src/main/resources/application.yml b/observability/models/observability-models-openai/src/main/resources/application.yml
@@ -4,11 +4,11 @@ spring:
   ai:
     chat:
       observations:
-        include-completion: true
-        include-prompt: true
+        log-completion: true
+        log-prompt: true
     image:
       observations:
-        include-prompt: true
+        log-prompt: true
     openai:
       api-key: ${OPENAI_API_KEY}
       chat:
diff --git a/observability/vector-stores/observability-vector-stores-pgvector/src/main/resources/application.yml b/observability/vector-stores/observability-vector-stores-pgvector/src/main/resources/application.yml
@@ -5,10 +5,10 @@ spring:
     chat:
       client:
         observations:
-          include-input: true
+          log-prompt: true
       observations:
-        include-completion: true
-        include-prompt: true
+        log-completion: true
+        log-prompt: true
     ollama:
       init:
         pull-model-strategy: when_missing
@@ -21,7 +21,7 @@ spring:
           model: nomic-embed-text
     vectorstore:
       observations:
-        include-query-response: true
+        log-query-response: true
       pgvector:
         initialize-schema: true
         dimensions: 768
diff --git a/patterns/memory/memory-basics/src/main/java/com/thomasvitale/ai/spring/MemoryControllerAdvisorMessages.java b/patterns/memory/memory-basics/src/main/java/com/thomasvitale/ai/spring/MemoryControllerAdvisorMessages.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY;
+import static org.springframework.ai.chat.memory.ChatMemory.CONVERSATION_ID;
 
 /**
  * Chat examples using the high-level ChatClient API.
@@ -20,15 +20,15 @@ class MemoryControllerAdvisorMessages {
 
     MemoryControllerAdvisorMessages(ChatClient.Builder chatClientBuilder, ChatMemory chatMemory) {
         this.chatClient = chatClientBuilder.clone()
-                .defaultAdvisors(new MessageChatMemoryAdvisor(chatMemory))
+                .defaultAdvisors(MessageChatMemoryAdvisor.builder(chatMemory).build())
                 .build();
     }
 
     @PostMapping("/memory/messages/{conversationId}")
     String chat(@PathVariable String conversationId, @RequestBody String question) {
         return chatClient.prompt()
                 .user(question)
-                .advisors(a -> a.param(CHAT_MEMORY_CONVERSATION_ID_KEY, conversationId))
+                .advisors(a -> a.param(CONVERSATION_ID, conversationId))
                 .call()
                 .content();
     }
diff --git a/patterns/memory/memory-basics/src/main/java/com/thomasvitale/ai/spring/MemoryControllerAdvisorPrompt.java b/patterns/memory/memory-basics/src/main/java/com/thomasvitale/ai/spring/MemoryControllerAdvisorPrompt.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY;
+import static org.springframework.ai.chat.memory.ChatMemory.CONVERSATION_ID;
 
 /**
  * Chat examples using the high-level ChatClient API.
@@ -20,15 +20,15 @@ class MemoryControllerAdvisorPrompt {
 
     MemoryControllerAdvisorPrompt(ChatClient.Builder chatClientBuilder, ChatMemory chatMemory) {
         this.chatClient = chatClientBuilder.clone()
-                .defaultAdvisors(new PromptChatMemoryAdvisor(chatMemory))
+                .defaultAdvisors(PromptChatMemoryAdvisor.builder(chatMemory).build())
                 .build();
     }
 
     @PostMapping("/memory/prompt/{conversationId}")
     String chat(@PathVariable String conversationId, @RequestBody String question) {
         return chatClient.prompt()
                 .user(question)
-                .advisors(a -> a.param(CHAT_MEMORY_CONVERSATION_ID_KEY, conversationId))
+                .advisors(a -> a.param(CONVERSATION_ID, conversationId))
                 .call()
                 .content();
     }
diff --git a/patterns/memory/memory-jdbc/build.gradle b/patterns/memory/memory-jdbc/build.gradle
@@ -23,7 +23,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.ai:spring-ai-starter-model-ollama'
-    implementation 'org.springframework.ai:spring-ai-starter-model-chat-memory-jdbc'
+    implementation 'org.springframework.ai:spring-ai-starter-model-chat-memory-repository-jdbc'
 
     runtimeOnly 'org.postgresql:postgresql'
 
diff --git a/patterns/memory/memory-jdbc/src/main/java/com/thomasvitale/ai/spring/MemoryController.java b/patterns/memory/memory-jdbc/src/main/java/com/thomasvitale/ai/spring/MemoryController.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY;
+import static org.springframework.ai.chat.memory.ChatMemory.CONVERSATION_ID;
 
 /**
  * Chat examples using the high-level ChatClient API.
@@ -20,15 +20,15 @@ class MemoryController {
 
     MemoryController(ChatClient.Builder chatClientBuilder, ChatMemory chatMemory) {
         this.chatClient = chatClientBuilder.clone()
-                .defaultAdvisors(new MessageChatMemoryAdvisor(chatMemory))
+                .defaultAdvisors(MessageChatMemoryAdvisor.builder(chatMemory).build())
                 .build();
     }
 
     @PostMapping("/memory/jdbc/{conversationId}")
     String chat(@PathVariable String conversationId, @RequestBody String question) {
         return chatClient.prompt()
                 .user(question)
-                .advisors(a -> a.param(CHAT_MEMORY_CONVERSATION_ID_KEY, conversationId))
+                .advisors(a -> a.param(CONVERSATION_ID, conversationId))
                 .call()
                 .content();
     }
diff --git a/patterns/memory/memory-jdbc/src/main/java/com/thomasvitale/ai/spring/MemoryJdbcApplication.java b/patterns/memory/memory-jdbc/src/main/java/com/thomasvitale/ai/spring/MemoryJdbcApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.ai.chat.memory.ChatMemory;
 import org.springframework.ai.chat.memory.MessageWindowChatMemory;
-import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryRepository;
+import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepository;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
diff --git a/patterns/memory/memory-spring-security/src/main/java/com/thomasvitale/ai/spring/MemoryController.java b/patterns/memory/memory-spring-security/src/main/java/com/thomasvitale/ai/spring/MemoryController.java
@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY;
+import static org.springframework.ai.chat.memory.ChatMemory.CONVERSATION_ID;
 
 /**
  * Chat examples using the high-level ChatClient API.
@@ -21,7 +21,7 @@ class MemoryController {
 
     MemoryController(ChatClient.Builder chatClientBuilder, ChatMemory chatMemory) {
         this.chatClient = chatClientBuilder.clone()
-                .defaultAdvisors(new MessageChatMemoryAdvisor(chatMemory))
+                .defaultAdvisors(MessageChatMemoryAdvisor.builder(chatMemory).build())
                 .build();
     }
 
@@ -30,7 +30,7 @@ String chat(@AuthenticationPrincipal User user, @RequestBody String question) {
         String conversationId = user.getUsername();
         return chatClient.prompt()
                 .user(question)
-                .advisors(a -> a.param(CHAT_MEMORY_CONVERSATION_ID_KEY, conversationId))
+                .advisors(a -> a.param(CONVERSATION_ID, conversationId))
                 .call()
                 .content();
     }
diff --git a/patterns/memory/memory-vector-store/src/main/java/com/thomasvitale/ai/spring/MemoryControllerAdvisorVectorStore.java b/patterns/memory/memory-vector-store/src/main/java/com/thomasvitale/ai/spring/MemoryControllerAdvisorVectorStore.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY;
+import static org.springframework.ai.chat.memory.ChatMemory.CONVERSATION_ID;
 
 /**
  * Chat examples using the high-level ChatClient API.
@@ -28,7 +28,7 @@ class MemoryControllerAdvisorVectorStore {
     String chat(@PathVariable String conversationId, @RequestBody String question) {
         return chatClient.prompt()
                 .user(question)
-                .advisors(a -> a.param(CHAT_MEMORY_CONVERSATION_ID_KEY, conversationId))
+                .advisors(a -> a.param(CONVERSATION_ID, conversationId))
                 .call()
                 .content();
     }
diff --git a/patterns/multimodality/multimodality-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/patterns/multimodality/multimodality-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -43,11 +43,10 @@ String chatImageFile(String question) {
     @GetMapping("/chat/image/url")
     String chatImageUrl(String question) throws MalformedURLException {
         var imageUrl = "https://upload.wikimedia.org/wikipedia/commons/4/47/PNG_transparency_demonstration_1.png";
-        var url = URI.create(imageUrl).toURL();
         return chatClient.prompt()
                 .user(userSpec -> userSpec
                         .text(question)
-                        .media(new Media(MimeTypeUtils.IMAGE_PNG, url))
+                        .media(new Media(MimeTypeUtils.IMAGE_PNG, URI.create(imageUrl)))
                 )
                 .call()
                 .content();
diff --git a/patterns/multimodality/multimodality-mistral-ai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/patterns/multimodality/multimodality-mistral-ai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -35,7 +35,7 @@ class ChatModelController {
 
     @GetMapping("/chat/image/file")
     String chatImageFile(String question) {
-        var userMessage = new UserMessage(question, new Media(MimeTypeUtils.IMAGE_PNG, image));
+        var userMessage = UserMessage.builder().text(question).media(new Media(MimeTypeUtils.IMAGE_PNG, image)).build();
         var prompt = new Prompt(userMessage);
         var chatResponse = chatModel.call(prompt);
         return chatResponse.getResult().getOutput().getText();
@@ -44,9 +44,8 @@ String chatImageFile(String question) {
     @GetMapping("/chat/image/url")
     String chatImageUrl(String question) throws MalformedURLException {
         var imageUrl = "https://upload.wikimedia.org/wikipedia/commons/4/47/PNG_transparency_demonstration_1.png";
-        var url = URI.create(imageUrl).toURL();
 
-        var userMessage = new UserMessage(question, new Media(MimeTypeUtils.IMAGE_PNG, url));
+        var userMessage = UserMessage.builder().text(question).media(new Media(MimeTypeUtils.IMAGE_PNG, URI.create(imageUrl))).build();
         var prompt = new Prompt(userMessage);
         var chatResponse = chatModel.call(prompt);
         return chatResponse.getResult().getOutput().getText();
diff --git a/patterns/multimodality/multimodality-ollama/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/patterns/multimodality/multimodality-ollama/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -29,7 +29,7 @@ class ChatModelController {
 
     @GetMapping("/chat/image/file")
     String chatImageFile(String question) {
-        var userMessage = new UserMessage(question, new Media(MimeTypeUtils.IMAGE_PNG, image));
+        var userMessage = UserMessage.builder().text(question).media(new Media(MimeTypeUtils.IMAGE_PNG, image)).build();
         var prompt = new Prompt(userMessage);
         var chatResponse = chatModel.call(prompt);
         return chatResponse.getResult().getOutput().getText();
diff --git a/patterns/multimodality/multimodality-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/patterns/multimodality/multimodality-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -45,11 +45,10 @@ String chatImageFile(String question) {
     @GetMapping("/chat/image/url")
     String chatImageUrl(String question) throws MalformedURLException {
         var imageUrl = "https://upload.wikimedia.org/wikipedia/commons/4/47/PNG_transparency_demonstration_1.png";
-        var url = URI.create(imageUrl).toURL();
         return chatClient.prompt()
                 .user(userSpec -> userSpec
                         .text(question)
-                        .media(new Media(MimeTypeUtils.IMAGE_PNG, url))
+                        .media(new Media(MimeTypeUtils.IMAGE_PNG, URI.create(imageUrl)))
                 )
                 .call()
                 .content();
diff --git a/patterns/multimodality/multimodality-openai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/patterns/multimodality/multimodality-openai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -37,7 +37,7 @@ class ChatModelController {
 
     @GetMapping("/chat/image/file")
     String chatImageFile(String question) {
-        var userMessage = new UserMessage(question, new Media(MimeTypeUtils.IMAGE_PNG, image));
+        var userMessage = UserMessage.builder().text(question).media(new Media(MimeTypeUtils.IMAGE_PNG, image)).build();
         var prompt = new Prompt(userMessage);
         var chatResponse = chatModel.call(prompt);
         return chatResponse.getResult().getOutput().getText();
@@ -46,17 +46,16 @@ String chatImageFile(String question) {
     @GetMapping("/chat/image/url")
     String chatImageUrl(String question) throws MalformedURLException {
         var imageUrl = "https://upload.wikimedia.org/wikipedia/commons/4/47/PNG_transparency_demonstration_1.png";
-        var url = URI.create(imageUrl).toURL();
 
-        var userMessage = new UserMessage(question, new Media(MimeTypeUtils.IMAGE_PNG, url));
+        var userMessage = UserMessage.builder().text(question).media(new Media(MimeTypeUtils.IMAGE_PNG, URI.create(imageUrl))).build();
         var prompt = new Prompt(userMessage);
         var chatResponse = chatModel.call(prompt);
         return chatResponse.getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/audio/file")
     String chatAudioFile(String question) {
-        var userMessage = new UserMessage(question, new Media(MimeTypeUtils.parseMimeType("audio/mp3"), audio));
+        var userMessage = UserMessage.builder().text(question).media(new Media(MimeTypeUtils.parseMimeType("audio/mp3"), audio)).build();
         var prompt = new Prompt(userMessage, OpenAiChatOptions.builder()
                 .model(OpenAiApi.ChatModel.GPT_4_O_AUDIO_PREVIEW.getValue())
                 .build());
diff --git a/rag/rag-branching/src/main/resources/application.yml b/rag/rag-branching/src/main/resources/application.yml
@@ -4,8 +4,8 @@ spring:
   ai:
     chat:
       observations:
-        include-completion: true
-        include-prompt: true
+        log-completion: true
+        log-prompt: true
     ollama:
       init:
         pull-model-strategy: when_missing
@@ -18,7 +18,7 @@ spring:
           model: nomic-embed-text
     vectorstore:
       observations:
-        include-query-response: true
+        log-query-response: true
       pgvector:
         initialize-schema: true
         dimensions: 768
diff --git a/rag/rag-sequential/rag-advanced/src/main/java/com/thomasvitale/ai/spring/RagAdvanced.java b/rag/rag-sequential/rag-advanced/src/main/java/com/thomasvitale/ai/spring/RagAdvanced.java
@@ -1,10 +1,7 @@
 package com.thomasvitale.ai.spring;
 
-import org.springframework.ai.chat.memory.ChatMemory;
-import org.springframework.ai.chat.memory.InMemoryChatMemory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class RagAdvanced {
@@ -13,9 +10,4 @@ public static void main(String[] args) {
         SpringApplication.run(RagAdvanced.class, args);
     }
 
-    @Bean
-    ChatMemory chatMemory() {
-        return new InMemoryChatMemory();
-    }
-
 }
diff --git a/rag/rag-sequential/rag-advanced/src/main/java/com/thomasvitale/ai/spring/RagControllerCompression.java b/rag/rag-sequential/rag-advanced/src/main/java/com/thomasvitale/ai/spring/RagControllerCompression.java
@@ -1,7 +1,6 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor;
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.ai.chat.memory.ChatMemory;
 import org.springframework.ai.rag.advisor.RetrievalAugmentationAdvisor;
@@ -46,7 +45,7 @@ String rag(@RequestBody String input, @PathVariable String conversationId) {
         return chatClient.prompt()
                 .advisors(chatMemoryAdvisor, retrievalAugmentationAdvisor)
                 .advisors(advisors -> advisors.param(
-                        AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY, conversationId))
+                        ChatMemory.CONVERSATION_ID, conversationId))
                 .user(input)
                 .call()
                 .content();
diff --git a/rag/rag-sequential/rag-advanced/src/main/java/com/thomasvitale/ai/spring/RagControllerMemory.java b/rag/rag-sequential/rag-advanced/src/main/java/com/thomasvitale/ai/spring/RagControllerMemory.java
diff --git a/rag/rag-sequential/rag-advanced/src/main/resources/application.yml b/rag/rag-sequential/rag-advanced/src/main/resources/application.yml
diff --git a/use-cases/chatbot/src/main/java/com/thomasvitale/ai/spring/ChatbotController.java b/use-cases/chatbot/src/main/java/com/thomasvitale/ai/spring/ChatbotController.java
