Merge pull request #110 from schemacrawler/nextrel

sualeh · web-flow · commit d47e908d2228 · 2025-09-26T18:11:37.000-04:00
Update Spring AI version
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@
 # ========================================================================
 
 # Provided arguments
-ARG FROM_IMAGE=schemacrawler/schemacrawler:v16.28.2
+ARG FROM_IMAGE=schemacrawler/schemacrawler:v16.28.3
 
 # BUILDER stage - Build SchemaCrawler AI
 FROM maven:3.9-eclipse-temurin-21 AS builder
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>us.fatehi</groupId>
   <artifactId>schemacrawler-ai-aggregator</artifactId>
-  <version>16.28.2-2</version>
+  <version>16.28.3-1</version>
   <packaging>pom</packaging>
   <name>SchemaCrawler AI [Aggregator]</name>
 
diff --git a/schemacrawler-ai-aichat/pom.xml b/schemacrawler-ai-aichat/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>us.fatehi</groupId>
       <artifactId>schemacrawler-ai-parent</artifactId>
-      <version>16.28.2-2</version>
+      <version>16.28.3-1</version>
       <relativePath>../schemacrawler-ai-parent</relativePath>
    </parent>
    <artifactId>schemacrawler-ai-aichat</artifactId>
diff --git a/schemacrawler-ai-core/pom.xml b/schemacrawler-ai-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.28.2-2</version>
+    <version>16.28.3-1</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
 
diff --git a/schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/tools/FunctionParameters.java b/schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/tools/FunctionParameters.java
@@ -8,7 +8,10 @@
 
 package schemacrawler.tools.ai.tools;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public interface FunctionParameters {
 
+  @JsonIgnore
   FunctionReturnType getFunctionReturnType();
 }
diff --git a/schemacrawler-ai-distrib/pom.xml b/schemacrawler-ai-distrib/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.28.2-2</version>
+    <version>16.28.3-1</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
 
diff --git a/schemacrawler-ai-langchain4j/pom.xml b/schemacrawler-ai-langchain4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.28.2-2</version>
+    <version>16.28.3-1</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
 
diff --git a/schemacrawler-ai-mcpserver/mcp-registration.json b/schemacrawler-ai-mcpserver/mcp-registration.json
@@ -8,13 +8,13 @@
     "url": "https://github.com/schemacrawler/SchemaCrawler-AI",
     "source": "github"
   },
