wip wip

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

Author: Kehrlann

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webflux/src/test/java/org/springframework/ai/mcp/server/autoconfigure/StreamableMcpAnnotationsWithLLMIT.java

@@ -49,6 +49,7 @@
 import org.springframework.ai.mcp.client.common.autoconfigure.McpToolCallbackAutoConfiguration;
 import org.springframework.ai.mcp.client.common.autoconfigure.annotations.McpClientAnnotationScannerAutoConfiguration;
 import org.springframework.ai.mcp.client.webflux.autoconfigure.StreamableHttpWebFluxTransportAutoConfiguration;
+import org.springframework.ai.mcp.server.autoconfigure.capabilities.McpHandlerConfiguration;
 import org.springframework.ai.mcp.server.autoconfigure.capabilities.McpHandlerService;
 import org.springframework.ai.mcp.server.common.autoconfigure.McpServerAutoConfiguration;
 import org.springframework.ai.mcp.server.common.autoconfigure.ToolCallbackConverterAutoConfiguration;
@@ -238,7 +239,8 @@ public String weather(McpSyncRequestContext ctx, @McpToolParam String cityName)
 				ctx.ping(); // call client ping
 
 				// call elicitation
-				var elicitationResult = ctx.elicit(e -> e.message("Test message"), McpHandlerService.ElicitInput.class);
+				var elicitationResult = ctx.elicit(e -> e.message("Test message"),
+						McpHandlerConfiguration.ElicitInput.class);
 
 				ctx.progress(p -> p.progress(0.50).total(1.0).message("elicitation completed"));
 

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webflux/src/test/java/org/springframework/ai/mcp/server/autoconfigure/capabilities/McpHandlerConfiguration.java

@@ -0,0 +1,61 @@
+package org.springframework.ai.mcp.server.autoconfigure.capabilities;
+
+import io.modelcontextprotocol.spec.McpSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springaicommunity.mcp.annotation.McpElicitation;
+import org.springaicommunity.mcp.context.StructuredElicitResult;
+
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.web.context.annotation.RequestScope;
+
+@Configuration
+public class McpHandlerConfiguration {
+
+	private static final Logger logger = LoggerFactory.getLogger(McpHandlerConfiguration.class);
+
+	record ElicitationHandler() {
+
+		@McpElicitation(clients = "server1")
+		public StructuredElicitResult<ElicitInput> elicitationHandler(McpSchema.ElicitRequest request) {
+			logger.info("MCP ELICITATION: {}", request);
+			ElicitInput elicitData = new ElicitInput(request.message());
+			return StructuredElicitResult.builder().structuredContent(elicitData).build();
+		}
+
+	}
+
+	public record ElicitInput(String message) {
+	}
+
+	public static class Foo {
+
+	}
+
+	public static class Bar {
+
+	}
+
+	@Bean
+	ElicitationHandler elicitationHandler() {
+		return new ElicitationHandler();
+	}
+
+	// Ensure that we don't blow up on non-singleton beans
+	@Bean
+	@Scope(scopeName = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+	Foo foo() {
+		return new Foo();
+	}
+
+	// Ensure that we don't blow up on non-singleton beans
+	@Bean
+	@RequestScope
+	Bar bar(Foo foo) {
+		return new Bar();
+	}
+
+}

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-webflux/src/test/java/org/springframework/ai/mcp/server/autoconfigure/capabilities/McpHandlerService.java

@@ -19,9 +19,7 @@
 import io.modelcontextprotocol.spec.McpSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springaicommunity.mcp.annotation.McpElicitation;
 import org.springaicommunity.mcp.annotation.McpSampling;
-import org.springaicommunity.mcp.context.StructuredElicitResult;
 
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.stereotype.Service;
@@ -51,14 +49,4 @@ public McpSchema.CreateMessageResult samplingHandler(McpSchema.CreateMessageRequ
 			.build();
 	}
 
-	@McpElicitation(clients = "server1")
-	public StructuredElicitResult<ElicitInput> elicitationHandler(McpSchema.ElicitRequest request) {
-		logger.info("MCP ELICITATION: {}", request);
-		ElicitInput elicitData = new ElicitInput(request.message());
-		return StructuredElicitResult.builder().structuredContent(elicitData).build();
-	}
-
-	public record ElicitInput(String message) {
-	}
-
 }

mcp/mcp-annotations-spring/src/main/java/org/springframework/ai/mcp/annotation/spring/AbstractClientMcpHandlerRegistry.java

@@ -35,8 +35,8 @@
 import org.springaicommunity.mcp.annotation.McpSampling;
 import org.springaicommunity.mcp.annotation.McpToolListChanged;
 
+import org.springframework.aop.framework.autoproxy.AutoProxyUtils;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -70,8 +70,11 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 		Map<String, List<String>> elicitationClientToAnnotatedBeans = new HashMap<>();
 		Map<String, List<String>> samplingClientToAnnotatedBeans = new HashMap<>();
 		for (var beanName : beanFactory.getBeanDefinitionNames()) {
-			var definition = beanFactory.getBeanDefinition(beanName);
-			var foundAnnotations = scan(getBeanClass(definition, beanFactory.getBeanClassLoader()));
+			if (!beanFactory.getBeanDefinition(beanName).isSingleton()) {
+				// Only process singleton beans, not scoped beans
+				continue;
+			}
+			var foundAnnotations = scan(AutoProxyUtils.determineTargetClass(beanFactory, beanName));
 			if (!foundAnnotations.isEmpty()) {
 				this.allAnnotatedBeans.add(beanName);
 			}
@@ -118,23 +121,6 @@ else if (foundAnnotation instanceof McpElicitation elicitation) {
 			.collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().build()));
 	}
 
-	private static Class<?> getBeanClass(BeanDefinition definition, ClassLoader beanClassLoader) {
-		if (definition.getResolvableType().resolve() != null) {
-			return definition.getResolvableType().resolve();
-		}
-		// @Component beans registered by component scanning do not have a resolvable type
-		// We try to resolve them using the beanClassName (which might be null)
-		if (beanClassLoader != null && definition.getBeanClassName() != null) {
-			try {
-				return Class.forName(definition.getBeanClassName(), false, beanClassLoader);
-			}
-			catch (ClassNotFoundException ignored) {
-
-			}
-		}
-		return null;
-	}
-
 	protected List<Annotation> scan(Class<?> beanClass) {
 		List<Annotation> foundAnnotations = new ArrayList<>();