Skip to content

Simplify filtering MCP ToolCallbackProviders for ToolCallingAutoConfiguration #4764

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Simplify filtering MCP ToolCallbackProviders for ToolCallingAutoConfiguration #4764

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
6 changes: 3 additions & 3 deletions ...in/java/org/springframework/ai/model/tool/autoconfigure/ToolCallingAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
* @author Thomas Vitale
* @author Christian Tzolov
* @author Daniel Garnier-Moiroux
* @author Yanming Zhou
* @since 1.0.0
*/
@AutoConfiguration
Expand All @@ -70,10 +71,9 @@ public class ToolCallingAutoConfiguration {
@Bean
@ConditionalOnMissingBean
ToolCallbackResolver toolCallbackResolver(GenericApplicationContext applicationContext,
List<ToolCallback> toolCallbacks, List<ToolCallbackProvider> tcbProviders) {
List<ToolCallback> toolCallbacks, ObjectProvider<ToolCallbackProvider> tcbProviders) {
Copy link
Member

@ilayaperumalg ilayaperumalg Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For backwards compatibility, Would this work if there is a List instead of just multiple ToolCallbackProvider instances?

Copy link
Contributor Author

@quaff quaff Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

List<ToolCallbackProvider> bean will not be injected via ObjectProvider<ToolCallbackProvider>, but I don't think anyone would do that, and ObjectProvider<ToolCallbackProvider> is the recommended way by Spring Boot, you can refer to other AutoConfigurations.

Copy link
Member

@ilayaperumalg ilayaperumalg Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree on using ObjectProvider being the better approach. My question is mainly about backwards compatibility. Since we already had "List tcbProviders", we don't want to break the compatibility for those who already uses "List tcbProviders". Perhaps, we should use ObjectProvider<List>. cc @tzolov

List<ToolCallback> allFunctionAndToolCallbacks = new ArrayList<>(toolCallbacks);
tcbProviders.stream()
.filter(pr -> !isMcpToolCallbackProvider(ResolvableType.forInstance(pr)))
tcbProviders.stream(clazz -> !isMcpToolCallbackProvider(ResolvableType.forClass(clazz)))
.map(pr -> List.of(pr.getToolCallbacks()))
.forEach(allFunctionAndToolCallbacks::addAll);

Expand Down