update to Spring AI 1.0.0

Author: alexcheng1982

deployment/ollama/pom.xml

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>deployment-ollama</artifactId>
+  <name>Deployment :: Ollama</name>
 
   <dependencies>
     <dependency>

deployment/openai/pom.xml

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>deployment-openai</artifactId>
+  <name>Deployment :: OpenAI</name>
 
   <dependencies>
     <dependency>

deployment/pom.xml

@@ -11,6 +11,7 @@
 
   <artifactId>deployment</artifactId>
   <packaging>pom</packaging>
+  <name>Deployment</name>
   <modules>
     <module>ollama</module>
     <module>openai</module>

pom.xml

@@ -15,6 +15,7 @@
   <artifactId>pdf-qa</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <name>PDF QA</name>
   <modules>
     <module>shared</module>
     <module>deployment</module>

shared/pom.xml

@@ -18,14 +18,18 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <chat-agent-ui.version>0.11.0</chat-agent-ui.version>
-    <llm-agent-spec.version>0.1.2</llm-agent-spec.version>
+    <llm-agent-spec.version>0.2.1</llm-agent-spec.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-starter-vector-store-pgvector</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ai</groupId>
+      <artifactId>spring-ai-rag</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-pdf-document-reader</artifactId>
@@ -37,7 +41,7 @@
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.8</version>
     </dependency>
     <dependency>
       <groupId>com.javaaidev.chatagentui</groupId>

shared/src/main/java/com/javaaidev/pdfqa/AppConfiguration.java

@@ -1,8 +1,8 @@
 package com.javaaidev.pdfqa;
 
-import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor;
 import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
-import org.springframework.ai.vectorstore.SearchRequest;
+import org.springframework.ai.rag.advisor.RetrievalAugmentationAdvisor;
+import org.springframework.ai.rag.retrieval.search.VectorStoreDocumentRetriever;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,8 +11,10 @@
 public class AppConfiguration {
 
   @Bean
-  public QuestionAnswerAdvisor questionAnswerAdvisor(VectorStore vectorStore) {
-    return new QuestionAnswerAdvisor(vectorStore, SearchRequest.builder().topK(3).build());
+  public RetrievalAugmentationAdvisor questionAnswerAdvisor(VectorStore vectorStore) {
+    return RetrievalAugmentationAdvisor.builder().documentRetriever(
+        VectorStoreDocumentRetriever.builder().vectorStore(vectorStore).build()
+    ).build();
   }
 
   @Bean

shared/src/main/java/com/javaaidev/pdfqa/QaController.java

@@ -4,9 +4,9 @@
 import com.javaaidev.chatagent.model.ChatAgentResponse;
 import com.javaaidev.chatagent.springai.ModelAdapter;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor;
 import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
 import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.rag.advisor.RetrievalAugmentationAdvisor;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,10 +19,10 @@ public class QaController {
   private final ChatClient chatClient;
 
   public QaController(ChatClient.Builder builder,
-      QuestionAnswerAdvisor questionAnswerAdvisor,
+      RetrievalAugmentationAdvisor ragAdvisor,
       SimpleLoggerAdvisor simpleLoggerAdvisor) {
     this.chatClient = builder.defaultAdvisors(
-        questionAnswerAdvisor,
+        ragAdvisor,
         simpleLoggerAdvisor).build();
   }