-  "version": "v16.28.2-2",
+  "version": "v16.28.3-1",
   "packages": [
     {
       "registry_type": "oci",
       "registry_base_url": "https://docker.io",
       "identifier": "schemacrawler/schemacrawler-ai",
-      "version": "v16.28.2-2",
+      "version": "v16.28.3-1",
       "transport": {
         "type": "stdio"
       },
diff --git a/schemacrawler-ai-mcpserver/pom.xml b/schemacrawler-ai-mcpserver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.28.2-2</version>
+    <version>16.28.3-1</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
   <artifactId>schemacrawler-ai-mcpserver</artifactId>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>org.springframework.ai</groupId>
         <artifactId>spring-ai-bom</artifactId>
-        <version>1.1.0-M1</version>
+        <version>1.1.0-M2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ResourceProvider.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ResourceProvider.java
@@ -26,7 +26,7 @@
 import schemacrawler.tools.ai.model.TableDocument;
 
 @Service
-public class DatabaseObjectResourceProvider {
+public class ResourceProvider {
 
   @Autowired public Catalog catalog;
 
@@ -47,11 +47,11 @@ public String getRoutineDetails(
               .withAdditionalRoutineDetails(allRoutineDetails())
               .getRoutineDocument(routine);
       LoggingUtility.log(
-          exchange, String.format("Generated resource for <%s>", resourceRequest.uri()));
+          exchange, String.format("Located resource for <%s>", resourceRequest.uri()));
       return document.toObjectNode().toPrettyString();
     } catch (final Exception e) {
       LoggingUtility.logException(
-          exchange, String.format("Could not read resource <%s>", resourceRequest.uri()), e);
+          exchange, String.format("Could not locate resource <%s>", resourceRequest.uri()), e);
       throw e;
     }
   }
@@ -73,36 +73,36 @@ public String getTableDetails(
               .withAdditionalTableDetails(allTableDetails())
               .getTableDocument(table);
       LoggingUtility.log(
-          exchange, String.format("Generated resource for <%s>", resourceRequest.uri()));
+          exchange, String.format("Located resource for <%s>", resourceRequest.uri()));
       return document.toObjectNode().toPrettyString();
     } catch (final Exception e) {
       LoggingUtility.logException(
-          exchange, String.format("Could not read resource <%s>", resourceRequest.uri()), e);
+          exchange, String.format("Could not locate resource <%s>", resourceRequest.uri()), e);
       throw e;
     }
   }
 
   private <DO extends DatabaseObject> DO lookupDatabaseObject(
-      final String databaseObjectName, final Collection<DO> databaseObjects) {
-    requireNonNull(databaseObjects, "No database objects provided");
+      final String databaseObjectName, final Collection<DO> allDatabaseObjects) {
+    requireNonNull(allDatabaseObjects, "No database objects provided");
     final String searchObjectName = trimToEmpty(databaseObjectName);
-    final List<DO> routines =
-        databaseObjects.stream()
+    final List<DO> databaseObjects =
+        allDatabaseObjects.stream()
             .filter(
                 databaseObject ->
                     databaseObject.getName().equalsIgnoreCase(searchObjectName)
                         || databaseObject.getFullName().equalsIgnoreCase(searchObjectName))
             .collect(Collectors.toList());
-    if (routines.isEmpty()) {
+    if (databaseObjects.isEmpty()) {
       throw new SchemaCrawlerException(String.format("<%s> not found", databaseObjectName));
     }
-    if (routines.size() > 1) {
+    if (databaseObjects.size() > 1) {
       throw new SchemaCrawlerException(
           String.format(
               "<%s> has too many matches - provide a fully-qualified name", databaseObjectName));
     }
 
-    final DO routine = routines.get(0);
-    return routine;
+    final DO databaseObject = databaseObjects.get(0);
+    return databaseObject;
   }
 }
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ToolHelper.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ToolHelper.java
@@ -10,10 +10,13 @@
 
 import static java.util.Objects.requireNonNull;
 import static schemacrawler.tools.ai.mcpserver.utility.LoggingUtility.log;
+import static schemacrawler.tools.ai.utility.JsonUtility.mapper;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import io.modelcontextprotocol.json.McpJsonMapper;
 import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.server.McpSyncServerExchange;
+import io.modelcontextprotocol.spec.McpSchema;
 import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
 import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
 import io.modelcontextprotocol.spec.McpSchema.Content;
@@ -22,7 +25,6 @@
 import java.sql.Connection;
 import java.util.List;
 import java.util.function.BiFunction;
-import org.springframework.ai.model.ModelOptionsUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import schemacrawler.schema.Catalog;
@@ -50,7 +52,7 @@ public CallToolResult apply(
         final McpSyncServerExchange exchange, final CallToolRequest request) {
       FunctionReturn functionReturn;
       try {
-        final String arguments = ModelOptionsUtils.toJsonString(request.arguments());
+        final String arguments = mapper.writeValueAsString(request.arguments());
         log(
             exchange,
             String.format(
@@ -62,7 +64,9 @@ public CallToolResult apply(
       }
       final List<Content> content = createContent(functionReturn);
       final boolean inError = functionReturn instanceof ExceptionFunctionReturn;
-      return new CallToolResult(content, inError);
+      final CallToolResult callToolResult =
+          CallToolResult.builder().content(content).isError(inError).build();
+      return callToolResult;
     }
 
     private List<Content> createContent(final FunctionReturn functionReturn) {
@@ -82,23 +86,27 @@ private List<Content> createContent(final FunctionReturn functionReturn) {
       McpServerFeatures.SyncToolSpecification toSyncToolSpecification(
           final FunctionDefinition<P> functionDefinition) {
 
-    final Tool tool = toTool(functionDefinition);
+    final McpSchema.Tool tool = toTool(functionDefinition);
     final FunctionCallback<P> functionCallback =
         new FunctionCallback<>(functionDefinition, catalog);
     final ToolCallHandler toolCallHandler = new ToolCallHandler(functionCallback);
 
     return new McpServerFeatures.SyncToolSpecification(tool, null, toolCallHandler);
   }
 
-  private Tool toTool(final FunctionDefinition<?> functionDefinition) {
+  private <P extends FunctionParameters> Tool toTool(
+      final FunctionDefinition<P> functionDefinition) {
     requireNonNull(functionDefinition, "No function definition provided");
-    final JsonNode parametersSchemaNode =
-        ToolUtility.extractParametersSchemaNode(functionDefinition.getParametersClass());
-    final Tool tool =
-        Tool.builder()
-            .name(functionDefinition.getName())
+    final String toolName = functionDefinition.getName();
+
+    final Class<P> parametersClass = functionDefinition.getParametersClass();
+    final JsonNode parametersSchemaNode = ToolUtility.extractParametersSchemaNode(parametersClass);
+
+    final McpSchema.Tool tool =
+        McpSchema.Tool.builder()
+            .name(toolName)
             .description(functionDefinition.getDescription())
-            .inputSchema(parametersSchemaNode.toString())
+            .inputSchema(McpJsonMapper.createDefault(), parametersSchemaNode.toString())
             .build();
     return tool;
   }
diff --git a/schemacrawler-ai-mcpserver/src/main/resources/application.yaml b/schemacrawler-ai-mcpserver/src/main/resources/application.yaml
@@ -17,7 +17,7 @@ spring:
         name: schemacrawler-mcpserver
 server:
   name: SchemaCrawler AI MCP Server
-  version: "v16.28.2-2"
+  version: "v16.28.3-1"
   heartbeat: true
 
 ---
@@ -45,3 +45,5 @@ spring:
         protocol: STREAMABLE
         stdio: false
         allowed-origin: '*'
+        streamable-http:
+          disallow-delete: true
diff --git a/schemacrawler-ai-mcpserver/src/main/resources/banner.txt b/schemacrawler-ai-mcpserver/src/main/resources/banner.txt
@@ -1,5 +1,5 @@
 
 --------------------------------
 SchemaCrawler AI MCP Server
-v16.28.2-2
+v16.28.3-1
 --------------------------------
diff --git a/schemacrawler-ai-parent/pom.xml b/schemacrawler-ai-parent/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-parent</artifactId>
-    <version>16.28.2</version>
+    <version>16.28.3</version>
     <relativePath />
   </parent>
 
   <artifactId>schemacrawler-ai-parent</artifactId>
-  <version>16.28.2-2</version>
+  <version>16.28.3-1</version>
   <packaging>pom</packaging>
   <name>SchemaCrawler AI [Parent]</name>
   <description>Free database schema discovery and comprehension tool</description>
@@ -21,7 +21,7 @@
     <java.version>21</java.version>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
-    <schemacrawler.version>16.28.2</schemacrawler.version>
+    <schemacrawler.version>16.28.3</schemacrawler.version>
   </properties>
 
   <dependencyManagement>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,10 @@`
`8`	`8`
`9`	`9`	`package schemacrawler.tools.ai.tools;`
`10`	`10`
	`11`	`+import com.fasterxml.jackson.annotation.JsonIgnore;`
	`12`	`+`
`11`	`13`	`public interface FunctionParameters {`
`12`	`14`
	`15`	`+ @JsonIgnore`
`13`	`16`	`FunctionReturnType getFunctionReturnType();`
`14`	`17`	`}`