mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-16 23:41:43 +00:00
* fix(proxy): allow non-admin virtual keys to call GA Realtime WebRTC HTTP routes (#30089) * fix(proxy): allow non-admin virtual keys to call GA Realtime WebRTC HTTP routes Add the realtime WebRTC HTTP sub-routes (/realtime/client_secrets, /realtime/calls and their /v1 + /openai/v1 variants) to LiteLLMRoutes.openai_routes so is_llm_api_route() classifies them as LLM API routes. Without this, non-admin virtual keys received 401 'Only proxy admin can be used to generate, delete, update info for new keys/users/teams' when calling these endpoints. Fixes #29923 * fix(proxy): validate session.model for realtime routes in model-access check The GA Realtime WebRTC HTTP routes resolve the effective model from the nested session.model (falling back to the top-level model), but the auth layer's get_model_from_request() only extracted the top-level model. A model-restricted virtual key could therefore place a disallowed model in session.model, leave the top-level model unset, and skip can_key_call_model() entirely - obtaining an ephemeral token for a model it is not allowed to use. Extract session.model for the realtime client_secrets/calls routes so the model-access check runs against the model the request will actually use. Legitimate callers are unaffected; their permitted model still validates. Relates to https://github.com/BerriAI/litellm/issues/29923 * fix(proxy): classify realtime transcription_sessions routes as LLM API routes Add the GA Realtime WebRTC transcription_sessions HTTP routes to openai_routes so is_llm_api_route() returns True for them, matching the client_secrets and calls routes already fixed. These endpoints are registered with user_api_key_auth in realtime_endpoints/endpoints.py, so without this a non-admin virtual key calling POST /v1/realtime/transcription_sessions would hit the admin-only 401 branch. Extends the regression test parametrization accordingly. --------- Co-authored-by: habonlaci <4699494+habonlaci@users.noreply.github.com> * feat(proxy): surface max_input_tokens/max_output_tokens on /v1/models (#30272) * feat(proxy): surface max_input_tokens/max_output_tokens on /v1/models * fix(proxy): degrade /v1/models gracefully when model-group lookup fails --------- Co-authored-by: Sameer Kankute <sameer@berri.ai> * fix: sort tiered token-cost thresholds numerically (#30375) * fix: sort tiered token-cost thresholds numerically _get_token_base_cost iterated input_cost_per_token_above_<N>_tokens keys with a lexicographic sort, so for tiers whose thresholds have different digit lengths (e.g. 90k vs 128k) a request crossing both was billed at the lower tier that sorted first. Sort by the parsed numeric threshold instead, so the highest tier the request actually crosses is applied. * refactor: reuse _parse_above_token_threshold for inline threshold parse --------- Co-authored-by: Eric (GabiDevFamily) <271972409+santino18727-debug@users.noreply.github.com> * fix(openai): preserve cache_control for openai-compatible custom endpoints (#30387) * fix(openai): preserve cache_control for openai-compatible custom endpoints * fix(openai): use parsed hostname to detect real OpenAI for cache_control preservation * fix(proxy): drain all daily-spend batches per flush cycle (#30281) (#30505) * fix(types): prevent internal parallel_request_limiter fields from leaking to upstream providers (#30545) * fix(types): add internal parallel_request_limiter fields to all_litellm_params to prevent forwarding to upstream providers * test(types): add regression test for internal rate-limit fields in all_litellm_params * fix(init): add bool type annotation to suppress_debug_info (#30531) Module-level `suppress_debug_info = False` had no annotation, so strict type checkers (e.g. ty) infer it as `Literal[False]`. Reassigning it to `True` (as done in proxy_server.py and router.py) then fails with an invalid-assignment error. Annotate it as `bool` to match every other flag in this module. * fix: coalesce null aggregates in update_metrics for no-spend keys (#29945) * feat(team_endpoints): add query parameter `key_limit` to `/team/info` endpoint (#30006) * feat(team_endpoints): Add query parameter key_limit to /team/info * feat(team_endpoints): update schema.d.ts to include the new query parameter * feat(team_endpoints): add tests for limitting key count in /team/info response * feat(team_endpoints): Apply suggestions from greptile * Set greater-than constraint on key-limit * Fix type * fix(router): release aiohttp connection when stream iteration ends abnormally (#30271) * fix(router): release aiohttp connection when stream iteration ends abnormally A streaming response that terminates with a mid-stream read timeout, a task cancellation (client disconnect), or GeneratorExit never closed the underlying aiohttp ClientResponse. aiohttp only auto-releases the connector slot at body EOF, so each abnormally terminated stream permanently leaked one slot from the shared TCPConnector pool. During a backend traffic spike the pool drains; once exhausted every subsequent request to that host waits for a slot, times out and surfaces as a 408, indefinitely, even after the backend recovers. Only a proxy restart cleared the in-memory sessions, which matched the reported symptom of a router stuck returning 408 for a healthy vLLM backend. Close the response in a finally clause when iteration ends. On a fully read response the connection was already released at EOF and close() is a no-op, so keep-alive reuse for normal requests is unchanged. Fixes #30192 * test(aiohttp): cover GeneratorExit path with a mock instead of a live socket The previous slot-release test started a real aiohttp TCP server, which can flake in offline CI and does not exercise this fix's code path directly. Replace it with a dependency-injected mock that closes the stream generator (GeneratorExit) and asserts the response is closed, covering the third abnormal-exit path the finally block handles * feat(proxy): serve Anthropic-native /v1/models for Claude Code gateway discovery (#30273) * feat(proxy): serve Anthropic-native /v1/models for Claude Code gateway discovery * refactor(proxy): move Anthropic model-list formatter into llms/anthropic/common_utils * fix(proxy): make model_list request param optional for direct callers * feat(dashscope): add Responses API support (#30286) * feat(dashscope): add Responses API support DashScope's OpenAI-compatible endpoint serves /responses, so register a DashScopeResponsesAPIConfig that routes dashscope/* responses calls to {api_base}/responses without rewriting the upstream model id, instead of falling back to the chat-completions -> responses emulation pipeline. Closes #29780 * feat(dashscope): mark responses API as not supporting native websocket Matches the hosted_vllm/perplexity/openrouter responses configs, which all override supports_native_websocket() to False since the OpenAI-compatible endpoint has no native wss:// responses transport. --------- Co-authored-by: Sameer Kankute <sameer@berri.ai> * fix(spend-logs): preserve error_message on ProxyException failures (#30381) * fix(spend-logs): preserve error_message on ProxyException failures `StandardLoggingPayloadSetup.get_error_information` used `str(original_exception)` to populate the human-readable error message stored in `spend_logs.metadata.error_information.error_message`. `ProxyException` (litellm/proxy/_types.py:3453) sets `self.message` in its constructor but does NOT call `super().__init__(message)` and does NOT define `__str__`. As a result, `str(ProxyException(...))` returns the empty string, and every auth/budget/quota rejection was landing in spend_logs with `error_message=""` despite a fully populated traceback. Operator impact: dashboard "LLM Failure" rows became untriageable — the only way to tell a 401 from a 429 was to manually unpack the traceback JSON via psql. Burst failure patterns (e.g. a UI session polling with a stale token) produced 20-30 indistinguishable `error_code=401` rows per second. Fix: prefer the `.message` attribute (set by ProxyException and every litellm.exceptions.* class) over `str(exc)`. The `str(exc)` fallback is retained for non-litellm exception types, preserving prior behavior. Test plan: - 2 new unit tests in tests/test_litellm/litellm_core_utils/ test_litellm_logging.py: * test_get_error_information_prefers_message_attribute_over_str * test_get_error_information_falls_back_to_str_when_no_message_attr - Existing test_get_error_information_error_code_priority still passes - End-to-end verified: bad-key 401 now stores full "Authentication Error, Invalid proxy server token passed..." message in spend_logs.metadata.error_information.error_message * fix(spend-logs): preserve explicit empty .message + drop dead reference Greptile P2 on #30381. The truthiness check `if message_attr:` silently skipped an explicit empty-string `.message` and fell through to `str(original_exception)`. For ProxyException-shaped objects both produce empty, so the bug was latent; for other exception types it would inject a different string into error_information.error_message and corrupt the signal. Use `is not None` so an empty string survives verbatim. Also drop the stale `See e2e/cases/11.` comment reference — that path does not exist anywhere in the repo and confuses future readers. Regression test added: an exception with `.message=""` and a non-empty `super().__init__()` arg must yield error_message == "". * ci: retrigger workflows after base branch change to litellm_internal_staging * fix(anthropic): strip LiteLLM-injected total_tokens from /v1/messages response (#30382) * fix(anthropic): strip LiteLLM-injected total_tokens from /v1/messages response The non-streaming /v1/messages response carries a LiteLLM-injected usage.total_tokens = input_tokens + output_tokens that is not part of the Anthropic API spec. This caused three problems: 1. Shape divergence with streaming on the same endpoint. message_delta.usage in the SSE path never carries total_tokens. Clients parsing both paths get two different schemas from one endpoint. 2. Shape divergence with upstream. Direct calls to https://api.anthropic.com/v1/messages return no total_tokens field, so clients using the official Anthropic SDK couldn't rely on it, and clients that did rely on the LiteLLM-injected one broke when bypassing the proxy. 3. Numerical misuse. total = input + output undercounts when cache_read_input_tokens and cache_creation_input_tokens are non-zero, because cache tokens are reported in their own fields. A 100k-token cached prompt with 1 non-cache input token + 200 output tokens reports total_tokens = 201, off by ~99.8% from any reasonable definition of "total." Fix: add _strip_total_tokens_from_anthropic_response in litellm/proxy/anthropic_endpoints/endpoints.py and invoke it in the success path of anthropic_response right before returning. Only mutates dict-shaped responses; streaming (which already lacks the field) is left untouched. spend_logs / Prometheus continue to compute total_tokens internally for billing — this fix only strips the field from the wire response. Scope: only the Anthropic passthrough endpoint /v1/messages. The OpenAI-shape /v1/chat/completions is unaffected. * fix(anthropic): gate total_tokens strip behind flag + handle Pydantic .usage Two P1 greptile threads on #30382: P1 — **Backwards-incompatible removal without a feature flag** Stripping `usage.total_tokens` unconditionally breaks any client currently reading the LiteLLM-shaped non-streaming /v1/messages response. Per the codebase's policy (mirrors #30418), gate behind a new flag. - `litellm.strip_anthropic_total_tokens: bool = False` (default — backward-compat: clients keep seeing total_tokens). - Env override: `LITELLM_STRIP_ANTHROPIC_TOTAL_TOKENS=true`. - Docstring: planned to flip to True in a future major release; opt in early. P1 — **Silent no-op if `result` is a Pydantic model** `base_process_llm_request` may return a Pydantic-style object whose `.usage` is a plain dict (the most common shape — e.g. objects wrapping raw upstream JSON). The original `isinstance(response, dict)` guard skipped strip on those, so `total_tokens` would still hit the wire. Helper now also reads `getattr(response, "usage", None)` and strips when that's a dict. Strongly-typed Pydantic `Usage` sub-models with required `total_tokens` fields are still skipped — those impose type constraints the helper doesn't try to subvert. Tests: - `test_strips_total_tokens_on_pydantic_model_with_dict_usage` - `test_flag_defaults_off` 8/8 pass locally. * fix(anthropic): drop env var for strip flag (docs CI) Mirrors #30418's pattern (`expose_router_debug_in_errors: bool = True`, no `os.getenv`). The `LITELLM_STRIP_ANTHROPIC_TOTAL_TOKENS` env var introduced in the prior commit was flagged by `tests/documentation_tests/test_env_keys.py` because the documentation file `docs/my-website/docs/proxy/config_settings.md` lives in `BerriAI/litellm-docs` (separate repo) and registering a new env key requires a parallel docs PR — a friction we avoid here by exposing the flag only as a Python attribute + `litellm_settings` config key, both of which load through the existing proxy config plumbing without needing the env-var registry to be updated. No semantic change: default still False, behavior identical when set via `litellm.strip_anthropic_total_tokens = True` or `litellm_settings.strip_anthropic_total_tokens: true` in config.yaml. Verified locally: env scan no longer surfaces the key; 8/8 tests pass. * ci: retrigger workflows after base branch change to litellm_internal_staging * fix(pricing): correct swapped input/output token costs for command-r7b-12-2024 (#30413) * fix(pricing): correct swapped input/output token costs for command-r7b-12-2024 * test: resolve model prices JSON relative to test file for pip installs * fix(exception-mapping): map Gemini upstream-error body code 429 to RateLimitError (#30417) * fix(exception-mapping): map Gemini upstream-error body code 429 to RateLimitError Some Gemini-compatible gateways (e.g. new-api) wrap a 429 rate-limit signal from upstream inside an HTTP 500/503 envelope, with the real code only surfaced in the JSON body: {"error":{"message":"...high demand...","type":"upstream_error", "param":"","code":429}} Previously LiteLLM only looked at the HTTP status and mapped this to InternalServerError, which Router treats as non-retryable for many configs — so users got hard 500s instead of fallback/retry. Now the Gemini/Vertex exception mapper parses error.code from the body and routes code 429 to RateLimitError before falling through to the HTTP-status branches. Other body codes fall through unchanged. Tests cover: - new-api gateway's `code:429` payload now maps to RateLimitError - Genuine 500-body responses stay InternalServerError - Non-JSON body strings fall through to status-code mapping unchanged * fix(exception-mapping): scope body-code 429 promotion to 5xx envelopes Addresses greptile P1/P2 + @Sameerlite's review on #30417. The new elif branch was firing for any HTTP status, so a gateway response of HTTP 400 with body {"error":{"code":429,...}} would be incorrectly promoted to RateLimitError (retryable) instead of falling through to BadRequestError. Same trap for 401 -> AuthenticationError. Scoped the body-code 429 check to `500 <= status_code < 600` — covers 500/502/503/504 (gateways wrapping upstream 429 in any 5xx envelope) without inviting the 4xx misclassification. Tests: parametrized table now covers 5xx (500/502/503), 4xx (400/401), and the existing fall-through cases, asserting each maps to the exception type that matches the HTTP status code. 50/50 pass locally. * ci: retrigger workflows after base branch change to litellm_internal_staging * feat(router): add expose_router_debug_in_errors flag (default True) to redact internal model_group/fallback names (#30418) * feat(router)!: redact internal model_group/fallback names from exception messages The Router was unconditionally appending internal config names onto exception.message: - "Received Model Group=..." - "Available Model Group Fallbacks=..." - "No fallback model group found... Fallbacks={...}" - "context_window_fallbacks={...}" - Deployment-timeout messages including model_group - Fallback failure detail listing fallback chain ProxyException forwards .message verbatim to clients, so gateways were leaking their model_name / fallback wiring in every failed call. Fix: gate all five mutation sites on a new `litellm.expose_router_debug_in_errors` flag (default False). Set to True to restore upstream debug behavior for local debugging. Why: matches the redaction posture this codebase already has for upstream model identifiers (cf. _litellm_returned_model_name) and removes the last common error-path leak of internal model_group names. Breaking change marker (!): if anything parses "Received Model Group=" out of client error messages, flip the flag on or migrate to the x-litellm-* response headers instead. Tests: 7 cases covering each of the 5 redaction sites + the flag-on inverse path, plus a "default off" sanity check. * test(router): cover sites 1 + 3 of expose_router_debug_in_errors gate Addresses Greptile / codecov feedback on #30418: patch coverage was 55.6% with 4 lines uncovered in litellm/router.py. The existing tests exercised sites 2 (ContextWindowExceededError), 4 (no-fallback-found), and 5 (Received Model Group) — both default and flag-on. Sites 1 and 3 were declared in the PR description as covered by "site 5 also fires" but the gate body lines for each (the `e.message +=` inside the `if litellm.expose_router_debug_in_errors:` branch) only execute when the flag is on AND the specific exception path is taken, which neither existing test triggered. Added 4 new tests (default + flag-on × 2 sites): - test_default_does_not_leak_deployment_timeout_debug - test_flag_on_leaks_deployment_timeout_debug - test_default_does_not_leak_content_policy_fallback_hint - test_flag_on_leaks_content_policy_fallback_hint Trigger details: - Site 1 (litellm.Timeout in _acompletion) is reached via the Router-supported `mock_timeout=True` + `timeout=0.001` kwargs on `acompletion(...)`. Cannot embed a Timeout instance in model_list because Router.__init__ deep-copies it and Timeout.__reduce__ does not preserve the required positional args. - Site 3 (ContentPolicyViolationError without content_policy_fallbacks set, in async_function_with_fallbacks_common_utils) is reached by passing a `mock_response=litellm.ContentPolicyViolationError(...)` instance via the call-site kwarg — same deepcopy-avoidance reason. 11/11 tests pass locally. Patch coverage on litellm/router.py for this PR's diff should now be 100%. * chore(router): flip expose_router_debug_in_errors default to True Addresses @Sameerlite's review on #30418 — maintain backward compat on the wire. Redact becomes opt-in via setting the flag to False; the historical behavior (leak internal model_group / fallback wiring through exception messages) is preserved as the default. - litellm/__init__.py: default flipped to True, docstring rewritten with deprecation note pointing at a future flip to False (redact by default) in a major release. - tests/test_litellm/test_router_exception_redaction.py: fixture resets to True (was False); the "off" tests now explicitly set False; the "default_leaks_*" tests rely on the fixture default. test_flag_defaults_off -> test_flag_defaults_on. - No router.py change needed; the gate keys off the same flag, only the default changes. - PR title no longer needs the breaking-change `!` marker — no client sees a behavior change at default settings. 11/11 pass locally. * ci: retrigger workflows after base branch change to litellm_internal_staging * feat(guardrails): integrate Repelloai Argus guardrail (#30465) * feat(guardrails): add RepelloAI Argus guardrail integration (#1) * feat(guardrails): add RepelloAI Argus guardrail integration Add a new guardrail hook backed by RepelloAI Argus, with dashboard-managed asset policies enforced via an asset_id and X-API-Key auth. * fix(guardrails): harden RepelloAI Argus guardrail - scan streaming responses on output (was bypassing the guardrail) - log blocked verdicts as guardrail_intervened instead of success - treat auth/config errors (401/403/404/422) as misconfiguration that always blocks, not a fail-open-able unreachable error - default unreachable_fallback to fail_closed and read it directly; block on unknown/malformed verdicts so an API change can't silently disable enforcement - type unreachable_fallback as a Literal, drop the duplicate config model, expose unreachable_fallback in the config schema, and stop leaking the raw provider response / exception strings to the client * fix(guardrails): address RepelloAI Argus review feedback - support ARGUS_API_KEY (with REPELLOAI_API_KEY fallback) - make asset_id required in the config model - normalize unreachable_fallback so only fail_open opens; block on 400 misconfig - correct the shared unreachable_fallback field description * docs(guardrails): add RepelloAI Argus docs page and dashboard listing - add docs page covering config, env vars, modes, verdicts, failure semantics - list RepelloAI Argus in the Guardrail Garden with provider/logo mappings - add a regression test for the provider logo and display-name resolution * fix(guardrails): keep RepelloAI asset_id optional in config model A required asset_id leaked onto the shared LitellmParams (which inherits RepelloAIGuardrailConfigModel), breaking validation for every other guardrail. Keep it optional like sibling models; the guardrail __init__ still raises when asset_id is missing, which is the real enforcement. * Add comment for last user turn scanning * feat(guardrails): harden repelloai scanning * feat(guardrails): expand repelloai scanning to include tool definitions Add extraction of tool definitions and tool call arguments to the RepelloAI guardrail scanning. Improves detection coverage by including function schemas and parameters in the prompt sent to the guardrail service. Also captures detailed error responses in logs and adds guardrail header to streaming responses. * refactor(guardrails): fix and harden repelloai schema text extraction - Fix duplicate text in _iter_schema_text: previously all dict values were re-queued onto the stack even after scalar/list keys were already extracted explicitly, causing names/descriptions to appear twice in the scanned prompt - Extract schema key frozensets to module-level constants so they are not reconstructed on every call - Change _iter_schema_text from @classmethod to @staticmethod (cls unused) - Narrow _call_analyze stage param from str to Literal["prompt", "response"] - Add HttpxResponse type annotation to _raise_for_config_error - Add LLMResponseTypes annotation to async_post_call_success_hook response param * fix(guardrails): resolve pyright type errors in repelloai guardrail - Narrow async_handler.post return from Response|None to Response with explicit None guard before calling raise_for_status/json - Fix list comprehension returning str|None by switching to explicit loop with isinstance guard so pyright tracks the narrowing - Cast model_dump() result to Dict since hasattr does not narrow object type in pyright * fix(guardrails/repello): include Responses API instructions field in prompt scan The /v1/responses top-level `instructions` field was not included in _extract_prompt_text, allowing a caller to bypass guardrail policy checks by putting blocked content in `instructions` while keeping `input` benign. * feat: add api_key to config model and read prompt from data dict * fix(guardrails/repello): plug input_text and tool-call response bypass gaps Responses API input content parts with type 'input_text' were silently dropped by build_inspection_messages (which only handles type='text'), allowing callers to send blocked content via that path without triggering the pre-call scan. Fix: add _extract_input_text_parts to RepelloAIGuardrail and call it when walking the Responses API input messages. Post-call scanning skipped responses whose choices contained only tool_calls or function_call (message.content=None), letting models put blocked output in function arguments undetected. Fix: _extract_chat_completion_text now calls _extract_tool_call_args_from_message on each choice message. Also replace typing.Dict/List with builtin dict/list to clear TID251 strict ruff violations introduced by this file. * fix(guardrails/repello): scan Responses API function_call output arguments Output items with type 'function_call' in a /v1/responses response were skipped by _extract_responses_api_text; only 'message' items were walked. A model could return blocked content in function_call.arguments undetected. Now extract arguments from function_call output items before scanning. * fix(anthropic): drop orphaned server_tool_use on multi-turn replay from generic OpenAI clients (#30486) * fix(anthropic): drop orphaned server_tool_use on multi-turn replay from generic OpenAI clients When an Anthropic server-side tool (web_search, id `srvtoolu_...`) is used, its result is carried in `provider_specific_fields.web_search_results` — PRs #17746 / #17798 restore it for callers that round-trip provider_specific_fields. A generic OpenAI client that does NOT preserve provider_specific_fields (e.g. Open WebUI talking to a Vertex/Anthropic model over /chat/completions) drops it on replay and instead sends back an assistant `tool_call` + a `tool` message both keyed to the `srvtoolu_` id. The transform then produced a bare `server_tool_use` (with no following *_tool_result) plus a user `tool_result` for the same id — both invalid, so the next turn 400s: messages.N.content.0: unexpected `tool_use_id` found in `tool_result` blocks: srvtoolu_... Each `tool_result` block must have a corresponding `tool_use` block in the previous message. This is the commonly-reported vertex_ai symptom where Gemini works but Claude 400s on the 2nd turn of a web-search chat. Fix (litellm/litellm_core_utils/prompt_templates/factory.py): - convert_to_anthropic_tool_invoke: only emit a server_tool_use when its matching *_tool_result is available to pair with it; otherwise skip it (a bare server_tool_use is itself rejected). - anthropic_messages_pt: drop a replayed `tool`/`function` message whose tool_call_id starts with `srvtoolu_` (a server-executed tool produces no client result; a user tool_result for it is invalid). The existing reconstruction path (provider_specific_fields present, e.g. the litellm SDK) is unchanged, as is regular client tool_use/tool_result. Tests (tests/llm_translation/test_prompt_factory.py): - update test_convert_to_anthropic_tool_invoke_server_tool -> test_convert_to_anthropic_tool_invoke_server_tool_without_result_is_dropped - add test_anthropic_messages_pt_generic_client_drops_orphan_server_tool Follow-up to #17746 / #17798; addresses the generic-client (no provider_specific_fields) case of #17737. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(anthropic): cover the srvtoolu_ round-trip fix in the test_litellm unit suite The regression tests added in tests/llm_translation/test_prompt_factory.py aren't run by the coverage CI job (it runs tests/test_litellm), so the new factory.py branches showed as uncovered (codecov patch coverage). Add equivalent focused tests in the unit suite so both new branches are exercised there: - convert_to_anthropic_tool_invoke drops a srvtoolu_ server_tool_use when no matching *_tool_result is available. - anthropic_messages_pt drops the orphaned srvtoolu_ tool message a generic OpenAI client replays. Refs #17737 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(anthropic): cover the server_tool_use + result valid-pair path in unit suite Covers the remaining patch-coverage lines codecov flagged: convert_to_anthropic_tool_invoke emitting server_tool_use followed by its web_search_tool_result when the matching result is present (the litellm-SDK round-trip path). Refs #17737 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * style(anthropic): flatten srvtoolu_ tool-message guard to a negated if Addresses the Greptile style nit: replace the if-pass/else with a single negated `if not (...)` guard around the tool_result append. Behavior unchanged. Refs #17737 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(proxy): require premium only when enabling premium metadata fields (#30285) (#30506) Co-authored-by: Sameer Kankute <sameer@berri.ai> * fix(perplexity): stop double-billing reasoning tokens in manual cost fallback (#30488) * fix(perplexity): stop double-billing reasoning tokens in manual cost fallback When perplexity_cost_per_token cannot use the API-provided usage.cost.total_cost short-circuit and falls back to manual calculation, it multiplies the full usage.completion_tokens by output_cost_per_token and then adds reasoning_tokens * output_cost_per_reasoning_token on top. Per the OpenAI/Perplexity usage convention codified for the central path in PR #18607, completion_tokens already INCLUDES reasoning_tokens, so the manual fallback double-bills reasoning at both the output and reasoning rate. Concrete impact on perplexity/sonar-deep-research (input 2e-6, output 8e-6, reasoning 3e-6): for the exact usage shape exercised by the live response fixture in tests/llm_translation/test_perplexity_reasoning.py (prompt_tokens=9, completion_tokens=20, reasoning_tokens=15) the current code charges 0.000223 vs the convention-correct 0.000103, a 2.165x overcharge. The bug is reachable whenever Perplexity omits the cost object (streaming chunks, fixture-driven paths, older API versions). Subtracts reasoning_tokens (clamped at zero) from completion_tokens before applying the output rate, mirroring how dashscope/cost_calculator.py and the central generic_cost_per_token already handle it. Preserves the existing fallback behaviour when output_cost_per_reasoning_token is unset (all completion_tokens stay at the output rate). Existing tests in tests/test_litellm/llms/perplexity/test_perplexity_cost_calculator.py asserted the buggy math and are updated to the convention-correct math. Adds a focused regression test using the exact usage shape from the live response fixture so this class of bug cannot be silently reintroduced. * style(perplexity): drop redundant type annotation on else branch to satisfy mypy mypy [no-redef] flagged 'completion_cost' as declared in both if and else arms; keeping the annotation only on the first declaration matches existing patterns in this file. * fix(perplexity): update integration test expected costs for non-double-billed math Three tests in test_perplexity_integration.py asserted the old buggy expectation that reasoning_tokens are billed in addition to the full completion_tokens count. After the fix in cost_per_token, reasoning_tokens are billed at the reasoning rate and the remaining (completion_tokens - reasoning_tokens) at the standard output rate, matching OpenAI/Perplexity convention (PR #18607). Updates: test_end_to_end_cost_calculation_with_transformation, test_main_cost_calculator_integration, test_high_volume_cost_calculation. The high-volume sanity threshold drops to 0.25 to reflect the corrected total. * fix(ui): use dynamic proxy base URL in MCP usage examples (#30487) Replace hardcoded http://localhost:4000 with getProxyBaseUrl() in the MCP server usage example and copy-to-clipboard snippet so the generated configuration works for non-local deployments. Fixes #30466 * feat: add missing UK PII entity types to Presidio guardrail (#30537) * feat: add missing UK PII entity types to Presidio guardrail Add UK_PASSPORT, UK_POSTCODE, and UK_VEHICLE_REGISTRATION to PiiEntityType enum and PII_ENTITY_CATEGORIES_MAP. These entity types are supported by Microsoft Presidio but were missing from litellm's type definitions, preventing users from configuring UK-specific PII detection. * test: remove fragile hardcoded entity count test Remove test_uk_category_entity_count which hardcodes len() == 5. The test_uk_entities_match_presidio_recognizers test already verifies exact set equality, making the count test redundant and fragile to future Presidio additions. * style: apply Black formatting to match CI requirements * fix: route volcengine (Doubao) tiered-pricing models to the tiered cost handler (#30357) Volcengine (Doubao) models define `tiered_pricing` but no flat per-token cost, so cost_per_token fell through to generic_cost_per_token (which only reads flat costs) and tracked them at $0 Route custom_llm_provider == "volcengine" to the shared tiered-pricing handler in litellm/llms/dashscope/cost_calculator.py, which already computes graduated tier costs. Make that handler provider-agnostic by adding a custom_llm_provider argument (default "dashscope" preserves existing behavior) so get_model_info resolves the correct model map entry Fixes #30346 * feat(mcp): make MCP gateway name and description configurable via env vars (#30473) * feat(mcp): make MCP gateway name and description configurable via env vars * Rename function _restore_env to _apply_env * docs(mcp): document import-time capture of env-backed identity constants Address Greptile review feedback: clarify that LITELLM_MCP_SERVER_NAME and LITELLM_MCP_SERVER_DESCRIPTION are read once at import and require a module reload to observe env changes after import. Generated with AI assistance Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Yevhen Luhovtsov <yevhen.luhovtsov@intapp.com> Co-authored-by: Claude <noreply@anthropic.com> * fix(mcp): preserve native tools in semantic filter hook (#26650) * fix(mcp): preserve native tools in semantic filter hook The SemanticToolFilterHook.async_pre_call_hook passed ALL tools (MCP + native) to filter_tools(), which only knows MCP-registered tool names. Native tools silently failed the name match in _get_tools_by_names() and were dropped from the request. Fix: partition tools into native and MCP-registered before filtering. Run the semantic filter only on MCP tools, then merge native tools back unconditionally. Changes: - Robust _is_mcp_tool() using shape-based detection for OpenAI-format dicts, safe regardless of future _extract_tool_info changes - Single-pass partition loop (no double _is_mcp_tool calls) - Preserve native tools in MCP expansion path (mixed requests) - Track MCP expansion to prevent expanded tools bypassing filtering - filter_stats reports MCP-only counts for accurate metrics - Extracted _emit_filter_metadata() helper - Skip spurious filter headers for all-native tool requests Closes #26212 * remove stale docstring note referencing tools_expanded_from_mcp * fix: handle Responses API name collision and preserve tool ordering - Classify Responses API tools ({type: 'function', name: '...'}) as native to prevent name collisions with MCP canonical names - Preserve original request tool ordering using id()-based merge instead of naive native+mcp concatenation - Add 2 regression tests: name collision and ordering preservation * style: apply black formatting * fix(mcp): harden semantic filter — preserve all native tool formats, safe metadata access, graceful expansion failure, name-based merge * lint: suppress PLR0915 on async_pre_call_hook (matches codebase convention) * ci: retrigger checks after rebase onto litellm_internal_staging * feat(fireworks): sync Fireworks AI model registry with current platform catalog (#30616) Adds 12 new Fireworks serverless models and updates 3 existing entries in model_prices_and_context_window.json and its bundled backup to match the current Fireworks platform model list. New direct models: glm-5p2, qwen3p7-plus, minimax-m3, minimax-m2p7, kimi-k2p7-code, kimi-k2p6, deepseek-v4-pro, deepseek-v4-flash. New router endpoints: glm-5p1-fast, kimi-k2p6-fast, kimi-k2p7-code-fast. Updated: glm-5p1, gpt-oss-120b, and gpt-oss-20b now carry correct output token caps, cache-read pricing, and explicit capability flags max_tokens is set equal to max_output_tokens (not the full context window) for models whose generation cap is below their context window. This avoids the shared input+output budget path in get_modified_max_tokens, which would otherwise let callers request output sizes the model cannot produce. The same fix corrects the pre-existing glm-5p1, gpt-oss-120b, and gpt-oss-20b entries that had max_tokens equal to the full context window Short-form aliases (fireworks_ai/<model>) are added for every direct accounts/fireworks/models/ entry so cost attribution works for callers using bare model names. Router endpoints get short-form aliases too, and transform_request now routes bare names ending in -fast to the accounts/fireworks/routers/ path instead of defaulting every bare name to models/. This keeps the kimi-k2p6-fast router from being misrouted to the nonexistent models/kimi-k2p6-fast endpoint kimi-k2p6-turbo is intentionally excluded; kimi-k2p6-fast is its replacement. Context windows for deepseek-v4 and kimi models use the power-of-two values (1048576 and 262144) published on the Fireworks model pages, matching the convention already used by existing entries Two regression tests in test_utils.py assert the exact per-token costs, token limits, capability flags, and short-form-to-long-form equality for all 15 models against both the main and backup cost maps. Two routing tests in test_fireworks_ai_chat_transformation.py verify bare -fast names route to routers/ and bare direct-model names route to models/ * fix(bedrock): handle role:"system" inside the messages array on /v1/messages (#29698) (#30443) * feat(anthropic): hoist leading in-array system to top-level (helper) * test(anthropic): cover _system_content_to_blocks edge cases; deepcopy cache_control * test(anthropic): mid-conversation system normalization cases * feat: add supports_mid_conversation_system flag to Claude Opus 4.8 Add supports_mid_conversation_system: true to all 9 claude-opus-4-8 cost-map entries (Anthropic-native, Bedrock, Vertex, Azure AI) in both the root cost map and the bundled package backup, since the runtime helper and tests read the backup in local/offline mode. Pin the mid-system passthrough regression test to the local cost map via the existing local_model_cost_map fixture so it reads the branch-local flag rather than the network-fetched main copy. * fix(bedrock): normalize in-array system in /v1/messages handler (#29698) Wire normalize_system_messages_for_anthropic into anthropic_messages_handler so all Bedrock /v1/messages paths (Invoke / Mantle / ClaudePlatform / Converse-bridge) hoist leading in-array system entries (and demote mid-conversation ones on models lacking supports_mid_conversation_system) into the top-level system field. The normalized messages/system are written back into the local_vars snapshot the base_llm branch reads from, otherwise the Invoke/Mantle fix would silently no-op. Also fix the helper to resolve supports_mid_conversation_system through the prefix-aware AnthropicModelInfo._supports_model_capability resolver. The raw _supports_factory could not see the flag once get_llm_provider left the invoke/ prefix on the model id, which would have wrongly demoted mid-conversation system on a Bedrock invoke opus-4-8 path. * fix(bedrock): resolve mid-conversation-system flag through mantle/invoke/converse route prefixes; drop unused param * fix(types): widen system param to Union[str, List] for hoisted system blocks * refactor(bedrock): drop dead local_vars messages writeback * fix(bedrock/converse): translate in-array system in anthropic->openai adapter (#29698) * fix(bedrock/converse): preserve cache_control on in-array system; test drop-empty * fix(bedrock/converse): rename colliding local to satisfy mypy; test handler system-merge branches * fix(types): register supports_mid_conversation_system in model-info schema The cost-map JSON-schema validation test (test_aaamodel_prices_and_context_window_json_is_valid) rejects unknown properties, so adding supports_mid_conversation_system to the opus-4-8 cost-map entries failed CI with 'Additional properties are not allowed'. Register the flag in the INTENDED_SCHEMA allow-list and in the ProviderSpecificModelInfo TypedDict so it is a typed, first-class capability flag alongside its peers (supports_output_config, etc.). --------- Co-authored-by: Sameer Kankute <sameer@berri.ai> * fix(bedrock/agentcore): optionally forward multimodal content blocks in InvokeAgentRuntime payload (#28885) * fix(bedrock/agentcore): optionally forward multimodal content blocks in InvokeAgentRuntime payload By default the agentcore provider flattens the last message to a text-only {"prompt": "..."} payload via convert_content_list_to_str, silently dropping OpenAI multimodal blocks (image_url, file, input_audio, ...). This adds an opt-in `forward_multimodal_content` litellm param. When truthy and the last message's content is a list containing a non-text block, the original OpenAI content list is forwarded verbatim under a new "content" field so an attachment-aware AgentCore agent can read it. Default off keeps the payload byte-identical to the legacy {"prompt": "..."} shape — existing agents are unaffected. The flag is read from optional_params (where other AgentCore params land) with a litellm_params fallback, and accepts a bool or a config/env string ('true', '1', ...). AgentCore Runtime is schemaless on the agent side — the agent's @app.entrypoint parses arbitrary JSON up to 100 MB (per https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/runtime-invoke-agent.html), so this is a purely upstream change; no AgentCore-side schema is asserted. * fix(bedrock/agentcore): shallow-copy forwarded multimodal content list Address review feedback (Sameerlite): payload["content"] = last_content aliased the caller's mutable messages[-1]["content"] list. Harmless today because the payload is JSON-serialized immediately, but a latent footgun if a future caller mutates the returned payload before serialization. Forward list(last_content) so the payload owns its own list. Block dicts stay shared on purpose — a deep copy would clone potentially large base64 media on the request hot path, and the flagged risk was the shared list, not the blocks. Update the passthrough tests to assert equality + distinct identity, and add a regression test that mutating the payload list can't leak back into the original message content. * Revert "fix(mcp): preserve native tools in semantic filter hook (#26650)" This reverts commit438c825bd4. * Revert "feat(guardrails): integrate Repelloai Argus guardrail (#30465)" This reverts commit54da7857f2. * Revert "feat(dashscope): add Responses API support (#30286)" This reverts commit67662565e8. * Revert "fix(bedrock): handle role:"system" inside the messages array on /v1/messages (#29698) (#30443)" This reverts commitb8a8083308. * Revert "fix(anthropic): drop orphaned server_tool_use on multi-turn replay from generic OpenAI clients (#30486)" This reverts commit6e9c0b0dd2. * Revert "fix: route volcengine (Doubao) tiered-pricing models to the tiered cost handler (#30357)" This reverts commit172e302dab. * Revert "feat(proxy): serve Anthropic-native /v1/models for Claude Code gateway discovery (#30273)" This reverts commit4e3188525e. * fix: pass key_limit=None in team_member_update and patch model_cost in pricing test team_member_update called team_info without key_limit, so the fastapi.Query default object (not None) was passed through to get_data, which failed when serializing it. Pass key_limit=None explicitly to avoid this. test_get_model_info_costs patched litellm.model_cost from the local backup so the assertion holds before the PR is merged and the remote main URL is updated. * fix(security): validate resolved model in /realtime/client_secrets for non-transcription sessions (#30710) Omitting both model and session.model caused the endpoint to default to gpt-4o-realtime-preview without running can_key_call_resolved_model, so any key could access that model regardless of its allowed-model list. The transcription path already called can_key_call_resolved_model; this adds the same call for the realtime path before returning. * fix(lint): fix F821 undefined model_info and F841 unused metadata in create_model_info_response * fix: black formatting and stub get_model_group_info in third team translation test * fix: reformat utils.py with black 26.3.1 to match CI * fix: replace Optional[X] with X | None to satisfy UP045 ruff strict gate --------- Co-authored-by: Habon Laszlo <habonlaci@users.noreply.github.com> Co-authored-by: habonlaci <4699494+habonlaci@users.noreply.github.com> Co-authored-by: Armaan Sandhu <74664101+Ar-maan05@users.noreply.github.com> Co-authored-by: santino18727-debug <santino18727@gmail.com> Co-authored-by: Eric (GabiDevFamily) <271972409+santino18727-debug@users.noreply.github.com> Co-authored-by: Nitish Agarwal <1592163+nitishagar@users.noreply.github.com> Co-authored-by: jho1-godaddy <171078705+jho1-godaddy@users.noreply.github.com> Co-authored-by: 安妮的心动录 <74543653+anneheartrecord@users.noreply.github.com> Co-authored-by: Harshith Gujjeti <153299927+Harshxth@users.noreply.github.com> Co-authored-by: Tomoya Tabuchi <t@tomoyat1.com> Co-authored-by: Vedant Agarwal <43557509+Vedant-Agarwal@users.noreply.github.com> Co-authored-by: Prathamesh Jadhav <55660103+lollinng@users.noreply.github.com> Co-authored-by: songkuan-zheng <252822057+songkuan-zheng@users.noreply.github.com> Co-authored-by: Kropiunig <48442031+Kropiunig@users.noreply.github.com> Co-authored-by: Lavish Bansal <lavish.bansal619@gmail.com> Co-authored-by: Shane Emmons <27679+semmons99@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Anuj ojha <ojhaanuj224@gmail.com> Co-authored-by: Nahrin <nahrin@nahrinoda.com> Co-authored-by: Nbouyaa <67773915+FadelT@users.noreply.github.com> Co-authored-by: Vineeth Sai <vineethsai4444@gmail.com> Co-authored-by: Eugene Lugovtsov <34510252+EugeneLugovtsov@users.noreply.github.com> Co-authored-by: Yevhen Luhovtsov <yevhen.luhovtsov@intapp.com> Co-authored-by: Ayush Shekhar <106994833+ayushh0110@users.noreply.github.com> Co-authored-by: Ahmad Shahzad <107808273+shzdehmd@users.noreply.github.com> Co-authored-by: Kent <72616338+kingdoooo@users.noreply.github.com> Co-authored-by: Jón Levy <levy@apro.is>
2162 lines
81 KiB
Python
2162 lines
81 KiB
Python
"""
|
|
Unit tests for auth_utils functions related to rate limiting and customer ID extraction.
|
|
"""
|
|
|
|
import base64
|
|
from typing import Optional
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from litellm.proxy._types import UserAPIKeyAuth
|
|
from litellm.proxy.auth.auth_utils import (
|
|
_get_customer_id_from_standard_headers,
|
|
abbreviate_api_key,
|
|
check_complete_credentials,
|
|
custom_auth_common_checks_warning,
|
|
warn_once_if_custom_auth_skips_common_checks,
|
|
get_end_user_id_from_request_body,
|
|
get_key_mcp_rpm_limit,
|
|
get_key_model_rpm_limit,
|
|
get_key_model_tpm_limit,
|
|
get_model_from_request,
|
|
get_project_model_rpm_limit,
|
|
get_project_model_tpm_limit,
|
|
get_request_route_template,
|
|
is_request_body_safe,
|
|
)
|
|
|
|
|
|
class TestCustomAuthCommonChecksWarning:
|
|
"""custom_auth_common_checks_warning only warns when custom auth is configured
|
|
and the common-checks opt-in is off, since that is the only state where
|
|
project/team enforcement silently does nothing."""
|
|
|
|
def test_warns_when_custom_auth_configured_and_checks_off(self):
|
|
warning = custom_auth_common_checks_warning(
|
|
custom_auth_configured=True,
|
|
run_common_checks=False,
|
|
)
|
|
assert warning is not None
|
|
assert "custom_auth_run_common_checks: true" in warning
|
|
assert "https://docs.litellm.ai/docs/proxy/custom_auth" in warning
|
|
|
|
def test_no_warning_when_common_checks_enabled(self):
|
|
assert (
|
|
custom_auth_common_checks_warning(
|
|
custom_auth_configured=True,
|
|
run_common_checks=True,
|
|
)
|
|
is None
|
|
)
|
|
|
|
def test_no_warning_when_custom_auth_not_configured(self):
|
|
assert (
|
|
custom_auth_common_checks_warning(
|
|
custom_auth_configured=False,
|
|
run_common_checks=False,
|
|
)
|
|
is None
|
|
)
|
|
assert (
|
|
custom_auth_common_checks_warning(
|
|
custom_auth_configured=False,
|
|
run_common_checks=True,
|
|
)
|
|
is None
|
|
)
|
|
|
|
|
|
class TestWarnOnceIfCustomAuthSkipsCommonChecks:
|
|
"""The startup warning must fire at most once per process, since load_config
|
|
re-runs on hot-reload / config refresh and would otherwise spam the log."""
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _reset_sentinel(self, monkeypatch):
|
|
monkeypatch.setattr(
|
|
"litellm.proxy.auth.auth_utils._custom_auth_common_checks_warning_emitted",
|
|
False,
|
|
)
|
|
|
|
def test_warns_only_once_across_repeated_calls(self):
|
|
logger = MagicMock()
|
|
for _ in range(3):
|
|
warn_once_if_custom_auth_skips_common_checks(
|
|
custom_auth_configured=True,
|
|
run_common_checks=False,
|
|
logger=logger,
|
|
)
|
|
assert logger.warning.call_count == 1
|
|
assert "custom_auth_run_common_checks" in logger.warning.call_args[0][0]
|
|
|
|
def test_does_not_warn_when_common_checks_enabled(self):
|
|
logger = MagicMock()
|
|
warn_once_if_custom_auth_skips_common_checks(
|
|
custom_auth_configured=True,
|
|
run_common_checks=True,
|
|
logger=logger,
|
|
)
|
|
assert logger.warning.call_count == 0
|
|
|
|
|
|
class TestGetKeyModelRpmLimit:
|
|
"""Tests for get_key_model_rpm_limit function."""
|
|
|
|
def test_returns_key_metadata_when_present(self):
|
|
"""Key metadata takes priority over team metadata."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={"model_rpm_limit": {"gpt-4": 100}},
|
|
team_metadata={"model_rpm_limit": {"gpt-4": 50}},
|
|
)
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 100}
|
|
|
|
def test_falls_back_to_team_metadata_when_key_has_other_metadata(self):
|
|
"""Should fall back to team metadata when key metadata exists but has no model_rpm_limit."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={
|
|
"some_other_key": "value"
|
|
}, # Has metadata, but not model_rpm_limit
|
|
team_metadata={"model_rpm_limit": {"gpt-4": 50}},
|
|
)
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 50}
|
|
|
|
def test_extracts_from_model_max_budget(self):
|
|
"""Should extract rpm_limit from model_max_budget when metadata is empty."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
model_max_budget={
|
|
"gpt-4": {"rpm_limit": 100, "tpm_limit": 1000},
|
|
"gpt-3.5-turbo": {"rpm_limit": 200},
|
|
},
|
|
)
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 100, "gpt-3.5-turbo": 200}
|
|
|
|
def test_skips_models_without_rpm_limit(self):
|
|
"""Should skip models that don't have rpm_limit in model_max_budget."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
model_max_budget={
|
|
"gpt-4": {"rpm_limit": 100},
|
|
"gpt-3.5-turbo": {"tpm_limit": 1000}, # No rpm_limit
|
|
},
|
|
)
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 100}
|
|
|
|
def test_returns_none_when_no_limits_configured(self):
|
|
"""Should return None when no rate limits are configured."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
def test_team_metadata_empty_rpm_dict_falls_through_to_deployment_default(self):
|
|
"""Explicitly empty team model_rpm_limit ({}) should be returned as-is, not fallen through."""
|
|
# An empty dict is a valid team limit map (no per-model limits configured).
|
|
# It should be returned directly rather than falling through to deployment defaults,
|
|
# so a team with an empty map is treated as unconstrained at the team level.
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
team_metadata={"model_rpm_limit": {}},
|
|
)
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result == {}
|
|
|
|
|
|
class TestGetKeyMcpRpmLimit:
|
|
def test_empty_dict_limits_are_returned(self):
|
|
key_override = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={"mcp_rpm_limit": {}},
|
|
team_metadata={"mcp_rpm_limit": {"github": 50}},
|
|
)
|
|
assert get_key_mcp_rpm_limit(key_override) == {}
|
|
|
|
team_empty = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
team_metadata={"mcp_rpm_limit": {}},
|
|
)
|
|
assert get_key_mcp_rpm_limit(team_empty) == {}
|
|
|
|
|
|
class TestGetKeyModelTpmLimit:
|
|
"""Tests for get_key_model_tpm_limit function."""
|
|
|
|
def test_returns_key_metadata_when_present(self):
|
|
"""Key metadata takes priority over team metadata."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={"model_tpm_limit": {"gpt-4": 10000}},
|
|
team_metadata={"model_tpm_limit": {"gpt-4": 5000}},
|
|
)
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 10000}
|
|
|
|
def test_falls_back_to_team_metadata_when_key_has_other_metadata(self):
|
|
"""Should fall back to team metadata when key metadata exists but has no model_tpm_limit."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={
|
|
"some_other_key": "value"
|
|
}, # Has metadata, but not model_tpm_limit
|
|
team_metadata={"model_tpm_limit": {"gpt-4": 5000}},
|
|
)
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 5000}
|
|
|
|
def test_extracts_from_model_max_budget(self):
|
|
"""Should extract tpm_limit from model_max_budget when metadata is empty."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
model_max_budget={
|
|
"gpt-4": {"tpm_limit": 10000, "rpm_limit": 100},
|
|
"gpt-3.5-turbo": {"tpm_limit": 20000},
|
|
},
|
|
)
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 10000, "gpt-3.5-turbo": 20000}
|
|
|
|
def test_skips_models_without_tpm_limit(self):
|
|
"""Should skip models that don't have tpm_limit in model_max_budget."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
model_max_budget={
|
|
"gpt-4": {"tpm_limit": 10000},
|
|
"gpt-3.5-turbo": {"rpm_limit": 100}, # No tpm_limit
|
|
},
|
|
)
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 10000}
|
|
|
|
def test_returns_none_when_no_limits_configured(self):
|
|
"""Should return None when no rate limits are configured."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
def test_model_max_budget_priority_over_team(self):
|
|
"""model_max_budget should take priority over team_metadata."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
model_max_budget={"gpt-4": {"tpm_limit": 10000}},
|
|
team_metadata={"model_tpm_limit": {"gpt-4": 5000}},
|
|
)
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 10000}
|
|
|
|
def test_team_metadata_empty_tpm_dict_falls_through_to_deployment_default(self):
|
|
"""Explicitly empty team model_tpm_limit ({}) should be returned as-is, not fallen through."""
|
|
# An empty dict is a valid team limit map (no per-model limits configured).
|
|
# It should be returned directly rather than falling through to deployment defaults,
|
|
# so a team with an empty map is treated as unconstrained at the team level.
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
team_metadata={"model_tpm_limit": {}},
|
|
)
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result == {}
|
|
|
|
def test_skips_deployments_with_malformed_limit_value(self):
|
|
"""Deployments with non-integer-parseable limit values are skipped without raising."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
{
|
|
"model_name": "model1",
|
|
"litellm_params": {"default_api_key_tpm_limit": "not-a-number"},
|
|
},
|
|
_make_deployment_dict("model1", tpm=500),
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
# The malformed deployment is skipped; the valid one provides 500
|
|
assert result == {"model1": 500}
|
|
|
|
|
|
class TestGetCustomerIdFromStandardHeaders:
|
|
"""Tests for _get_customer_id_from_standard_headers helper function."""
|
|
|
|
def test_should_return_customer_id_from_x_litellm_customer_id_header(self):
|
|
"""Should extract customer ID from x-litellm-customer-id header."""
|
|
headers = {"x-litellm-customer-id": "customer-123"}
|
|
result = _get_customer_id_from_standard_headers(request_headers=headers)
|
|
assert result == "customer-123"
|
|
|
|
def test_should_return_customer_id_from_x_litellm_end_user_id_header(self):
|
|
"""Should extract customer ID from x-litellm-end-user-id header."""
|
|
headers = {"x-litellm-end-user-id": "end-user-456"}
|
|
result = _get_customer_id_from_standard_headers(request_headers=headers)
|
|
assert result == "end-user-456"
|
|
|
|
def test_should_return_none_when_headers_is_none(self):
|
|
"""Should return None when headers is None."""
|
|
result = _get_customer_id_from_standard_headers(request_headers=None)
|
|
assert result is None
|
|
|
|
def test_should_return_none_when_no_standard_headers_present(self):
|
|
"""Should return None when no standard customer ID headers are present."""
|
|
headers = {"x-other-header": "some-value"}
|
|
result = _get_customer_id_from_standard_headers(request_headers=headers)
|
|
assert result is None
|
|
|
|
|
|
class TestGetEndUserIdFromRequestBodyWithStandardHeaders:
|
|
"""Tests for get_end_user_id_from_request_body with standard customer ID headers."""
|
|
|
|
def test_should_prioritize_standard_header_over_body_user(self):
|
|
"""Standard customer ID header should take precedence over body user field."""
|
|
headers = {"x-litellm-customer-id": "header-customer"}
|
|
request_body = {"user": "body-user"}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers=headers
|
|
)
|
|
assert result == "header-customer"
|
|
|
|
def test_should_fall_back_to_body_when_no_standard_header(self):
|
|
"""Should fall back to body user when no standard headers are present."""
|
|
headers = {"x-other-header": "value"}
|
|
request_body = {"user": "body-user"}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers=headers
|
|
)
|
|
assert result == "body-user"
|
|
|
|
|
|
def test_get_model_from_request_supports_google_model_names_with_slashes():
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={},
|
|
route="/v1beta/models/bedrock/claude-sonnet-3.7:generateContent",
|
|
)
|
|
== "bedrock/claude-sonnet-3.7"
|
|
)
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={},
|
|
route="/models/hosted_vllm/gpt-oss-20b:generateContent",
|
|
)
|
|
== "hosted_vllm/gpt-oss-20b"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_vertex_passthrough_still_works():
|
|
route = "/vertex_ai/v1/projects/p/locations/l/publishers/google/models/gemini-1.5-pro:generateContent"
|
|
assert get_model_from_request(request_data={}, route=route) == "gemini-1.5-pro"
|
|
|
|
|
|
def test_get_model_from_request_openai_deployment_route_still_works():
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={},
|
|
route="/openai/deployments/my-azure-deployment/chat/completions",
|
|
)
|
|
== "my-azure-deployment"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_includes_file_endpoint_header_model():
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={},
|
|
route="/v1/files",
|
|
request_headers={"X-LiteLLM-Model": "restricted-model"},
|
|
)
|
|
== "restricted-model"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_ignores_routing_header_on_standard_llm_routes():
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"model": "allowed-model"},
|
|
route="/v1/chat/completions",
|
|
request_headers={"x-litellm-model": "restricted-model"},
|
|
)
|
|
== "allowed-model"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_authorizes_all_file_routing_model_sources():
|
|
models = get_model_from_request(
|
|
request_data={"model": "body-model"},
|
|
route="/v1/files",
|
|
request_headers={"x-litellm-model": "header-model"},
|
|
request_query_params={"target_model_names": "query-model-a,query-model-b"},
|
|
)
|
|
assert isinstance(models, list)
|
|
assert set(models) == {
|
|
"body-model",
|
|
"query-model-a",
|
|
"query-model-b",
|
|
"header-model",
|
|
}
|
|
|
|
|
|
def test_get_model_from_request_extracts_simple_encoded_file_id_model():
|
|
from litellm.proxy.openai_files_endpoints.common_utils import (
|
|
encode_file_id_with_model,
|
|
)
|
|
|
|
file_id = encode_file_id_with_model(
|
|
file_id="file-provider-id",
|
|
model="restricted-model",
|
|
)
|
|
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"file_id": file_id},
|
|
route="/v1/files/{file_id}",
|
|
)
|
|
== "restricted-model"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_extracts_unified_file_id_models():
|
|
raw_unified_file_id = (
|
|
"litellm_proxy:application/octet-stream;unified_id,test-id;"
|
|
"target_model_names,model-a,model-b;llm_output_file_id,file-provider-id"
|
|
)
|
|
encoded_unified_file_id = (
|
|
base64.urlsafe_b64encode(raw_unified_file_id.encode()).decode().rstrip("=")
|
|
)
|
|
|
|
assert get_model_from_request(
|
|
request_data={"file_id": encoded_unified_file_id},
|
|
route="/v1/files/{file_id}",
|
|
) == ["model-a", "model-b"]
|
|
|
|
|
|
def test_get_model_from_request_extracts_eval_completion_model():
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"completion": {"model": "judge-model"}},
|
|
route="/v1/evals/{eval_id}/runs",
|
|
)
|
|
== "judge-model"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_includes_fine_tuning_target_model_query():
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={},
|
|
route="/v1/fine_tuning/jobs",
|
|
request_query_params={"target_model_names": "fine-tune-model"},
|
|
)
|
|
== "fine-tune-model"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_extracts_video_id_model():
|
|
from litellm.types.videos.utils import encode_video_id_with_provider
|
|
|
|
video_id = encode_video_id_with_provider(
|
|
video_id="video-provider-id",
|
|
provider="openai",
|
|
model_id="video-model",
|
|
)
|
|
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"video_id": video_id},
|
|
route="/v1/videos/{video_id}",
|
|
)
|
|
== "video-model"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_resolves_video_id_model_with_router():
|
|
from litellm.types.videos.utils import encode_video_id_with_provider
|
|
|
|
provider_video_id = (
|
|
"projects/test-project/locations/us-central1/publishers/google/models/"
|
|
"veo-3.1-generate-001/operations/operation-id"
|
|
)
|
|
video_id = encode_video_id_with_provider(
|
|
video_id=provider_video_id,
|
|
provider="vertex_ai",
|
|
model_id="veo-3.1-generate-001",
|
|
)
|
|
llm_router = MagicMock()
|
|
llm_router.resolve_model_name_from_model_id.return_value = (
|
|
"gcp/google/veo-3.1-generate-001"
|
|
)
|
|
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"video_id": video_id},
|
|
route="/v1/videos/{video_id}",
|
|
llm_router=llm_router,
|
|
)
|
|
== "gcp/google/veo-3.1-generate-001"
|
|
)
|
|
llm_router.resolve_model_name_from_model_id.assert_called_once_with(
|
|
"veo-3.1-generate-001"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_resolves_character_id_model_with_router():
|
|
from litellm.types.videos.utils import encode_character_id_with_provider
|
|
|
|
character_id = encode_character_id_with_provider(
|
|
character_id="character-provider-id",
|
|
provider="vertex_ai",
|
|
model_id="veo-3.1-generate-001",
|
|
)
|
|
llm_router = MagicMock()
|
|
llm_router.resolve_model_name_from_model_id.return_value = (
|
|
"gcp/google/veo-3.1-generate-001"
|
|
)
|
|
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"character_id": character_id},
|
|
route="/v1/videos/characters/{character_id}",
|
|
llm_router=llm_router,
|
|
)
|
|
== "gcp/google/veo-3.1-generate-001"
|
|
)
|
|
llm_router.resolve_model_name_from_model_id.assert_called_once_with(
|
|
"veo-3.1-generate-001"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_only_runs_media_decoders_for_matching_fields():
|
|
with (
|
|
patch(
|
|
"litellm.types.videos.utils.decode_video_id_with_provider",
|
|
return_value={"model_id": "video-model"},
|
|
) as video_decoder,
|
|
patch(
|
|
"litellm.types.videos.utils.decode_character_id_with_provider",
|
|
return_value={"model_id": "character-model"},
|
|
) as character_decoder,
|
|
):
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"file_id": "file-provider-id"},
|
|
route="/v1/files/{file_id}",
|
|
)
|
|
is None
|
|
)
|
|
video_decoder.assert_not_called()
|
|
character_decoder.assert_not_called()
|
|
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"video_id": "video-provider-id"},
|
|
route="/v1/videos/{video_id}",
|
|
)
|
|
== "video-model"
|
|
)
|
|
video_decoder.assert_called_once_with("video-provider-id")
|
|
character_decoder.assert_not_called()
|
|
|
|
video_decoder.reset_mock()
|
|
character_decoder.reset_mock()
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"character_id": "character-provider-id"},
|
|
route="/v1/videos/{character_id}",
|
|
)
|
|
== "character-model"
|
|
)
|
|
video_decoder.assert_not_called()
|
|
character_decoder.assert_called_once_with("character-provider-id")
|
|
|
|
|
|
def test_get_model_from_request_handles_managed_id_decoder_failures():
|
|
with (
|
|
patch(
|
|
"litellm.proxy.openai_files_endpoints.common_utils.decode_model_from_file_id",
|
|
side_effect=Exception("decode failed"),
|
|
),
|
|
patch(
|
|
"litellm.llms.base_llm.managed_resources.utils.parse_unified_id",
|
|
side_effect=Exception("parse failed"),
|
|
),
|
|
patch(
|
|
"litellm.types.videos.utils.decode_video_id_with_provider",
|
|
side_effect=Exception("video decode failed"),
|
|
),
|
|
):
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"file_id": "not-a-managed-resource-id"},
|
|
route="/v1/files/{file_id}",
|
|
)
|
|
is None
|
|
)
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"video_id": "not-a-managed-resource-id"},
|
|
route="/v1/videos/{video_id}",
|
|
)
|
|
is None
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"route",
|
|
[
|
|
"/realtime/client_secrets",
|
|
"/v1/realtime/client_secrets",
|
|
"/openai/v1/realtime/client_secrets",
|
|
"/realtime/calls",
|
|
"/v1/realtime/calls",
|
|
"/openai/v1/realtime/calls",
|
|
],
|
|
)
|
|
def test_get_model_from_request_extracts_realtime_session_model(route):
|
|
"""The effective realtime model lives in ``session.model`` (not the
|
|
top-level ``model``). It must be surfaced so can_key_call_model() can
|
|
validate the model a restricted key is actually requesting.
|
|
|
|
Regression test for the model-access bypass on the GA Realtime WebRTC
|
|
HTTP routes (https://github.com/BerriAI/litellm/issues/29923).
|
|
"""
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"session": {"type": "realtime", "model": "gpt-realtime"}},
|
|
route=route,
|
|
)
|
|
== "gpt-realtime"
|
|
)
|
|
|
|
|
|
def test_get_model_from_request_realtime_includes_top_level_and_session_model():
|
|
"""When both top-level and session model are present, both are returned so
|
|
neither path can smuggle a disallowed model past the model-access check."""
|
|
models = get_model_from_request(
|
|
request_data={
|
|
"model": "gpt-4o-realtime-preview",
|
|
"session": {"type": "realtime", "model": "gpt-realtime"},
|
|
},
|
|
route="/v1/realtime/client_secrets",
|
|
)
|
|
assert models == ["gpt-4o-realtime-preview", "gpt-realtime"]
|
|
|
|
|
|
def test_get_model_from_request_ignores_session_model_on_non_realtime_routes():
|
|
"""A nested ``session.model`` must not leak into model resolution for
|
|
unrelated routes."""
|
|
assert (
|
|
get_model_from_request(
|
|
request_data={"session": {"type": "realtime", "model": "gpt-realtime"}},
|
|
route="/v1/chat/completions",
|
|
)
|
|
is None
|
|
)
|
|
|
|
|
|
def test_abbreviate_api_key():
|
|
assert abbreviate_api_key("sk-test-1234") == "sk-...1234"
|
|
|
|
|
|
def test_get_customer_user_header_returns_none_when_no_customer_role():
|
|
from litellm.proxy.auth.auth_utils import get_customer_user_header_from_mapping
|
|
|
|
mappings = [
|
|
{"header_name": "X-OpenWebUI-User-Id", "litellm_user_role": "internal_user"}
|
|
]
|
|
result = get_customer_user_header_from_mapping(mappings)
|
|
assert result is None
|
|
|
|
|
|
def test_get_customer_user_header_returns_none_for_single_non_customer_mapping():
|
|
from litellm.proxy.auth.auth_utils import get_customer_user_header_from_mapping
|
|
|
|
mapping = {"header_name": "X-Only-Internal", "litellm_user_role": "internal_user"}
|
|
result = get_customer_user_header_from_mapping(mapping)
|
|
assert result is None
|
|
|
|
|
|
def test_get_customer_user_header_from_mapping_returns_customer_header():
|
|
from litellm.proxy.auth.auth_utils import get_customer_user_header_from_mapping
|
|
|
|
mappings = [
|
|
{"header_name": "X-OpenWebUI-User-Id", "litellm_user_role": "internal_user"},
|
|
{"header_name": "X-OpenWebUI-User-Email", "litellm_user_role": "customer"},
|
|
]
|
|
result = get_customer_user_header_from_mapping(mappings)
|
|
assert result == ["x-openwebui-user-email"]
|
|
|
|
|
|
def test_get_customer_user_header_returns_customers_header_in_config_order_when_multiple_exist():
|
|
from litellm.proxy.auth.auth_utils import get_customer_user_header_from_mapping
|
|
|
|
mappings = [
|
|
{"header_name": "X-OpenWebUI-User-Id", "litellm_user_role": "internal_user"},
|
|
{"header_name": "X-OpenWebUI-User-Email", "litellm_user_role": "customer"},
|
|
{"header_name": "X-User-Id", "litellm_user_role": "customer"},
|
|
]
|
|
result = get_customer_user_header_from_mapping(mappings)
|
|
assert result == ["x-openwebui-user-email", "x-user-id"]
|
|
|
|
|
|
def test_get_end_user_id_returns_id_from_user_header_mappings():
|
|
from litellm.proxy.auth.auth_utils import get_end_user_id_from_request_body
|
|
|
|
mappings = [
|
|
{"header_name": "x-openwebui-user-id", "litellm_user_role": "internal_user"},
|
|
{"header_name": "x-openwebui-user-email", "litellm_user_role": "customer"},
|
|
]
|
|
general_settings = {"user_header_mappings": mappings}
|
|
headers = {"x-openwebui-user-email": "1234"}
|
|
|
|
with (
|
|
patch(
|
|
"litellm.proxy.auth.auth_utils._get_customer_id_from_standard_headers",
|
|
return_value=None,
|
|
),
|
|
patch("litellm.proxy.proxy_server.general_settings", general_settings),
|
|
):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body={}, request_headers=headers
|
|
)
|
|
|
|
assert result == "1234"
|
|
|
|
|
|
def test_get_end_user_id_returns_first_customer_header_when_multiple_mappings_exist():
|
|
from litellm.proxy.auth.auth_utils import get_end_user_id_from_request_body
|
|
|
|
mappings = [
|
|
{"header_name": "x-openwebui-user-id", "litellm_user_role": "internal_user"},
|
|
{"header_name": "x-user-id", "litellm_user_role": "customer"},
|
|
{"header_name": "x-openwebui-user-email", "litellm_user_role": "customer"},
|
|
]
|
|
general_settings = {"user_header_mappings": mappings}
|
|
headers = {
|
|
"x-user-id": "user-456",
|
|
"x-openwebui-user-email": "user@example.com",
|
|
}
|
|
|
|
with (
|
|
patch(
|
|
"litellm.proxy.auth.auth_utils._get_customer_id_from_standard_headers",
|
|
return_value=None,
|
|
),
|
|
patch("litellm.proxy.proxy_server.general_settings", general_settings),
|
|
):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body={}, request_headers=headers
|
|
)
|
|
|
|
assert result == "user-456"
|
|
|
|
|
|
def test_get_end_user_id_returns_none_when_no_customer_role_in_mappings():
|
|
from litellm.proxy.auth.auth_utils import get_end_user_id_from_request_body
|
|
|
|
mappings = [
|
|
{"header_name": "x-openwebui-user-id", "litellm_user_role": "internal_user"},
|
|
]
|
|
general_settings = {"user_header_mappings": mappings}
|
|
headers = {"x-openwebui-user-id": "user-789"}
|
|
|
|
with (
|
|
patch(
|
|
"litellm.proxy.auth.auth_utils._get_customer_id_from_standard_headers",
|
|
return_value=None,
|
|
),
|
|
patch("litellm.proxy.proxy_server.general_settings", general_settings),
|
|
):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body={}, request_headers=headers
|
|
)
|
|
|
|
assert result is None
|
|
|
|
|
|
def test_get_end_user_id_falls_back_to_deprecated_user_header_name():
|
|
from litellm.proxy.auth.auth_utils import get_end_user_id_from_request_body
|
|
|
|
general_settings = {"user_header_name": "x-custom-user-id"}
|
|
headers = {"x-custom-user-id": "user-legacy"}
|
|
|
|
with (
|
|
patch(
|
|
"litellm.proxy.auth.auth_utils._get_customer_id_from_standard_headers",
|
|
return_value=None,
|
|
),
|
|
patch("litellm.proxy.proxy_server.general_settings", general_settings),
|
|
):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body={}, request_headers=headers
|
|
)
|
|
|
|
assert result == "user-legacy"
|
|
|
|
|
|
class TestCoerceUserIdToStr:
|
|
"""Unit tests for the _coerce_user_id_to_str helper."""
|
|
|
|
def test_plain_string_is_returned_verbatim(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str("alice@example.com") == "alice@example.com"
|
|
|
|
def test_string_is_stripped(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str(" bob ") == "bob"
|
|
|
|
def test_codex_opaque_identifier_is_preserved(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
codex_id = (
|
|
"user_8a4a360c36621665b341e06fb76041d9b6def732bb183eea148d4abc9d97c1de"
|
|
"_account__session_a2bce4a5-8887-44ef-b491-fbf0a55c6569"
|
|
)
|
|
assert _coerce_user_id_to_str(codex_id) == codex_id
|
|
|
|
def test_none_returns_none(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str(None) is None
|
|
|
|
def test_empty_string_returns_none(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str("") is None
|
|
assert _coerce_user_id_to_str(" ") is None
|
|
|
|
def test_dict_returns_none(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
payload = {
|
|
"device_id": "abc",
|
|
"account_uuid": "",
|
|
"session_id": "c284b8cb",
|
|
}
|
|
assert _coerce_user_id_to_str(payload) is None
|
|
|
|
def test_list_returns_none(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str(["a", "b"]) is None
|
|
|
|
def test_json_encoded_dict_string_passes_through_by_default(self):
|
|
"""JSON-encoded dict strings are preserved unless opt-in flag is on.
|
|
|
|
This preserves backwards compatibility: existing deployments that
|
|
intentionally pass JSON-encoded user identifiers keep working.
|
|
"""
|
|
import litellm
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
blob = (
|
|
'{"device_id":"d5abe9199ee7759a0558974e9371e78c7b38d7621aae26d6609c1de61af6afb0",'
|
|
'"account_uuid":"","session_id":"c284b8cb-a050-4278-8599-cc4e016a10ab"}'
|
|
)
|
|
original = litellm.validate_end_user_id_in_db
|
|
litellm.validate_end_user_id_in_db = False
|
|
try:
|
|
assert _coerce_user_id_to_str(blob) == blob
|
|
finally:
|
|
litellm.validate_end_user_id_in_db = original
|
|
|
|
def test_json_encoded_dict_string_returns_none_when_validation_enabled(self):
|
|
import litellm
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
# Same broken shape we saw in spend logs, but pre-stringified to JSON.
|
|
blob = (
|
|
'{"device_id":"d5abe9199ee7759a0558974e9371e78c7b38d7621aae26d6609c1de61af6afb0",'
|
|
'"account_uuid":"","session_id":"c284b8cb-a050-4278-8599-cc4e016a10ab"}'
|
|
)
|
|
original = litellm.validate_end_user_id_in_db
|
|
litellm.validate_end_user_id_in_db = True
|
|
try:
|
|
assert _coerce_user_id_to_str(blob) is None
|
|
finally:
|
|
litellm.validate_end_user_id_in_db = original
|
|
|
|
def test_json_encoded_list_string_passes_through_by_default(self):
|
|
import litellm
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
original = litellm.validate_end_user_id_in_db
|
|
litellm.validate_end_user_id_in_db = False
|
|
try:
|
|
assert _coerce_user_id_to_str('["a","b"]') == '["a","b"]'
|
|
finally:
|
|
litellm.validate_end_user_id_in_db = original
|
|
|
|
def test_json_encoded_list_string_returns_none_when_validation_enabled(self):
|
|
import litellm
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
original = litellm.validate_end_user_id_in_db
|
|
litellm.validate_end_user_id_in_db = True
|
|
try:
|
|
assert _coerce_user_id_to_str('["a","b"]') is None
|
|
finally:
|
|
litellm.validate_end_user_id_in_db = original
|
|
|
|
def test_int_returns_str(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str(12345) == "12345"
|
|
|
|
def test_bool_returns_none(self):
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
# bool is an int subclass — reject explicitly, never produce "True"/"False".
|
|
assert _coerce_user_id_to_str(True) is None
|
|
assert _coerce_user_id_to_str(False) is None
|
|
|
|
def test_brace_string_that_isnt_json_is_kept(self):
|
|
"""A string starting with `{` but failing to parse stays as-is."""
|
|
from litellm.proxy.auth.auth_utils import _coerce_user_id_to_str
|
|
|
|
assert _coerce_user_id_to_str("{not json") == "{not json"
|
|
|
|
|
|
class TestGetEndUserIdDropsMalformedBodyValues:
|
|
"""Tests that get_end_user_id_from_request_body drops dict-shaped values
|
|
rather than stringifying them into spend logs."""
|
|
|
|
def test_dict_user_falls_through_to_litellm_metadata(self):
|
|
request_body = {
|
|
"user": {
|
|
"device_id": "abc",
|
|
"session_id": "c284b8cb",
|
|
},
|
|
"litellm_metadata": {"user": "alice@example.com"},
|
|
}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result == "alice@example.com"
|
|
|
|
def test_dict_user_with_no_other_sources_returns_none(self):
|
|
request_body = {
|
|
"user": {"device_id": "abc", "session_id": "xyz"},
|
|
}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result is None
|
|
|
|
def test_json_encoded_user_string_passes_through_by_default(self):
|
|
"""JSON-encoded user strings pass through unless validation is opted in.
|
|
|
|
Gating behind ``litellm.validate_end_user_id_in_db`` keeps existing
|
|
deployments that send JSON-encoded identifiers working until they
|
|
explicitly opt into the stricter extraction.
|
|
"""
|
|
import litellm
|
|
|
|
blob = (
|
|
'{"device_id":"d5abe9199ee7759a","account_uuid":"",'
|
|
'"session_id":"c284b8cb-a050-4278-8599-cc4e016a10ab"}'
|
|
)
|
|
request_body = {"user": blob}
|
|
|
|
original = litellm.validate_end_user_id_in_db
|
|
litellm.validate_end_user_id_in_db = False
|
|
try:
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
finally:
|
|
litellm.validate_end_user_id_in_db = original
|
|
|
|
assert result == blob
|
|
|
|
def test_json_encoded_user_string_returns_none_when_validation_enabled(self):
|
|
import litellm
|
|
|
|
request_body = {
|
|
"user": (
|
|
'{"device_id":"d5abe9199ee7759a","account_uuid":"",'
|
|
'"session_id":"c284b8cb-a050-4278-8599-cc4e016a10ab"}'
|
|
),
|
|
}
|
|
|
|
original = litellm.validate_end_user_id_in_db
|
|
litellm.validate_end_user_id_in_db = True
|
|
try:
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
finally:
|
|
litellm.validate_end_user_id_in_db = original
|
|
|
|
assert result is None
|
|
|
|
def test_plain_string_user_is_preserved(self):
|
|
request_body = {"user": "alice@example.com"}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result == "alice@example.com"
|
|
|
|
def test_codex_opaque_user_is_preserved(self):
|
|
codex_id = (
|
|
"user_8a4a360c36621665b341e06fb76041d9b6def732bb183eea148d4abc9d97c1de"
|
|
"_account__session_a2bce4a5-8887-44ef-b491-fbf0a55c6569"
|
|
)
|
|
request_body = {"user": codex_id}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result == codex_id
|
|
|
|
def test_int_user_is_coerced_to_string(self):
|
|
request_body = {"user": 12345}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result == "12345"
|
|
|
|
def test_list_user_falls_through(self):
|
|
request_body = {
|
|
"user": ["a", "b"],
|
|
"safety_identifier": "alice@example.com",
|
|
}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result == "alice@example.com"
|
|
|
|
def test_dict_safety_identifier_returns_none(self):
|
|
request_body = {
|
|
"safety_identifier": {"device_id": "abc"},
|
|
}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result is None
|
|
|
|
def test_dict_metadata_user_id_returns_none(self):
|
|
request_body = {
|
|
"metadata": {"user_id": {"device_id": "abc"}},
|
|
}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result is None
|
|
|
|
def test_whitespace_user_falls_through(self):
|
|
request_body = {"user": " ", "safety_identifier": "alice@example.com"}
|
|
|
|
with patch("litellm.proxy.proxy_server.general_settings", {}):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers={}
|
|
)
|
|
|
|
assert result == "alice@example.com"
|
|
|
|
def test_dict_user_header_falls_through_to_body(self):
|
|
"""A dict-shaped value in a configured user-id header is dropped, not stringified."""
|
|
general_settings = {"user_header_name": "x-custom-user-id"}
|
|
# A header value will normally be a str, but be defensive: the coercion
|
|
# must drop anything that isn't a usable identifier.
|
|
headers = {"x-custom-user-id": {"device_id": "abc"}}
|
|
request_body = {"user": "alice@example.com"}
|
|
|
|
with (
|
|
patch(
|
|
"litellm.proxy.auth.auth_utils._get_customer_id_from_standard_headers",
|
|
return_value=None,
|
|
),
|
|
patch("litellm.proxy.proxy_server.general_settings", general_settings),
|
|
):
|
|
result = get_end_user_id_from_request_body(
|
|
request_body=request_body, request_headers=headers
|
|
)
|
|
|
|
assert result == "alice@example.com"
|
|
|
|
|
|
def _make_deployment_dict(
|
|
model_name: str, tpm: Optional[int] = None, rpm: Optional[int] = None
|
|
) -> dict:
|
|
"""Helper to build a minimal deployment dict as returned by router.get_model_list."""
|
|
litellm_params: dict = {"model": model_name}
|
|
if tpm is not None:
|
|
litellm_params["default_api_key_tpm_limit"] = tpm
|
|
if rpm is not None:
|
|
litellm_params["default_api_key_rpm_limit"] = rpm
|
|
return {"model_name": model_name, "litellm_params": litellm_params}
|
|
|
|
|
|
_ROUTER_PATCH = "litellm.proxy.proxy_server.llm_router"
|
|
|
|
|
|
class TestDeploymentDefaultRpmLimit:
|
|
"""Tests for deployment default_api_key_rpm_limit fallback in get_key_model_rpm_limit."""
|
|
|
|
def test_returns_deployment_default_when_key_has_no_limits(self):
|
|
"""Case 2 from spec: key has no model-specific limits, falls back to deployment default."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", rpm=200)
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 200}
|
|
|
|
def test_key_model_limit_takes_priority_over_deployment_default(self):
|
|
"""Case 1 from spec: key model-specific limit wins over deployment default."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={"model_rpm_limit": {"model1": 10}},
|
|
)
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", rpm=200)
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 10}
|
|
|
|
def test_returns_none_when_no_deployment_default_and_no_key_limits(self):
|
|
"""Returns None when neither the key nor the deployment has any rpm limit."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1") # no rpm default
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result is None
|
|
|
|
def test_returns_none_without_model_name_even_when_deployment_has_default(self):
|
|
"""No model_name means deployment fallback is skipped."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", rpm=200)
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
def test_returns_none_when_llm_router_is_none(self):
|
|
"""No router means deployment fallback returns None gracefully."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
with patch(_ROUTER_PATCH, None):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result is None
|
|
|
|
def test_returns_minimum_across_multiple_deployments(self):
|
|
"""When multiple deployments share a model name, the minimum rpm limit is used."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", rpm=200),
|
|
_make_deployment_dict("model1", rpm=50),
|
|
_make_deployment_dict("model1", rpm=150),
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 50}
|
|
|
|
def test_ignores_deployments_without_default_when_others_have_it(self):
|
|
"""Deployments missing the field are skipped; min is taken over those that have it."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1"), # no rpm default
|
|
_make_deployment_dict("model1", rpm=75),
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 75}
|
|
|
|
def test_skips_deployments_with_malformed_limit_value(self):
|
|
"""Deployments with non-integer-parseable limit values are skipped without raising."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
{
|
|
"model_name": "model1",
|
|
"litellm_params": {"default_api_key_rpm_limit": "not-a-number"},
|
|
},
|
|
_make_deployment_dict("model1", rpm=100),
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_rpm_limit(user_api_key_dict, model_name="model1")
|
|
# The malformed deployment is skipped; the valid one provides 100
|
|
assert result == {"model1": 100}
|
|
|
|
|
|
class TestDeploymentDefaultTpmLimit:
|
|
"""Tests for deployment default_api_key_tpm_limit fallback in get_key_model_tpm_limit."""
|
|
|
|
def test_returns_deployment_default_when_key_has_no_limits(self):
|
|
"""Case 2 from spec: key has no model-specific limits, falls back to deployment default."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", tpm=100)
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 100}
|
|
|
|
def test_key_model_limit_takes_priority_over_deployment_default(self):
|
|
"""Case 1 from spec: key model-specific limit wins over deployment default."""
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
metadata={"model_tpm_limit": {"model1": 20}},
|
|
)
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", tpm=100)
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 20}
|
|
|
|
def test_returns_none_when_no_deployment_default_and_no_key_limits(self):
|
|
"""Returns None when neither the key nor the deployment has any tpm limit."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1") # no tpm default
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result is None
|
|
|
|
def test_returns_none_without_model_name_even_when_deployment_has_default(self):
|
|
"""No model_name means deployment fallback is skipped."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", tpm=100)
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
def test_returns_none_when_llm_router_is_none(self):
|
|
"""No router means deployment fallback returns None gracefully."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
with patch(_ROUTER_PATCH, None):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result is None
|
|
|
|
def test_returns_minimum_across_multiple_deployments(self):
|
|
"""When multiple deployments share a model name, the minimum tpm limit is used."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1", tpm=1000),
|
|
_make_deployment_dict("model1", tpm=300),
|
|
_make_deployment_dict("model1", tpm=700),
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 300}
|
|
|
|
def test_ignores_deployments_without_default_when_others_have_it(self):
|
|
"""Deployments missing the field are skipped; min is taken over those that have it."""
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
mock_router = MagicMock()
|
|
mock_router.get_model_list.return_value = [
|
|
_make_deployment_dict("model1"), # no tpm default
|
|
_make_deployment_dict("model1", tpm=400),
|
|
]
|
|
with patch(_ROUTER_PATCH, mock_router):
|
|
result = get_key_model_tpm_limit(user_api_key_dict, model_name="model1")
|
|
assert result == {"model1": 400}
|
|
|
|
|
|
class TestGetProjectModelRpmLimit:
|
|
"""Tests for get_project_model_rpm_limit function."""
|
|
|
|
def test_returns_project_metadata_rpm_limit(self):
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
project_metadata={"model_rpm_limit": {"gpt-4": 200}},
|
|
)
|
|
result = get_project_model_rpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 200}
|
|
|
|
def test_returns_none_when_no_project_metadata(self):
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
result = get_project_model_rpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
def test_returns_none_when_project_metadata_missing_key(self):
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
project_metadata={"other_key": "value"},
|
|
)
|
|
result = get_project_model_rpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
|
|
class TestGetProjectModelTpmLimit:
|
|
"""Tests for get_project_model_tpm_limit function."""
|
|
|
|
def test_returns_project_metadata_tpm_limit(self):
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
project_metadata={"model_tpm_limit": {"gpt-4": 50000}},
|
|
)
|
|
result = get_project_model_tpm_limit(user_api_key_dict)
|
|
assert result == {"gpt-4": 50000}
|
|
|
|
def test_returns_none_when_no_project_metadata(self):
|
|
user_api_key_dict = UserAPIKeyAuth(api_key="sk-123")
|
|
result = get_project_model_tpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
def test_returns_none_when_project_metadata_missing_key(self):
|
|
user_api_key_dict = UserAPIKeyAuth(
|
|
api_key="sk-123",
|
|
project_metadata={"other_key": "value"},
|
|
)
|
|
result = get_project_model_tpm_limit(user_api_key_dict)
|
|
assert result is None
|
|
|
|
|
|
class TestCheckCompleteCredentials:
|
|
"""Tests for the api_key validation in check_complete_credentials."""
|
|
|
|
def test_returns_false_when_api_key_missing(self):
|
|
result = check_complete_credentials({"model": "gpt-4"})
|
|
assert result is False
|
|
|
|
def test_returns_false_when_api_key_is_none(self):
|
|
result = check_complete_credentials({"model": "gpt-4", "api_key": None})
|
|
assert result is False
|
|
|
|
def test_returns_false_when_api_key_is_empty_string(self):
|
|
result = check_complete_credentials({"model": "gpt-4", "api_key": ""})
|
|
assert result is False
|
|
|
|
def test_returns_false_when_api_key_is_whitespace(self):
|
|
result = check_complete_credentials({"model": "gpt-4", "api_key": " "})
|
|
assert result is False
|
|
|
|
def test_returns_true_when_api_key_is_valid(self):
|
|
result = check_complete_credentials({"model": "gpt-4", "api_key": "sk-valid"})
|
|
assert result is True
|
|
|
|
|
|
class TestCheckCompleteCredentialsBlocksSSRF:
|
|
"""
|
|
Even with credentials supplied, ``api_base`` / ``base_url`` must not
|
|
point at private / internal / cloud-metadata addresses. Without this
|
|
the gate accepts ``api_key=anything`` plus a malicious target and the
|
|
proxy is used as an SSRF pivot.
|
|
|
|
The check only runs when ``litellm.user_url_validation`` is True, so
|
|
every test in this class flips the toggle. Tests stay mock-only — no
|
|
real DNS is performed.
|
|
"""
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _enable_url_validation(self, monkeypatch):
|
|
import litellm
|
|
|
|
monkeypatch.setattr(litellm, "user_url_validation", True, raising=False)
|
|
|
|
@pytest.mark.parametrize(
|
|
"url_field",
|
|
["api_base", "base_url"],
|
|
)
|
|
@pytest.mark.parametrize(
|
|
"blocked_url",
|
|
[
|
|
"http://169.254.169.254/latest/meta-data/iam/security-credentials/",
|
|
"http://metadata.google.internal/computeMetadata/v1/",
|
|
"http://127.0.0.1:8080/admin",
|
|
"http://10.0.0.1/",
|
|
"http://192.168.1.1/",
|
|
],
|
|
)
|
|
def test_rejects_private_or_metadata_targets(self, url_field, blocked_url):
|
|
from litellm.litellm_core_utils.url_utils import SSRFError
|
|
|
|
with patch(
|
|
"litellm.proxy.auth.auth_utils.validate_url",
|
|
side_effect=SSRFError(f"blocked: {blocked_url}"),
|
|
):
|
|
with pytest.raises(ValueError) as exc_info:
|
|
check_complete_credentials(
|
|
{
|
|
"model": "gpt-4",
|
|
"api_key": "sk-some-clientside-key",
|
|
url_field: blocked_url,
|
|
}
|
|
)
|
|
assert url_field in str(exc_info.value)
|
|
assert "SSRF" in str(exc_info.value)
|
|
|
|
def test_allows_public_target_when_validate_url_passes(self):
|
|
# ``validate_url`` is mocked so no real DNS is performed.
|
|
with patch(
|
|
"litellm.proxy.auth.auth_utils.validate_url",
|
|
return_value=("https://api.openai.com/v1", "api.openai.com"),
|
|
):
|
|
result = check_complete_credentials(
|
|
{
|
|
"model": "gpt-4",
|
|
"api_key": "sk-some-clientside-key",
|
|
"api_base": "https://api.openai.com/v1",
|
|
}
|
|
)
|
|
assert result is True
|
|
|
|
def test_skips_url_validation_when_toggle_is_off(self, monkeypatch):
|
|
# Admins who disable ``user_url_validation`` (default) should not
|
|
# have requests rejected at the proxy boundary even if the URL
|
|
# would fail the SSRF guard.
|
|
import litellm
|
|
|
|
monkeypatch.setattr(litellm, "user_url_validation", False, raising=False)
|
|
with patch(
|
|
"litellm.proxy.auth.auth_utils.validate_url",
|
|
) as mocked:
|
|
result = check_complete_credentials(
|
|
{
|
|
"model": "gpt-4",
|
|
"api_key": "sk-some-clientside-key",
|
|
"api_base": "http://127.0.0.1:8080/admin",
|
|
}
|
|
)
|
|
assert result is True
|
|
mocked.assert_not_called()
|
|
|
|
|
|
class TestGetDynamicLitellmParamsClearsAdminConfigOnBaseOverride:
|
|
"""
|
|
When the caller redirects ``api_base`` / ``base_url`` to their own
|
|
server, admin-set fields like ``OpenAI-Organization``, ``extra_body``,
|
|
AWS / Vertex / Azure tokens, and per-deployment ``api_version`` must
|
|
NOT flow through to that destination.
|
|
"""
|
|
|
|
def test_clears_admin_organization_and_extra_body_on_base_override(self):
|
|
from litellm.router_utils.clientside_credential_handler import (
|
|
get_dynamic_litellm_params,
|
|
)
|
|
|
|
admin_params = {
|
|
"model": "gpt-4",
|
|
"api_key": "sk-admin-key",
|
|
"api_base": "https://admin.upstream/v1",
|
|
"organization": "org-admin-corp",
|
|
"extra_body": {"x-admin-secret": "super-secret"},
|
|
"api_version": "2026-04-01",
|
|
}
|
|
out = get_dynamic_litellm_params(
|
|
litellm_params=dict(admin_params),
|
|
request_kwargs={
|
|
"api_key": "sk-attacker",
|
|
"api_base": "https://attacker.example",
|
|
},
|
|
)
|
|
assert out["api_base"] == "https://attacker.example"
|
|
assert out["api_key"] == "sk-attacker"
|
|
assert "organization" not in out
|
|
assert "extra_body" not in out
|
|
assert "api_version" not in out
|
|
|
|
def test_clears_aws_and_vertex_secrets_on_base_override(self):
|
|
from litellm.router_utils.clientside_credential_handler import (
|
|
get_dynamic_litellm_params,
|
|
)
|
|
|
|
admin_params = {
|
|
"model": "bedrock/claude-3",
|
|
"aws_access_key_id": "AKIA-EXAMPLE",
|
|
"aws_secret_access_key": "secret-example",
|
|
"aws_session_token": "session-example",
|
|
"vertex_credentials": '{"private_key":"-----BEGIN..."}',
|
|
"vertex_project": "admin-gcp-project",
|
|
}
|
|
out = get_dynamic_litellm_params(
|
|
litellm_params=dict(admin_params),
|
|
request_kwargs={"base_url": "https://attacker.example"},
|
|
)
|
|
assert "aws_access_key_id" not in out
|
|
assert "aws_secret_access_key" not in out
|
|
assert "aws_session_token" not in out
|
|
assert "vertex_credentials" not in out
|
|
assert "vertex_project" not in out
|
|
|
|
def test_caller_resupplied_value_overrides_admin_value_on_base_override(self):
|
|
# When the caller redirects ``api_base`` and *also* supplies their
|
|
# own value for one of the admin fields (e.g. ``organization``),
|
|
# the caller's value must win — never the admin's. The naive
|
|
# ``if field not in request_kwargs: pop`` shape lets a caller echo
|
|
# the field name with any value (or empty string) to keep the
|
|
# admin's value forwarded, which is the exfiltration vector this
|
|
# test guards against.
|
|
from litellm.router_utils.clientside_credential_handler import (
|
|
get_dynamic_litellm_params,
|
|
)
|
|
|
|
out = get_dynamic_litellm_params(
|
|
litellm_params={
|
|
"api_base": "https://admin.upstream/v1",
|
|
"organization": "org-admin",
|
|
"extra_body": {"admin": "value"},
|
|
},
|
|
request_kwargs={
|
|
"api_base": "https://attacker.example",
|
|
"organization": "org-attacker",
|
|
"extra_body": {"attacker": "value"},
|
|
},
|
|
)
|
|
assert out["organization"] == "org-attacker"
|
|
assert out["extra_body"] == {"attacker": "value"}
|
|
|
|
def test_field_echo_does_not_preserve_admin_value(self):
|
|
# Regression: a caller that echoes an admin-config field name with
|
|
# an *empty* value (or any value) must not be able to keep the
|
|
# admin's value in ``litellm_params``.
|
|
from litellm.router_utils.clientside_credential_handler import (
|
|
get_dynamic_litellm_params,
|
|
)
|
|
|
|
out = get_dynamic_litellm_params(
|
|
litellm_params={
|
|
"api_base": "https://admin.upstream/v1",
|
|
"organization": "org-admin-secret",
|
|
"extra_body": {"x-admin-only": "secret"},
|
|
},
|
|
request_kwargs={
|
|
"api_base": "https://attacker.example",
|
|
"organization": "",
|
|
"extra_body": "",
|
|
},
|
|
)
|
|
assert out["organization"] == ""
|
|
assert out["extra_body"] == ""
|
|
assert "org-admin-secret" not in str(out)
|
|
|
|
def test_no_clearing_when_only_api_key_overridden(self):
|
|
from litellm.router_utils.clientside_credential_handler import (
|
|
get_dynamic_litellm_params,
|
|
)
|
|
|
|
# Caller only overrides api_key (BYOK pattern); admin's organization /
|
|
# extra_body / region still apply because the destination is unchanged.
|
|
out = get_dynamic_litellm_params(
|
|
litellm_params={
|
|
"api_base": "https://admin.upstream/v1",
|
|
"organization": "org-admin",
|
|
"api_version": "2026-04-01",
|
|
},
|
|
request_kwargs={"api_key": "sk-byok"},
|
|
)
|
|
assert out["organization"] == "org-admin"
|
|
assert out["api_version"] == "2026-04-01"
|
|
assert out["api_base"] == "https://admin.upstream/v1"
|
|
|
|
|
|
class TestIsRequestBodySafeBlocksEndpointTargetingFields:
|
|
"""
|
|
``is_request_body_safe`` rejects request-body fields that retarget the
|
|
outbound request to a caller-controlled host. Beyond the original
|
|
``api_base`` / ``base_url``, the same protection must apply to:
|
|
|
|
* ``aws_bedrock_runtime_endpoint`` — Bedrock endpoint redirect; an
|
|
attacker-controlled value coerces the proxy to authenticate against
|
|
their host with the admin's AWS creds.
|
|
* ``langsmith_base_url`` — Langsmith callback host; attacker-controlled
|
|
values exfiltrate the entire request payload (incl. message content)
|
|
via the observability hook.
|
|
* ``langfuse_host`` — same exfil vector via the Langfuse hook.
|
|
"""
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _disable_url_validation(self, monkeypatch):
|
|
# The new banned-params entries should be rejected even when
|
|
# ``user_url_validation`` is off — the gate isn't the URL guard,
|
|
# it's the banned-params list.
|
|
import litellm
|
|
|
|
monkeypatch.setattr(litellm, "user_url_validation", False, raising=False)
|
|
|
|
@pytest.mark.parametrize(
|
|
"field",
|
|
[
|
|
"aws_bedrock_runtime_endpoint",
|
|
"langsmith_base_url",
|
|
"langfuse_host",
|
|
"posthog_host",
|
|
"braintrust_host",
|
|
"slack_webhook_url",
|
|
"s3_endpoint_url",
|
|
"sagemaker_base_url",
|
|
"deployment_url",
|
|
],
|
|
)
|
|
def test_endpoint_targeting_field_in_request_body_is_rejected(self, field):
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={"model": "gpt-4", field: "https://attacker.example"},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
# The function lists the offending param name in the error.
|
|
assert field in str(exc.value)
|
|
|
|
@pytest.mark.parametrize(
|
|
"field",
|
|
["api_base", "base_url", "user_config", "langfuse_host", "slack_webhook_url"],
|
|
)
|
|
def test_api_key_does_not_bypass_blocklist(self, field):
|
|
# Regression: the historical ``check_complete_credentials`` clause
|
|
# made the entire blocklist a no-op for any caller that supplied
|
|
# a non-empty ``api_key``. That bypass turned every missing entry
|
|
# on the blocklist into an SSRF / credential-exfil hole. Verify
|
|
# that supplying an api_key (alongside the banned param) does NOT
|
|
# bypass the gate — it can only be opened by an admin opt-in.
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
"api_key": "sk-anything",
|
|
field: "https://attacker.example",
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
assert field in str(exc.value)
|
|
|
|
def test_admin_opt_in_proxy_wide_still_allows(self):
|
|
# ``general_settings.allow_client_side_credentials = True`` remains
|
|
# the documented proxy-wide BYOK opt-in.
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={"model": "gpt-4", "api_base": "https://my-byok.example"},
|
|
general_settings={"allow_client_side_credentials": True},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
is True
|
|
)
|
|
|
|
|
|
class TestIsRequestBodySafeBlocksBedrockProjectOverride:
|
|
"""``aws_bedrock_project_id`` pins a deployment to a Bedrock project so
|
|
that project's data-retention policy applies to its requests. A
|
|
caller-supplied value would run the request under any project reachable
|
|
with the deployment's shared AWS credentials, bypassing the configured
|
|
retention/accounting association."""
|
|
|
|
def test_project_id_in_request_body_is_rejected(self):
|
|
with pytest.raises(ValueError, match="aws_bedrock_project_id"):
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
"aws_bedrock_project_id": "proj_attacker000000",
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
|
|
def test_admin_opt_in_proxy_wide_allows_project_id(self):
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
"aws_bedrock_project_id": "proj_byok000000",
|
|
},
|
|
general_settings={"allow_client_side_credentials": True},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
is True
|
|
)
|
|
|
|
|
|
# ── is_request_body_safe nested-config recursion (VERIA-6) ────────────────────
|
|
|
|
|
|
class TestIsRequestBodySafeNestedConfig:
|
|
"""The Milvus vector store transformer unpacks
|
|
``litellm_embedding_config`` as ``**kwargs`` into ``litellm.embedding(...)``
|
|
— same SSRF / credential-exfil surface as a top-level ``api_base`` in
|
|
the request body. ``is_request_body_safe`` must recurse into this
|
|
nested dict so a banned param can't be smuggled in via nesting."""
|
|
|
|
def test_root_level_api_base_blocked_when_no_opt_in(self):
|
|
"""Sanity check: pre-existing root-level enforcement still works."""
|
|
with pytest.raises(ValueError, match="api_base"):
|
|
is_request_body_safe(
|
|
request_body={"api_base": "https://attacker.example.com"},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
|
|
def test_nested_api_base_in_embedding_config_blocked(self):
|
|
"""Smuggling ``api_base`` inside ``litellm_embedding_config`` is
|
|
the VERIA-6 bypass — must be blocked by the recursive check."""
|
|
with pytest.raises(ValueError, match="api_base"):
|
|
is_request_body_safe(
|
|
request_body={
|
|
"litellm_embedding_config": {
|
|
"api_base": "https://attacker.example.com",
|
|
"api_key": "leaked-key",
|
|
}
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="milvus-store",
|
|
)
|
|
|
|
def test_nested_langfuse_host_in_embedding_config_blocked(self):
|
|
"""The recursion uses the *full* banned-param list, not a special
|
|
subset — so any flag that's banned at the root is also banned
|
|
when nested."""
|
|
with pytest.raises(ValueError, match="langfuse_host"):
|
|
is_request_body_safe(
|
|
request_body={
|
|
"litellm_embedding_config": {
|
|
"langfuse_host": "https://attacker.example.com"
|
|
}
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="milvus-store",
|
|
)
|
|
|
|
def test_nested_api_base_allowed_when_admin_opts_in(self):
|
|
"""Admins who explicitly enable client-side credential passthrough
|
|
keep the existing escape hatch — same UX as for root-level."""
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={
|
|
"litellm_embedding_config": {
|
|
"api_base": "https://my-azure.example.com"
|
|
}
|
|
},
|
|
general_settings={"allow_client_side_credentials": True},
|
|
llm_router=None,
|
|
model="milvus-store",
|
|
)
|
|
is True
|
|
)
|
|
|
|
def test_safe_nested_config_accepted(self):
|
|
"""A nested config without any banned params passes — there's no
|
|
false-positive on legitimate ``api_version`` / model params."""
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={
|
|
"litellm_embedding_config": {
|
|
"api_version": "2024-02-15-preview",
|
|
}
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="milvus-store",
|
|
)
|
|
is True
|
|
)
|
|
|
|
def test_non_dict_nested_config_does_not_break_check(self):
|
|
"""A bogus type for ``litellm_embedding_config`` (string, list,
|
|
None) must not crash the validator — it should just fall through."""
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={"litellm_embedding_config": "not-a-dict"},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="x",
|
|
)
|
|
is True
|
|
)
|
|
|
|
def test_deeply_nested_config_does_not_recurse(self):
|
|
"""Greptile P1: ``is_request_body_safe`` is iterative single-level —
|
|
a deeply-nested ``litellm_embedding_config`` cannot exhaust the
|
|
Python call stack to trigger a 500 ``RecursionError``. Build a
|
|
body 1000 levels deep; the validator must complete in O(1)
|
|
descent."""
|
|
body = {"litellm_embedding_config": {}}
|
|
cur = body["litellm_embedding_config"]
|
|
for _ in range(1000):
|
|
cur["litellm_embedding_config"] = {}
|
|
cur = cur["litellm_embedding_config"]
|
|
# Banned param at the deepest level shouldn't be reached — single
|
|
# level only.
|
|
cur["api_base"] = "https://attacker.example.com"
|
|
|
|
# No exception raised: deeper levels aren't checked.
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body=body,
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="x",
|
|
)
|
|
is True
|
|
)
|
|
|
|
|
|
# ── observability-callback ban (root + metadata) ───────────────────────────
|
|
|
|
|
|
class TestObservabilityCallbackBans:
|
|
"""The proxy must reject observability credentials, hosts, and project
|
|
identifiers regardless of whether they arrive at the request body root,
|
|
in ``metadata`` / ``litellm_metadata``, or in a JSON-string-encoded
|
|
metadata blob (multipart/``extra_body`` path).
|
|
|
|
The ban list is derived from
|
|
``litellm.litellm_core_utils.initialize_dynamic_callback_params._supported_callback_params``
|
|
minus a small ``_SAFE_CLIENT_CALLBACK_PARAMS`` allow-list, plus
|
|
``_EXTRA_BANNED_OBSERVABILITY_PARAMS`` for fields integrations read but
|
|
that are not yet in the canonical allow-list. The derivation keeps the
|
|
proxy in sync as new integrations are added.
|
|
"""
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _disable_url_validation(self, monkeypatch):
|
|
import litellm
|
|
|
|
monkeypatch.setattr(litellm, "user_url_validation", False, raising=False)
|
|
|
|
@pytest.mark.parametrize(
|
|
"field",
|
|
[
|
|
"langfuse_public_key",
|
|
"langfuse_secret",
|
|
"langfuse_secret_key",
|
|
"langsmith_api_key",
|
|
"langsmith_project",
|
|
"langsmith_tenant_id",
|
|
"arize_api_key",
|
|
"arize_space_key",
|
|
"arize_space_id",
|
|
"posthog_api_key",
|
|
"posthog_api_url",
|
|
"braintrust_api_key",
|
|
"braintrust_project",
|
|
"phoenix_project_name",
|
|
"phoenix_project_name_override",
|
|
"wandb_api_key",
|
|
"weave_project_id",
|
|
"gcs_bucket_name",
|
|
"gcs_path_service_account",
|
|
"humanloop_api_key",
|
|
"lunary_public_key",
|
|
],
|
|
)
|
|
def test_observability_field_in_request_body_root_is_rejected(self, field):
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={"model": "gpt-4", field: "attacker-value"},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
assert field in str(exc.value)
|
|
|
|
@pytest.mark.parametrize(
|
|
"metadata_key",
|
|
["metadata", "litellm_metadata"],
|
|
)
|
|
@pytest.mark.parametrize(
|
|
"field",
|
|
[
|
|
"langfuse_host",
|
|
"langfuse_secret_key",
|
|
"langsmith_api_key",
|
|
"posthog_api_url",
|
|
"braintrust_project",
|
|
"phoenix_project_name",
|
|
"phoenix_project_name_override",
|
|
],
|
|
)
|
|
def test_observability_field_in_metadata_dict_is_rejected(
|
|
self, metadata_key, field
|
|
):
|
|
# Verifies the metadata walk: a value smuggled inside ``metadata``
|
|
# or ``litellm_metadata`` is just as dangerous as the same field
|
|
# at the body root, and must hit the same gate.
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
metadata_key: {field: "attacker-value"},
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
assert field in str(exc.value)
|
|
|
|
@pytest.mark.parametrize(
|
|
"metadata_key",
|
|
["metadata", "litellm_metadata"],
|
|
)
|
|
def test_observability_field_in_json_string_metadata_is_rejected(
|
|
self, metadata_key
|
|
):
|
|
# Multipart/form-data and ``extra_body`` callers send metadata as a
|
|
# JSON-encoded string. The bouncer parses it before applying the
|
|
# banned-params check so the JSON-string path can't smuggle past
|
|
# the ``isinstance(dict)`` guard.
|
|
import json
|
|
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
metadata_key: json.dumps(
|
|
{"langfuse_host": "https://attacker.example"}
|
|
),
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
assert "langfuse_host" in str(exc.value)
|
|
|
|
def test_admin_opt_in_allows_metadata_credential_passthrough(self):
|
|
# The opt-in gate covers the metadata path the same way it covers
|
|
# the root path — operators running BYO observability with
|
|
# clientside creds flip a single flag and both paths work.
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
"metadata": {
|
|
"langfuse_host": "https://my-langfuse.example",
|
|
"langfuse_public_key": "pk-mine",
|
|
"langfuse_secret_key": "sk-mine",
|
|
},
|
|
},
|
|
general_settings={"allow_client_side_credentials": True},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
is True
|
|
)
|
|
|
|
def test_safe_per_request_observability_metadata_is_allowed(self):
|
|
# Informational fields (sampling rate, prompt version) describe
|
|
# the request being logged — they don't choose the destination or
|
|
# credentials, so they must remain accepted from clients without
|
|
# the opt-in flag.
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
"metadata": {
|
|
"langfuse_prompt_version": "v2",
|
|
"langsmith_sampling_rate": 0.1,
|
|
},
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
is True
|
|
)
|
|
|
|
|
|
def test_model_level_allow_does_not_skip_subsequent_banned_params(monkeypatch):
|
|
"""Greptile P1: ``_check_banned_params`` previously ``return``-ed when a
|
|
deployment's ``configurable_clientside_auth_params`` permitted one
|
|
banned field, exiting before any later banned field in the same body
|
|
was checked. The metadata walk this PR adds multiplies the surface
|
|
where that bypass matters: a body pairing a model-level-allowed
|
|
``api_base`` with an observability credential like ``langfuse_host``
|
|
must still reject on the second field, not silently pass."""
|
|
from litellm.proxy.auth import auth_utils
|
|
|
|
monkeypatch.setattr(
|
|
auth_utils,
|
|
"_allow_model_level_clientside_configurable_parameters",
|
|
lambda model, param, request_body_value, llm_router: param == "api_base",
|
|
)
|
|
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={
|
|
"model": "gpt-4",
|
|
"api_base": "https://allowed-by-deployment.example",
|
|
"langfuse_host": "https://attacker.example",
|
|
},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
assert "langfuse_host" in str(exc.value)
|
|
|
|
|
|
def test_observability_ban_covers_canonical_supported_callback_params():
|
|
"""Guard test: every entry in the canonical
|
|
``_supported_callback_params`` allow-list must end up either banned by
|
|
the proxy or explicitly safe-listed. New integrations added to that
|
|
list are banned by default (the safe failure mode); flagging them as
|
|
safe is an explicit decision recorded in
|
|
``_SAFE_CLIENT_CALLBACK_PARAMS``."""
|
|
from litellm.litellm_core_utils.initialize_dynamic_callback_params import (
|
|
_request_blocked_callback_params,
|
|
_supported_callback_params,
|
|
)
|
|
from litellm.proxy.auth.auth_utils import (
|
|
_BANNED_REQUEST_BODY_PARAMS,
|
|
_SAFE_CLIENT_CALLBACK_PARAMS,
|
|
)
|
|
|
|
banned = set(_BANNED_REQUEST_BODY_PARAMS)
|
|
for param in _supported_callback_params:
|
|
assert param in banned or param in _SAFE_CLIENT_CALLBACK_PARAMS, (
|
|
f"{param} is in _supported_callback_params but neither banned nor "
|
|
f"safe-listed. Add it to _SAFE_CLIENT_CALLBACK_PARAMS if it is an "
|
|
f"informational per-request field; otherwise the derivation will "
|
|
f"ban it automatically."
|
|
)
|
|
for param in _request_blocked_callback_params:
|
|
assert param in banned, (
|
|
f"{param} is in _request_blocked_callback_params but is not banned "
|
|
"at the proxy request-body boundary."
|
|
)
|
|
|
|
|
|
# ── pricing injection (global model cost registry poisoning) ──────────────────
|
|
|
|
|
|
class TestPricingInjectionBlocked:
|
|
"""Authenticated clients must not be able to mutate the global
|
|
litellm.model_cost registry by supplying pricing fields in the request
|
|
body. Any CustomPricingLiteLLMParams field (input_cost_per_token etc.)
|
|
passed to completion() is forwarded to register_model(), which overwrites
|
|
the shared global dict for ALL users on the instance.
|
|
|
|
Fix: all CustomPricingLiteLLMParams fields are in _BANNED_REQUEST_BODY_PARAMS,
|
|
so is_request_body_safe() rejects them before they reach completion().
|
|
"""
|
|
|
|
@pytest.mark.parametrize(
|
|
"field,value",
|
|
[
|
|
("input_cost_per_token", -0.01),
|
|
("output_cost_per_token", 0.0),
|
|
("input_cost_per_second", 999.0),
|
|
("output_cost_per_second", -1.0),
|
|
("cache_read_input_token_cost", 0.0),
|
|
("cache_creation_input_token_cost", -0.05),
|
|
],
|
|
)
|
|
def test_pricing_field_rejected_by_default(self, field, value):
|
|
with pytest.raises(ValueError) as exc:
|
|
is_request_body_safe(
|
|
request_body={"model": "gpt-4", field: value},
|
|
general_settings={},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
assert field in str(exc.value)
|
|
|
|
def test_all_custom_pricing_fields_are_banned(self):
|
|
from litellm.proxy.auth.auth_utils import _BANNED_REQUEST_BODY_PARAMS
|
|
from litellm.types.utils import CustomPricingLiteLLMParams
|
|
|
|
banned = set(_BANNED_REQUEST_BODY_PARAMS)
|
|
for field in CustomPricingLiteLLMParams.model_fields:
|
|
assert field in banned, (
|
|
f"CustomPricingLiteLLMParams.{field} is not in "
|
|
"_BANNED_REQUEST_BODY_PARAMS — clients can poison the global "
|
|
"model cost registry by supplying it in the request body."
|
|
)
|
|
|
|
def test_pricing_field_allowed_with_admin_opt_in(self):
|
|
assert (
|
|
is_request_body_safe(
|
|
request_body={"model": "gpt-4", "input_cost_per_token": 0.00001},
|
|
general_settings={"allow_client_side_credentials": True},
|
|
llm_router=None,
|
|
model="gpt-4",
|
|
)
|
|
is True
|
|
)
|
|
|
|
|
|
class TestGetRequestRouteTemplate:
|
|
"""get_request_route_template returns the low-cardinality FastAPI route
|
|
template (e.g. /v1/threads/{thread_id}/runs) for http.route, distinct
|
|
from the literal url.path. None when unavailable."""
|
|
|
|
def _request(self, scope):
|
|
req = MagicMock()
|
|
req.scope = scope
|
|
return req
|
|
|
|
def test_returns_route_template(self):
|
|
route = MagicMock()
|
|
route.path = "/v1/threads/{thread_id}/runs"
|
|
req = self._request({"route": route, "path": "/v1/threads/abc123/runs"})
|
|
# template, not the literal path — two thread IDs share this value
|
|
assert get_request_route_template(req) == "/v1/threads/{thread_id}/runs"
|
|
|
|
def test_scope_not_dict_returns_none(self):
|
|
assert get_request_route_template(self._request("not-a-dict")) is None
|
|
|
|
def test_no_route_in_scope_returns_none(self):
|
|
assert get_request_route_template(self._request({"path": "/x"})) is None
|
|
|
|
def test_route_without_str_path_returns_none(self):
|
|
route = MagicMock()
|
|
route.path = 12345 # not a str
|
|
assert get_request_route_template(self._request({"route": route})) is None
|
|
|
|
def test_route_with_empty_path_returns_none(self):
|
|
route = MagicMock()
|
|
route.path = ""
|
|
assert get_request_route_template(self._request({"route": route})) is None
|
|
|
|
def test_exception_returns_none(self):
|
|
req = MagicMock()
|
|
type(req).scope = property(
|
|
lambda self: (_ for _ in ()).throw(RuntimeError("boom"))
|
|
)
|
|
assert get_request_route_template(req) is None
|