Do not inject MCP ToolCallbackProviders into ToolCallbackResolver #4751
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ilayaperumalg
approved these changes
Oct 28, 2025
Kehrlann
force-pushed
the
dgarnier/lazily-resolved-tcb
branch
2 times, most recently
from
6c70377 to
8245542
Compare
tzolov
changed the title
Kehrlann
force-pushed
the
dgarnier/lazily-resolved-tcb
branch
from
8245542 to
2608950
Compare
Kehrlann
changed the title
Kehrlann
force-pushed
the
dgarnier/lazily-resolved-tcb
branch
2 times, most recently
from
91a2254 to
5cd2988
Compare
- MCP ToolCallbackProviders should not be "resolved" at startup time by
the auto-configuration, ie we don't want to call #getToolCallback
eagerly
- We also want to break the following dependency cycle:
- ChatClient
-> ToolCallingManager
-> ToolCallbackResolver
-> ToolCallbackProvider (incl. SyncMcpToolCallbackProvider)
-> McpSyncClient
-> ClientMcpAnnotatedBeans
-> ChatClient (when there is Sampling)
- This PR ensures that the ToolCallbackResolver does not depend on
SyncMcpToolCallbackProvider, thus breaking the cycle.
- MCP callback providers can still be passed to the chat client, but
only at runtime, not during the configuration phase.
Signed-off-by: Daniel Garnier-Moiroux <[email protected]>
Kehrlann
force-pushed
the
dgarnier/lazily-resolved-tcb
branch
from
5cd2988 to
93470e7
Compare
tzolov
reviewed
Oct 28, 2025
| return true; | ||
| } | ||
| var superType = type.getSuperType(); | ||
| return superType != ResolvableType.NONE && isMcpToolCallbackProvider(superType); |
There was a problem hiding this comment.
After we remove the deprecated constructors It won't have (A)SyncMcpToolCallbackProvider inheritance.
But currently it is possible.
There was a problem hiding this comment.
Good point. We should make these classes final if their constructors are all private.
quaff
added a commit
to quaff/spring-ai
that referenced
this pull request
Oct 30, 2025
…backProviders See spring-projectsGH-4751 Signed-off-by: Yanming Zhou <[email protected]>
quaff
added a commit
to quaff/spring-ai
that referenced
this pull request
Oct 30, 2025
…backProviders See spring-projectsGH-4751 Signed-off-by: Yanming Zhou <[email protected]>
quaff
added a commit
to quaff/spring-ai
that referenced
this pull request
Oct 30, 2025
…nfiguration See spring-projectsGH-4751 Signed-off-by: Yanming Zhou <[email protected]>
quaff
added a commit
to quaff/spring-ai
that referenced
this pull request
Oct 30, 2025
…guration See spring-projectsGH-4751 Signed-off-by: Yanming Zhou <[email protected]>
quaff
added a commit
to quaff/spring-ai
that referenced
this pull request
Oct 30, 2025
…guration See spring-projectsGH-4751 Signed-off-by: Yanming Zhou <[email protected]>
ilayaperumalg
pushed a commit
that referenced
this pull request
Oct 30, 2025
…backProviders See GH-4751 Signed-off-by: Yanming Zhou <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Breaking change
MCP tools cannot be resolved by name anymore. The following code would not resolve the MCP tool anymore:
Instead you'd have to to: