Skip to content

Commit 17babe5

Browse files
committed
Simplify filtering MCP ToolCallbackProviders for ToolCallingAutoConfiguration
See GH-4751 Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
1 parent 374c09e commit 17babe5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
* @author Thomas Vitale
5353
* @author Christian Tzolov
5454
* @author Daniel Garnier-Moiroux
55+
* @author Yanming Zhou
5556
* @since 1.0.0
5657
*/
5758
@AutoConfiguration
@@ -70,10 +71,9 @@ public class ToolCallingAutoConfiguration {
7071
@Bean
7172
@ConditionalOnMissingBean
7273
ToolCallbackResolver toolCallbackResolver(GenericApplicationContext applicationContext,
73-
List<ToolCallback> toolCallbacks, List<ToolCallbackProvider> tcbProviders) {
74+
List<ToolCallback> toolCallbacks, ObjectProvider<ToolCallbackProvider> tcbProviders) {
7475
List<ToolCallback> allFunctionAndToolCallbacks = new ArrayList<>(toolCallbacks);
75-
tcbProviders.stream()
76-
.filter(pr -> !isMcpToolCallbackProvider(ResolvableType.forInstance(pr)))
76+
tcbProviders.stream(clazz -> !isMcpToolCallbackProvider(ResolvableType.forClass(clazz)))
7777
.map(pr -> List.of(pr.getToolCallbacks()))
7878
.forEach(allFunctionAndToolCallbacks::addAll);
7979

0 commit comments

Comments
 (0)