Build and run agents you can see, understand and trust.
Python agentchatbotlarge-language-modelsllmllm-agentmcpmulti-agentmulti-modalreact-agentrealtime-agentvoice-agentvoice-assistant
fix(model): normalize nullable Gemini cache token usage (#3079)
HootRocka639a9036ce5
diff --git a/src/agentscope/model/_gemini/_model.py b/src/agentscope/model/_gemini/_model.pyindex c07902f03..9c41b76ce 100644--- a/src/agentscope/model/_gemini/_model.py+++ b/src/agentscope/model/_gemini/_model.py@@ -526,7 +526,8 @@ class GeminiChatModel(ChatModelBase):usage_metadata,"cached_content_token_count",0,- ),+ )+ or 0,)return Nonediff --git a/tests/model_gemini_test.py b/tests/model_gemini_test.pyindex 5a419b632..df5fde2f4 100644--- a/tests/model_gemini_test.py+++ b/tests/model_gemini_test.py@@ -15,6 +15,7 @@ from unittest.mock import AsyncMock, MagicMockfrom utils import AnyStringfrom agentscope.message import TextBlock, ToolCallBlock, ThinkingBlock+from agentscope.message._base import Usagefrom agentscope.model import GeminiChatModelfrom agentscope.model._gemini._model import _sanitize_schema_for_geminifrom agentscope._utils._common import _flatten_json_schema@@ -254,6 +255,49 @@ class TestGeminiNonStream(IsolatedAsyncioTestCase):),)+ async def test_usage_normalizes_optional_cache_count(self) -> None:+ """SDK cache counts remain integer-valued in raw model usage."""+ from google.genai.types import GenerateContentResponseUsageMetadata++ for cache_count, expected in [(None, 0), (0, 0), (5, 5)]:+ with self.subTest(cache_count=cache_count):+ resp = _mock_completion([_make_part(text="hello")])+ resp.usage_metadata = GenerateContentResponseUsageMetadata(+ prompt_token_count=10,+ candidates_token_count=5,+ total_token_count=15,+ cached_content_token_count=cache_count,+ )+ self.mock_client.aio.models.generate_content = AsyncMock(+ return_value=resp,+ )++ result = await self.model([])++ self.assertEqual(+ dict(result.usage),+ {+ "input_tokens": 10,+ "output_tokens": 5,+ "time": result.usage.time,+ "cache_creation_input_tokens": 0,+ "cache_input_tokens": expected,+ "type": "chat",+ "metadata": None,+ },+ )+ self.assertIs(type(result.usage.cache_input_tokens), int)+ usage = Usage(**dict(result.usage))+ self.assertEqual(+ usage.model_dump(),+ {+ "input_tokens": 10,+ "output_tokens": 5,+ "cache_input_tokens": expected,+ "cache_creation_input_tokens": 0,+ },+ )+async def test_usage_classifies_tool_use_tokens_as_input(self) -> None:"""Usage classifies tool-use tokens as input, not output."""parts = [_make_part(text="hello")]@@ -382,6 +426,54 @@ class TestGeminiStream(IsolatedAsyncioTestCase):],)+ async def test_stream_usage_normalizes_optional_cache_count(self) -> None:+ """Delta and final usage normalize optional SDK cache counts."""+ from google.genai.types import GenerateContentResponseUsageMetadata++ for cache_count, expected in [(None, 0), (0, 0), (5, 5)]:+ with self.subTest(cache_count=cache_count):+ chunk = _make_stream_chunk([_make_part(text="hello")])+ chunk.usage_metadata = GenerateContentResponseUsageMetadata(+ prompt_token_count=10,+ candidates_token_count=5,+ total_token_count=15,+ cached_content_token_count=cache_count,+ )+ self.mock_client.aio.models.generate_content_stream = (+ AsyncMock(+ return_value=_MockAsyncStream([chunk]),+ )+ )++ gen = await self.model([])+ responses = [r async for r in gen]++ self.assertEqual(len(responses), 2)+ for response in responses:+ self.assertEqual(+ dict(response.usage),+ {+ "input_tokens": 10,+ "output_tokens": 5,+ "time": response.usage.time,+ "cache_creation_input_tokens": 0,+ "cache_input_tokens": expected,+ "type": "chat",+ "metadata": None,+ },+ )+ self.assertIs(type(response.usage.cache_input_tokens), int)+ usage = Usage(**dict(response.usage))+ self.assertEqual(+ usage.model_dump(),+ {+ "input_tokens": 10,+ "output_tokens": 5,+ "cache_input_tokens": expected,+ "cache_creation_input_tokens": 0,+ },+ )+async def test_stream_usage_classifies_tool_use_tokens(self) -> None:"""Streaming usage classifies tool-use tokens as input."""chunk = _make_stream_chunk([_make_part(text="hello")])