fix(deepseek): reset tool_choice handling to prevent infinite loop when returnDirect=false (#4617) #4649
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
jiafu1115
reviewed
Oct 17, 2025
| * backed by {@link DeepSeekApi}. | ||
| * | ||
| * @author Geng Rong | ||
| * @last Updated By : @kuntal1461 |
There was a problem hiding this comment.
keep same style? @author Geng Rong
There was a problem hiding this comment.
@jiafu1115 It is fixed . Please review once
jiafu1115
reviewed
Oct 20, 2025
| .build()); | ||
| } | ||
| else { | ||
| // Reset tool choice to AUTO to prevent forcing repeated tool calls. |
There was a problem hiding this comment.
duplicated code with 223. you can extract these duplicated line to seperate method.
…en returnDirect=false (spring-projects#4617) Signed-off-by: Kuntal Maity <kuntal.1461@gmail.com>
…ed tool_choice reset validation (spring-projects#4617) Signed-off-by: Kuntal Maity <kuntal.1461@gmail.com>
…en returnDirect=false (spring-projects#4617) Signed-off-by: Kuntal Maity <kuntal.1461@gmail.com>
kuntal1461
force-pushed
the
fix/deepseekchatmodel-toolchoice-loop-4617
branch
from
c312b9c to
d05c8dd
Compare
Signed-off-by: Kuntal Maity <kuntal.1461@gmail.com>
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.
Summary
Fixes #4617 — When DeepSeekChatModel is forced to use a tool_choice with returnDirect=false,
the model repeatedly re-enters tool-call, causing an infinite loop.
This change resets tool_choice to auto after tool execution so the model can produce normal assistant text.
Changes
How to Reproduce
Expected Behavior
Tool is invoked once; model returns normal text.
Environment
Tests
mvn -pl models/spring-ai-deepseek -Dtest=org.springframework.ai.deepseek.DeepSeekChatModelToolChoiceResetTests test
DCO Sign-off
Signed-off-by: Kuntal Maity kuntal.1461@gmail.com