Merge pull request #140 from schemacrawler/mcp-json

Use library to create inputSchema

Author: sualeh

schemacrawler-ai-core/pom.xml

@@ -65,6 +65,11 @@
       <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
+    <dependency>
+      <groupId>us.fatehi</groupId>
+      <artifactId>mcp-json-schema</artifactId>
+      <version>1.0.1</version>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/tools/JsonSchemaGenerator.java

@@ -23,8 +23,8 @@
 import schemacrawler.tools.ai.functions.ListFunctionParameters;
 import schemacrawler.tools.ai.functions.TableSampleFunctionParameters;
 import schemacrawler.tools.ai.tools.FunctionParameters;
-import schemacrawler.tools.ai.tools.JsonSchemaGenerator;
 import tools.jackson.databind.JsonNode;
+import us.fatehi.mcp_json_schema.McpJsonSchemaUtility;
 import us.fatehi.test.utility.TestWriter;
 
 public class JsonSchemaGeneratorTest {
@@ -45,7 +45,7 @@ public void functionParameters() {
     final TestWriter testout = new TestWriter();
     try (final TestWriter out = testout) {
       for (final Class<?> parametersClass : functionParameters) {
-        final JsonNode schemaNode = JsonSchemaGenerator.generateSchema(parametersClass);
+        final JsonNode schemaNode = McpJsonSchemaUtility.generateJsonSchema(parametersClass);
         // final JsonNode schemaNode =
         // ToolUtility.extractParametersSchemaNode(parametersClass);
 

schemacrawler-ai-core/src/test/java/schemacrawler/tools/ai/tools/test/JsonSchemaGeneratorTest.java

@@ -33,8 +33,8 @@
 import schemacrawler.tools.ai.tools.FunctionDefinition;
 import schemacrawler.tools.ai.tools.FunctionParameters;
 import schemacrawler.tools.ai.tools.FunctionReturn;
-import schemacrawler.tools.ai.tools.JsonSchemaGenerator;
 import tools.jackson.databind.JsonNode;
+import us.fatehi.mcp_json_schema.McpJsonSchemaUtility;
 
 @Component
 public class ToolHelper {
@@ -103,7 +103,7 @@ private <P extends FunctionParameters> Tool toTool(
     final String toolName = functionDefinition.getName();
 
     final Class<P> parametersClass = functionDefinition.getParametersClass();
-    final JsonNode parametersSchemaNode = JsonSchemaGenerator.generateSchema(parametersClass);
+    final JsonNode parametersSchemaNode = McpJsonSchemaUtility.generateJsonSchema(parametersClass);
 
     final McpSchema.Tool tool =
         McpSchema.Tool.builder()