mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
fix(logging): keep the virtual-key flag out of the standard logging payload
The flag exists so the spend writer can tell a team's virtual key apart from other callers. Declaring it on the key-metadata type also copied it into every logger's standard logging metadata, so both metadata builders now leave it out
This commit is contained in:
parent
696aa76d54
commit
2cf4402fdc
2 changed files with 25 additions and 4 deletions
|
|
@ -48,6 +48,7 @@ from litellm.constants import (
|
|||
LITELLM_LOGGING_NO_UPSTREAM_LLM_CALL,
|
||||
PROVIDER_REQUEST_ID_HEADERS,
|
||||
REDACTED_BY_LITELLM,
|
||||
USER_API_KEY_IS_VIRTUAL_KEY_METADATA_KEY,
|
||||
)
|
||||
from litellm.cost_calculator import (
|
||||
RealtimeAPITokenUsageProcessor,
|
||||
|
|
@ -322,9 +323,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:
|
||||
|
|
@ -7878,7 +7880,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:
|
||||
|
|
|
|||
|
|
@ -5737,6 +5737,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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue