scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-11-14 09:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 214

Merge fac1192aa5 into 4a7fb30b0a

Browse source
This commit is contained in:
Armen Petrosyan 2026-11-04 22:44:44 +02:00 • committed by GitHub
commit 7b567a9650
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
litellm/llms/anthropic/count_tokens/transformation.py
View file

@ -491,5 +491,5 @@ class AnthropicCountTokensConfig:
if "role" not in message:
raise ValueError(f"Message {i} must have a 'role' field")
if "content" not in message:
if "content" not in message and "tool_calls" not in message:
raise ValueError(f"Message {i} must have a 'content' field")

34
tests/unit/llms/anthropic/test_anthropic_count_tokens_transformation.py
View file

@ -1029,3 +1029,37 @@ async def test_counter_leaves_out_context_management_without_edits(context_manag
ANTHROPIC_BETA_HEADER_VALUES.COMPACT_2026_01_12.value,
ANTHROPIC_BETA_HEADER_VALUES.CONTEXT_MANAGEMENT_2025_06_27.value,
}
@pytest.mark.parametrize("config_type", (AnthropicCountTokensConfig, AzureAIAnthropicCountTokensConfig))
def test_validate_request_accepts_a_tool_call_turn_without_content(
config_type: type[AnthropicCountTokensConfig],
) -> None:
"""OpenAI leaves ``content`` optional on an assistant ``tool_calls`` turn, and an SDK dump that drops
None values leaves the key out, so the shape the chat translation already counts is not rejected here."""
validated: Final = config_type().validate_request(
model="claude-opus-5-5",
messages=[
{"role": "user", "content": "Weather in SF?"},
{
"role": "assistant",
"tool_calls": [
{"id": "call-1", "type": "function", "function": {"name": "get_weather", "arguments": "{}"}}
],
},
],
)
assert validated is None
@pytest.mark.parametrize("config_type", (AnthropicCountTokensConfig, AzureAIAnthropicCountTokensConfig))
def test_validate_request_still_requires_content_on_a_plain_turn(
config_type: type[AnthropicCountTokensConfig],
) -> None:
"""A turn that carries neither content nor tool calls has nothing to count and is still refused."""
with pytest.raises(ValueError, match="Message 1 must have a 'content' field"):
config_type().validate_request(
model="claude-opus-5-5",
messages=[{"role": "user", "content": "Weather in SF?"}, {"role": "assistant"}],
)