agent uses mcp tools

alexcheng1982 · alexcheng1982 · commit 6eb23073e59f · 2025-10-22T07:01:44.000+13:00
diff --git a/core/pom.xml b/core/pom.xml
@@ -24,6 +24,14 @@
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-client-chat</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ai</groupId>
+      <artifactId>spring-ai-mcp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.ai</groupId>
+      <artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
@@ -33,6 +41,10 @@
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-observation</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/core/src/main/java/com/javaaidev/agenticpatterns/core/Agent.java b/core/src/main/java/com/javaaidev/agenticpatterns/core/Agent.java
@@ -18,7 +18,8 @@ protected Agent(ChatClient chatClient) {
     this.observationRegistry = null;
   }
 
-  protected Agent(ChatClient chatClient, @Nullable ObservationRegistry observationRegistry) {
+  protected Agent(ChatClient chatClient,
+      @Nullable ObservationRegistry observationRegistry) {
     this.chatClient = chatClient;
     this.observationRegistry = observationRegistry;
   }
diff --git a/core/src/main/java/com/javaaidev/agenticpatterns/core/McpClientConfiguration.java b/core/src/main/java/com/javaaidev/agenticpatterns/core/McpClientConfiguration.java
@@ -0,0 +1,30 @@
+package com.javaaidev.agenticpatterns.core;
+
+import io.modelcontextprotocol.client.transport.ServerParameters;
+import java.util.HashMap;
+import java.util.Map;
+import org.jspecify.annotations.Nullable;
+import org.springframework.ai.mcp.client.autoconfigure.properties.McpSseClientProperties.SseParameters;
+import org.springframework.ai.mcp.client.autoconfigure.properties.McpStdioClientProperties.Parameters;
+
+public record McpClientConfiguration(
+    @Nullable StdioClientProperties stdioClientProperties,
+    @Nullable SseClientProperties sseClientProperties
+) {
+
+  public record StdioClientProperties(Map<String, Parameters> connections) {
+
+    public Map<String, ServerParameters> toServerParameters() {
+      Map<String, ServerParameters> serverParameters = new HashMap<>();
+      for (Map.Entry<String, Parameters> entry : this.connections.entrySet()) {
+        serverParameters.put(entry.getKey(),
+            entry.getValue().toServerParameters());
+      }
+      return serverParameters;
+    }
+  }
+
+  public record SseClientProperties(Map<String, SseParameters> connections) {
+
+  }
+}
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -18,8 +18,8 @@
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.0.0</spring-ai.version>
-    <spring-boot.version>3.4.6</spring-boot.version>
+    <spring-ai.version>1.0.3</spring-ai.version>
+    <spring-boot.version>3.4.10</spring-boot.version>
   </properties>
 
   <dependencyManagement>
@@ -38,6 +38,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-bom</artifactId>
+        <version>1.55.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.opentelemetry.instrumentation</groupId>
         <artifactId>opentelemetry-instrumentation-bom</artifactId>
@@ -93,7 +100,7 @@
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.9</version>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
diff --git a/examples/src/main/java/com/javaaidev/agenticpatterns/examples/taskexecution/UserGenerationConfiguration.java b/examples/src/main/java/com/javaaidev/agenticpatterns/examples/taskexecution/UserGenerationConfiguration.java
@@ -1,10 +1,15 @@
 package com.javaaidev.agenticpatterns.examples.taskexecution;
 
 import com.javaaidev.agenticpatterns.core.AgentUtils;
+import com.javaaidev.agenticpatterns.core.McpClientConfiguration;
+import com.javaaidev.agenticpatterns.core.McpClientConfiguration.StdioClientProperties;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
 import io.micrometer.observation.ObservationRegistry;
+import java.util.List;
+import java.util.Map;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
+import org.springframework.ai.mcp.client.autoconfigure.properties.McpStdioClientProperties.Parameters;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,14 +26,32 @@ public TaskExecutionAgent<UserGenerationRequest, UserGenerationResponse> userGen
       SimpleLoggerAdvisor simpleLoggerAdvisor,
       ObservationRegistry observationRegistry
   ) {
-    var chatClient = chatClientBuilder.defaultAdvisors(simpleLoggerAdvisor).build();
+    var chatClient = chatClientBuilder.defaultAdvisors(simpleLoggerAdvisor)
+        .build();
     return TaskExecutionAgent.<UserGenerationRequest, UserGenerationResponse>defaultBuilder()
         .chatClient(chatClient)
         .responseType(UserGenerationResponse.class)
         .promptTemplate(
-            AgentUtils.loadPromptTemplateFromClasspath("prompt_template/generate-user.st"))
+            AgentUtils.loadPromptTemplateFromClasspath(
+                "prompt_template/generate-user.st"))
         .name("UserGeneration")
         .observationRegistry(observationRegistry)
