Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions python/packages/gemini/agent_framework_gemini/_chat_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,10 @@ def _parse_usage(self, usage: types.GenerateContentResponseUsageMetadata | None)
details["output_token_count"] = v
if (v := usage.total_token_count) is not None:
details["total_token_count"] = v
if (v := usage.cached_content_token_count) is not None:
details["cache_read_input_token_count"] = v
if (v := usage.thoughts_token_count) is not None:
details["reasoning_output_token_count"] = v
return details or None

def _map_finish_reason(self, reason: str | None) -> FinishReasonLiteral | None:
Expand Down
25 changes: 25 additions & 0 deletions python/packages/gemini/tests/test_gemini_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ def _make_response(
prompt_tokens: int | None = 10,
output_tokens: int | None = 5,
total_tokens: int | None = 15,
cached_tokens: int | None = None,
thoughts_tokens: int | None = None,
) -> MagicMock:
"""Build a mock types.GenerateContentResponse."""
response = MagicMock()
Expand All @@ -113,6 +115,8 @@ def _make_response(
usage.prompt_token_count = prompt_tokens
usage.candidates_token_count = output_tokens
usage.total_token_count = total_tokens
usage.cached_content_token_count = cached_tokens
usage.thoughts_token_count = thoughts_tokens
response.usage_metadata = usage
else:
response.usage_metadata = None
Expand Down Expand Up @@ -374,6 +378,27 @@ async def test_get_response_usage_details() -> None:
assert response.usage_details["total_token_count"] == 28


async def test_get_response_usage_details_includes_cached_and_reasoning_tokens() -> None:
"""Surfaces Gemini cached-content and thinking token counts into the canonical usage fields."""
client, mock = _make_gemini_client()
mock.aio.models.generate_content = AsyncMock(
return_value=_make_response(
[_make_part(text="Hi")],
prompt_tokens=20,
output_tokens=8,
total_tokens=28,
cached_tokens=12,
thoughts_tokens=6,
)
)

response = await client.get_response(messages=[Message(role="user", contents=[Content.from_text("Hi")])])

assert response.usage_details is not None
assert response.usage_details["cache_read_input_token_count"] == 12
assert response.usage_details["reasoning_output_token_count"] == 6


Comment on lines +381 to +401
async def test_get_response_no_usage_when_metadata_absent() -> None:
"""Returns None for usage_details when the API response includes no usage metadata."""
client, mock = _make_gemini_client()
Expand Down