Skip to content

fix: map token usage metadata for Anthropic Claude model #1261

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

fix: map token usage metadata for Anthropic Claude model #1261

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
15 changes: 10 additions & 5 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 @@ -34,11 +34,7 @@
import com.google.adk.JsonBaseModel;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.genai.types.Content;
import com.google.genai.types.FunctionCall;
import com.google.genai.types.FunctionDeclaration;
import com.google.genai.types.GenerateContentConfig;
import com.google.genai.types.Part;
import com.google.genai.types.*;
import io.reactivex.rxjava3.core.Flowable;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -268,6 +264,15 @@ private LlmResponse convertAnthropicResponseToLlmResponse(Message message) {
responseBuilder.content(
Content.builder().role("model").parts(ImmutableList.copyOf(parts)).build());
}
if (message.usage() != null) {
responseBuilder.usageMetadata(
GenerateContentResponseUsageMetadata.builder()
.promptTokenCount((int) message.usage().inputTokens())
.candidatesTokenCount((int) message.usage().outputTokens())
.totalTokenCount(
(int) (message.usage().inputTokens() + message.usage().outputTokens()))
.build());
}
return responseBuilder.build();
}

Expand Down
22 changes: 22 additions & 0 deletions core/src/test/java/com/google/adk/models/ClaudeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
package com.google.adk.models;

import static com.google.common.truth.Truth.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import com.anthropic.client.AnthropicClient;
import com.anthropic.models.messages.ContentBlockParam;
import com.anthropic.models.messages.Message;
import com.anthropic.models.messages.ToolResultBlockParam;
import com.anthropic.models.messages.Usage;
import com.google.common.collect.ImmutableMap;
import com.google.genai.types.FunctionResponse;
import com.google.genai.types.Part;
Expand Down Expand Up @@ -78,4 +83,21 @@ public void testPartToAnthropicMessageBlock_jsonFallback() throws Exception {
ToolResultBlockParam toolResult = result.asToolResult();
assertThat(toolResult.content().get().asString()).contains("\"custom_key\":\"custom_value\"");
}

@Test
public void testClaudeUsageMapping_ShouldFailWhenMappingIsMissing() throws Exception {
Usage mockUsage = mock(Usage.class);
when(mockUsage.inputTokens()).thenReturn(10L);
when(mockUsage.outputTokens()).thenReturn(20L);

Message mockMessage = mock(Message.class);
when(mockMessage.usage()).thenReturn(mockUsage);
when(mockMessage.content()).thenReturn(java.util.Collections.emptyList());

Method convertMethod =
Claude.class.getDeclaredMethod("convertAnthropicResponseToLlmResponse", Message.class);
convertMethod.setAccessible(true);
LlmResponse result = (LlmResponse) convertMethod.invoke(claude, mockMessage);
assertTrue(result.usageMetadata().isPresent());
}
}