feat: mcp integration

alexcheng1982 · alexcheng1982 · commit ce23601a53a9 · 2025-04-09T21:09:44.000+12:00
diff --git a/code-generator/cli/pom.xml b/code-generator/cli/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>code-generator-cli</artifactId>
diff --git a/code-generator/cli/src/main/kotlin/com/javaaidev/easyllmtools/codegenerator/cli/CodeGeneratorCli.kt b/code-generator/cli/src/main/kotlin/com/javaaidev/easyllmtools/codegenerator/cli/CodeGeneratorCli.kt
@@ -8,7 +8,7 @@ import kotlin.system.exitProcess
 @CommandLine.Command(
     name = "easy-llm-tools",
     mixinStandardHelpOptions = true,
-    version = ["0.1.6"],
+    version = ["0.1.7"],
     description = ["Generate code for LLM tools"],
     scope = CommandLine.ScopeType.INHERIT,
     subcommands = [
diff --git a/code-generator/openapi/pom.xml b/code-generator/openapi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>code-generator-openapi</artifactId>
diff --git a/code-generator/openapi/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/code-generator/openapi/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -392,7 +392,7 @@
       <dependency>
         <groupId>com.javaaidev.easyllmtools</groupId>
         <artifactId>llm-tool-spec</artifactId>
-        <version>0.1.6</version>
+        <version>0.1.7</version>
       </dependency>
         <!-- test dependencies -->
         <dependency>
diff --git a/code-generator/pom.xml b/code-generator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>easyllmtools-parent</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>code-generator</artifactId>
diff --git a/code-generator/shared/pom.xml b/code-generator/shared/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>code-generator-shared</artifactId>
diff --git a/code-generator/simple/pom.xml b/code-generator/simple/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>code-generator-simple</artifactId>
diff --git a/code-generator/simple/src/main/resources/template/pom.hbs b/code-generator/simple/src/main/resources/template/pom.hbs
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.javaaidev.easyllmtools</groupId>
             <artifactId>llm-tool-spec</artifactId>
-            <version>0.1.6</version>
+            <version>0.1.7</version>
         </dependency>
     </dependencies>
 
diff --git a/integration/core/pom.xml b/integration/core/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.javaaidev.easyllmtools</groupId>
+    <artifactId>integration</artifactId>
+    <version>0.1.7</version>
+  </parent>
+
+  <artifactId>integration-core</artifactId>
+  <name>Integration :: Core</name>
+  <description>Integration core library</description>
+
+  <properties>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jackson.version>2.17.3</jackson.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.javaaidev.easyllmtools</groupId>
+      <artifactId>llm-tool-spec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-kotlin</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/integration/core/src/main/java/com/javaaidev/easyllmtools/integration/core/ToolCallException.java b/integration/core/src/main/java/com/javaaidev/easyllmtools/integration/core/ToolCallException.java
@@ -0,0 +1,15 @@
+package com.javaaidev.easyllmtools.integration.core;
+
+public class ToolCallException extends RuntimeException {
+
+  private final String toolId;
+
+  public ToolCallException(String toolId, String message, Throwable cause) {
+    super(message, cause);
+    this.toolId = toolId;
+  }
+
+  public String getToolId() {
+    return toolId;
+  }
+}
diff --git a/integration/core/src/main/java/com/javaaidev/easyllmtools/integration/core/ToolInvoker.java b/integration/core/src/main/java/com/javaaidev/easyllmtools/integration/core/ToolInvoker.java
@@ -0,0 +1,55 @@
+package com.javaaidev.easyllmtools.integration.core;
+
+import static com.fasterxml.jackson.module.kotlin.ExtensionsKt.jacksonMapperBuilder;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.javaaidev.easyllmtools.llmtoolspec.Tool;
+import java.util.Map;
+
+public class ToolInvoker {
+
+  private final ObjectMapper objectMapper;
+  private final ObjectMapper defaultObjectMapper = jacksonMapperBuilder()
+      .addModule(new Jdk8Module())
+      .addModule(new JavaTimeModule())
+      .serializationInclusion(JsonInclude.Include.NON_ABSENT)
+      .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
+      .disable(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)
+      .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+      .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+      .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+      .build();
+
+  public ToolInvoker() {
+    this.objectMapper = defaultObjectMapper;
+  }
+
+  public ToolInvoker(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper != null ? objectMapper : defaultObjectMapper;
+  }
+
+  public String invoke(Tool tool, Map<String, Object> input) {
+    try {
+      return invoke(tool, objectMapper.writeValueAsString(input));
+    } catch (JsonProcessingException e) {
+      throw new ToolCallException(tool.getId(), e.getMessage(), e);
+    }
+  }
+
+  public String invoke(Tool tool, String toolInput) {
+    try {
+      var type = objectMapper.getTypeFactory().constructType(tool.getRequestType());
+      var input = objectMapper.readValue(toolInput, type);
+      var result = tool.call(input);
+      return objectMapper.writeValueAsString(result);
+    } catch (Exception e) {
+      throw new ToolCallException(tool.getId(), e.getMessage(), e);
+    }
+  }
+}
diff --git a/integration/mcp/pom.xml b/integration/mcp/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.javaaidev.easyllmtools</groupId>
+    <artifactId>integration</artifactId>
+    <version>0.1.7</version>
+  </parent>
+
+  <artifactId>integration-mcp</artifactId>
+  <name>Integration :: MCP</name>
+
+  <properties>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <java.version>17</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.javaaidev.easyllmtools</groupId>
+      <artifactId>llm-tool-spec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.javaaidev.easyllmtools</groupId>
+      <artifactId>integration-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.modelcontextprotocol.sdk</groupId>
+      <artifactId>mcp</artifactId>
+      <version>0.8.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/main/kotlin</sourceDirectory>
+    <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/integration/mcp/src/main/kotlin/com/javaaidev/easyllmtools/integration/mcp/McpToolHelper.java b/integration/mcp/src/main/kotlin/com/javaaidev/easyllmtools/integration/mcp/McpToolHelper.java
@@ -0,0 +1,52 @@
+package com.javaaidev.easyllmtools.integration.mcp;
+
+import com.javaaidev.easyllmtools.integration.core.ToolCallException;
+import com.javaaidev.easyllmtools.integration.core.ToolInvoker;
+import com.javaaidev.easyllmtools.llmtoolspec.Tool;
+import io.modelcontextprotocol.server.McpServerFeatures;
+import io.modelcontextprotocol.server.McpServerFeatures.AsyncToolSpecification;
+import io.modelcontextprotocol.server.McpServerFeatures.SyncToolSpecification;
+import io.modelcontextprotocol.spec.McpSchema;
+import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
+import io.modelcontextprotocol.spec.McpSchema.TextContent;
+import java.util.List;
+import java.util.Map;
+import reactor.core.publisher.Mono;
+
+public class McpToolHelper {
+
+  private final ToolInvoker toolInvoker = new ToolInvoker();
+
+  public McpServerFeatures.SyncToolSpecification toSyncTool(Tool tool) {
+    return new SyncToolSpecification(
+        fromTool(tool), (exchange, args) -> callTool(tool, args)
+    );
+  }
+
+  public McpServerFeatures.AsyncToolSpecification toAsyncTool(Tool tool) {
+    return new AsyncToolSpecification(
+        fromTool(tool),
+        (mcpAsyncServerExchange, args) -> Mono.fromSupplier(() -> callTool(tool, args))
+    );
+  }
+
+  private McpSchema.Tool fromTool(Tool tool) {
+    return new McpSchema.Tool(
+        tool.getName(),
+        tool.getDescription(),
+        tool.getParametersSchema()
+    );
+  }
+
+  private CallToolResult callTool(Tool tool, Map<String, Object> args) {
+    String content;
+    boolean isError = false;
+    try {
+      content = toolInvoker.invoke(tool, args);
+    } catch (ToolCallException e) {
+      content = e.getMessage();
+      isError = true;
+    }
+    return new CallToolResult(List.of(new TextContent(content)), isError);
+  }
+}
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>easyllmtools-parent</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>integration</artifactId>
@@ -15,6 +15,8 @@
   <packaging>pom</packaging>
   <modules>
     <module>spring-ai</module>
+    <module>mcp</module>
+    <module>core</module>
   </modules>
 
   <properties>
diff --git a/integration/spring-ai/pom.xml b/integration/spring-ai/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>integration</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
   </parent>
 
   <artifactId>integration-spring-ai</artifactId>
@@ -39,6 +39,11 @@
       <artifactId>llm-tool-spec</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.javaaidev.easyllmtools</groupId>
+      <artifactId>integration-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-core</artifactId>
@@ -47,21 +52,6 @@
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-kotlin</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolCallException.java b/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolCallException.java
diff --git a/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolFunctionCallback.java b/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolFunctionCallback.java
diff --git a/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolsFunctionCallbackResolver.java b/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolsFunctionCallbackResolver.java
diff --git a/llm-tool-spec/pom.xml b/llm-tool-spec/pom.xml
diff --git a/pom.xml b/pom.xml
diff --git a/support/command-line-invoker/pom.xml b/support/command-line-invoker/pom.xml
diff --git a/support/pom.xml b/support/pom.xml
