From 78f9b5f0cc3a398c265e0899ff326e13cc90a354 Mon Sep 17 00:00:00 2001 From: dlowzzxx Date: Thu, 17 Sep 2026 23:12:00 +0200 Subject: [PATCH] fix(token_counter): tolerate non-dictionary property schemas --- litellm/litellm_core_utils/token_counter.py | 2 ++ .../test_token_counter_tool.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/litellm/litellm_core_utils/token_counter.py b/litellm/litellm_core_utils/token_counter.py index f08ec7bc62c..997f995ce29 100644 --- a/litellm/litellm_core_utils/token_counter.py +++ b/litellm/litellm_core_utils/token_counter.py @@ -970,6 +970,8 @@ def _format_object_parameters(parameters, indent): required_params: Final = parameters.get("required", []) lines: Final = [] for key, props in properties.items(): + if not isinstance(props, dict): + continue description = props.get("description") if description: lines.append(f"// {description}") diff --git a/tests/test_litellm/litellm_core_utils/test_token_counter_tool.py b/tests/test_litellm/litellm_core_utils/test_token_counter_tool.py index 045c1a13eb1..df16046e2fd 100644 --- a/tests/test_litellm/litellm_core_utils/test_token_counter_tool.py +++ b/tests/test_litellm/litellm_core_utils/test_token_counter_tool.py @@ -99,3 +99,20 @@ def test_token_counter_tool_array_schema_without_items(): messages = [{"role": "user", "content": "Hello"}] tokens = token_counter(model="gpt-3.5-turbo", messages=messages, tools=tools) assert tokens > 0 + + +def test_token_counter_tool_non_dict_property_schema(): + """Test that malformed string-valued property schemas do not crash token counting (#40344).""" + tools = [ + { + "type": "function", + "function": { + "name": "f", + "description": "d", + "parameters": {"type": "object", "properties": {"s": "string"}}, + }, + } + ] + messages = [{"role": "user", "content": "Hello"}] + tokens = token_counter(model="gpt-3.5-turbo", messages=messages, tools=tools) + assert tokens > 0