Skip to content

fix: fix ToolRetryInterceptor maxRetries invalid #4399

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
humdeef wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: fix ToolRetryInterceptor maxRetries invalid #4399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1006fbb
fix ToolRetryInterceptor maxRetries invalid
111hh111 Mar 10, 2026
359aa69
Merge branch 'main' into main
yuluo-yx Mar 21, 2026
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
14 changes: 14 additions & 0 deletions ...ramework/src/main/java/com/alibaba/cloud/ai/graph/agent/interceptor/ToolCallResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/
public class ToolCallResponse {

public final static String SUCCESS_STATUS = "SUCCESS";
private final String result;
private final String toolName;
private final String toolCallId;
Expand All @@ -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);
}
Comment on lines 29 to +63

/**
* Creates an error response for a failed tool execution.
* @param toolCallId the tool call ID
Expand Down
11 changes: 9 additions & 2 deletions ...ain/java/com/alibaba/cloud/ai/graph/agent/interceptor/toolretry/ToolRetryInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,16 @@ public ToolCallResponse interceptToolCall(ToolCallRequest request, ToolCallHandl
Exception lastException = null;
int attempt = 0;

while (attempt <= maxRetries) {
while (attempt < maxRetries) {
try {
Comment on lines +86 to 87
return handler.call(request);
ToolCallResponse response = handler.call(request);
if (ToolCallResponse.SUCCESS_STATUS.equals(response.getStatus())) {
return response;
Comment on lines +86 to +90
}
else {
// fail, continue run in while method
throw new RuntimeException(response.getResult().toString());
}
Comment on lines +88 to +95
Comment on lines +88 to +95
}
catch (Exception e) {
lastException = e;
Expand Down
4 changes: 2 additions & 2 deletions ...ba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/node/AgentToolNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ private ToolCallResponse executeAsyncTool(AsyncToolCallback callback, ToolCallRe
}
}

return ToolCallResponse.of(request.getToolCallId(), request.getToolName(), result);
return ToolCallResponse.success(request.getToolCallId(), request.getToolName(), result);
}
catch (CompletionException e) {
Throwable cause = e.getCause() != null ? e.getCause() : e;
Expand Down Expand Up @@ -785,7 +785,7 @@ private ToolCallResponse executeSyncTool(ToolCallback callback, ToolCallRequest
}
}

return ToolCallResponse.of(request.getToolCallId(), request.getToolName(), result);
return ToolCallResponse.success(request.getToolCallId(), request.getToolName(), result);
}
catch (ToolExecutionException e) {
logger.error("Tool {} execution failed, handling with processor: {}", request.getToolName(),
Expand Down
Loading