Skip to content

Build and run agents you can see, understand and trust.

fix(model): normalize nullable usage counters in adapters (#3453)

xiong-wei161556bf376ec
diff --git a/src/agentscope/model/_anthropic/_model.py b/src/agentscope/model/_anthropic/_model.py
index b28d723b9..2bf8f2b83 100644
--- a/src/agentscope/model/_anthropic/_model.py
+++ b/src/agentscope/model/_anthropic/_model.py
@@ -384,8 +384,8 @@ class AnthropicChatModel(ChatModelBase):
if response.usage:
u = response.usage
usage = ChatUsage(
- input_tokens=u.input_tokens,
- output_tokens=u.output_tokens,
+ input_tokens=u.input_tokens or 0,
+ output_tokens=u.output_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_creation_input_tokens=getattr(
u,
@@ -460,8 +460,8 @@ class AnthropicChatModel(ChatModelBase):
if message.usage:
u = message.usage
usage = ChatUsage(
- input_tokens=u.input_tokens,
- output_tokens=getattr(u, "output_tokens", 0),
+ input_tokens=u.input_tokens or 0,
+ output_tokens=getattr(u, "output_tokens", 0) or 0,
time=(
datetime.now() - start_datetime
).total_seconds(),
@@ -469,12 +469,14 @@ class AnthropicChatModel(ChatModelBase):
u,
"cache_creation_input_tokens",
0,
- ),
+ )
+ or 0,
cache_input_tokens=getattr(
u,
"cache_read_input_tokens",
0,
- ),
+ )
+ or 0,
)
elif event.type == "content_block_start":
@@ -563,7 +565,7 @@ class AnthropicChatModel(ChatModelBase):
elif event.type == "message_delta":
if event.usage and usage:
- usage.output_tokens = event.usage.output_tokens
+ usage.output_tokens = event.usage.output_tokens or 0
# ``usage`` was stamped when ``message_start``
# arrived, i.e. at time-to-first-token. Refresh it
# here so ``time`` spans the whole generation, as
diff --git a/src/agentscope/model/_dashscope/_model.py b/src/agentscope/model/_dashscope/_model.py
index b1a828ca9..d07bd01d7 100644
--- a/src/agentscope/model/_dashscope/_model.py
+++ b/src/agentscope/model/_dashscope/_model.py
@@ -475,8 +475,8 @@ class DashScopeChatModel(ChatModelBase):
else:
cache_read = 0
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=cache_read,
)
diff --git a/src/agentscope/model/_deepseek/_model.py b/src/agentscope/model/_deepseek/_model.py
index 880c37294..11e84cdf0 100644
--- a/src/agentscope/model/_deepseek/_model.py
+++ b/src/agentscope/model/_deepseek/_model.py
@@ -276,14 +276,15 @@ class DeepSeekChatModel(ChatModelBase):
if chunk.usage:
u = chunk.usage
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
u,
"prompt_cache_hit_tokens",
0,
- ),
+ )
+ or 0,
)
if not chunk.choices:
@@ -382,14 +383,15 @@ class DeepSeekChatModel(ChatModelBase):
if response.usage:
u = response.usage
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
u,
"prompt_cache_hit_tokens",
0,
- ),
+ )
+ or 0,
)
resp_kwargs: dict[str, Any] = {
diff --git a/src/agentscope/model/_moonshot/_model.py b/src/agentscope/model/_moonshot/_model.py
index e2ce68d23..c92c3c2f7 100644
--- a/src/agentscope/model/_moonshot/_model.py
+++ b/src/agentscope/model/_moonshot/_model.py
@@ -282,14 +282,15 @@ class MoonshotChatModel(ChatModelBase):
u = chunk.usage
details = getattr(u, "prompt_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
details,
"cached_tokens",
0,
)
+ or 0
if details
else 0,
)
@@ -391,14 +392,15 @@ class MoonshotChatModel(ChatModelBase):
u = response.usage
details = getattr(u, "prompt_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
details,
"cached_tokens",
0,
)
+ or 0
if details
else 0,
)
diff --git a/src/agentscope/model/_openai_chat/_model.py b/src/agentscope/model/_openai_chat/_model.py
index b08e200ff..a14c4183e 100644
--- a/src/agentscope/model/_openai_chat/_model.py
+++ b/src/agentscope/model/_openai_chat/_model.py
@@ -353,14 +353,15 @@ class OpenAIChatModel(ChatModelBase):
u = chunk.usage
details = getattr(u, "prompt_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
details,
"cached_tokens",
0,
)
+ or 0
if details
else 0,
)
@@ -542,14 +543,15 @@ class OpenAIChatModel(ChatModelBase):
u = response.usage
details = getattr(u, "prompt_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
details,
"cached_tokens",
0,
)
+ or 0
if details
else 0,
)
diff --git a/src/agentscope/model/_openai_response/_model.py b/src/agentscope/model/_openai_response/_model.py
index 2d74d57a9..ebc092388 100644
--- a/src/agentscope/model/_openai_response/_model.py
+++ b/src/agentscope/model/_openai_response/_model.py
@@ -398,8 +398,8 @@ class OpenAIResponseModel(ChatModelBase):
u = resp.usage
details = getattr(u, "input_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.input_tokens,
- output_tokens=u.output_tokens,
+ input_tokens=u.input_tokens or 0,
+ output_tokens=u.output_tokens or 0,
time=(
datetime.now() - start_datetime
).total_seconds(),
@@ -408,6 +408,7 @@ class OpenAIResponseModel(ChatModelBase):
"cached_tokens",
0,
)
+ or 0
if details
else 0,
)
@@ -526,14 +527,15 @@ class OpenAIResponseModel(ChatModelBase):
u = response.usage
details = getattr(u, "input_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.input_tokens,
- output_tokens=u.output_tokens,
+ input_tokens=u.input_tokens or 0,
+ output_tokens=u.output_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=getattr(
details,
"cached_tokens",
0,
)
+ or 0
if details
else 0,
)
diff --git a/src/agentscope/model/_volcengine/_model.py b/src/agentscope/model/_volcengine/_model.py
index 7233272a7..49246cc14 100644
--- a/src/agentscope/model/_volcengine/_model.py
+++ b/src/agentscope/model/_volcengine/_model.py
@@ -280,11 +280,11 @@ class VolcengineChatModel(ChatModelBase):
u = chunk.usage
details = getattr(u, "prompt_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=(
- getattr(details, "cached_tokens", 0)
+ getattr(details, "cached_tokens", 0) or 0
if details
else 0
),
@@ -387,11 +387,11 @@ class VolcengineChatModel(ChatModelBase):
u = response.usage
details = getattr(u, "prompt_tokens_details", None)
usage = ChatUsage(
- input_tokens=u.prompt_tokens,
- output_tokens=u.completion_tokens,
+ input_tokens=u.prompt_tokens or 0,
+ output_tokens=u.completion_tokens or 0,
time=(datetime.now() - start_datetime).total_seconds(),
cache_input_tokens=(
- getattr(details, "cached_tokens", 0) if details else 0
+ getattr(details, "cached_tokens", 0) or 0 if details else 0
),
)