From dae0f87a64477c243f0aafba7548df4cf8e74f59 Mon Sep 17 00:00:00 2001 From: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Date: Sat, 31 Oct 2026 03:52:28 -0700 Subject: [PATCH] fix(anthropic): name a list role under the drop_params cache cap and keep the Bedrock batch line prefix --- .../anthropic_cache_control_hook.py | 3 ++- litellm/llms/bedrock/files/transformation.py | 10 ++++++++- .../test_anthropic_chat_transformation.py | 21 +++++++++++++++++++ .../test_bedrock_files_transformation.py | 16 ++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/litellm/integrations/anthropic_cache_control_hook.py b/litellm/integrations/anthropic_cache_control_hook.py index 39368dee47c..94a2ad1e83d 100644 --- a/litellm/integrations/anthropic_cache_control_hook.py +++ b/litellm/integrations/anthropic_cache_control_hook.py @@ -32,6 +32,7 @@ from litellm.litellm_core_utils.prompt_templates.factory import ( tool_call_ids_answered_by_client, tool_call_ids_answered_in, ) +from litellm.litellm_core_utils.prompt_templates.mid_conversation_system import string_field from litellm.llms.anthropic.common_utils import ( is_claude_code_one_shot_subagent_request, supports_anthropic_cache_control, @@ -128,7 +129,7 @@ def _message_mark_reaches_provider(fields: Mapping[str, object]) -> bool: return False return ( not isinstance(fields.get("content"), list) - or fields.get("role") in _ROLES_SENDING_MESSAGE_MARK_WITH_LIST_CONTENT + or string_field(fields, "role") in _ROLES_SENDING_MESSAGE_MARK_WITH_LIST_CONTENT ) diff --git a/litellm/llms/bedrock/files/transformation.py b/litellm/llms/bedrock/files/transformation.py index 0624c2c65db..dcdd9e39c20 100644 --- a/litellm/llms/bedrock/files/transformation.py +++ b/litellm/llms/bedrock/files/transformation.py @@ -42,6 +42,7 @@ from litellm.litellm_core_utils.prompt_templates.common_utils import ( extract_file_data, text_completion_prompt_to_messages, ) +from litellm.llms.anthropic.common_utils import AnthropicError from litellm.llms.base_llm.base_utils import map_developer_role_to_system_role from litellm.llms.base_llm.chat.transformation import BaseLLMException from litellm.llms.base_llm.files.batch_records import responses_batch_body_to_chat_body @@ -347,7 +348,14 @@ class _BatchInputLine: record: _OpenAIBatchRecord -_BATCH_RECORD_CONVERSION_ERRORS: Final = (AttributeError, LookupError, TypeError, ValueError, BadRequestError) +_BATCH_RECORD_CONVERSION_ERRORS: Final = ( + AttributeError, + LookupError, + TypeError, + ValueError, + BadRequestError, + AnthropicError, +) def _batch_line_error(line_number: int, problem: str) -> BedrockError: diff --git a/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py b/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py index 1382e4db938..2bcd4740c1f 100644 --- a/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py +++ b/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py @@ -10059,6 +10059,27 @@ def test_chat_transform_request_answers_400_naming_a_non_string_role_or_tool_cal ) +@pytest.mark.parametrize(("role", "type_name"), [(["user"], "list"), ({"name": "user"}, "dict"), ([], "list")]) +def test_chat_transform_request_names_a_non_string_role_on_a_cache_marked_message_under_drop_params( + local_model_cost_map, role: object, type_name: str +): + marked: Final = {"role": role, "content": [{"type": "text", "text": "ok"}], "cache_control": {"type": "ephemeral"}} + + with pytest.raises(AnthropicError) as raised: + AnthropicConfig().transform_request( + model=UNFLAGGED_CLAUDE, + messages=[_ASK, marked], + optional_params={}, + litellm_params={"drop_params": True}, + headers={}, + ) + + assert (raised.value.status_code, raised.value.message) == ( + 400, + f"Invalid type for 'messages[1].role': expected a string, got {type_name}", + ) + + @pytest.mark.parametrize( ("malformed", "well_formed", "modify_params"), [ diff --git a/tests/unit/llms/bedrock/files/test_bedrock_files_transformation.py b/tests/unit/llms/bedrock/files/test_bedrock_files_transformation.py index 9d9e39df944..512e1f325f4 100644 --- a/tests/unit/llms/bedrock/files/test_bedrock_files_transformation.py +++ b/tests/unit/llms/bedrock/files/test_bedrock_files_transformation.py @@ -4472,6 +4472,17 @@ def test_file_content_conversion_keeps_a_line_whose_json_holds_unicode_line_sepa assert bedrock_record["modelInput"]["messages"] == [{"role": "user", "content": [{"text": text}]}] +_CLAUDE_BODY_WITH_A_LIST_ROLE_BEFORE_A_SYSTEM_MESSAGE: Final = { + "model": "bedrock/us.anthropic.claude-haiku-5-5", + "max_tokens": 20, + "messages": [ + {"role": "user", "content": "hi"}, + {"role": ["user"], "content": "ok"}, + {"role": "system", "content": "Be terse."}, + ], +} + + def _batch_line(body: object) -> str: return json.dumps({**_VALID_BATCH_RECORD, "body": body}) @@ -4516,6 +4527,11 @@ def _batch_line_with_body(field: str, value: object) -> str: "Batch input file line 2 could not be converted to a Bedrock batch record", id="string-messages", ), + pytest.param( + f"{_VALID_BATCH_LINE}\n{_batch_line(_CLAUDE_BODY_WITH_A_LIST_ROLE_BEFORE_A_SYSTEM_MESSAGE)}\n".encode(), + "Batch input file line 2 could not be converted to a Bedrock batch record", + id="claude-list-role-before-a-system-message", + ), pytest.param( f"{_VALID_BATCH_LINE}\n{'[' * 1_000_000}{']' * 1_000_000}\n".encode(), "Batch input file line 2 could not be parsed",