Skip to content

fix: Stateless mcp server registration tools failed #4396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: Stateless mcp server registration tools failed #4396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...ommon/autoconfigure/annotations/StatelessServerSpecificationFactoryAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import java.util.List;

import io.modelcontextprotocol.server.McpServerFeatures;
import io.modelcontextprotocol.server.McpStatelessServerFeatures;
import org.springaicommunity.mcp.annotation.McpComplete;
import org.springaicommunity.mcp.annotation.McpPrompt;
Expand Down Expand Up @@ -76,10 +75,10 @@ public List<McpStatelessServerFeatures.SyncCompletionSpecification> completionSp
}

@Bean
public List<McpServerFeatures.SyncToolSpecification> toolSpecs(
public List<McpStatelessServerFeatures.SyncToolSpecification> toolSpecs(
ServerMcpAnnotatedBeans beansWithMcpMethodAnnotations) {
return SyncMcpAnnotationProviders
.toolSpecifications(beansWithMcpMethodAnnotations.getBeansByAnnotation(McpTool.class));
.statelessToolSpecifications(beansWithMcpMethodAnnotations.getBeansByAnnotation(McpTool.class));
}

}
Expand Down
1 change: 1 addition & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ org.springframework.ai.mcp.server.common.autoconfigure.ToolCallbackConverterAuto
org.springframework.ai.mcp.server.common.autoconfigure.McpServerStatelessAutoConfiguration
org.springframework.ai.mcp.server.common.autoconfigure.StatelessToolCallbackConverterAutoConfiguration
org.springframework.ai.mcp.server.common.autoconfigure.annotations.McpServerSpecificationFactoryAutoConfiguration
org.springframework.ai.mcp.server.common.autoconfigure.annotations.StatelessServerSpecificationFactoryAutoConfiguration
org.springframework.ai.mcp.server.common.autoconfigure.annotations.McpServerAnnotationScannerAutoConfiguration
153 changes: 153 additions & 0 deletions .../org/springframework/ai/mcp/server/common/autoconfigure/McpServerAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,20 @@
package org.springframework.ai.mcp.server.common.autoconfigure;

import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.stream.Stream;

import com.fasterxml.jackson.core.type.TypeReference;
import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.server.McpAsyncServer;
import io.modelcontextprotocol.server.McpAsyncServerExchange;
import io.modelcontextprotocol.server.McpServerFeatures;
import io.modelcontextprotocol.server.McpServerFeatures.AsyncCompletionSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.AsyncPromptSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.AsyncResourceSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.AsyncToolSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.SyncPromptSpecification;
Expand All @@ -39,9 +44,17 @@
import io.modelcontextprotocol.spec.McpServerTransportProvider;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springaicommunity.mcp.annotation.McpArg;
import org.springaicommunity.mcp.annotation.McpComplete;
import org.springaicommunity.mcp.annotation.McpPrompt;
import org.springaicommunity.mcp.annotation.McpResource;
import org.springaicommunity.mcp.annotation.McpTool;
import org.springaicommunity.mcp.annotation.McpToolParam;
import reactor.core.publisher.Mono;

import org.springframework.ai.mcp.SyncMcpToolCallback;
import org.springframework.ai.mcp.server.common.autoconfigure.annotations.McpServerAnnotationScannerAutoConfiguration;
import org.springframework.ai.mcp.server.common.autoconfigure.annotations.McpServerSpecificationFactoryAutoConfiguration;
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerChangeNotificationProperties;
import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerProperties;
import org.springframework.ai.tool.ToolCallback;
Expand All @@ -50,6 +63,8 @@
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.test.util.ReflectionTestUtils;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -345,6 +360,72 @@ void toolCallbackProviderConfiguration() {
.run(context -> assertThat(context).hasSingleBean(ToolCallbackProvider.class));
}

@SuppressWarnings("unchecked")
@Test
void syncServerSpecificationConfiguration() {
this.contextRunner
.withUserConfiguration(McpServerAnnotationScannerAutoConfiguration.class,
McpServerSpecificationFactoryAutoConfiguration.class)
.withBean(SyncTestMcpSpecsComponent.class)
.run(context -> {
McpSyncServer syncServer = context.getBean(McpSyncServer.class);
McpAsyncServer asyncServer = (McpAsyncServer) ReflectionTestUtils.getField(syncServer, "asyncServer");

CopyOnWriteArrayList<AsyncToolSpecification> tools = (CopyOnWriteArrayList<AsyncToolSpecification>) ReflectionTestUtils
.getField(asyncServer, "tools");
assertThat(tools).hasSize(1);
assertThat(tools.get(0).tool().name()).isEqualTo("add");

ConcurrentHashMap<String, AsyncResourceSpecification> resources = (ConcurrentHashMap<String, AsyncResourceSpecification>) ReflectionTestUtils
.getField(asyncServer, "resources");
assertThat(resources).hasSize(1);
assertThat(resources.get("config://{key}")).isNotNull();

ConcurrentHashMap<String, AsyncPromptSpecification> prompts = (ConcurrentHashMap<String, AsyncPromptSpecification>) ReflectionTestUtils
.getField(asyncServer, "prompts");
assertThat(prompts).hasSize(1);
assertThat(prompts.get("greeting")).isNotNull();

ConcurrentHashMap<McpSchema.CompleteReference, AsyncCompletionSpecification> completions = (ConcurrentHashMap<McpSchema.CompleteReference, AsyncCompletionSpecification>) ReflectionTestUtils
.getField(asyncServer, "completions");
assertThat(completions).hasSize(1);
assertThat(completions.keySet().iterator().next()).isInstanceOf(McpSchema.CompleteReference.class);
});
}

