diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py index 9e0461e951d..eee0bde2f49 100644 --- a/litellm/litellm_core_utils/litellm_logging.py +++ b/litellm/litellm_core_utils/litellm_logging.py @@ -7131,19 +7131,17 @@ class StandardLoggingPayloadSetup: litellm_metadata: Final = cast( # cast-ok: request metadata is caller-provided Mapping[str, object], litellm_params.get("litellm_metadata") or {} ) - if metadata.get("tags", []): - request_tags = cast(list[str], metadata.get("tags", [])).copy() # cast-ok: tags are caller-provided - elif litellm_metadata.get("tags", []): - request_tags = cast(list[str], litellm_metadata.get("tags", [])).copy() # cast-ok: tags are caller-provided - else: - request_tags = [] + request_tags: Final = next( + ( + cast(list[str], tags) # cast-ok: preserve existing caller-provided list elements + for tag_metadata in (metadata, litellm_metadata) + if isinstance(tags := tag_metadata.get("tags"), list) and tags + ), + (), + ) user_agent_tags: Final = StandardLoggingPayloadSetup._get_user_agent_tags(proxy_server_request) additional_header_tags: Final = StandardLoggingPayloadSetup._get_extra_header_tags(proxy_server_request) - if user_agent_tags is not None: - request_tags.extend(user_agent_tags) - if additional_header_tags is not None: - request_tags.extend(additional_header_tags) - return request_tags + return [*request_tags, *(user_agent_tags or ()), *(additional_header_tags or ())] _get_request_tags = get_request_tags diff --git a/tests/unit/litellm_core_utils/test_litellm_logging.py b/tests/unit/litellm_core_utils/test_litellm_logging.py index 561ac9b2b33..a236c595040 100644 --- a/tests/unit/litellm_core_utils/test_litellm_logging.py +++ b/tests/unit/litellm_core_utils/test_litellm_logging.py @@ -3440,6 +3440,58 @@ def test_get_request_tags_preserves_non_string_metadata_tags(): assert 7 in tags +@pytest.mark.parametrize("metadata_key", ["metadata", "litellm_metadata"]) +@pytest.mark.parametrize("invalid_tags", ["my-tag", 7, True, {"tag": "value"}, ("my-tag",), None, ""]) +def test_standard_logging_payload_ignores_non_list_tags( + logging_obj: LitellmLogging, metadata_key: str, invalid_tags: object +) -> None: + timestamp: Final = datetime.datetime(2026, 1, 1) + payload: Final = get_standard_logging_object_payload( + kwargs={ + "litellm_call_id": "invalid-tag-request", + "model": "test-model", + "messages": [], + "litellm_params": { + metadata_key: {"tags": invalid_tags}, + "proxy_server_request": {"headers": {"user-agent": "litellm/1.0.0"}}, + }, + }, + init_response_obj={}, + start_time=timestamp, + end_time=timestamp, + logging_obj=logging_obj, + status="success", + ) + + assert payload is not None + assert payload["litellm_call_id"] == "invalid-tag-request" + assert payload["request_tags"] == ["User-Agent: litellm", "User-Agent: litellm/1.0.0"] + + +@pytest.mark.parametrize("invalid_tags", ["my-tag", 7, {"tag": "value"}, ("my-tag",), [], None]) +def test_get_request_tags_uses_valid_fallback_tags(invalid_tags: object) -> None: + fallback_tags: Final = ["fallback-tag"] + tags: Final = StandardLoggingPayloadSetup.get_request_tags( + litellm_params={ + "metadata": {"tags": invalid_tags}, + "litellm_metadata": {"tags": fallback_tags}, + }, + proxy_server_request={"headers": {"user-agent": "litellm/1.0.0"}}, + ) + + assert tags == ["fallback-tag", "User-Agent: litellm", "User-Agent: litellm/1.0.0"] + assert fallback_tags == ["fallback-tag"] + + +def test_get_request_tags_skips_unused_malformed_metadata() -> None: + tags: Final = StandardLoggingPayloadSetup.get_request_tags( + litellm_params={"metadata": {"tags": ["primary-tag"]}, "litellm_metadata": "unused"}, + proxy_server_request={}, + ) + + assert tags == ["primary-tag"] + + def test_get_request_tags_from_metadata_and_litellm_metadata(): """ Test that _get_request_tags correctly picks tags from both 'metadata' and 'litellm_metadata'.