code update

Author: alexcheng1982

LICENSE

@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2025 Fu Cheng
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -10,20 +10,24 @@ How to run:
 
 1. Requires Java 21 to build and run.
 2. Start Postgres database using Docker Compose.
-3. Start the server and use [Swagger UI](http://localhost:8080/swagger-ui/index.html) to run query.
+3. Start the server and use [Chat Agent UI](http://localhost:8080/webjars/chat-agent-ui/index.html) to run query.
 
 Sample query:
 
 ```text
-how many movies are produced in the United States?
+How many movies were produced in the United States?
 ```
 
 Output:
 
 ```text
-There are 2,058 movies produced in the United States.
+The total number of movies produced in the United States is 2058.
 ```
 
+See the screenshot below.
+
+![Chat Agent UI](simple-text-to-sql-ui.png)
+
 ## Full Text-to-SQL Implementation
 
 For a complete Text-to-SQL implementation, check out my [course](https://www.udemy.com/course/spring-ai-text-to-sql/?referralCode=6180D9A02FA8BA9D4F60).

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.4</version>
+    <version>3.4.4</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,9 @@
   <properties>
     <java.version>21</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.0.0-M5</spring-ai.version>
+    <spring-ai.version>1.0.0-M6</spring-ai.version>
+    <chat-agent-ui.version>0.11.0</chat-agent-ui.version>
+    <llm-agent-spec.version>0.1.2</llm-agent-spec.version>
   </properties>
 
   <dependencyManagement>
@@ -68,6 +70,16 @@
       <artifactId>commons-csv</artifactId>
       <version>1.12.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.javaaidev.chatagentui</groupId>
+      <artifactId>chat-agent-ui</artifactId>
+      <version>${chat-agent-ui.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.javaaidev.llmagentspec</groupId>
+      <artifactId>spring-ai-adapter</artifactId>
+      <version>${llm-agent-spec.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -98,15 +110,5 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>spring-snapshots</id>
-      <name>Spring Snapshots</name>
-      <url>https://repo.spring.io/snapshot</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
   </repositories>
-
-
 </project>

simple-text-to-sql-ui.png

@@ -7,14 +7,15 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
 import org.springframework.ai.chat.client.advisor.api.AdvisedResponse;
+import org.springframework.ai.chat.client.advisor.api.BaseAdvisor;
 import org.springframework.ai.chat.client.advisor.api.CallAroundAdvisor;
 import org.springframework.ai.chat.client.advisor.api.CallAroundAdvisorChain;
 import org.springframework.core.Ordered;
 
 /**
  * Advisor to update system text of the prompt
  */
-public class DatabaseMetadataAdvisor implements CallAroundAdvisor {
+public class DatabaseMetadataAdvisor implements BaseAdvisor {
 
   private static final String DEFAULT_SYSTEM_TEXT = """
       You are a Postgres expert. Please help to generate a Postgres query, then run the query to answer the question. The output should be in tabular format.
@@ -45,15 +46,18 @@ private String getDatabaseMetadata() {
   }
 
   @Override
-  public AdvisedResponse aroundCall(AdvisedRequest advisedRequest,
-      CallAroundAdvisorChain chain) {
+  public AdvisedRequest before(AdvisedRequest advisedRequest) {
     var systemParams = new HashMap<>(advisedRequest.systemParams());
     systemParams.put("table_schemas", tableSchemas);
-    var request = AdvisedRequest.from(advisedRequest)
+    return AdvisedRequest.from(advisedRequest)
         .systemText(DEFAULT_SYSTEM_TEXT)
         .systemParams(systemParams)
         .build();
-    return chain.nextAroundCall(request);
+  }
+
+  @Override
+  public AdvisedResponse after(AdvisedResponse advisedResponse) {
+    return advisedResponse;
   }
 
   @Override

src/main/java/com/javaaidev/text2sql/DatabaseMetadataAdvisor.java

@@ -1,12 +1,16 @@
 package com.javaaidev.text2sql.controller;
 
+import com.javaaidev.chatagent.model.ChatAgentRequest;
+import com.javaaidev.chatagent.model.ChatAgentResponse;
+import com.javaaidev.chatagent.springai.ModelAdapter;
 import com.javaaidev.text2sql.DatabaseMetadataAdvisor;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.openai.OpenAiChatOptions;
-import org.springframework.ai.openai.api.OpenAiApi.ChatModel;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
 
 @RestController
 public class ChatController {
@@ -19,14 +23,12 @@ public ChatController(ChatClient.Builder builder,
   }
 
   @PostMapping("/chat")
-  public ChatResponse chat(@RequestBody ChatRequest request) {
-    return new ChatResponse(
-        chatClient.prompt().user(request.input())
-            .options(OpenAiChatOptions.builder()
-                .model(ChatModel.GPT_4_O_MINI)
-                .temperature(0.0)
-                .function("runSqlQuery")
-                .build())
-            .call().content());
+  public Flux<ServerSentEvent<ChatAgentResponse>> chat(@RequestBody ChatAgentRequest request) {
+    return ModelAdapter.toStreamingResponse(
+        chatClient.prompt()
+            .messages(ModelAdapter.fromRequest(request).toArray(new Message[0]))
+            .tools("runSqlQuery")
+            .stream()
+            .chatResponse());
   }
 }

src/main/java/com/javaaidev/text2sql/controller/ChatController.java

@@ -1,5 +1,8 @@
 package com.javaaidev.text2sql.metadata;
 
-public record ColumnInfo(String name, String dataType, String description) {
+public record ColumnInfo(
+    String name,
+    String dataType,
+    String description) {
 
 }

src/main/java/com/javaaidev/text2sql/metadata/ColumnInfo.java

@@ -2,7 +2,11 @@
 
 import java.util.List;
 
-public record TableInfo(String name, String description, String catalog,
-                        String schema, List<ColumnInfo> columns) {
+public record TableInfo(
+    String name,
+    String description,
+    String catalog,
+    String schema,
+    List<ColumnInfo> columns) {
 
 }

src/main/java/com/javaaidev/text2sql/metadata/TableInfo.java

@@ -2,11 +2,8 @@
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.simple.JdbcClient;
@@ -37,7 +34,7 @@ public RunSqlQueryResponse apply(RunSqlQueryRequest request) {
     }
   }
 
-  private String runQuery(String query) {
+  private String runQuery(String query) throws IOException {
     var rows = jdbcClient.sql(query)
         .query().listOfRows();
     if (CollectionUtils.isEmpty(rows)) {
@@ -51,11 +48,7 @@ private String runQuery(String query) {
         .build();
     var builder = new StringBuilder();
     for (Map<String, Object> row : rows) {
-      try {
-        printer.printRecord(builder, fields.stream().map(row::get).toArray());
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
+      printer.printRecord(builder, fields.stream().map(row::get).toArray());
     }
     return builder.toString();
   }

src/main/java/com/javaaidev/text2sql/tool/RunSqlQueryTool.java

@@ -7,6 +7,10 @@ spring:
   ai:
     openai:
       api-key: ${OPENAI_API_KEY:demo}
+      chat:
+        options:
+          model: gpt-4o-mini
+          temperature: 0.0
   datasource:
     url: jdbc:postgresql://localhost:5432/postgres
     username: postgres