Skip to content

Add fallback message for blank tool execution errors #4520

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

Closed
cho-thinkfree-com wants to merge 1 commit into from
Closed

Add fallback message for blank tool execution errors #4520

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions ...in/java/org/springframework/ai/tool/execution/DefaultToolExecutionExceptionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,13 @@ public String process(ToolExecutionException exception) {
if (this.alwaysThrow) {
throw exception;
}
logger.debug("Exception thrown by tool: {}. Message: {}", exception.getToolDefinition().name(),
exception.getMessage());
return exception.getMessage();
String message = exception.getMessage();
if (message == null || message.isBlank()) {
message = "Exception occurred in tool: " + exception.getToolDefinition().name() + " ("
+ cause.getClass().getSimpleName() + ")";
}
logger.debug("Exception thrown by tool: {}. Message: {}", exception.getToolDefinition().name(), message);
return message;
}

public static Builder builder() {
Expand Down
22 changes: 22 additions & 0 deletions ...va/org/springframework/ai/tool/execution/DefaultToolExecutionExceptionProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,28 @@ void processReturnsMessage() {
assertThat(result).isEqualTo(this.toolException.getMessage());
}

@Test
void processReturnsFallbackMessageWhenNull() {
DefaultToolExecutionExceptionProcessor processor = DefaultToolExecutionExceptionProcessor.builder().build();

ToolExecutionException exception = new ToolExecutionException(this.toolDefinition, new IllegalStateException());

String result = processor.process(exception);

assertThat(result).isEqualTo("Exception occurred in tool: toolName (IllegalStateException)");
}

@Test
void processReturnsFallbackMessageWhenBlank() {
DefaultToolExecutionExceptionProcessor processor = DefaultToolExecutionExceptionProcessor.builder().build();

ToolExecutionException exception = new ToolExecutionException(this.toolDefinition, new RuntimeException(" "));

String result = processor.process(exception);

assertThat(result).isEqualTo("Exception occurred in tool: toolName (RuntimeException)");
}

@Test
void processAlwaysThrows() {
DefaultToolExecutionExceptionProcessor processor = DefaultToolExecutionExceptionProcessor.builder()
Expand Down