fix: fix ToolRetryInterceptor maxRetries invalid#4399
Open
humdeef wants to merge 2 commits intoalibaba:mainfrom
Open
fix: fix ToolRetryInterceptor maxRetries invalid#4399humdeef wants to merge 2 commits intoalibaba:mainfrom
humdeef wants to merge 2 commits intoalibaba:mainfrom
Conversation
Author
|
fix ToolRetryInterceptor maxRetries invalid |
|
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to fix ToolRetryInterceptor not honoring maxRetries by making retry decisions based on ToolCallResponse success/error status (instead of only catching thrown exceptions), addressing issue #4386 where tool failures were converted into responses and therefore not retried.
Changes:
- Adjust tool execution nodes to return a “success” response variant on normal completion.
- Update
ToolRetryInterceptorto treat non-success responses as retryable failures. - Add a success status constant/factory on
ToolCallResponse.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 7 comments.
| File | Description |
|---|---|
| spring-ai-alibaba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/node/AgentToolNode.java | Uses a new success response factory on sync/async successful tool completion. |
| spring-ai-alibaba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/interceptor/toolretry/ToolRetryInterceptor.java | Changes retry loop bounds and adds status-based retry triggering. |
| spring-ai-alibaba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/interceptor/ToolCallResponse.java | Introduces SUCCESS_STATUS and a success(...) factory method. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+88
to
+95
| ToolCallResponse response = handler.call(request); | ||
| if (ToolCallResponse.SUCCESS_STATUS.equals(response.getStatus())) { | ||
| return response; | ||
| } | ||
| else { | ||
| // fail, continue run in while method | ||
| throw new RuntimeException(response.getResult().toString()); | ||
| } |
Comment on lines
29
to
+63
| @@ -48,6 +49,19 @@ public static ToolCallResponse of(String toolCallId, String toolName, String res | |||
| return new ToolCallResponse(result, toolName, toolCallId); | |||
| } | |||
|
|
|||
| /** | |||
| * <p> | |||
| * Rewrite the status field of the source code to SUCCESS, and then make a judgment in the tool interceptor | |||
| * </p> | |||
| * @param toolCallId toolCallId | |||
| * @param toolName toolName | |||
| * @param result response | |||
| * @return | |||
| */ | |||
| public static ToolCallResponse success(String toolCallId, String toolName, String result) { | |||
| return new ToolCallResponse(result, toolName, toolCallId, SUCCESS_STATUS, null); | |||
| } | |||
| } | ||
|
|
||
| return ToolCallResponse.of(request.getToolCallId(), request.getToolName(), result); | ||
| return ToolCallResponse.success(request.getToolCallId(), request.getToolName(), result); |
| } | ||
|
|
||
| return ToolCallResponse.of(request.getToolCallId(), request.getToolName(), result); | ||
| return ToolCallResponse.success(request.getToolCallId(), request.getToolName(), result); |
Comment on lines
+86
to
+90
| while (attempt < maxRetries) { | ||
| try { | ||
| return handler.call(request); | ||
| ToolCallResponse response = handler.call(request); | ||
| if (ToolCallResponse.SUCCESS_STATUS.equals(response.getStatus())) { | ||
| return response; |
Comment on lines
+86
to
87
| while (attempt < maxRetries) { | ||
| try { |
Comment on lines
+88
to
+95
| ToolCallResponse response = handler.call(request); | ||
| if (ToolCallResponse.SUCCESS_STATUS.equals(response.getStatus())) { | ||
| return response; | ||
| } | ||
| else { | ||
| // fail, continue run in while method | ||
| throw new RuntimeException(response.getResult().toString()); | ||
| } |
Collaborator
Collaborator
|
@humdeef hi pls assign CLA, and pls take a look. copilot review, if needs, can accept. |
yuluo-yx
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Describe what this PR does / why we need it
ToolRetryInterceptor maxRetries invalid
Does this pull request fix one issue?
Describe how you did it
Reference #4386
Describe how to verify it
Write test case
Special notes for reviews
Only sync ,not test async method . Maybe you need scan.