Skip to content

fix(tool): validate parsed input when content is absent #2561

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
fukang0611 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

fix(tool): validate parsed input when content is absent #2561

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
4 changes: 3 additions & 1 deletion agentscope-core/src/main/java/io/agentscope/core/tool/ToolExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.agentscope.core.shutdown.GracefulShutdownManager;
import io.agentscope.core.tracing.TracerRegistry;
import io.agentscope.core.util.ExceptionUtils;
import io.agentscope.core.util.JsonUtils;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -208,7 +209,8 @@ private Mono<ToolResultBlock> executeCore(ToolCallParam param) {

// Validate input against schema
String validationError =
ToolValidator.validateInput(toolCall.getContent(), tool.getParameters());
ToolValidator.validateInput(
JsonUtils.resolveToolCallArgsJson(toolCall), tool.getParameters());
if (validationError != null) {
String errorMsg =
String.format(
Expand Down
15 changes: 15 additions & 0 deletions agentscope-core/src/test/java/io/agentscope/core/tool/ToolExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,21 @@ void shouldExecuteToolsInParallel() {
"\"HelloWorld\"", extractFirstText(concatResponse), "Concat tool result mismatch");
}

@Test
@DisplayName("Should validate parsed input when raw content is absent")
void shouldValidateInputWhenRawContentIsAbsent() {
Map<String, Object> input = Map.of("a", 10, "b", 20);
ToolUseBlock toolCall =
ToolUseBlock.builder().id("call-input-only").name("add").input(input).build();

ToolResultBlock result =
toolkit.callTool(ToolCallParam.builder().toolUseBlock(toolCall).build())
.block(TIMEOUT);

assertNotNull(result, "Result should not be null");
assertEquals("30", extractFirstText(result));
}

@Test
@DisplayName("Should wrap tool errors inside executor response")
void shouldReturnErrorWhenToolThrows() {
Expand Down
Loading