Defer call of getToolCallbacks() to prevent initializing ToolCallbackProvider eagerly

Before this commit, `McpSyncClient` is initialized even if `spring.ai.mcp.client.initialized` is set to `false`.

See GH-3232

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/src/main/java/org/springframework/ai/model/tool/autoconfigure/ToolCallingAutoConfiguration.java

@@ -32,6 +32,7 @@
 import org.springframework.ai.tool.observation.ToolCallingContentObservationFilter;
 import org.springframework.ai.tool.observation.ToolCallingObservationConvention;
 import org.springframework.ai.tool.resolution.DelegatingToolCallbackResolver;
+import org.springframework.ai.tool.resolution.ProviderToolCallbackResolver;
 import org.springframework.ai.tool.resolution.SpringBeanToolCallbackResolver;
 import org.springframework.ai.tool.resolution.StaticToolCallbackResolver;
 import org.springframework.ai.tool.resolution.ToolCallbackResolver;
@@ -51,6 +52,7 @@
  * @author Thomas Vitale
  * @author Christian Tzolov
  * @author Daniel Garnier-Moiroux
+ * @author Yanming Zhou
  * @since 1.0.0
  */
 @AutoConfiguration
@@ -66,15 +68,17 @@ ToolCallbackResolver toolCallbackResolver(GenericApplicationContext applicationC
 			List<ToolCallback> toolCallbacks, List<ToolCallbackProvider> tcbProviders) {
 
 		List<ToolCallback> allFunctionAndToolCallbacks = new ArrayList<>(toolCallbacks);
-		tcbProviders.stream().map(pr -> List.of(pr.getToolCallbacks())).forEach(allFunctionAndToolCallbacks::addAll);
 
 		var staticToolCallbackResolver = new StaticToolCallbackResolver(allFunctionAndToolCallbacks);
 
+		var providerToolCallbackResolver = new ProviderToolCallbackResolver(tcbProviders);
+
 		var springBeanToolCallbackResolver = SpringBeanToolCallbackResolver.builder()
 			.applicationContext(applicationContext)
 			.build();
 
-		return new DelegatingToolCallbackResolver(List.of(staticToolCallbackResolver, springBeanToolCallbackResolver));
+		return new DelegatingToolCallbackResolver(
+				List.of(staticToolCallbackResolver, providerToolCallbackResolver, springBeanToolCallbackResolver));
 	}
 
 	@Bean

auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/src/test/java/org/springframework/ai/model/tool/autoconfigure/ToolCallingAutoConfigurationTests.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 import org.springframework.ai.model.tool.DefaultToolCallingManager;
 import org.springframework.ai.model.tool.ToolCallingManager;
@@ -45,12 +46,16 @@
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 
 /**
  * Unit tests for {@link ToolCallingAutoConfiguration}.
  *
  * @author Thomas Vitale
  * @author Christian Tzolov
+ * @author Yanming Zhou
  */
 class ToolCallingAutoConfigurationTests {
 
@@ -69,6 +74,19 @@ void beansAreCreated() {
 			});
 	}
 
+	@Test
+	void deferGetToolCallbacks() {
+		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(ToolCallingAutoConfiguration.class))
+			.withUserConfiguration(Config.class)
+			.run(context -> {
+				var toolCallbackResolver = context.getBean(ToolCallbackResolver.class);
+				var toolCallbackProvider = context.getBean("toolCallbacks", ToolCallbackProvider.class);
+				then(toolCallbackProvider).should(never()).getToolCallbacks();
+				assertThat(toolCallbackResolver.resolve("getForecast")).isNotNull();
+				then(toolCallbackProvider).should(times(1)).getToolCallbacks();
+			});
+	}
+
 	@Test
 	void resolveMultipleFunctionAndToolCallbacks() {
 		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(ToolCallingAutoConfiguration.class))
@@ -212,7 +230,10 @@ static class Config {
 		// ToolCallbacks.from(...) utility method.
 		@Bean
 		public ToolCallbackProvider toolCallbacks() {
-			return MethodToolCallbackProvider.builder().toolObjects(new WeatherService()).build();
+			ToolCallbackProvider toolCallbackProvider = MethodToolCallbackProvider.builder()
+				.toolObjects(new WeatherService())
+				.build();
+			return Mockito.spy(toolCallbackProvider);
 		}
 
 		@Bean

spring-ai-model/src/main/java/org/springframework/ai/tool/resolution/ProviderToolCallbackResolver.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.tool.resolution;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.ToolCallbackProvider;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link ToolCallbackResolver} that resolves tool callbacks from
+ * {@link ToolCallbackProvider} lazily.
+ *
+ * @author Yanming Zhou
+ */
+public class ProviderToolCallbackResolver implements ToolCallbackResolver {
+
+	private static final Logger logger = LoggerFactory.getLogger(ProviderToolCallbackResolver.class);
+
+	private final List<ToolCallbackProvider> toolCallbackProviders;
+
+	public ProviderToolCallbackResolver(List<ToolCallbackProvider> toolCallbackProviders) {
+		Assert.notNull(toolCallbackProviders, "toolCallbackProviders cannot be null");
+
+		this.toolCallbackProviders = toolCallbackProviders;
+	}
+
+	@Override
+	@Nullable
+	public ToolCallback resolve(String toolName) {
+		Assert.hasText(toolName, "toolName cannot be null or empty");
+		for (ToolCallbackProvider provider : toolCallbackProviders) {
+			for (ToolCallback toolCallback : provider.getToolCallbacks()) {
+				if (toolName.equals(toolCallback.getToolDefinition().name())) {
+					return toolCallback;
+				}
+			}
+		}
+		return null;
+	}
+
+}