Upgrade to Spring AI 1.0.0

Author: alexcheng1982

pom.xml

@@ -18,7 +18,7 @@
   <properties>
     <java.version>21</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.0.0-M7</spring-ai.version>
+    <spring-ai.version>1.0.0</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>
@@ -100,15 +100,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <repositories>
-    <repository>
-      <id>spring-milestones</id>
-      <name>Spring Milestones</name>
-      <url>https://repo.spring.io/milestone</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
 </project>

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

@@ -4,9 +4,9 @@
 import com.javaaidev.text2sql.metadata.DatabaseMetadataHelper;
 import com.javaaidev.text2sql.tool.RunSqlQueryTool;
 import javax.sql.DataSource;
+import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Description;
 import org.springframework.jdbc.core.simple.JdbcClient;
 
 @Configuration
@@ -30,7 +30,7 @@ public JdbcClient jdbcClient(DataSource dataSource) {
   }
 
   @Bean
-  @Description("Query database using SQL")
+  @Tool(name = "runSqlQuery", description = "Query database using SQL")
   public RunSqlQueryTool runSqlQuery(JdbcClient jdbcClient) {
     return new RunSqlQueryTool(jdbcClient);
   }

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

@@ -2,14 +2,14 @@
 
 import com.javaaidev.text2sql.metadata.DatabaseMetadataHelper;
 import java.sql.SQLException;
-import java.util.HashMap;
+import java.util.Map;
 import org.slf4j.Logger;
 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.ChatClientRequest;
+import org.springframework.ai.chat.client.ChatClientResponse;
+import org.springframework.ai.chat.client.advisor.api.AdvisorChain;
 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.ai.chat.prompt.PromptTemplate;
 import org.springframework.core.Ordered;
 
 /**
@@ -46,18 +46,18 @@ private String getDatabaseMetadata() {
   }
 
   @Override
-  public AdvisedRequest before(AdvisedRequest advisedRequest) {
-    var systemParams = new HashMap<>(advisedRequest.systemParams());
-    systemParams.put("table_schemas", tableSchemas);
-    return AdvisedRequest.from(advisedRequest)
-        .systemText(DEFAULT_SYSTEM_TEXT)
-        .systemParams(systemParams)
-        .build();
+  public ChatClientRequest before(ChatClientRequest chatClientRequest, AdvisorChain advisorChain) {
+    var systemText = new PromptTemplate(DEFAULT_SYSTEM_TEXT).render(Map.of(
+        "table_schemas", tableSchemas
+    ));
+    return chatClientRequest.mutate()
+        .prompt(chatClientRequest.prompt().augmentSystemMessage(systemText)).build();
   }
 
   @Override
-  public AdvisedResponse after(AdvisedResponse advisedResponse) {
-    return advisedResponse;
+  public ChatClientResponse after(ChatClientResponse chatClientResponse,
+      AdvisorChain advisorChain) {
+    return chatClientResponse;
   }
 
   @Override

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

@@ -27,7 +27,7 @@ public Flux<ServerSentEvent<ChatAgentResponse>> chat(@RequestBody ChatAgentReque
     return ModelAdapter.toStreamingResponse(
         chatClient.prompt()
             .messages(ModelAdapter.fromRequest(request).toArray(new Message[0]))
-            .tools("runSqlQuery")
+            .toolNames("runSqlQuery")
             .stream()
             .chatResponse());
   }