scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-29 06:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 200

chore(count_tokens): give the picked token counter lines type-discipline reasons on stable/1.104.x

Browse source
This commit is contained in:
mateo-berri 2026-10-20 20:43:03 -07:00
parent 48544d32db
commit 2de6c76055
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
litellm/litellm_core_utils/prompt_templates/chat_template_tools.py
View file

@ -18,7 +18,12 @@ def _deepseek_v4_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
def _qwen3_5_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
return "".join(
"\n" + json.dumps({"type": "function", "function": function}, ensure_ascii=False) for function in functions
"\n"
+ json.dumps(
{"type": "function", "function": function}, # mutable-ok: serialized at once
ensure_ascii=False,
)
for function in functions
)

20
litellm/litellm_core_utils/token_counter.py
View file

@ -1049,7 +1049,7 @@ def _is_anthropic_web_search_tool(tool: Mapping[str, object]) -> bool:
def _tool_mappings(tools: Sequence[object]) -> Iterable[Mapping[str, object]]:
for tool in tools:
if isinstance(tool, Mapping):
yield cast(Mapping[str, object], tool)
yield cast(Mapping[str, object], tool) # cast-ok: tool payloads are JSON objects with str keys
def _function_definitions(tools: Sequence[object]) -> Iterable[Mapping[str, object]]:
@ -1069,20 +1069,22 @@ def _function_definitions_for_tool(tool: Mapping[str, object]) -> Iterable[Mappi
yield declaration
return
input_schema: Final = tool.get("input_schema")
parameters: Final = input_schema or tool.get("parameters") or {}
normalized_parameters: Final = parameters if isinstance(parameters, Mapping) else {}
parameters: Final = input_schema or tool.get("parameters") or {} # mutable-ok: read-only default
normalized_parameters: Final = parameters if isinstance(parameters, Mapping) else {} # mutable-ok: never mutated
unmapped_anthropic_keys: Final = (
{key: value for key, value in tool.items() if key not in _ANTHROPIC_TOOL_KEYS_MAPPED_BY_BRIDGE}
{ # mutable-ok: never mutated
key: value for key, value in tool.items() if key not in _ANTHROPIC_TOOL_KEYS_MAPPED_BY_BRIDGE
}
if input_schema is not None
else {}
else {} # mutable-ok: read-only default
)
description: Final = tool.get("description")
strict: Final = tool.get("strict")
yield {
yield { # mutable-ok: yielded as a read-only Mapping
"name": tool.get("name"),
"parameters": {**normalized_parameters, **unmapped_anthropic_keys},
**({"description": description} if description is not None else {}),
**({"strict": bool(strict)} if strict is not None else {}),
"parameters": {**normalized_parameters, **unmapped_anthropic_keys}, # mutable-ok: never mutated
**({"description": description} if description is not None else {}), # mutable-ok: spread at once
**({"strict": bool(strict)} if strict is not None else {}), # mutable-ok: spread at once
}

2
litellm/utils.py
View file

@ -2453,7 +2453,7 @@ def _return_huggingface_tokenizer(model: str, *, count_route: bool = False) -> S
def _huggingface_tokenizer(kind: HuggingFaceTokenizerKind) -> SelectTokenizerResponse:
with _BUNDLED_TOKENIZER_LOAD_LOCKS.get(kind, nullcontext()):
tokenizer: Final = _load_huggingface_tokenizer(kind, _huggingface_tokenizer_backend())
return {"type": "huggingface_tokenizer", "tokenizer": tokenizer}
return {"type": "huggingface_tokenizer", "tokenizer": tokenizer} # mutable-ok: SelectTokenizerResponse shape
def select_count_route_tokenizer(