From 256c431364277ff84e3d51c2f1a74d5b8d18baba Mon Sep 17 00:00:00 2001 From: yassin Date: Mon, 19 Oct 2026 16:34:40 +0000 Subject: [PATCH] fix(proxy): keep trusted litellm_params when a request body carries its own on proxy-only failures Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- litellm/proxy/utils.py | 15 ++++++- tests/unit/proxy/test_proxy_utils.py | 61 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py index 29749afb429..8c02d0f676a 100644 --- a/litellm/proxy/utils.py +++ b/litellm/proxy/utils.py @@ -1158,6 +1158,19 @@ def _call_type_for_route(route: str | None) -> str | None: _PROXY_ONLY_LLM_API_ERRORS: Final = (HTTPException, ProxyException, GuardrailRaisedException) +_PROXY_ONLY_ERROR_NON_OPTIONAL_PARAM_KEYS: Final = frozenset( + { + "model", + "user", + "litellm_logging_obj", + "litellm_params", + "optional_params", + "standard_callback_dynamic_params", + "start_time", + "completion_start_time", + "call_type", + } +) _LOG_DB_METRICS_CALL_TYPES: Final = frozenset(("get_data", "insert_data", "update_data", "delete_data")) @@ -3522,7 +3535,7 @@ class ProxyLogging: for k, v in request_data.items(): if k in litellm_param_keys: _litellm_params[k] = v - elif k not in ("model", "user", "litellm_logging_obj"): + elif k not in _PROXY_ONLY_ERROR_NON_OPTIONAL_PARAM_KEYS: _optional_params[k] = v attribution: Final = _stamp_deployment_attribution( diff --git a/tests/unit/proxy/test_proxy_utils.py b/tests/unit/proxy/test_proxy_utils.py index 2fc1b72c932..49072dd018a 100644 --- a/tests/unit/proxy/test_proxy_utils.py +++ b/tests/unit/proxy/test_proxy_utils.py @@ -2722,6 +2722,67 @@ async def test_handle_logging_proxy_only_error_syncs_normalized_call_type( assert logging_obj.model_call_details["call_type"] == expected_call_type +@pytest.mark.asyncio +async def test_proxy_only_error_failure_callback_preserves_trusted_litellm_params( + monkeypatch: pytest.MonkeyPatch, +): + from litellm.caching.caching import DualCache + from litellm.integrations.custom_logger import CustomLogger + from litellm.proxy.utils import ProxyLogging, hash_token + + class FailureCaptureLogger(CustomLogger): + def __init__(self): + self.failure_kwargs: Dict[str, Any] | None = None + + async def async_log_failure_event( + self, + kwargs: Dict[str, Any], + response_obj: object, + start_time: datetime, + end_time: datetime, + ) -> None: + self.failure_kwargs = kwargs + + capture_logger = FailureCaptureLogger() + monkeypatch.setattr(litellm, "callbacks", [capture_logger]) + monkeypatch.setattr(litellm, "input_callback", []) + monkeypatch.setattr(litellm, "success_callback", []) + monkeypatch.setattr(litellm, "failure_callback", []) + monkeypatch.setattr(litellm, "_async_success_callback", []) + monkeypatch.setattr(litellm, "_async_failure_callback", []) + monkeypatch.setattr(litellm.utils, "callback_list", []) + + await ProxyLogging(user_api_key_cache=DualCache())._handle_logging_proxy_only_error( + request_data={ + "model": "openai/gpt-4o-mini", + "messages": [{"role": "user", "content": "test"}], + "litellm_logging_obj": None, + "litellm_params": {"metadata": {"foo": "bar"}}, + "temperature": 0.2, + }, + user_api_key_dict=UserAPIKeyAuth( + api_key="sk-test", + key_alias="alias-1", + team_id="team-1", + team_alias="t1", + ), + route="/v1/chat/completions", + original_exception=HTTPException(status_code=400, detail="request rejected"), + ) + + callback_kwargs = capture_logger.failure_kwargs + assert callback_kwargs is not None + litellm_params_metadata = callback_kwargs["litellm_params"]["metadata"] + assert litellm_params_metadata["user_api_key_hash"] == hash_token("sk-test") + assert litellm_params_metadata["user_api_key_alias"] == "alias-1" + assert litellm_params_metadata["user_api_key_team_id"] == "team-1" + assert litellm_params_metadata["user_api_key_team_alias"] == "t1" + standard_metadata = callback_kwargs["standard_logging_object"]["metadata"] + assert standard_metadata["user_api_key_hash"] == hash_token("sk-test") + assert standard_metadata["user_api_key_team_id"] == "team-1" + assert callback_kwargs["optional_params"]["temperature"] == 0.2 + + @pytest.mark.asyncio async def test_during_call_hook_parallel_execution(): """