Skip to content

fix!: do not silently fail when an internal error occurs #452

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

Merged
copybara-service merged 1 commit into from
Sep 23, 2025
+15 −1
Merged

fix!: do not silently fail when an internal error occurs #452

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
3 changes: 2 additions & 1 deletion core/src/main/java/com/google/adk/tools/FunctionTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ public Single<Map<String, Object>> runAsync(Map<String, Object> args, ToolContex
return this.call(args, toolContext).defaultIfEmpty(ImmutableMap.of());
} catch (Exception e) {
e.printStackTrace();
return Single.just(ImmutableMap.of());
return Single.just(
ImmutableMap.of("status", "error", "message", "An internal error occurred."));
}
}

Expand Down
13 changes: 13 additions & 0 deletions core/src/test/java/com/google/adk/tools/FunctionToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,15 @@ public void call_withParameterizedListParam() throws Exception {
assertThat(result).containsExactly("listParam", listParam);
}

@Test
public void call_throwsException_returnsInternalError() {
FunctionTool tool = FunctionTool.create(Functions.class, "throwException");

Map<String, Object> result = tool.runAsync(ImmutableMap.of(), null).blockingGet();

assertThat(result).containsExactly("status", "error", "message", "An internal error occurred.");
}

@Test
public void create_withPojoParamWithGettersAndSetters() {
FunctionTool tool = FunctionTool.create(Functions.class, "pojoParamWithGettersAndSetters");
Expand Down Expand Up @@ -603,6 +612,10 @@ public static void voidReturnWithSchemaAndToolContext(
String param2,
ToolContext toolContext) {}

public static void throwException() {
throw new RuntimeException("test exception");
}

public static void voidReturnWithoutSchema() {}

public static ImmutableMap<String, Object> returnsMap() {
Expand Down