@SuppressWarnings("unchecked")
@Test
void asyncServerSpecificationConfiguration() {
this.contextRunner
.withUserConfiguration(McpServerAnnotationScannerAutoConfiguration.class,
McpServerSpecificationFactoryAutoConfiguration.class)
.withBean(AsyncTestMcpSpecsComponent.class)
.withPropertyValues("spring.ai.mcp.server.type=async")
.run(context -> {
McpAsyncServer asyncServer = context.getBean(McpAsyncServer.class);

CopyOnWriteArrayList<AsyncToolSpecification> tools = (CopyOnWriteArrayList<AsyncToolSpecification>) ReflectionTestUtils
.getField(asyncServer, "tools");
assertThat(tools).hasSize(1);
assertThat(tools.get(0).tool().name()).isEqualTo("add");

ConcurrentHashMap<String, AsyncResourceSpecification> resources = (ConcurrentHashMap<String, AsyncResourceSpecification>) ReflectionTestUtils
.getField(asyncServer, "resources");
assertThat(resources).hasSize(1);
assertThat(resources.get("config://{key}")).isNotNull();

ConcurrentHashMap<String, AsyncPromptSpecification> prompts = (ConcurrentHashMap<String, AsyncPromptSpecification>) ReflectionTestUtils
.getField(asyncServer, "prompts");
assertThat(prompts).hasSize(1);
assertThat(prompts.get("greeting")).isNotNull();

ConcurrentHashMap<McpSchema.CompleteReference, AsyncCompletionSpecification> completions = (ConcurrentHashMap<McpSchema.CompleteReference, AsyncCompletionSpecification>) ReflectionTestUtils
.getField(asyncServer, "completions");
assertThat(completions).hasSize(1);
assertThat(completions.keySet().iterator().next()).isInstanceOf(McpSchema.CompleteReference.class);
});
}

@Configuration
static class TestResourceConfiguration {

Expand Down Expand Up @@ -516,4 +597,76 @@ McpServerTransport customTransport() {

}

@Component
static class SyncTestMcpSpecsComponent {

@McpTool(name = "add", description = "Add two numbers together", title = "Add Two Numbers Together",
annotations = @McpTool.McpAnnotations(title = "Rectangle Area Calculator", readOnlyHint = true,
destructiveHint = false, idempotentHint = true))
public int add(@McpToolParam(description = "First number", required = true) int a,
@McpToolParam(description = "Second number", required = true) int b) {
return a + b;
}

@McpResource(uri = "config://{key}", name = "Configuration", description = "Provides configuration data")
public String getConfig(String key) {
return "config value";
}

@McpPrompt(name = "greeting", description = "Generate a greeting message")
public McpSchema.GetPromptResult greeting(
@McpArg(name = "name", description = "User's name", required = true) String name) {

String message = "Hello, " + name + "! How can I help you today?";

return new McpSchema.GetPromptResult("Greeting",
List.of(new McpSchema.PromptMessage(McpSchema.Role.ASSISTANT, new McpSchema.TextContent(message))));
}

@McpComplete(prompt = "city-search")
public List<String> completeCityName(String prefix) {
return Stream.of("New York", "Los Angeles", "Chicago", "Houston", "Phoenix")
.filter(city -> city.toLowerCase().startsWith(prefix.toLowerCase()))
.limit(10)
.toList();
}

}

@Component
static class AsyncTestMcpSpecsComponent {

@McpTool(name = "add", description = "Add two numbers together", title = "Add Two Numbers Together",
annotations = @McpTool.McpAnnotations(title = "Rectangle Area Calculator", readOnlyHint = true,
destructiveHint = false, idempotentHint = true))
public Mono<Integer> add(@McpToolParam(description = "First number", required = true) int a,
@McpToolParam(description = "Second number", required = true) int b) {
return Mono.just(a + b);
}

@McpResource(uri = "config://{key}", name = "Configuration", description = "Provides configuration data")
public Mono<String> getConfig(String key) {
return Mono.just("config value");
}

@McpPrompt(name = "greeting", description = "Generate a greeting message")
public Mono<McpSchema.GetPromptResult> greeting(
@McpArg(name = "name", description = "User's name", required = true) String name) {

String message = "Hello, " + name + "! How can I help you today?";

return Mono.just(new McpSchema.GetPromptResult("Greeting", List
.of(new McpSchema.PromptMessage(McpSchema.Role.ASSISTANT, new McpSchema.TextContent(message)))));
}

@McpComplete(prompt = "city-search")
public Mono<List<String>> completeCityName(String prefix) {
return Mono.just(Stream.of("New York", "Los Angeles", "Chicago", "Houston", "Phoenix")
.filter(city -> city.toLowerCase().startsWith(prefix.toLowerCase()))
.limit(10)
.toList());
}

}

}
Loading