Skip to content

Commit 328748b

Browse files
Fix cached_tokens handling in _extract_usage method (#6719)
* Fix cached_tokens handling in _extract_usage method Ensure cached_tokens is an integer and handle None safely. * ruuf format
1 parent 65a9132 commit 328748b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

astrbot/core/agent/handoff.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ def __init__(
1515
tool_description: str | None = None,
1616
**kwargs,
1717
) -> None:
18-
1918
# Avoid passing duplicate `description` to the FunctionTool dataclass.
2019
# Some call sites (e.g. SubAgentOrchestrator) pass `description` via kwargs
2120
# to override what the main agent sees, while we also compute a default

astrbot/core/provider/sources/openai_source.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,10 @@ def _extract_reasoning_content(
589589
def _extract_usage(self, usage: CompletionUsage | dict) -> TokenUsage:
590590
ptd = getattr(usage, "prompt_tokens_details", None)
591591
cached = getattr(ptd, "cached_tokens", 0) if ptd else 0
592-
prompt_tokens = getattr(usage, "prompt_tokens", 0) or 0
592+
cached = (
593+
cached if isinstance(cached, int) else 0
594+
) # ptd.cached_tokens 可能为None
595+
prompt_tokens = getattr(usage, "prompt_tokens", 0) or 0 # 安全
593596
completion_tokens = getattr(usage, "completion_tokens", 0) or 0
594597
cached = cached or 0
595598
prompt_tokens = prompt_tokens or 0

astrbot/core/utils/requirements_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ def find_missing_requirements(requirements_path: str) -> set[str] | None:
394394
def find_missing_requirements_from_lines(
395395
requirement_lines: Sequence[str],
396396
) -> set[str] | None:
397-
398397
required = list(iter_requirements(lines=requirement_lines))
399398
if not required:
400399
return set()

0 commit comments

Comments
 (0)