update to Spring AI 1.0.0-M6

Author: alexcheng1982

README.md

@@ -2,15 +2,13 @@
 
 ## 运行
 
-需要在本地安装 Ollama 和 Docker Desktop。使用 Docker Desktop 来运行
-Redis。参考 `docker-compose.yaml` 文件。
+需要在本地安装 Docker Desktop。使用 Docker Desktop 来运行
+Pgvector。参考 `docker-compose.yaml` 文件。
 
-默认使用通义千问 0.5b 模型（`qwen:0.5b`），可以通过配置文件来修改。
+默认使用通义千问 2.5 0.5b 模型（`qwen2.5:0.5b`），可以通过配置文件来修改。
 
 > 朴素 RAG 的结果，依赖于文档相似性的查询结果。在本地运行时，受限于模型的参数数量，查询结果可能不太准确。
 
-使用 `dev` profile 来运行 Spring，`-Dspring.profiles.active=dev`。
-
 访问 [Swagger UI](http://localhost:8080/swagger-ui/index.html) 来与 API 交互。
 
 ## 加载网页到向量数据库
@@ -25,14 +23,16 @@ Redis。参考 `docker-compose.yaml` 文件。
 
 ## 与大模型交互
 
-发送 POST 请求到 `/chat/query`，提供消息内容。
+发送 POST 请求到 `/chat`，提供消息内容。
 
 ```json
 {
-  "message": "从2024年政府工作报告中，分析人工智能的发展前景"
+  "input": "从2024年政府工作报告中，分析人工智能的发展前景"
 }
 ```
 
+通过用户界面进行交互，访问 http://localhost:8080/webjars/chat-agent-ui/index.html
+
 ## 课程
 
 [![课程](./course.png)](https://www.bilibili.com/cheese/play/ss15645)

docker-compose.yaml

@@ -1,11 +1,13 @@
-version: "3"
 services:
-  redis-stack:
-    image: redis/redis-stack
+  postgres:
+    image: pgvector/pgvector:0.8.0-pg16
     volumes:
-      - redis-data:/data
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: "postgres"
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
     ports:
-      - "6379:6379"
-      - "8001:8001"
+      - "5432:5432"
 volumes:
-  redis-data:
+    postgresql-data:

pom.xml

@@ -7,7 +7,7 @@
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>3.2.4</version>
-    <relativePath/> <!-- lookup parent from repository -->
+    <relativePath/>
   </parent>
   <groupId>cc.vividcode.ai</groupId>
   <artifactId>spring-ai-naive-rag</artifactId>
@@ -16,7 +16,7 @@
   <description>Spring AI Naive RAG</description>
   <properties>
     <java.version>21</java.version>
-    <spring-ai.version>0.8.1</spring-ai.version>
+    <spring-ai.version>1.0.0-M6</spring-ai.version>
   </properties>
   <dependencies>
     <dependency>
@@ -29,7 +29,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.ai</groupId>
-      <artifactId>spring-ai-redis</artifactId>
+      <artifactId>spring-ai-pgvector-store-spring-boot-starter</artifactId>
     </dependency>
 
     <dependency>
@@ -47,6 +47,11 @@
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
       <version>2.5.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.javaaidev</groupId>
+      <artifactId>chat-agent-ui</artifactId>
+      <version>0.5.1</version>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>

src/main/java/cc/vividcode/ai/naiverag/chat/ChatRequest.java

@@ -1,7 +1,7 @@
-package cc.vividcode.ai.naiverag;
+package com.javaaidev.naiverag;
 
-import cc.vividcode.ai.naiverag.chat.ChatModuleConfiguration;
-import cc.vividcode.ai.naiverag.etl.EtlModuleConfiguration;
+import com.javaaidev.naiverag.chat.ChatModuleConfiguration;
+import com.javaaidev.naiverag.etl.EtlModuleConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;

src/main/java/cc/vividcode/ai/naiverag/etl/EtlModuleConfiguration.java

@@ -1,12 +1,10 @@
-package cc.vividcode.ai.naiverag.chat;
+package com.javaaidev.naiverag.chat;
 
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/chat")
 public class ChatController {
 
   private final ChatService chatService;
@@ -15,8 +13,8 @@ public ChatController(ChatService chatService) {
     this.chatService = chatService;
   }
 
-  @PostMapping("/query")
-  public String chat(@RequestBody ChatRequest request) {
-    return chatService.chat(request);
+  @PostMapping("/chat")
+  public ChatResponse chat(@RequestBody ChatRequest request) {
+    return new ChatResponse(chatService.chat(request));
   }
 }

src/main/java/cc/vividcode/ai/naiverag/etl/RedisConfig.java

@@ -1,13 +1,18 @@
-package cc.vividcode.ai.naiverag.chat;
+package com.javaaidev.naiverag.chat;
 
-import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class ChatModuleConfiguration {
 
+  @Bean
+  public ChatClient chatClient(ChatClient.Builder builder) {
+    return builder.build();
+  }
+
   @Bean
   public ChatService chatService(ChatClient chatClient,
       VectorStore vectorStore) {

src/main/java/cc/vividcode/ai/naiverag/etl/WebPageReader.java

@@ -0,0 +1,5 @@
+package com.javaaidev.naiverag.chat;
+
+public record ChatRequest(String input) {
+
+}

src/main/java/cc/vividcode/ai/naiverag/NaiveRagApplication.java renamed to src/main/java/com/javaaidev/naiverag/NaiveRagApplication.java

@@ -0,0 +1,5 @@
+package com.javaaidev.naiverag.chat;
+
+public record ChatResponse(String output) {
+
+}

src/main/java/cc/vividcode/ai/naiverag/chat/ChatController.java renamed to src/main/java/com/javaaidev/naiverag/chat/ChatController.java

@@ -1,14 +1,15 @@
-package cc.vividcode.ai.naiverag.chat;
+package com.javaaidev.naiverag.chat;
 
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.document.Document;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.util.CollectionUtils;
 
 public class ChatService {
 
@@ -24,20 +25,23 @@ public ChatService(ChatClient chatClient, VectorStore vectorStore) {
   }
 
   public String chat(ChatRequest request) {
-    var documents = findDocuments(request.message());
+    var documents = findDocuments(request.input());
     var prompt = new PromptTemplate(promptRag).create(
-        Map.of("query", request.message(),
+        Map.of("query", request.input(),
             "documents", documents)
     );
-    return chatClient.call(prompt).getResult().getOutput().getContent();
+    return chatClient.prompt(prompt).call().content();
   }
 
   private String findDocuments(String query) {
     var docs = vectorStore.similaritySearch(
-        SearchRequest.query(query)
-            .withSimilarityThresholdAll()
-            .withTopK(3));
-    return docs.stream().map(Document::getContent)
+        SearchRequest.builder().query(query)
+            .similarityThresholdAll()
+            .topK(3).build());
+    if (CollectionUtils.isEmpty(docs)) {
+      return "";
+    }
+    return docs.stream().map(Document::getText)
         .collect(Collectors.joining("\r\n\r\n"));
   }
 }

src/main/java/cc/vividcode/ai/naiverag/chat/ChatModuleConfiguration.java renamed to src/main/java/com/javaaidev/naiverag/chat/ChatModuleConfiguration.java

@@ -1,4 +1,4 @@
-package cc.vividcode.ai.naiverag.etl;
+package com.javaaidev.naiverag.etl;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/javaaidev/naiverag/chat/ChatRequest.java

@@ -0,0 +1,21 @@
+package com.javaaidev.naiverag.etl;
+
+import org.springframework.ai.transformer.splitter.TextSplitter;
+import org.springframework.ai.vectorstore.VectorStore;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class EtlModuleConfiguration {
+
+  @Bean
+  public TextSplitter textSplitter() {
+    return new RecursiveTextSplitter();
+  }
+
+  @Bean
+  public EtlService etlService(TextSplitter textSplitter,
+      VectorStore vectorStore) {
+    return new EtlService(textSplitter, vectorStore);
+  }
+}

src/main/java/com/javaaidev/naiverag/chat/ChatResponse.java

@@ -1,4 +1,4 @@
-package cc.vividcode.ai.naiverag.etl;
+package com.javaaidev.naiverag.etl;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

src/main/java/cc/vividcode/ai/naiverag/chat/ChatService.java renamed to src/main/java/com/javaaidev/naiverag/chat/ChatService.java

@@ -1,5 +1,8 @@
-package cc.vividcode.ai.naiverag.etl;
+package com.javaaidev.naiverag.etl;
 
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ai.document.DocumentTransformer;
 import org.springframework.ai.document.DocumentWriter;
 
@@ -9,6 +12,8 @@ public class EtlTask implements Runnable {
   private final DocumentTransformer documentTransformer;
   private final DocumentWriter documentWriter;
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(EtlTask.class);
+
   public EtlTask(String webPageUrl, DocumentTransformer documentTransformer,
       DocumentWriter documentWriter) {
     this.webPageUrl = webPageUrl;
@@ -18,7 +23,16 @@ public EtlTask(String webPageUrl, DocumentTransformer documentTransformer,
 
   @Override
   public void run() {
+    LOGGER.info("Load web page: {}", webPageUrl);
     var reader = new WebPageReader(webPageUrl);
-    documentWriter.accept(documentTransformer.apply(reader.get()));
+    var docs = documentTransformer.apply(reader.get());
+    LOGGER.info("{} docs to store", docs.size());
+    var index = 0;
+    for (var doc : docs) {
+      LOGGER.info("Save doc #{}", index + 1);
+      documentWriter.accept(List.of(doc));
+      index++;
+    }
+    LOGGER.info("Imported documents");
   }
 }

src/main/java/cc/vividcode/ai/naiverag/etl/EtlController.java renamed to src/main/java/com/javaaidev/naiverag/etl/EtlController.java

@@ -1,4 +1,4 @@
-package cc.vividcode.ai.naiverag.etl;
+package com.javaaidev.naiverag.etl;
 
 import dev.langchain4j.data.document.Document;
 import dev.langchain4j.data.document.splitter.DocumentSplitters;
@@ -10,7 +10,7 @@ public class RecursiveTextSplitter extends TextSplitter {
 
   @Override
   protected List<String> splitText(String text) {
-    var splitter = DocumentSplitters.recursive(200, 20);
+    var splitter = DocumentSplitters.recursive(500, 100);
     return splitter.split(new Document(text))
         .stream()
         .map(TextSegment::text)

src/main/java/com/javaaidev/naiverag/etl/EtlModuleConfiguration.java

@@ -1,4 +1,4 @@
-package cc.vividcode.ai.naiverag.etl;
+package com.javaaidev.naiverag.etl;
 
 public record WebPageLoadRequest(String url) {