diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py index 97c019a2180..ed895bbd48f 100644 --- a/litellm/litellm_core_utils/litellm_logging.py +++ b/litellm/litellm_core_utils/litellm_logging.py @@ -52,6 +52,7 @@ from litellm.constants import ( PROVIDER_REQUEST_ID_HEADERS, REALTIME_METERED_USAGE_KEY, REDACTED_BY_LITELLM, + USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY, ) from litellm.cost_calculator import ( RealtimeAPITokenUsageProcessor, @@ -338,9 +339,10 @@ _in_memory_loggers: Final[list[CustomLogger]] = [] _STANDARD_LOGGING_METADATA_RESOLVED_KEYS: Final[frozenset[str]] = frozenset( ("used_client_oauth_token", "usage_object", KUBERNETES_POD_ROUTING_KEY, "is_silent_experiment") ) -_STANDARD_LOGGING_METADATA_KEYS: Final[frozenset[str]] = ( - frozenset(StandardLoggingMetadata.__annotations__.keys()) - _STANDARD_LOGGING_METADATA_RESOLVED_KEYS -) +_STANDARD_LOGGING_METADATA_KEYS: Final[frozenset[str]] = frozenset(StandardLoggingMetadata.__annotations__.keys()) - { + *_STANDARD_LOGGING_METADATA_RESOLVED_KEYS, + USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY, +} def _get_provider_request_id(original_exception: Exception) -> str | None: @@ -8187,7 +8189,10 @@ def get_standard_logging_metadata( ) if isinstance(metadata, dict): # Update the clean_metadata with values from input metadata that match StandardLoggingMetadata fields - for key in (metadata.keys() & StandardLoggingMetadata.__annotations__.keys()) - {"is_silent_experiment"}: + for key in (metadata.keys() & StandardLoggingMetadata.__annotations__.keys()) - { + "is_silent_experiment", + USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY, + }: clean_metadata[key] = metadata[key] if metadata.get("user_api_key") is not None: diff --git a/tests/unit/litellm_core_utils/test_litellm_logging.py b/tests/unit/litellm_core_utils/test_litellm_logging.py index 13e181b2b92..9cdcd6a2c88 100644 --- a/tests/unit/litellm_core_utils/test_litellm_logging.py +++ b/tests/unit/litellm_core_utils/test_litellm_logging.py @@ -5775,6 +5775,22 @@ def test_get_standard_logging_metadata_merges_recorded_applied_guardrails(): assert result["applied_guardrails"] == ["guard-a", "blocker"] +def test_logging_metadata_leaves_out_the_virtual_key_flag(): + from litellm.constants import USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY + from litellm.litellm_core_utils.litellm_logging import StandardLoggingPayloadSetup, get_standard_logging_metadata + + metadata: Final = {USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY: True, "user_api_key_team_id": "team-a"} + + payload_metadata: Final = StandardLoggingPayloadSetup.get_standard_logging_metadata( + metadata=metadata, litellm_params={} + ) + standalone_metadata: Final = get_standard_logging_metadata(metadata) + + assert USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY not in payload_metadata + assert USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY not in standalone_metadata + assert payload_metadata["user_api_key_team_id"] == standalone_metadata["user_api_key_team_id"] == "team-a" + + def test_function_setup_metadata_takes_precedence_over_litellm_metadata(): """ Test that when BOTH metadata and litellm_metadata are present (e.g., user sets