+        .mcpClientConfiguration(new McpClientConfiguration(
+            new StdioClientProperties(
+                Map.of(
+                    "file-system", new Parameters(
+                        "npx",
+                        List.of(
+                            "-y",
+                            "@modelcontextprotocol/server-filesystem",
+                            "/tmp"
+                        ),
+                        Map.of()
+                    )
+                )
+            ),
+            null
+        ))
         .build();
   }
 }
diff --git a/examples/src/main/resources/prompt_template/generate-user.st b/examples/src/main/resources/prompt_template/generate-user.st
@@ -1,4 +1,4 @@
-Goal: Generate {count} users
+Goal: Generate {count} users. Generated users are also saved as a JSON file to `/tmp`.
 
 Requirements:
 - Id should be a version 4 random UUID.
diff --git a/patterns/chain-workflow/src/main/java/com/javaaidev/agenticpatterns/chainworkflow/ChainStepAgent.java b/patterns/chain-workflow/src/main/java/com/javaaidev/agenticpatterns/chainworkflow/ChainStepAgent.java
@@ -1,12 +1,15 @@
 package com.javaaidev.agenticpatterns.chainworkflow;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.javaaidev.agenticpatterns.core.McpClientConfiguration;
 import com.javaaidev.agenticpatterns.taskexecution.AbstractTaskExecutionAgentBuilder;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
 import io.micrometer.observation.ObservationRegistry;
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.ChatClient.ChatClientRequestSpec;
@@ -38,10 +41,15 @@ public ChainStepAgent(ChatClient chatClient,
       @Nullable Type responseType,
       @Nullable Function<Request, Map<String, Object>> promptTemplateContextProvider,
       @Nullable Consumer<ChatClientRequestSpec> chatClientRequestSpecUpdater,
+      @Nullable McpClientConfiguration mcpClientConfiguration,
+      @Nullable Predicate<String> toolFilter,
       @Nullable String name,
-      @Nullable ObservationRegistry observationRegistry) {
-    super(chatClient, promptTemplate, responseType, promptTemplateContextProvider,
-        chatClientRequestSpecUpdater, name, observationRegistry);
+      @Nullable ObservationRegistry observationRegistry,
+      @Nullable ObjectMapper objectMapper) {
+    super(chatClient, promptTemplate, responseType,
+        promptTemplateContextProvider,
+        chatClientRequestSpecUpdater, mcpClientConfiguration, toolFilter,
+        name, observationRegistry, objectMapper);
   }
 
   public static <Req, Res> Builder<Req, Res> builder() {
@@ -69,19 +77,24 @@ public Builder<Request, Response> order(int order) {
     public ChainStepAgent<Request, Response> build() {
       Assert.notNull(chatClient, "ChatClient cannot be null");
       Assert.hasText(promptTemplate, "Prompt template cannot be empty");
-      Assert.notNull(nextRequestPreparer, "nextRequestPreparer cannot be null");
+      Assert.notNull(nextRequestPreparer,
+          "nextRequestPreparer cannot be null");
       return new ChainStepAgent<>(chatClient,
           promptTemplate,
           responseType,
           promptTemplateContextProvider,
           chatClientRequestSpecUpdater,
+          mcpClientConfiguration,
+          toolFilter,
           name,
-          observationRegistry) {
+          observationRegistry,
+          objectMapper) {
         @Override
         public Response call(Request request, Map<String, Object> context,
             WorkflowChain<Request, Response> chain) {
           var response = this.call(request);
-          return chain.callNext(nextRequestPreparer.apply(response), response);
+          return chain.callNext(nextRequestPreparer.apply(response),
+              response);
         }
 
         @Override
diff --git a/patterns/parallelization-workflow/src/main/java/com/javaaidev/agenticpatterns/parallelizationworkflow/DefaultResponseAssembler.java b/patterns/parallelization-workflow/src/main/java/com/javaaidev/agenticpatterns/parallelizationworkflow/DefaultResponseAssembler.java
@@ -1,5 +1,7 @@
 package com.javaaidev.agenticpatterns.parallelizationworkflow;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.javaaidev.agenticpatterns.core.McpClientConfiguration;
 import com.javaaidev.agenticpatterns.parallelizationworkflow.DefaultResponseAssembler.AssemblingInput;
 import com.javaaidev.agenticpatterns.taskexecution.AbstractTaskExecutionAgentBuilder;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
@@ -8,12 +10,14 @@
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.ChatClient.ChatClientRequestSpec;
 
 /**
- * A {@linkplain ResponseAssembler} implemented using {@linkplain TaskExecutionAgent}
+ * A {@linkplain ResponseAssembler} implemented using
+ * {@linkplain TaskExecutionAgent}
  *
  * @param <Request>
  * @param <Response>
@@ -26,14 +30,20 @@ public DefaultResponseAssembler(ChatClient chatClient,
       String promptTemplate, @Nullable Type responseType,
       @Nullable Function<AssemblingInput<Request>, Map<String, Object>> promptTemplateContextProvider,
       @Nullable Consumer<ChatClientRequestSpec> chatClientRequestSpecUpdater,
+      @Nullable McpClientConfiguration mcpClientConfiguration,
+      @Nullable Predicate<String> toolFilter,
       @Nullable String name,
-      @Nullable ObservationRegistry observationRegistry) {
-    super(chatClient, promptTemplate, responseType, promptTemplateContextProvider,
-        chatClientRequestSpecUpdater, name, observationRegistry);
+      @Nullable ObservationRegistry observationRegistry,
+      @Nullable ObjectMapper objectMapper) {
+    super(chatClient, promptTemplate, responseType,
+        promptTemplateContextProvider,
+        chatClientRequestSpecUpdater, mcpClientConfiguration, toolFilter,
+        name, observationRegistry, objectMapper);
   }
 
   @Override
-  public Response assemble(@Nullable Request request, TaskExecutionResults results) {
+  public Response assemble(@Nullable Request request,
+      TaskExecutionResults results) {
     return this.call(new AssemblingInput<>(request, results));
   }
 
@@ -57,8 +67,11 @@ public DefaultResponseAssembler<Request, Response> build() {
           responseType,
           promptTemplateContextProvider,
           chatClientRequestSpecUpdater,
+          mcpClientConfiguration,
+          toolFilter,
           name,
-          observationRegistry
+          observationRegistry,
+          objectMapper
       );
     }
   }
diff --git a/patterns/task-execution/README.md b/patterns/task-execution/README.md
@@ -1,6 +1,5 @@
 # Task Execution Agent
 
-Implementation
-of [Task Execution pattern](https://javaaidev.com/docs/agentic-patterns/patterns/task-execution)
+Implementation of [Task Execution pattern](https://javaaidev.com/docs/agentic-patterns/patterns/task-execution)
 
 See [doc](https://javaaidev.com/docs/agentic-patterns/reference-implementation/task-execution-agent)
diff --git a/patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/AbstractTaskExecutionAgentBuilder.java b/patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/AbstractTaskExecutionAgentBuilder.java
@@ -1,10 +1,13 @@
 package com.javaaidev.agenticpatterns.taskexecution;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.javaaidev.agenticpatterns.core.McpClientConfiguration;
 import io.micrometer.observation.ObservationRegistry;
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.ChatClient.ChatClientRequestSpec;
@@ -20,6 +23,9 @@ public abstract class AbstractTaskExecutionAgentBuilder<Request, Response, T ext
   protected @Nullable ObservationRegistry observationRegistry;
   protected @Nullable Function<Request, Map<String, Object>> promptTemplateContextProvider;
   protected @Nullable Consumer<ChatClientRequestSpec> chatClientRequestSpecUpdater;
+  protected @Nullable McpClientConfiguration mcpClientConfiguration;
+  protected @Nullable Predicate<String> toolFilter;
+  protected @Nullable ObjectMapper objectMapper;
 
   @SuppressWarnings("unchecked")
   protected T self() {
@@ -66,4 +72,23 @@ public T chatClientRequestSpecUpdater(
     this.chatClientRequestSpecUpdater = chatClientRequestSpecUpdater;
     return self();
   }
+
+  @Override
+  public T mcpClientConfiguration(
+      McpClientConfiguration mcpClientConfiguration) {
+    this.mcpClientConfiguration = mcpClientConfiguration;
+    return self();
+  }
+
+  @Override
+  public T toolFilter(Predicate<String> toolFilter) {
+    this.toolFilter = toolFilter;
+    return self();
+  }
+
+  @Override
+  public T objectMapper(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper;
+    return self();
+  }
 }
diff --git a/patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/DefaultTaskExecutionAgentBuilder.java b/patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/DefaultTaskExecutionAgentBuilder.java
@@ -14,8 +14,11 @@ public TaskExecutionAgent<Request, Response> build() {
         responseType,
         promptTemplateContextProvider,
         chatClientRequestSpecUpdater,
+        mcpClientConfiguration,
+        toolFilter,
         name,
-        observationRegistry) {
+        observationRegistry,
+        objectMapper) {
     };
   }
 }
diff --git a/patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/TaskExecutionAgent.java b/patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/TaskExecutionAgent.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ protected Agent(ChatClient chatClient) {`
`18`	`18`	`this.observationRegistry = null;`
`19`	`19`	`}`
`20`	`20`
`21`		`- protected Agent(ChatClient chatClient, @Nullable ObservationRegistry observationRegistry) {`
	`21`	`+ protected Agent(ChatClient chatClient,`
	`22`	`+ @Nullable ObservationRegistry observationRegistry) {`
`22`	`23`	`this.chatClient = chatClient;`
`23`	`24`	`this.observationRegistry = observationRegistry;`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Goal: Generate {count} users`
	`1`	+Goal: Generate {count} users. Generated users are also saved as a JSON file to `/tmp`.
`2`	`2`
`3`	`3`	`Requirements:`
`4`	`4`	`- Id should be a version 4 random UUID.`