Skip to content

fix(google_genai): preserve tool use tokens as metadata #637

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
Abhijeet Prasad (AbhiPrasad) merged 1 commit into from
Jul 31, 2026
+5 −2
Merged

fix(google_genai): preserve tool use tokens as metadata #637

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
2 changes: 2 additions & 0 deletions py/src/braintrust/integrations/google_genai/test_google_genai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,8 @@ def test_interactions_create_and_get(memory_logger):
response.usage.total_output_tokens + response.usage.total_thought_tokens
)
assert create_span["metrics"]["tokens"] == response.usage.total_tokens
assert "tool_use_tokens" not in create_span["metrics"]
assert create_span["metadata"]["total_tool_use_tokens"] == response.usage.total_tool_use_tokens

assert get_span["input"]["id"] == response.id
assert get_span["metadata"]["interaction_id"] == response.id
Expand Down
5 changes: 3 additions & 2 deletions py/src/braintrust/integrations/google_genai/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,6 @@ def _extract_interaction_usage_metrics(usage: Any, metrics: dict[str, Any]) -> N
metrics["prompt_cached_tokens"] = usage.total_cached_tokens
if total_thought_tokens is not None:
metrics["completion_reasoning_tokens"] = total_thought_tokens
if hasattr(usage, "total_tool_use_tokens") and usage.total_tool_use_tokens is not None:
metrics["tool_use_tokens"] = usage.total_tool_use_tokens


def _extract_interaction_text(outputs: list[dict[str, Any]]) -> str | None:
Expand Down Expand Up @@ -599,6 +597,9 @@ def _extract_interaction_metadata(response: "Interaction") -> dict[str, Any]:
"role": getattr(response, "role", None),
"response_mime_type": getattr(response, "response_mime_type", None),
"response_modalities": _materialize_interaction_value(getattr(response, "response_modalities", None)),
"total_tool_use_tokens": (
usage_serialized.get("total_tool_use_tokens") if isinstance(usage_serialized, dict) else None
),
"usage_by_modality": usage_by_modality,
}
)
Expand Down