Skip to content

Fix tool result processing in Claude model #609

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

Fix tool result processing in Claude model #609

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e1c3b
Fix tool result processing in Claude model
stevearmstrong-dev Nov 22, 2025
7a09913
Merge branch 'main' into fix/issue-566-tool-result-key
stevearmstrong-dev Nov 27, 2025
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
13 changes: 10 additions & 3 deletions core/src/main/java/com/google/adk/models/Claude.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
public class Claude extends BaseLlm {

private static final Logger logger = LoggerFactory.getLogger(Claude.class);
private static final ObjectMapper OBJECT_MAPPER =
new ObjectMapper().registerModule(new Jdk8Module());
private int maxTokens = 8192;
private final AnthropicClient anthropicClient;

Expand Down Expand Up @@ -170,9 +172,14 @@ private ContentBlockParam partToAnthropicMessageBlock(Part part) {
.build());
} else if (part.functionResponse().isPresent()) {
String content = "";
if (part.functionResponse().get().response().isPresent()
&& part.functionResponse().get().response().get().getOrDefault("result", null) != null) {
content = part.functionResponse().get().response().get().get("result").toString();
if (part.functionResponse().get().response().isPresent()) {
Map<String, Object> response = part.functionResponse().get().response().get();
try {
content = OBJECT_MAPPER.writeValueAsString(response);
} catch (com.fasterxml.jackson.core.JsonProcessingException e) {
logger.error("Failed to serialize tool response", e);
content = response.toString();
}
}
return ContentBlockParam.ofToolResult(
ToolResultBlockParam.builder()
Expand Down