samples: simplify clients and remove "InMemoryRepo"

Signed-off-by: Daniel Garnier-Moiroux <[email protected]>

Author: Kehrlann

samples/sample-mcp-client-webflux/src/main/java/org/springaicommunity/mcp/security/sample/client/DemoController.java

@@ -16,28 +16,31 @@
 
 package org.springaicommunity.mcp.security.sample.client;
 
-import java.io.IOException;
+import java.util.List;
 import java.util.stream.Collectors;
 
-import jakarta.servlet.http.HttpServletResponse;
+import io.modelcontextprotocol.client.McpSyncClient;
+import io.modelcontextprotocol.spec.McpSchema;
 
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 class DemoController {
 
-	private final InMemoryMcpClientRepository mcpClientRepo;
+	private final SyncMcpToolCallbackProvider mcpToolCallbacks;
 
-	private ChatClient chatClient;
+	private final List<McpSyncClient> clients;
 
-	DemoController(ChatClient.Builder chatClientBuilder, InMemoryMcpClientRepository mcpClientRepository) {
+	private final ChatClient chatClient;
+
+	DemoController(ChatClient.Builder chatClientBuilder, List<McpSyncClient> clients) {
 		this.chatClient = chatClientBuilder.build();
-		this.mcpClientRepo = mcpClientRepository;
+		this.mcpToolCallbacks = SyncMcpToolCallbackProvider.builder().mcpClients(clients).build();
+		this.clients = clients;
 	}
 
 	@GetMapping("/")
@@ -47,9 +50,9 @@ String index(String query) {
 			var chatResponse = chatClient.prompt("""
 					What is the weather in %s right now?
 					Compare to historical data over the past 5 years.
-					Tell me if it is within the usual range.
+					Concisely tell me if it is within the usual range.
 					Format the output in plain HTML, no CSS.""".formatted(query))
-				.toolCallbacks(new SyncMcpToolCallbackProvider(mcpClientRepo.getClients()))
+				.toolCallbacks(mcpToolCallbacks)
 				.call()
 				.content();
 
@@ -62,8 +65,9 @@ String index(String query) {
 					""".formatted(query, chatResponse);
 		}
 
-		var currentMcpServersBlock = this.mcpClientRepo.getClientNames()
-			.stream()
+		var currentMcpServersBlock = this.clients.stream()
+			.map(McpSyncClient::getClientInfo)
+			.map(McpSchema.Implementation::name)
 			.map("    <li>%s</li>"::formatted)
 			.collect(Collectors.joining("\n"));
 
@@ -86,20 +90,7 @@ String index(String query) {
 				<ul>
 				%s
 				</ul>
-				<form action="/mcp/add" method="GET">
-					<input type="text" name="name" placeholder="My MCP server" value="weather data history" />
-					<input type="text" name="url" placeholder="http://localhost:8090" value="http://localhost:8090" />
-					<button type="submit">Add</button>
-				</form>
 				""".formatted(currentWeatherBlock, currentMcpServersBlock);
 	}
 
-	// TODO: this should be a POST but that won't work with Spring Security
-	@GetMapping("/mcp/add")
-	void addMcpServer(@RequestParam String url, @RequestParam String name, HttpServletResponse response)
-			throws IOException {
-		this.mcpClientRepo.addClient(url, name);
-		response.sendRedirect("/");
-	}
-
 }

samples/sample-mcp-client-webflux/src/main/java/org/springaicommunity/mcp/security/sample/client/InMemoryMcpClientRepository.java

@@ -16,10 +16,16 @@
 
 package org.springaicommunity.mcp.security.sample.client;
 
+import java.util.List;
+
 import org.springaicommunity.mcp.security.client.sync.AuthenticationMcpTransportContextProvider;
 import org.springaicommunity.mcp.security.client.sync.oauth2.webclient.McpOAuth2AuthorizationCodeExchangeFilterFunction;
 
 import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
+import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
+import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
+import org.springframework.ai.tool.resolution.StaticToolCallbackResolver;
+import org.springframework.ai.tool.resolution.ToolCallbackResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
@@ -30,6 +36,26 @@
 @Configuration
 class McpConfiguration {
 
+	/**
+	 * If the default {@link ToolCallbackResolver} from
+	 * {@link ToolCallingAutoConfiguration} is imported, then all MCP-based tools are
+	 * added to the resolver. In order to do so, the {@link ToolCallbackResolver} bean
+	 * lists all MCP tools, therefore initializing MCP clients and listing the tools.
+	 * <p>
+	 * This is an issue when the MCP server is secured with OAuth2, because to obtain a
+	 * token, a user must be involved in the flow, and there is no user present on app
+	 * startup.
+	 * <p>
+	 * To avoid this issue, we must exclude the default {@link ToolCallbackResolver}. We
+	 * can't easily disable the entire {@link ToolCallingAutoConfiguration} class, because
+	 * it is imported directly by the chat model configurations, such as
+	 * {@link AnthropicChatAutoConfiguration}. Instead, we provide a default, no-op bean.
+	 */
+	@Bean
+	ToolCallbackResolver resolver() {
+		return new StaticToolCallbackResolver(List.of());
+	}
+
 	@Bean
 	McpSyncClientCustomizer syncClientCustomizer() {
 		return (name, syncSpec) -> syncSpec.transportContextProvider(new AuthenticationMcpTransportContextProvider());

samples/sample-mcp-client-webflux/src/main/java/org/springaicommunity/mcp/security/sample/client/McpConfiguration.java

@@ -3,9 +3,10 @@ server.port=8081
 
 spring.ai.anthropic.api-key=${ANTHROPIC_API_KEY}
 
-#spring.ai.mcp.client.sse.connections.current-weather.url=http://localhost:8091
+spring.ai.mcp.client.streamable-http.connections.historical-weather.url=http://localhost:8090
 spring.ai.mcp.client.streamable-http.connections.current-weather.url=http://localhost:8091
 spring.ai.mcp.client.type=SYNC
+spring.ai.mcp.client.initialized=false
 
 # For obtaining tokens for calling the tool
 spring.security.oauth2.client.registration.authserver.client-id=default-client

samples/sample-mcp-client-webflux/src/main/resources/application.properties

@@ -16,28 +16,31 @@
 
 package org.springaicommunity.mcp.security.sample.client;
 
-import java.io.IOException;
+import java.util.List;
 import java.util.stream.Collectors;
 
-import jakarta.servlet.http.HttpServletResponse;
+import io.modelcontextprotocol.client.McpSyncClient;
+import io.modelcontextprotocol.spec.McpSchema;
 
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 class DemoController {
 
-	private final InMemoryMcpClientRepository mcpClientRepo;
+	private final SyncMcpToolCallbackProvider mcpToolCallbacks;
 
-	private ChatClient chatClient;
+	private final List<McpSyncClient> clients;
 
-	DemoController(ChatClient.Builder chatClientBuilder, InMemoryMcpClientRepository mcpClientRepository) {
+	private final ChatClient chatClient;
+
+	DemoController(ChatClient.Builder chatClientBuilder, List<McpSyncClient> clients) {
 		this.chatClient = chatClientBuilder.build();
-		this.mcpClientRepo = mcpClientRepository;
+		this.mcpToolCallbacks = SyncMcpToolCallbackProvider.builder().mcpClients(clients).build();
+		this.clients = clients;
 	}
 
 	@GetMapping("/")
@@ -47,9 +50,9 @@ String index(String query) {
 			var chatResponse = chatClient.prompt("""
 					What is the weather in %s right now?
 					Compare to historical data over the past 5 years.
-					Tell me if it is within the usual range.
+					Concisely tell me if it is within the usual range.
 					Format the output in plain HTML, no CSS.""".formatted(query))
-				.toolCallbacks(new SyncMcpToolCallbackProvider(mcpClientRepo.getClients()))
+				.toolCallbacks(mcpToolCallbacks)
 				.call()
 				.content();
 
@@ -62,8 +65,9 @@ String index(String query) {
 					""".formatted(query, chatResponse);
 		}
 
-		var currentMcpServersBlock = this.mcpClientRepo.getClientNames()
-			.stream()
+		var currentMcpServersBlock = this.clients.stream()
+			.map(McpSyncClient::getClientInfo)
+			.map(McpSchema.Implementation::name)
 			.map("    <li>%s</li>"::formatted)
 			.collect(Collectors.joining("\n"));
 
@@ -86,20 +90,7 @@ String index(String query) {
 				<ul>
 				%s
 				</ul>
-				<form action="/mcp/add" method="GET">
-					<input type="text" name="name" placeholder="My MCP server" value="weather data history" />
-					<input type="text" name="url" placeholder="http://localhost:8090" value="http://localhost:8090" />
-					<button type="submit">Add</button>
-				</form>
 				""".formatted(currentWeatherBlock, currentMcpServersBlock);
 	}
 
-	// TODO: this should be a POST but that won't work with Spring Security
-	@GetMapping("/mcp/add")
-	void addMcpServer(@RequestParam String url, @RequestParam String name, HttpServletResponse response)
-			throws IOException {
-		this.mcpClientRepo.addClient(url, name);
-		response.sendRedirect("/");
-	}
-
 }