mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-12 03:48:56 +00:00
* feat(model-catalog): add Rust registry validation (#43136) * doc * feat(model-catalog): add Rust registry validation * test(model-catalog): ignore integration tests * docs(model-catalog): fix validation note grammar --------- Co-authored-by: Yujong Lee <yujong@berri.ai> (cherry picked from commitc289d5d6fb) * test(rust): reorganize core crate tests and split cache and OCR suites (#43177) * test(rust): group cache tests under cache/ and fold test_ocr.py into ocr/ The two failure cases in test_ocr.py duplicated the upstream-500 and timeout rows of PUBLIC_FAILURES, so only the file-input encoding case moves to ocr/test_requests.py Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(rust): split the response cache suite into one file per backend test_response_cache.py grew to 2400 lines. Each backend now has its own file, shared fixtures live in cache/conftest.py and shared helpers in support/cache.py. The helpers alias the private native test handles once, dropping the per-call reportPrivateUsage hits Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * split tokenizer test * test(core): consolidate route integration tests under tests/ with rstest and wiremock Moves the public-API OCR route tests out of src/ocr/route.rs and document.rs into tests/ocr/, split per provider plus lifecycle, machine, and document tests, merging the duplicated pairs. Messages, audio transcription, and chat completions share one wiremock-based upstream and recording secret source in tests/support, and gain table-driven cases for auth, routing, upstream errors, streaming, and declines. Tests of litellm-llms items move to that crate. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(messages): keep the stream relay test independent of the stream head contents The stream head carries no headers on main, so the relay test asserts the open-then-deliver order and the relayed body instead of header hand-off. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit10413796c6) * feat(rust): hand upstream response headers to the native Messages stream (#43178) * ci: drop the ocr_testing job now that tests/ocr_tests is gone Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(ocr): restore the live OCR matrix and the ocr_testing job The public litellm.ocr / aocr / Router interface is unchanged by the Rust migration, so the live provider matrix still applies. Drops the stale VCR skip list for the deleted test_rust_bridge.py. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(messages): show streamed upstream headers never reach the native stream The Python handler puts the upstream response headers on the stream's _hidden_params before the first chunk so the proxy can forward them as llm_provider-* headers. The native route drops them, and this test fails on the Rust path while passing on Python. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * feat(messages): hand upstream response headers to the native stream before its first chunk The Messages route fills MessagesStreamHead from the upstream response and yields it on Open. The Python driver converts it through the protocol host and hands it to Stream and SyncStream as their _hidden_params, so a streamed native call carries additional_headers the same way the Python handler does and the proxy can forward them as llm_provider-* headers. The relay contract lives in the core crate test, the hand-off in the host-python driver test, and the header projection in the route host test, so the recording-server test that showed the gap is dropped. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * wip --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit081f73f021) * feat(testkit): agent clients for Claude Code, Codex and opencode (#43181) * feat(testkit): install and configure Claude Code, Codex and opencode against a gateway Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor(testkit): derive targets from target-lexicon and split agents behind a trait Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor(testkit): group sources into agent and install folders Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat(testkit): split agents into install, configure and drive with semver-aware launch Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * style(testkit): drop a needless borrow Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> (cherry picked from commit9c10e0f985) * ci: run migrated unit selections on every event in legacy GHA shards (#43182) * ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit694783ebbe) * test: move tests/test_litellm root and small trees into tests/unit (#43186) * ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commitf6882246d4) * refactor(framer): replace Framer trait with tokio-util codecs (#43193) * refactor(framer): replace Framer trait with tokio-util codecs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor(framer): port SSE and AWS event stream framing to codecs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(rust): drop clone on Copy capabilities in messages request test Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(rust): use field init shorthand in messages request test Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit3c93ea1697) * test: move tests/test_litellm/llms into tests/unit/llms (#43191) * ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: move tests/test_litellm/llms into tests/unit/llms Rename-only. Moves the provider tests and the fine-tuning fixtures they load, mirroring the old paths. Follow-up commits merge, split and wire them. * test: merge, split and prune the moved llms tests Merges the Databricks chat transformation tests into the existing unit file, keeps the tests that need real keys or the network in tests/test_litellm, deletes the audited tests a stronger unit test already covers, and points imports at tests.unit.llms. * ci: run the moved llms tests under their legacy flags The Vertex AI and All Other Providers shards keep their legacy test-path for the retained files and add the llm-vertex-ai and llm-other-providers unit selections. CircleCI gets matching unit jobs. * test: make the tests/unit/llms directories packages Adds __init__.py to the moved dirs and drops the legacy ones whose directories no longer hold tests. * test: drop script runners and path hacks the llms split left dangling The __main__ runners in the split openai_like files and the Databricks e2e runner called tests that now live in the other half of the split or were deleted. The retained legacy halves also no longer need sys.path edits. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. * test: keep the Databricks manual e2e runner and fix the SageMaker Nova run path The Databricks e2e file is a manual script whose main() calls the tests that were pruned, so pruning them broke the documented run. It is back to its main version. The SageMaker Nova docstring now points at the file's real location in tests/local_testing. * test: keep the job's UNIT_FLAG out of the shard-script tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit5e6dc89ba1) * test: move tests/test_litellm integrations and secret_managers into tests/unit (#43194) * ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: move tests/test_litellm/llms into tests/unit/llms Rename-only. Moves the provider tests and the fine-tuning fixtures they load, mirroring the old paths. Follow-up commits merge, split and wire them. * test: merge, split and prune the moved llms tests Merges the Databricks chat transformation tests into the existing unit file, keeps the tests that need real keys or the network in tests/test_litellm, deletes the audited tests a stronger unit test already covers, and points imports at tests.unit.llms. * ci: run the moved llms tests under their legacy flags The Vertex AI and All Other Providers shards keep their legacy test-path for the retained files and add the llm-vertex-ai and llm-other-providers unit selections. CircleCI gets matching unit jobs. * test: make the tests/unit/llms directories packages Adds __init__.py to the moved dirs and drops the legacy ones whose directories no longer hold tests. * test: drop script runners and path hacks the llms split left dangling The __main__ runners in the split openai_like files and the Databricks e2e runner called tests that now live in the other half of the split or were deleted. The retained legacy halves also no longer need sys.path edits. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. * test: move tests/test_litellm integrations and secret_managers into tests/unit Rename-only. Mirrors the old paths, including the directory conftests and the prompt and JSON fixtures. Follow-up commits prune and wire them. * test: prune and repoint the moved integrations tests Deletes the 7 audited tests a stronger test in the same tree already covers, imports the TLS sink helpers from their new conftest path, and restores os.environ after each integrations test. Some presets write OTEL_EXPORTER_OTLP_HEADERS straight into os.environ, and without the legacy tree's test ordering that header leaked into the AgentOps tests. * ci: run the moved integrations tests under their legacy flag The integrations GHA shard and a new CircleCI job run the integrations unit selection. secret_managers joins the misc selection. * docs: point integrations and secret_managers references at tests/unit * test: make the moved integrations directories packages * test: keep the Databricks manual e2e runner and fix the SageMaker Nova run path The Databricks e2e file is a manual script whose main() calls the tests that were pruned, so pruning them broke the documented run. It is back to its main version. The SageMaker Nova docstring now points at the file's real location in tests/local_testing. * test: keep the job's UNIT_FLAG out of the shard-script tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commitcf491d1df9) * fix(tests): drop the repeated UNIT_FLAG key in test_unit_shard_missing_paths (#43212) Co-authored-by: mateo-berri <277851410+mateo-berri@users.noreply.github.com> (cherry picked from commit25de1ab2b0) * fix(jwt): let x-litellm-team-id select DB membership teams when the token also carries a team claim (#43206) * fix(jwt): let x-litellm-team-id select DB membership teams when the token also carries a team claim Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * docs(jwt): describe header team selection under fallback_to_db_teams Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: yassin <yassin@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit7b4fd47c6e) * test: move tests/test_litellm core utils, routing, responses, caching and rust_bridge into tests/unit (#43199) * ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: move tests/test_litellm/llms into tests/unit/llms Rename-only. Moves the provider tests and the fine-tuning fixtures they load, mirroring the old paths. Follow-up commits merge, split and wire them. * test: merge, split and prune the moved llms tests Merges the Databricks chat transformation tests into the existing unit file, keeps the tests that need real keys or the network in tests/test_litellm, deletes the audited tests a stronger unit test already covers, and points imports at tests.unit.llms. * ci: run the moved llms tests under their legacy flags The Vertex AI and All Other Providers shards keep their legacy test-path for the retained files and add the llm-vertex-ai and llm-other-providers unit selections. CircleCI gets matching unit jobs. * test: make the tests/unit/llms directories packages Adds __init__.py to the moved dirs and drops the legacy ones whose directories no longer hold tests. * test: drop script runners and path hacks the llms split left dangling The __main__ runners in the split openai_like files and the Databricks e2e runner called tests that now live in the other half of the split or were deleted. The retained legacy halves also no longer need sys.path edits. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. * test: move tests/test_litellm integrations and secret_managers into tests/unit Rename-only. Mirrors the old paths, including the directory conftests and the prompt and JSON fixtures. Follow-up commits prune and wire them. * test: prune and repoint the moved integrations tests Deletes the 7 audited tests a stronger test in the same tree already covers, imports the TLS sink helpers from their new conftest path, and restores os.environ after each integrations test. Some presets write OTEL_EXPORTER_OTLP_HEADERS straight into os.environ, and without the legacy tree's test ordering that header leaked into the AgentOps tests. * ci: run the moved integrations tests under their legacy flag The integrations GHA shard and a new CircleCI job run the integrations unit selection. secret_managers joins the misc selection. * docs: point integrations and secret_managers references at tests/unit * test: make the moved integrations directories packages * test: keep the Databricks manual e2e runner and fix the SageMaker Nova run path The Databricks e2e file is a manual script whose main() calls the tests that were pruned, so pruning them broke the documented run. It is back to its main version. The SageMaker Nova docstring now points at the file's real location in tests/local_testing. * test: move tests/test_litellm core utils, routing, responses, caching and rust_bridge into tests/unit Rename-only. Mirrors the old paths, including fixtures, the stubtest config and the native-route wheel script. Two files that collide with existing unit files are merged in a follow-up commit. * test: merge, prune and repoint the moved core, routing, responses, caching and rust_bridge tests Merges the two files that collided with existing unit files, folding the legacy extra case into test_is_chat_completion_cached_dict, and deletes the 9 audited tests a stronger test in the same file already covers. Keeps what needs the network in tests/test_litellm: test_tokenizers pulls a tokenizer from the Hugging Face hub, and the gpt2 and r50k_base tokenizer cases download their BPE files. The unit core_utils conftest points TIKTOKEN_CACHE_DIR at litellm's bundled encodings so the rest never depend on import order to stay offline, and FakeSecretVault moves to a shared module so both trees can build it. * ci: run the moved core, routing, responses, caching and rust_bridge tests under their flags core_utils gets a core-utils flag and CircleCI job, and its GHA shard keeps the legacy path for the retained network tests. router_utils and router_strategy join enterprise-routing, responses joins responses-caching-types (minus responses/mcp, which mcp-integration owns), caching joins caching-local and rust_bridge joins misc. The redis-compat, test-rust, stubtest and merge-smoke paths follow the move. * docs: point the Rust crate references at tests/unit * test: make the moved core, routing and rust_bridge directories packages * test: keep the no-loop DualCache batch_get_cache regression test It runs the sync path outside any event loop, which the inside-loop test cannot, so a change that picks the Redis client by loop state would only show up there. * test: keep the job's UNIT_FLAG out of the shard-script tests * fix(url_utils): block 192.0.0.0/24 on every Python patch release * test: move the new budget limiter tests into tests/unit/router_strategy * test: move the new sentry scrubbing tests into tests/unit/litellm_core_utils * test: move the new zerobus tests into tests/unit/integrations * test: make tests/unit/integrations/zerobus a package * test: load litellm's own tiktoken cache setup once instead of resetting it per test --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commita11a93f44a) * refactor(rust): move credential inheritance and the SDK limits out of the legacy callback crate into a driver preflight (#43259) The legacy callback crate carried two rewrites that have nothing to do with the Logging contract: litellm_credential_name inheritance and the max_budget and num_retries_per_request checks. Any later callback host would need them unchanged, which is the smell the crate's AGENTS.md now names. They are now a Preflight the driver in litellm-host-python runs on the keyword view begin returned, before the host projects from it, supplied by python-bridge and passed through run_legacy_call. The call order is unchanged (setup, deployment hook, credentials, limits) and a rejection still fails the call as a host failure, so the failure callbacks run as before. The preflight rewrites the adapter's own copy in place, so no extra dict copy and no new lifecycle method Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commite9491d31b5) * refactor(http): hand out an owned Client and route all providers through the pool (#43245) * refactor(messages): take the provider client from the injected HTTP pool The messages route kept its own process-wide reqwest client, so it ignored ssl_verify, CA bundles, client certs, proxies and every other setting that litellm-http resolves. The machine now takes the HttpClientPool and the call's HttpClientConfig, as OCR does, and the bridge passes its shared pool. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(http): hand out an owned Client and move chat, audio and OIDC onto the pool HttpClientPool now returns litellm_http::Client, a newtype only crates/http can build, so every provider client carries the resolved TLS, proxy and timeout settings. Chat completions and audio transcription drop their process-wide reqwest clients and take the pool and call config like messages; their 600s ceiling moves to the request. OidcResolver takes its client instead of building one, and the bridge hands it the pooled one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(secrets): build Google, Azure and CyberArk manager clients from the pool The native secret managers built bare reqwest clients, so they ignored the host's TLS and proxy settings. load_native_manager now takes the pool and the host config and hands each manager a pooled client. CyberArk's CYBERARK_SSL_VERIFY and CYBERARK_CLIENT_CERT/KEY become an override on the host config instead of a hand-built client. To express a certificate and key in separate files, HttpClientConfig::client_certificate is now a ClientIdentity that is either one PEM or a split pair. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * chore(clippy): only crates/http may build a reqwest client Fence reqwest::Client, ClientBuilder and the TLS builder methods with disallowed-types and disallowed-methods so new code takes a litellm_http::Client from the pool. crates/http is exempt as the one place clients are built, and testkit as a dev-only installer. Tests move to litellm_http::Client::plain_for_test or a pooled client. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(secrets-cyberark): keep verifying certificates when the host disables it Python hands CyberArk its own ssl_verify, which wins over the global setting, so CYBERARK_SSL_VERIFY unset or true still verifies even when the host sets ssl_verify false. The pooled client copied the host's Disabled and would send the API key unverified; fall back to the built-in roots instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(python-bridge): treat a missing litellm package as no host HTTP settings Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit1a58162630) * refactor(rust): promote anthropic messages out of experimental_pass_through (#43269) Co-authored-by: Yujong Lee <yujong@berri.ai> (cherry picked from commit2ef3250ec3) * test: stop CI tests from downloading tokenizer files and images (#43257) * test: load the embedding base image from a committed 100x100 PNG instead of downloading it * test: move the volcengine embedding test into tests/unit * test: check gpt2 and r50k_base tokenizer parity against committed tiktoken reference files * test: check hub tokenizer selection against an in-memory Hugging Face hub * test: serve image URLs from respx in the gemini tool-result and format-param tests * ci: drop the emptied legacy core-utils test path * test: cover the cohere and anthropic tokenizer paths in the hub tokenizer test * test: fetch every format-param image through respx and check its bytes reach the request * test: drop the gpt2 and r50k_base parity tests, which no litellm path uses * test: drop comments that restate assertions in the format-param test (cherry picked from commit2530255624) * fix(rust): preserve nested optional import failures (#43265) * fix(rust): preserve nested optional import failures Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * test(rust): restore Python modules after settings tests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commite1a9378093) * fix(callbacks-legacy-python): traverse and release the retained headers dict (#43274) * fix(callbacks-legacy-python): traverse and release the retained headers dict LegacyLogging keeps the headers dict it hands to pre_call and post_call, but its traverse never reported that edge to the collector and close never dropped it. A cycle a callback builds through that dict could not be collected, and a closed call kept the dict alive until the driver dropped the whole adapter. Visit and clear headers like body, with regression tests for both * refactor(callbacks-legacy-python): move the test support module into its own file --------- Co-authored-by: Yujong Lee <yujong@berri.ai> (cherry picked from commit4eb340abe0) * test(integration): port langfuse callbacks-in-db coverage to the local harness (#43282) * test(integration): port langfuse callbacks-in-db coverage to the local harness Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * test(integration): assert the langfuse db rows after the exported span Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: yuneng <yuneng@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commite11c3f5815) * test: finish the non-proxy half of tests/test_litellm (#43281) * test: move key-gated tests/test_litellm SDK tests into tests/llm_translation and drop empty folders * test: make token counter and health check unit tests run offline * ci: point unit shards, rust path filter, Makefile and docs at tests/unit * docs: fix stale test_litellm run paths in moved llm_translation tests * fix: correct databricks e2e sys.path depth and contributing example path --------- Co-authored-by: yuneng <yuneng@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit99655b6f86) * refactor(rust): prepare inference and auth foundations for the gateway (#43287) * refactor(rust): prepare inference and auth foundations * fix(rust): keep textract operations parsing from kebab-case model names Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit7ae721bf79) * feat(rust): add config router and gateway crates (#43289) Co-authored-by: Yujong Lee <yujong@berri.ai> (cherry picked from commitaffb547525) * test(integration): run the Langfuse DB-callback test on its own scratch database (#43288) * test(integration): run the Langfuse DB-callback test on its own scratch database The test from #43282 wrote success_callback=langfuse and the LANGFUSE_* env into the shared integration LiteLLM_Config. The suite's long-running gateway reloads that table and only ever adds callbacks, so it kept exporting to the test's closed Langfuse fake for the rest of the shard even after the rows were restored. The owned proxy now gets a scratch database, which also removes the snapshot/restore code. scratch_database moves into _support/database.py so test_cache_and_quota and this test share one copy, and the stock-config guard now checks the callback settings instead of the raw YAML text. * test(integration): include failure_callback in the stock-config Langfuse guard (cherry picked from commitdd63637322) * refactor(rust): expand logging and test coverage across gateway and Anthropic messages (#43295) * refactor(rust): prepare inference and auth foundations * fix(rust): keep textract operations parsing from kebab-case model names Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * done * refactor(types): derive Anthropic beta string conversions with Strum * fix(anthropic): report missing max_tokens as a missing field * refactor(rust): type Anthropic messages headers and auth after the Python layout Delete anthropic/messages/headers.rs. Its OAuth handling, credential ladder and beta merging move to anthropic/common_utils.rs where Python keeps them (optionally_handle_anthropic_oauth, get_auth_header, _merge_beta_headers), and the feature beta injection becomes update_headers_with_anthropic_beta on the messages config, as in Python. The BaseAnthropicMessagesConfig impl is unchanged apart from the bodies of validate_environment and request_headers Beta values are now the AnthropicBeta enum and BetaSet, which sort, dedupe and comma-join by construction. Request params gain typed speed, tools and context_management through Recognized, so the beta logic matches on enums instead of string-comparing JSON. OauthToken parses the sk-ant-oat token once and the chat config shares that detection instead of its own copy Case-insensitive header helpers move next to has_header in litellm-http. One deliberate divergence: a Bearer-prefixed OAuth key configured through api_key or ANTHROPIC_API_KEY is sent with a single Bearer scheme, where Python would emit "Bearer Bearer" Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * done * fix(rust): repair test compilation and clippy failures resolve auth before building the outbound request in prepare tests, give the host hook tests their own error type, and drop the disallowed reqwest client and err().expect() from core tests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit90873c46de) * test(proxy_behavior): scope the management proxy fixture to its package so its spend monitor cannot race the spend tests (#43302) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit115668f43e) * fix(ci): stop stale CI reds, keep unit tests off the host env, retry CyberArk policy conflicts (#43294) * fix(ci): stop five stale or flaky CI reds and retry CyberArk policy-load conflicts The Langfuse redaction unit test exports to a local OTLP capture instead of polling Langfuse Cloud through a recorded lookup. The passthrough worker-kill test only requires spend rows for requests the surviving worker served. The spend-routes sweep treats the intentional /spend/capture_rate 503 as expected. CyberArk retries a 409 policy load in Python, Rust and the e2e Conjur helper instead of reading it as "variable exists". The integration egress guard now matches the script's own cgroup, so it no longer blocks the CircleCI agent, which runs as the same user. * fix(ci): keep the policy-load backoff typed as float * fix(ci): retry CyberArk policy loads without blocking the event loop and tighten the worker-kill and Langfuse tests * fix(secrets): load CyberArk policy one request at a time per manager * test(secrets): pin that non-conflict CyberArk policy failures are not retried * test(unit): run tests/unit with only an allowlisted host environment CircleCI's unit job inherits every project env var, so real provider keys, REDIS_HOST, DATABASE_URL and AWS or Azure credentials reached tests that assume none are set. Locally, litellm's import-time load_dotenv did the same from any .env up the tree. The unit conftest now drops every variable outside a small allowlist and disables dotenv before litellm is imported. * test(e2e): name a failed search and the stuck batch status instead of misattributing them The websearch session test read an empty web_search_tool_result_error block as a successful search, so a failing search tool surfaced as a session billing bug. The batch cancellation timeout now reports the last status the proxy returned. * fix(ci): scrub the host environment per unit test instead of for the whole pytest process GHA shards run tests/unit next to other suites in one process, so the import-time scrub deleted MCP_TEST_PEER_PYTHON before tests/mcp_tests read it and the MCP upstream fell back to the SDK2 interpreter. The two websearch tests that called OpenAI and Perplexity live are removed: tests/unit no longer sees their keys. * fix(ci): scrub only the host variables present before litellm is imported The per-test scrub also deleted TIKTOKEN_CACHE_DIR, which litellm sets at import to its bundled encodings, so tokenizer paths tried to download them and hit the socket guard. The prisma setup test now passes its own database URL instead of reading one another test leaked into the process environment. * fix(ci): stop the order-dependent unit reds and settle logging tasks on their own queue LoggingWorker marked a task done on whichever queue was current when the callback finished, so a callback that outlived an event-loop change raised "task_done() called too many times" or undercounted the new loop's queue. It now settles the queue the task came from. The rest are test isolation fixes for failures that only appeared when another file ran first on the same xdist worker: a replaced user_api_key_cache, breaker metrics unregistered by prometheus tests, semantic_router's health-check filter on uvicorn.access, logging tasks carried over from bedrock tests, a Router-written model_cost entry, and a stray post captured by the langflow test. The token counter check now asserts bounded chunking instead of wall-clock time. * test(e2e/ui): wait for the logout redirect before visiting a protected page Logout revokes the session server-side before clearing cookies and navigating, so an immediate page.goto either ran with the cookie still set or was aborted by the logout redirect (net::ERR_ABORTED). * test(unit): restore the prometheus metrics config per test and settle logs carried from earlier tests in the a2a cost tests * test(router): pin the router clock in the usage counter tests so a minute rollover cannot empty the read * test(e2e/ui): wait for logout to clear the token cookie instead of for a login redirect * test(integration/mcp): answer the model-info probe another test's proxy sends to the model double (cherry picked from commit14f4c34c61) * test(e2e): assert only litellm-owned batch behavior and move the blank S3 env pin to an integration test (#43321) (cherry picked from commite53e67ede5) * ci: drop main and litellm_* branch filters from the CircleCI litellm-main workflows (#43272) Co-authored-by: yuneng <yuneng@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commitc822c7fffa) * test(e2e): accept the otel cost write as a linked root trace (#42931) * test(e2e): accept the otel cost write as a linked root trace Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * test(e2e): window and fail-closed the linked otel trace read-back Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * test(e2e): poll the otel read-back without recursion Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: yuneng <yuneng@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> (cherry picked from commit3ebf6a1fd8) * refactor(rust): exclude gateway and config crates from rc backport * refactor(rust): exclude router crate from rc backport --------- Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Co-authored-by: yassin <yassin@berri.ai>
1768 lines
66 KiB
Python
1768 lines
66 KiB
Python
import ast
|
|
import asyncio
|
|
import base64
|
|
import dataclasses
|
|
import json
|
|
import logging
|
|
import re
|
|
import sys
|
|
import time
|
|
from io import StringIO
|
|
from pathlib import Path
|
|
from typing import Final, List
|
|
|
|
import pytest
|
|
from pydantic import BaseModel, computed_field
|
|
|
|
import litellm
|
|
from litellm._logging import (
|
|
_COLOR_LOG_FORMAT,
|
|
_MAX_SCRUBBED_ACCESS_ARG,
|
|
_PLAIN_LOG_FORMAT,
|
|
ALL_LOGGERS,
|
|
AccessLogPathFilter,
|
|
AccessLogRedactionFilter,
|
|
CorrelationContextFilter,
|
|
CorrelationPlainFormatter,
|
|
DiagnosticProcessingFilter,
|
|
JsonFormatter,
|
|
LevelRoutingStreamHandler,
|
|
SecretRedactionFilter,
|
|
StdoutLogTruncationFilter,
|
|
_get_uvicorn_json_log_config,
|
|
_initialize_loggers_with_handler,
|
|
_parse_json_logs_env,
|
|
_plain_log_format,
|
|
_stdout_truncation_marker,
|
|
_turn_on_json,
|
|
format_base64_size,
|
|
session_id_var,
|
|
set_session_id,
|
|
set_trace_id,
|
|
trace_id_var,
|
|
verbose_logger,
|
|
verbose_proxy_logger,
|
|
verbose_router_logger,
|
|
)
|
|
from litellm.constants import LITELLM_TRUNCATED_PAYLOAD_FIELD
|
|
from litellm.integrations.custom_logger import CustomLogger
|
|
from litellm.litellm_core_utils import secret_redaction
|
|
from litellm.types.utils import StandardLoggingPayload
|
|
|
|
|
|
class CacheHitCustomLogger(CustomLogger):
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
self.logged_standard_logging_payloads: List[StandardLoggingPayload] = []
|
|
|
|
async def async_log_success_event(self, kwargs, response_obj, start_time, end_time):
|
|
standard_logging_payload = kwargs.get("standard_logging_object", None)
|
|
if standard_logging_payload:
|
|
self.logged_standard_logging_payloads.append(standard_logging_payload)
|
|
|
|
|
|
def test_json_mode_emits_one_record_per_logger(capfd):
|
|
# Turn on JSON logging
|
|
_turn_on_json()
|
|
# Make sure our loggers will emit INFO-level records
|
|
for lg in (verbose_logger, verbose_router_logger, verbose_proxy_logger):
|
|
lg.setLevel(logging.INFO)
|
|
|
|
# Log one message from each logger at different levels
|
|
verbose_logger.info("first info")
|
|
verbose_router_logger.info("second info from router")
|
|
verbose_proxy_logger.info("third info from proxy")
|
|
|
|
# All three records are INFO, so they must route to stdout and none to stderr
|
|
out, err = capfd.readouterr()
|
|
assert [raw for raw in err.splitlines() if raw.strip()] == []
|
|
lines = [raw for raw in out.splitlines() if raw.strip()]
|
|
|
|
# Expect exactly three JSON lines
|
|
assert len(lines) == 3, f"got {len(lines)} lines, want 3: {lines!r}"
|
|
|
|
# Each line must be valid JSON with the required fields
|
|
for line in lines:
|
|
obj = json.loads(line)
|
|
assert "message" in obj, "`message` key missing"
|
|
assert "level" in obj, "`level` key missing"
|
|
assert "timestamp" in obj, "`timestamp` key missing"
|
|
|
|
|
|
def test_json_formatter_parses_embedded_json_message():
|
|
"""
|
|
Test that JsonFormatter parses embedded JSON in the message field and promotes
|
|
sub-fields to first-class JSON properties for downstream querying.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
record = logging.LogRecord(
|
|
name="LiteLLM",
|
|
level=logging.DEBUG,
|
|
pathname="",
|
|
lineno=0,
|
|
msg='{"event": "giveup", "exception": "Connection failed", "model_name": "gpt-4"}',
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
output = formatter.format(record)
|
|
obj = json.loads(output)
|
|
# Standard fields preserved
|
|
assert "message" in obj
|
|
assert obj["level"] == "DEBUG"
|
|
assert "timestamp" in obj
|
|
# Embedded JSON fields promoted to top-level for querying
|
|
assert obj["event"] == "giveup"
|
|
assert obj["exception"] == "Connection failed"
|
|
assert obj["model_name"] == "gpt-4"
|
|
|
|
|
|
def test_json_formatter_includes_extra_attributes():
|
|
"""
|
|
Test that JsonFormatter includes extra attributes from logger.debug("msg", extra={...}).
|
|
"""
|
|
formatter = JsonFormatter()
|
|
record = logging.LogRecord(
|
|
name="LiteLLM",
|
|
level=logging.DEBUG,
|
|
pathname="",
|
|
lineno=0,
|
|
msg="POST Request Sent from LiteLLM",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
record.api_base = "https://api.openai.com"
|
|
record.authorization = "Bearer sk-***"
|
|
output = formatter.format(record)
|
|
obj = json.loads(output)
|
|
assert obj["message"] == "POST Request Sent from LiteLLM"
|
|
assert obj["api_base"] == "https://api.openai.com"
|
|
assert obj["authorization"] == "Bearer sk-***"
|
|
|
|
|
|
def test_json_formatter_plain_message_unchanged():
|
|
"""
|
|
Test that non-JSON messages are passed through as-is in the message field.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
record = logging.LogRecord(
|
|
name="LiteLLM",
|
|
level=logging.INFO,
|
|
pathname="",
|
|
lineno=0,
|
|
msg="Cache hit!",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
output = formatter.format(record)
|
|
obj = json.loads(output)
|
|
assert obj["message"] == "Cache hit!"
|
|
assert "event" not in obj
|
|
assert "exception" not in obj
|
|
|
|
|
|
def test_json_formatter_parses_embedded_python_dict_repr():
|
|
"""
|
|
Test that JsonFormatter parses Python dict repr (str/deployment) embedded in
|
|
plain text, e.g. from get_available_deployment logs.
|
|
Reproduces Roni's reported case.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
msg = (
|
|
"get_available_deployment for model: text-embedding-3-large, "
|
|
"Selected deployment: {'model_name': 'text-embedding-3-large', "
|
|
"'litellm_params': {'api_key': 'sk**********', 'tpm': 1000000, 'rpm': 2000, "
|
|
"'use_in_pass_through': False, 'use_litellm_proxy': False, "
|
|
"'merge_reasoning_content_in_choices': False, 'model': 'text-embedding-3-large'}, "
|
|
"'model_info': {'id': 'a624b057aec64ada48311', 'db_model': False}} "
|
|
"for model: text-embedding-3-large"
|
|
)
|
|
record = logging.LogRecord(
|
|
name="LiteLLM Router",
|
|
level=logging.INFO,
|
|
pathname="",
|
|
lineno=0,
|
|
msg=msg,
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
output = formatter.format(record)
|
|
obj = json.loads(output)
|
|
assert "message" in obj
|
|
assert obj["level"] == "INFO"
|
|
# Python dict parsed and promoted to first-class properties
|
|
assert obj["model_name"] == "text-embedding-3-large"
|
|
assert "litellm_params" in obj
|
|
# Redacted, not passed through: SecretRedactionFilter already collapses this
|
|
# pair in the plain path before any formatter sees it, so the JSON path matching
|
|
# it is production parity. The key survives because redaction is per-value here.
|
|
assert obj["litellm_params"]["api_key"] == "REDACTED"
|
|
assert obj["litellm_params"]["tpm"] == 1000000
|
|
assert obj["litellm_params"]["use_in_pass_through"] is False
|
|
assert "model_info" in obj
|
|
assert obj["model_info"]["id"] == "a624b057aec64ada48311"
|
|
assert obj["model_info"]["db_model"] is False
|
|
|
|
|
|
def test_json_formatter_output_stays_parseable_when_a_secret_is_redacted():
|
|
"""Redaction must collapse the value only, never the surrounding JSON member.
|
|
|
|
Redacting the serialized document turned '"api_key": "sk-..."' into a bare
|
|
REDACTED token, so the line stopped being valid JSON entirely.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
record = logging.LogRecord(
|
|
name="LiteLLM",
|
|
level=logging.INFO,
|
|
pathname="",
|
|
lineno=0,
|
|
msg="calling deployment",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
record.deployment = {
|
|
"api_key": "sk-abcdefghijklmnopqrstuvwxyz0123456789",
|
|
"aws_secret_access_key": "wJalrXUtnFEMIQAfakeKEYbPxRfiCYEXAMPLEKEY",
|
|
"aws_region_name": "us-east-1",
|
|
"nested": {"tokens": ["Bearer abcdefghijklmnop", "keep-me"]},
|
|
}
|
|
|
|
obj = json.loads(formatter.format(record))
|
|
|
|
assert obj["deployment"]["api_key"] == "REDACTED"
|
|
assert obj["deployment"]["aws_secret_access_key"] == "REDACTED"
|
|
# Non-secret siblings stay legible so the logs remain useful
|
|
assert obj["deployment"]["aws_region_name"] == "us-east-1"
|
|
assert obj["deployment"]["nested"]["tokens"] == ["REDACTED", "keep-me"]
|
|
|
|
|
|
def test_json_formatter_includes_component_field():
|
|
"""
|
|
Test that JsonFormatter always emits a 'component' field equal to the logger name.
|
|
This allows filtering by component (e.g. "LiteLLM Proxy") in Datadog / third-party log services.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
for logger_name in ("LiteLLM Proxy", "LiteLLM Router", "LiteLLM"):
|
|
record = logging.LogRecord(
|
|
name=logger_name,
|
|
level=logging.ERROR,
|
|
pathname="proxy_server.py",
|
|
lineno=42,
|
|
msg="something went wrong",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
output = formatter.format(record)
|
|
obj = json.loads(output)
|
|
assert obj["component"] == logger_name, f"Expected component={logger_name!r}, got {obj.get('component')!r}"
|
|
|
|
|
|
def test_json_formatter_includes_logger_field():
|
|
"""
|
|
Test that JsonFormatter always emits a 'logger' field with filename:lineno.
|
|
This allows pinpointing the exact source of a log line in third-party services.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
record = logging.LogRecord(
|
|
name="LiteLLM Proxy",
|
|
level=logging.INFO,
|
|
pathname="/app/litellm/proxy/proxy_server.py",
|
|
lineno=123,
|
|
msg="request received",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
output = formatter.format(record)
|
|
obj = json.loads(output)
|
|
assert obj["logger"] == "proxy_server.py:123", f"Expected logger='proxy_server.py:123', got {obj['logger']!r}"
|
|
|
|
|
|
def test_json_formatter_extra_component_not_overwritten():
|
|
"""
|
|
User-supplied extra={"component": "..."} must not be silently dropped.
|
|
"""
|
|
formatter = JsonFormatter()
|
|
record = logging.LogRecord(
|
|
name="LiteLLM Proxy",
|
|
level=logging.INFO,
|
|
pathname="proxy_server.py",
|
|
lineno=1,
|
|
msg="event",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
record.component = "auth-service"
|
|
obj = json.loads(formatter.format(record))
|
|
assert obj["component"] == "auth-service", f"User-supplied component was overwritten, got {obj['component']!r}"
|
|
|
|
|
|
def test_initialize_loggers_with_handler_sets_propagate_false():
|
|
"""
|
|
Test that the initialize_loggers_with_handler function sets propagate to False for all loggers
|
|
"""
|
|
# Initialize loggers with the test handler
|
|
_initialize_loggers_with_handler(logging.StreamHandler())
|
|
|
|
# Check that propagate is set to False for all loggers
|
|
for logger in ALL_LOGGERS:
|
|
assert logger.propagate is False, (
|
|
f"Logger {logger.name} has propagate set to {logger.propagate}, expected False"
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_cache_hit_includes_custom_llm_provider():
|
|
"""
|
|
Test that when there's a cache hit, the standard logging payload includes the custom_llm_provider
|
|
"""
|
|
# Set up caching and custom logger
|
|
litellm.cache = litellm.Cache()
|
|
test_custom_logger = CacheHitCustomLogger()
|
|
original_callbacks = litellm.callbacks.copy() if litellm.callbacks else []
|
|
litellm.callbacks = [test_custom_logger]
|
|
|
|
try:
|
|
# First call - should be a cache miss
|
|
response1 = await litellm.acompletion(
|
|
model="gpt-3.5-turbo",
|
|
messages=[{"role": "user", "content": "test cache hit message"}],
|
|
mock_response="test response",
|
|
caching=True,
|
|
)
|
|
|
|
# Wait for logging to complete
|
|
await asyncio.sleep(0.5)
|
|
|
|
# Second identical call - should be a cache hit
|
|
response2 = await litellm.acompletion(
|
|
model="gpt-3.5-turbo",
|
|
messages=[{"role": "user", "content": "test cache hit message"}],
|
|
mock_response="test response",
|
|
caching=True,
|
|
)
|
|
|
|
# Wait for logging to complete
|
|
await asyncio.sleep(0.5)
|
|
|
|
# Verify we have logged events
|
|
assert len(test_custom_logger.logged_standard_logging_payloads) >= 2, (
|
|
f"Expected at least 2 logged events, got {len(test_custom_logger.logged_standard_logging_payloads)}"
|
|
)
|
|
|
|
# Find the cache hit event (should be the second call)
|
|
cache_hit_payload = None
|
|
for payload in test_custom_logger.logged_standard_logging_payloads:
|
|
if payload.get("cache_hit") is True:
|
|
cache_hit_payload = payload
|
|
break
|
|
|
|
# Verify cache hit event was found
|
|
assert cache_hit_payload is not None, "No cache hit event found in logged payloads"
|
|
|
|
# Verify custom_llm_provider is included in the cache hit payload
|
|
assert "custom_llm_provider" in cache_hit_payload, (
|
|
"custom_llm_provider missing from cache hit standard logging payload"
|
|
)
|
|
|
|
# Verify custom_llm_provider has a valid value (should be "openai" for gpt-3.5-turbo)
|
|
custom_llm_provider = cache_hit_payload["custom_llm_provider"]
|
|
assert custom_llm_provider is not None and custom_llm_provider != "", (
|
|
f"custom_llm_provider should not be None or empty, got: {custom_llm_provider}"
|
|
)
|
|
|
|
print(
|
|
f"Cache hit standard logging payload with custom_llm_provider: {custom_llm_provider}",
|
|
json.dumps(cache_hit_payload, indent=2),
|
|
)
|
|
|
|
finally:
|
|
# Clean up
|
|
litellm.callbacks = original_callbacks
|
|
litellm.cache = None
|
|
|
|
|
|
LITELLM_LOGGER_NAMES = frozenset(
|
|
{"verbose_logger", "verbose_proxy_logger", "verbose_router_logger", "logger", "logging"}
|
|
)
|
|
LOG_LEVEL_METHODS = frozenset({"debug", "info", "warning", "error", "exception", "critical"})
|
|
LITELLM_PACKAGE_ROOT = Path(__file__).resolve().parents[2] / "litellm"
|
|
|
|
|
|
def _receiver_name(node: ast.expr) -> str:
|
|
if isinstance(node, ast.Name):
|
|
return node.id
|
|
if isinstance(node, ast.Attribute):
|
|
return node.attr
|
|
return ""
|
|
|
|
|
|
def _is_logging_call(node: ast.AST) -> bool:
|
|
return (
|
|
isinstance(node, ast.Call)
|
|
and isinstance(node.func, ast.Attribute)
|
|
and node.func.attr in LOG_LEVEL_METHODS
|
|
and _receiver_name(node.func.value) in LITELLM_LOGGER_NAMES
|
|
)
|
|
|
|
|
|
def _has_format_spec(message: ast.JoinedStr) -> bool:
|
|
return any(isinstance(value, ast.FormattedValue) and value.format_spec is not None for value in message.values)
|
|
|
|
|
|
def _eager_logging_calls(source: str, path: Path) -> tuple[str, ...]:
|
|
return tuple(
|
|
f"{path}:{node.lineno}"
|
|
for node in ast.walk(ast.parse(source))
|
|
if _is_logging_call(node)
|
|
and node.args
|
|
and isinstance(node.args[0], ast.JoinedStr)
|
|
and not _has_format_spec(node.args[0])
|
|
)
|
|
|
|
|
|
def test_logging_calls_do_not_build_their_message_eagerly():
|
|
"""A discarded log record must not have cost anything to build.
|
|
|
|
`log.debug(f"payload: {body}")` interpolates before the call runs, so the message is
|
|
built and thrown away on every request the level filters out; `log.debug("payload: %s", body)`
|
|
defers that to `record.getMessage()`, which only runs once the record passes the level check.
|
|
|
|
f-strings carrying a format spec are exempt: `%`-style has no faithful equivalent for
|
|
specs like `{ratio:.1%}`, and those sites interpolate scalars rather than payloads.
|
|
"""
|
|
offenders = tuple(
|
|
offender
|
|
for path in sorted(LITELLM_PACKAGE_ROOT.rglob("*.py"))
|
|
for offender in _eager_logging_calls(
|
|
path.read_text(encoding="utf-8"), path.relative_to(LITELLM_PACKAGE_ROOT.parent)
|
|
)
|
|
)
|
|
|
|
assert offenders == (), (
|
|
"these logging calls build their message eagerly; pass the values as %-style arguments instead:\n"
|
|
+ "\n".join(offenders)
|
|
)
|
|
|
|
|
|
class _JsonCapture(logging.Handler):
|
|
def __init__(self):
|
|
super().__init__()
|
|
self.formatter = JsonFormatter()
|
|
self.records: list[dict] = []
|
|
self.addFilter(CorrelationContextFilter())
|
|
|
|
def emit(self, record):
|
|
self.records.append(json.loads(self.formatter.format(record)))
|
|
|
|
|
|
def _make_capture_logger(name: str) -> tuple[logging.Logger, _JsonCapture]:
|
|
lg = logging.getLogger(name)
|
|
cap = _JsonCapture()
|
|
lg.addHandler(cap)
|
|
lg.setLevel(logging.DEBUG)
|
|
return lg, cap
|
|
|
|
|
|
def test_trace_id_injected_into_json_record(monkeypatch):
|
|
"""trace_id set via set_trace_id() appears in every JSON record in that context."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_capture_logger("test.trace_inject")
|
|
set_trace_id("trace-abc-123")
|
|
try:
|
|
lg.info("test message")
|
|
assert len(cap.records) == 1
|
|
assert cap.records[0]["trace_id"] == "trace-abc-123"
|
|
finally:
|
|
trace_id_var.set("")
|
|
|
|
|
|
def test_session_id_injected_when_set(monkeypatch):
|
|
"""session_id set via set_session_id() appears in JSON record."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_capture_logger("test.session_inject")
|
|
set_session_id("sess-xyz-456")
|
|
try:
|
|
lg.info("another message")
|
|
assert cap.records[0]["session_id"] == "sess-xyz-456"
|
|
finally:
|
|
session_id_var.set("")
|
|
|
|
|
|
def test_trace_id_and_session_id_cannot_be_spoofed_by_message_content(monkeypatch):
|
|
"""A log message that happens to parse as JSON/dict with "trace_id"/"session_id"
|
|
keys (e.g. the proxy logging a raw request-header dict) must not override the
|
|
real correlation ids set via set_trace_id()/set_session_id()."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_capture_logger("test.spoof_attempt")
|
|
set_trace_id("real-trace-id")
|
|
set_session_id("real-session-id")
|
|
try:
|
|
lg.info('{"trace_id": "attacker-supplied-trace", "session_id": "attacker-supplied-session"}')
|
|
assert cap.records[0]["trace_id"] == "real-trace-id"
|
|
assert cap.records[0]["session_id"] == "real-session-id"
|
|
finally:
|
|
trace_id_var.set("")
|
|
session_id_var.set("")
|
|
|
|
|
|
def test_trace_id_and_session_id_cannot_be_injected_with_no_active_context(monkeypatch):
|
|
"""A message that happens to parse as JSON/dict with "trace_id"/"session_id" keys
|
|
must not surface those fields at all when CorrelationContextFilter hasn't stamped
|
|
this record - e.g. a log line emitted before Logging.__init__() runs for a request
|
|
(request_correlation_in_logs on, but no genuine trace/session id active yet)."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_capture_logger("test.no_context_spoof_attempt")
|
|
trace_id_var.set("")
|
|
session_id_var.set("")
|
|
lg.info('{"trace_id": "attacker-supplied-trace", "session_id": "attacker-supplied-session"}')
|
|
assert "trace_id" not in cap.records[0]
|
|
assert "session_id" not in cap.records[0]
|
|
|
|
|
|
def test_trace_id_and_session_id_are_redacted_when_credential_shaped(monkeypatch):
|
|
"""A caller-controlled trace_id/session_id (e.g. from x-litellm-trace-id or a W3C
|
|
baggage header) that happens to look like a real credential must not reach log
|
|
records unredacted. CorrelationContextFilter stamps trace_id/session_id onto the
|
|
record after SecretRedactionFilter has already run, so those two fields would
|
|
otherwise bypass credential redaction entirely - the fix redacts at set_trace_id()/
|
|
set_session_id() time instead, before the value ever reaches a log record."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_capture_logger("test.credential_shaped_correlation_id")
|
|
poisoned_trace_id = "sk-ant-api03-" + "A" * 40
|
|
poisoned_session_id = "AKIA" + "B" * 16
|
|
set_trace_id(poisoned_trace_id)
|
|
set_session_id(poisoned_session_id)
|
|
try:
|
|
lg.info("some benign log line")
|
|
assert cap.records[0]["trace_id"] == "REDACTED"
|
|
assert cap.records[0]["session_id"] == "REDACTED"
|
|
assert poisoned_trace_id not in json.dumps(cap.records[0])
|
|
assert poisoned_session_id not in json.dumps(cap.records[0])
|
|
finally:
|
|
trace_id_var.set("")
|
|
session_id_var.set("")
|
|
|
|
|
|
def test_session_id_absent_when_not_set():
|
|
"""session_id must NOT appear in JSON record when not set for this context."""
|
|
lg, cap = _make_capture_logger("test.no_session")
|
|
session_id_var.set("")
|
|
lg.info("no session message")
|
|
assert "session_id" not in cap.records[0]
|
|
|
|
|
|
def test_trace_id_absent_when_not_set():
|
|
"""trace_id must NOT appear when not set."""
|
|
lg, cap = _make_capture_logger("test.no_trace")
|
|
trace_id_var.set("")
|
|
lg.info("no trace message")
|
|
assert "trace_id" not in cap.records[0]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_contextvar_isolation_between_tasks():
|
|
"""Two concurrent async tasks each see only their own trace_id."""
|
|
results: dict[str, str] = {}
|
|
|
|
async def task(task_id: str, trace_id: str) -> None:
|
|
set_trace_id(trace_id)
|
|
await asyncio.sleep(0)
|
|
results[task_id] = trace_id_var.get()
|
|
|
|
await asyncio.gather(
|
|
task("A", "trace-for-A"),
|
|
task("B", "trace-for-B"),
|
|
)
|
|
|
|
assert results["A"] == "trace-for-A"
|
|
assert results["B"] == "trace-for-B"
|
|
|
|
|
|
def test_trace_id_not_in_log_when_flag_disabled(monkeypatch):
|
|
"""When request_correlation_in_logs is False (default), trace_id must not appear in JSON records even when set."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", False)
|
|
lg, cap = _make_capture_logger("test.no_trace_gated")
|
|
set_trace_id("trace-should-not-appear")
|
|
try:
|
|
lg.info("message")
|
|
assert "trace_id" not in cap.records[0]
|
|
finally:
|
|
trace_id_var.set("")
|
|
|
|
|
|
def test_session_id_not_in_log_when_flag_disabled(monkeypatch):
|
|
"""When request_correlation_in_logs is False (default), session_id must not appear in JSON records even when set."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", False)
|
|
lg, cap = _make_capture_logger("test.no_session_gated")
|
|
set_session_id("sess-should-not-appear")
|
|
try:
|
|
lg.info("message")
|
|
assert "session_id" not in cap.records[0]
|
|
finally:
|
|
session_id_var.set("")
|
|
|
|
|
|
class _PlainCapture(logging.Handler):
|
|
def __init__(self):
|
|
super().__init__()
|
|
self.formatter = CorrelationPlainFormatter("%(message)s")
|
|
self.records: list[str] = []
|
|
self.addFilter(CorrelationContextFilter())
|
|
|
|
def emit(self, record):
|
|
self.records.append(self.formatter.format(record))
|
|
|
|
|
|
def _make_plain_capture_logger(name: str) -> tuple[logging.Logger, _PlainCapture]:
|
|
lg = logging.getLogger(name)
|
|
cap = _PlainCapture()
|
|
lg.addHandler(cap)
|
|
lg.setLevel(logging.DEBUG)
|
|
return lg, cap
|
|
|
|
|
|
def test_plain_formatter_appends_trace_id_and_session_id(monkeypatch):
|
|
"""CorrelationPlainFormatter must append trace_id/session_id to non-JSON log lines too."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_plain_capture_logger("test.plain_trace_session")
|
|
set_trace_id("plain-trace-1")
|
|
set_session_id("plain-session-1")
|
|
try:
|
|
lg.info("plaintext message")
|
|
assert cap.records[0] == "plaintext message [trace_id=plain-trace-1 session_id=plain-session-1]"
|
|
finally:
|
|
trace_id_var.set("")
|
|
session_id_var.set("")
|
|
|
|
|
|
def test_plain_formatter_appends_only_trace_id_when_session_id_absent(monkeypatch):
|
|
"""Only trace_id is appended when session_id was never set."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", True)
|
|
lg, cap = _make_plain_capture_logger("test.plain_trace_only")
|
|
set_trace_id("plain-trace-2")
|
|
session_id_var.set("")
|
|
try:
|
|
lg.info("plaintext message")
|
|
assert cap.records[0] == "plaintext message [trace_id=plain-trace-2]"
|
|
finally:
|
|
trace_id_var.set("")
|
|
|
|
|
|
def test_plain_formatter_unchanged_when_flag_disabled(monkeypatch):
|
|
"""When request_correlation_in_logs is False, plain log lines are unmodified even if the contextvars are set."""
|
|
monkeypatch.setattr(litellm, "request_correlation_in_logs", False)
|
|
lg, cap = _make_plain_capture_logger("test.plain_flag_off")
|
|
set_trace_id("should-not-appear")
|
|
set_session_id("should-not-appear")
|
|
try:
|
|
lg.info("plaintext message")
|
|
assert cap.records[0] == "plaintext message"
|
|
finally:
|
|
trace_id_var.set("")
|
|
session_id_var.set("")
|
|
|
|
|
|
def test_set_trace_id_strips_control_characters():
|
|
"""set_trace_id() must strip \\r/\\n/escape sequences so a caller-controlled
|
|
trace id can't forge fake log entries when interpolated into plain-text logs."""
|
|
token = set_trace_id('evil\r\n{"level": "CRITICAL", "message": "forged"}')
|
|
try:
|
|
value = trace_id_var.get()
|
|
assert "\r" not in value
|
|
assert "\n" not in value
|
|
finally:
|
|
trace_id_var.reset(token)
|
|
|
|
|
|
_MARKER_RE = re.compile(rf"\.\.\. \({LITELLM_TRUNCATED_PAYLOAD_FIELD} skipped (\d+) chars\..*?\) \.\.\.", re.S)
|
|
|
|
|
|
def _extract_marker(text: str) -> "re.Match[str] | None":
|
|
return _MARKER_RE.search(text)
|
|
|
|
|
|
def _make_record(level: int, msg: str, args=(), exc_info=None) -> logging.LogRecord:
|
|
return logging.LogRecord(
|
|
name="LiteLLM Router",
|
|
level=level,
|
|
pathname="",
|
|
lineno=0,
|
|
msg=msg,
|
|
args=args,
|
|
exc_info=exc_info,
|
|
)
|
|
|
|
|
|
def _oversized_text(length: int) -> str:
|
|
return ("payload " * (length // 8 + 1))[:length]
|
|
|
|
|
|
_OVERSIZED_TEXT = _oversized_text(100_000)
|
|
|
|
|
|
def test_oversized_info_record_is_truncated(monkeypatch):
|
|
"""An error string echoing a huge request payload must not reach stdout in full."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
payload = _OVERSIZED_TEXT
|
|
record = _make_record(logging.INFO, "litellm.acompletion(model=%s) Exception %s", ("gpt-4", payload))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
message = record.getMessage()
|
|
assert LITELLM_TRUNCATED_PAYLOAD_FIELD in message
|
|
assert len(message) <= 500
|
|
assert message.startswith("litellm.acompletion(model=gpt-4) Exception payload payload")
|
|
assert message.endswith("payload ")
|
|
|
|
marker = _extract_marker(message)
|
|
assert marker is not None
|
|
kept, skipped = len(message) - len(marker.group(0)), int(marker.group(1))
|
|
assert kept + skipped == 43 + len(payload)
|
|
|
|
|
|
def test_truncated_message_fits_the_configured_cap(monkeypatch):
|
|
"""The cap is the whole point of the setting, so the marker has to be paid for out of
|
|
the budget instead of appended on top of a limit-sized head and tail."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
record = _make_record(logging.ERROR, "Exception %s", ("p" * 2000,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
message = record.getMessage()
|
|
assert _extract_marker(message) is not None
|
|
assert len(message) == 500
|
|
|
|
|
|
@pytest.mark.parametrize("payload_len", [501, 512, 1000, 9999, 100_000])
|
|
def test_truncated_message_never_exceeds_the_cap(monkeypatch, payload_len):
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
record = _make_record(logging.ERROR, "%s", (_oversized_text(payload_len),))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert len(record.getMessage()) <= 500
|
|
|
|
|
|
_NO_BUDGET_PAYLOAD = "p" * 2000
|
|
_MARKER_SIZED_CAP = len(_stdout_truncation_marker(len(_NO_BUDGET_PAYLOAD)))
|
|
|
|
|
|
@pytest.mark.parametrize("cap", [_MARKER_SIZED_CAP, _MARKER_SIZED_CAP - 1, 100])
|
|
def test_cap_leaving_no_room_for_the_marker_still_bounds_output(monkeypatch, cap):
|
|
"""An operator can set the cap at or below the marker's own length, leaving nothing to
|
|
spend on a head and tail, and the output still has to fit."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", str(cap))
|
|
record = _make_record(logging.ERROR, "%s", (_NO_BUDGET_PAYLOAD,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert len(record.getMessage()) == cap
|
|
|
|
|
|
def test_debug_record_is_not_truncated(monkeypatch):
|
|
"""--detailed_debug exists to dump full payloads, so DEBUG records pass through."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
payload = _OVERSIZED_TEXT
|
|
record = _make_record(logging.DEBUG, "raw request %s", (payload,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == f"raw request {payload}"
|
|
|
|
|
|
def test_truncation_disabled_by_zero_limit(monkeypatch):
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "0")
|
|
payload = _OVERSIZED_TEXT
|
|
record = _make_record(logging.ERROR, "Exception %s", (payload,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == f"Exception {payload}"
|
|
|
|
|
|
def test_oversized_traceback_is_truncated(monkeypatch):
|
|
"""verbose_proxy_logger.exception() re-logs the payload inside the traceback too."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
try:
|
|
raise ValueError("payload " + _OVERSIZED_TEXT)
|
|
except ValueError:
|
|
exc_info = sys.exc_info()
|
|
record = _make_record(logging.ERROR, "Exception occured", exc_info=exc_info)
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.exc_text is not None
|
|
assert LITELLM_TRUNCATED_PAYLOAD_FIELD in record.exc_text
|
|
assert len(record.exc_text) <= 500
|
|
assert "Traceback (most recent call last)" in record.exc_text
|
|
|
|
|
|
def test_falsy_exc_info_is_not_formatted(monkeypatch):
|
|
"""Callers pass exc_info=False, which logging leaves on the record as a bool."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
record = _make_record(logging.WARNING, "skipping malformed endpoint %s", (_OVERSIZED_TEXT,), exc_info=False)
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.exc_text is None
|
|
assert LITELLM_TRUNCATED_PAYLOAD_FIELD in record.getMessage()
|
|
|
|
|
|
def test_secret_filter_keeps_truncated_traceback(monkeypatch):
|
|
"""SecretRedactionFilter runs after truncation, so it must redact the capped
|
|
traceback instead of reformatting the full one from exc_info."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
try:
|
|
raise ValueError("sk-1234567890abcdefghij payload " + _OVERSIZED_TEXT)
|
|
except ValueError:
|
|
exc_info = sys.exc_info()
|
|
record = _make_record(logging.ERROR, "Exception occured", exc_info=exc_info)
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
|
|
assert record.exc_text is not None
|
|
assert len(record.exc_text) <= 500
|
|
assert "sk-1234567890abcdefghij" not in record.exc_text
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_diagnostic_redaction_precedes_a_credential_cut(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
monkeypatch.setenv("MAX_BASE64_LENGTH_STDOUT_LOG", "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
secret = "sk-" + "q" * 48
|
|
record = _make_record(logging.INFO, "%s", ("é" * 110 + secret + "界" * 1000,))
|
|
|
|
assert DiagnosticProcessingFilter().filter(record) is True
|
|
|
|
assert len(record.getMessage()) <= 500
|
|
assert "sk-qq" not in record.getMessage()
|
|
|
|
|
|
def test_correlation_id_redacts_before_its_length_bound(monkeypatch):
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
secret = "sk-" + "q" * 48
|
|
token = set_trace_id("x" * 250 + secret)
|
|
try:
|
|
assert "sk-qq" not in trace_id_var.get()
|
|
assert len(trace_id_var.get()) <= 256
|
|
finally:
|
|
trace_id_var.reset(token)
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_malformed_interpolation_still_scrubs_a_record(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "bad % api_key=secret123", ("value",))
|
|
record.color_message = "bad % api_key=secret123"
|
|
|
|
assert DiagnosticProcessingFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == "REDACTED"
|
|
assert record.color_message == "REDACTED"
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_key_pattern_template_keeps_the_rendered_redacted_line(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.INFO, "password=%s ok", ("hunter2",))
|
|
record.color_message = "password=%s ok"
|
|
|
|
assert DiagnosticProcessingFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == "REDACTED ok"
|
|
assert record.color_message == "REDACTED ok"
|
|
|
|
|
|
def test_disabled_diagnostic_call_does_not_render_arguments(caplog):
|
|
class Unrenderable:
|
|
def __str__(self):
|
|
raise AssertionError("disabled call rendered its argument")
|
|
|
|
with caplog.at_level(logging.ERROR, logger="LiteLLM"):
|
|
verbose_logger.debug("hidden %s", Unrenderable())
|
|
|
|
assert not caplog.records
|
|
|
|
|
|
def test_truncation_filter_survives_json_reconfiguration():
|
|
"""The cap lives on the loggers, so swapping handlers (JSON mode) can't drop it."""
|
|
_turn_on_json()
|
|
|
|
for lg in (verbose_logger, verbose_router_logger, verbose_proxy_logger):
|
|
assert any(isinstance(f, StdoutLogTruncationFilter) for f in lg.filters), f"{lg.name} lost stdout truncation"
|
|
|
|
|
|
def test_oversized_error_is_truncated_end_to_end(monkeypatch, caplog):
|
|
"""The router's own exception log line must come out bounded, not just the filter in isolation."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
|
|
with caplog.at_level(logging.INFO, logger="LiteLLM Router"):
|
|
verbose_router_logger.info("litellm.acompletion(model=%s) Exception %s", "gpt-4", _OVERSIZED_TEXT)
|
|
|
|
emitted = "".join(record.getMessage() for record in caplog.records)
|
|
assert LITELLM_TRUNCATED_PAYLOAD_FIELD in emitted
|
|
assert len(emitted) <= 500
|
|
|
|
|
|
_PDF_BASE64 = base64.b64encode(bytes(range(256)) * 18).decode()
|
|
_IMAGE_BASE64 = base64.b64encode(bytes(range(256)) * 24).decode()
|
|
_SHA256_HEX = "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
|
|
_LIMIT_SIZED_TOKEN = "t" * 4096
|
|
|
|
|
|
def _base64_run(length: int) -> str:
|
|
return (_PDF_BASE64 * (length // len(_PDF_BASE64) + 1))[:length]
|
|
|
|
|
|
def test_debug_record_collapses_long_base64_runs():
|
|
"""A DEBUG line dumping a document upload keeps its text but not the megabytes of
|
|
base64, which cost seconds of event-loop time per line in the secret regex alone."""
|
|
record = _make_record(
|
|
logging.DEBUG,
|
|
"receiving data: %s",
|
|
(
|
|
f"{{'document': 'data:application/pdf;base64,{_PDF_BASE64}', "
|
|
f"'base64Source': '{_IMAGE_BASE64}', "
|
|
f"'sha256': '{_SHA256_HEX}', 'token': '{_LIMIT_SIZED_TOKEN}'}}",
|
|
),
|
|
)
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == (
|
|
"receiving data: {'document': 'data:application/pdf;base64,[base64_data truncated: 4.5KB]', "
|
|
"'base64Source': '[base64_data truncated: 6.0KB]', "
|
|
f"'sha256': '{_SHA256_HEX}', 'token': '{_LIMIT_SIZED_TOKEN}'}}"
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize("run_length,collapses", ((4096, False), (4097, True)))
|
|
def test_base64_run_collapses_only_past_the_limit(run_length, collapses):
|
|
record = _make_record(logging.DEBUG, "%s", (_base64_run(run_length),))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert ("[base64_data truncated: " in record.getMessage()) is collapses
|
|
|
|
|
|
@pytest.mark.parametrize("limit,collapses", (("0", False), ("100", True)))
|
|
def test_base64_collapse_limit_follows_the_env(monkeypatch, limit, collapses):
|
|
monkeypatch.setenv("MAX_BASE64_LENGTH_STDOUT_LOG", limit)
|
|
record = _make_record(logging.DEBUG, "%s", (_base64_run(200),))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert ("[base64_data truncated: " in record.getMessage()) is collapses
|
|
|
|
|
|
def test_info_record_collapses_base64_before_truncating(monkeypatch):
|
|
"""The collapse runs at every level ahead of the INFO+ cap, so an error echoing a
|
|
document upload comes out as its text around a size placeholder, not a head and tail."""
|
|
monkeypatch.setenv("MAX_STRING_LENGTH_STDOUT_LOG", "500")
|
|
record = _make_record(logging.ERROR, "Exception: bad document %s (status 400)", (_base64_run(100_000),))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == "Exception: bad document [base64_data truncated: 73.2KB] (status 400)"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"run",
|
|
(_SHA256_HEX * 80, _SHA256_HEX.upper() * 80, "0123456789" * 512, "0f" * 2100),
|
|
ids=("hex", "upper_hex", "digits", "two_char_hex_dump"),
|
|
)
|
|
def test_hex_and_decimal_runs_are_not_mistaken_for_base64(run):
|
|
"""A long hex dump or numeric id stays in the log line even past the limit, since it
|
|
is not a payload and the operator asked for the full debug output."""
|
|
record = _make_record(logging.DEBUG, "checksum %s", (run,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == f"checksum {run}"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"payload",
|
|
(bytes(6000), b"\x01" * 6000, b"\x55" * 6000, b"\xaa" * 6000),
|
|
ids=("zero_filled", "0x01_filled", "0x55_filled", "0xaa_filled"),
|
|
)
|
|
def test_constant_byte_payloads_still_collapse(payload):
|
|
"""A zero-filled buffer encodes to one repeated character, and other constant bytes to
|
|
a single-case cycle: neither is a digest or an id, so the secret regex never sees them
|
|
in full and the event loop is not blocked by a degenerate upload."""
|
|
encoded = base64.b64encode(payload).decode()
|
|
record = _make_record(logging.DEBUG, "upload %s", (encoded,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.getMessage() == f"upload [base64_data truncated: {format_base64_size(len(encoded))}]"
|
|
|
|
|
|
def test_debug_traceback_collapses_base64_runs():
|
|
"""An exception that echoes a document upload gets the same collapse in its traceback
|
|
as the message does, at DEBUG too, so the secret regex never sees the payload in full."""
|
|
try:
|
|
raise ValueError(f"bad document: {_base64_run(100_000)}")
|
|
except ValueError:
|
|
exc_info = sys.exc_info()
|
|
record = _make_record(logging.DEBUG, "call failed", exc_info=exc_info)
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
|
|
assert record.exc_text is not None
|
|
assert "Traceback (most recent call last)" in record.exc_text
|
|
assert record.exc_text.endswith("ValueError: bad document: [base64_data truncated: 73.2KB]")
|
|
|
|
|
|
def test_base64_collapse_applies_end_to_end(caplog):
|
|
"""The proxy's own request dump must come out collapsed, not just the filter in isolation."""
|
|
with caplog.at_level(logging.DEBUG, logger="LiteLLM Proxy"):
|
|
verbose_proxy_logger.debug("receiving data: %s", f"{{'document': 'data:application/pdf;base64,{_PDF_BASE64}'}}")
|
|
|
|
emitted = "".join(record.getMessage() for record in caplog.records)
|
|
assert emitted == "receiving data: {'document': 'data:application/pdf;base64,[base64_data truncated: 4.5KB]'}"
|
|
|
|
|
|
class _CountingPattern:
|
|
def __init__(self, pattern: "re.Pattern[str]"):
|
|
self._pattern = pattern
|
|
self.calls = 0
|
|
self.scanned_chars = 0
|
|
|
|
def sub(self, repl: str, string: str, count: int = 0) -> str:
|
|
self.calls += 1
|
|
self.scanned_chars += len(string)
|
|
return self._pattern.sub(repl, string, count)
|
|
|
|
|
|
_REQUEST_DUMP = "{'model': 'gpt-4', 'messages': [{'role': 'user', 'content': 'hello world'}]}"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"formatter",
|
|
(CorrelationPlainFormatter(_PLAIN_LOG_FORMAT), JsonFormatter()),
|
|
ids=("plain", "json"),
|
|
)
|
|
def test_scrubbed_record_scans_the_large_rendered_value_once(monkeypatch, formatter):
|
|
"""The raw format template gets its own check, while the large rendered value gets one scan."""
|
|
counting = _CountingPattern(secret_redaction._SECRET_RE)
|
|
monkeypatch.setenv("LITELLM_RUST", "0")
|
|
monkeypatch.setattr(secret_redaction, "_SECRET_RE", counting)
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.DEBUG, "receiving data: %s", (_REQUEST_DUMP,))
|
|
|
|
assert StdoutLogTruncationFilter().filter(record) is True
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
rendered = formatter.format(record)
|
|
|
|
assert _REQUEST_DUMP in rendered
|
|
assert "litellm_redacted" not in rendered
|
|
assert counting.calls == 2
|
|
assert counting.scanned_chars == len(f"receiving data: {_REQUEST_DUMP}") + len("receiving data: %s")
|
|
|
|
|
|
def test_stamped_record_is_not_scanned_again(monkeypatch):
|
|
"""JSON mode puts the filter on a third-party logger and again on the root handler its
|
|
records propagate to, so the second filter must trust the stamp instead of rescanning."""
|
|
counting = _CountingPattern(secret_redaction._SECRET_RE)
|
|
monkeypatch.setenv("LITELLM_RUST", "0")
|
|
monkeypatch.setattr(secret_redaction, "_SECRET_RE", counting)
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.DEBUG, "receiving data: %s", (_REQUEST_DUMP,))
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
|
|
assert counting.calls == 2
|
|
|
|
|
|
def test_caller_supplied_stamp_never_skips_the_scrub(monkeypatch):
|
|
"""The stamp is a private sentinel, so a caller passing extra={"litellm_redacted": True}
|
|
still gets the full scrub, and only the filter's own stamp lets a later pass skip it."""
|
|
counting = _CountingPattern(secret_redaction._SECRET_RE)
|
|
monkeypatch.setenv("LITELLM_RUST", "0")
|
|
monkeypatch.setattr(secret_redaction, "_SECRET_RE", counting)
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.DEBUG, "api_key=sk-1234567890abcdefghij")
|
|
record.litellm_redacted = True
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
assert "sk-1234567890abcdefghij" not in record.getMessage()
|
|
assert counting.calls == 1
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
assert counting.calls == 1
|
|
|
|
|
|
def test_stack_info_is_scrubbed_before_the_plain_formatter(monkeypatch):
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.INFO, "call failed")
|
|
record.stack_info = "Stack (most recent call last):\n api_key=sk-1234567890abcdefghij"
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
rendered = CorrelationPlainFormatter(_PLAIN_LOG_FORMAT).format(record)
|
|
|
|
assert "sk-1234567890abcdefghij" not in rendered
|
|
assert "Stack (most recent call last):" in rendered
|
|
|
|
|
|
class _BrokenModel(BaseModel):
|
|
name: str
|
|
|
|
@computed_field
|
|
@property
|
|
def snapshot(self) -> str:
|
|
raise RuntimeError("snapshot unavailable")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"extra",
|
|
({1, "a"}, {"nested": {1, "a"}}, _BrokenModel(name="gpt-4o"), {"request": _BrokenModel(name="gpt-4o")}),
|
|
ids=("mixed_set", "nested_mixed_set", "raising_model", "nested_raising_model"),
|
|
)
|
|
def test_unserializable_extra_never_breaks_the_filter(monkeypatch, extra):
|
|
"""A pydantic computed field that raises escapes model_dump() and str() alike, and a
|
|
logging filter that lets it through raises into the caller's own log call."""
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "request sent")
|
|
record.payload = extra
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
rendered = json.loads(JsonFormatter().format(record))
|
|
|
|
assert rendered["message"] == "request sent"
|
|
assert "payload" in rendered
|
|
|
|
|
|
@dataclasses.dataclass(frozen=True, slots=True)
|
|
class _RequestExtra:
|
|
model: str
|
|
attempt: int
|
|
api_key: str = dataclasses.field(default="", repr=False)
|
|
|
|
|
|
def _nest(value: object, levels: int) -> object:
|
|
return value if levels == 0 else _nest([value], levels - 1)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"extra",
|
|
(
|
|
("gpt-4o", 2),
|
|
["gpt-4o", None, 1.5],
|
|
{"models": ("gpt-4o", "gpt-4o-mini"), "attempt": 2},
|
|
{"model": "gpt-4o", "status": "ok"},
|
|
_nest("gpt-4o", 99),
|
|
),
|
|
ids=("tuple", "list", "nested_tuple", "dict", "deep_list"),
|
|
)
|
|
def test_secret_free_extra_keeps_its_original_object(monkeypatch, extra):
|
|
"""A host application's own handler on a litellm logger reads extras by type, so a
|
|
container that carried no secret must reach it untouched, not as its JSON shape."""
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "request sent")
|
|
record.payload = extra
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
|
|
assert record.payload is extra
|
|
assert "payload" in json.loads(JsonFormatter().format(record))
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"extra,scrubbed",
|
|
(
|
|
(("gpt-4o", "sk-1234567890abcdefghij"), ("gpt-4o", "REDACTED")),
|
|
({"gpt-4o", "sk-1234567890abcdefghij"}, ["REDACTED", "gpt-4o"]),
|
|
({"model": "gpt-4o", "key": "sk-1234567890abcdefghij"}, {"model": "gpt-4o", "key": "REDACTED"}),
|
|
),
|
|
ids=("tuple", "set", "dict"),
|
|
)
|
|
def test_extra_that_carried_a_secret_comes_back_scrubbed(monkeypatch, extra, scrubbed):
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "request sent")
|
|
record.payload = extra
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
rendered = JsonFormatter().format(record)
|
|
|
|
assert record.payload == scrubbed
|
|
assert type(record.payload) is type(scrubbed)
|
|
assert "sk-1234567890abcdefghij" not in rendered
|
|
assert "REDACTED" in rendered
|
|
|
|
|
|
class _AmbiguousArray:
|
|
def __eq__(self, other: object) -> bool:
|
|
raise ValueError("The truth value of an array with more than one element is ambiguous")
|
|
|
|
def __repr__(self) -> str:
|
|
return "array([1, 2])"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"extra,scrubbed",
|
|
((_AmbiguousArray(), "array([1, 2])"), ({"weights": _AmbiguousArray()}, {"weights": "array([1, 2])"})),
|
|
ids=("top_level", "nested"),
|
|
)
|
|
def test_extra_whose_equality_raises_still_comes_back_scrubbed(monkeypatch, extra, scrubbed):
|
|
"""numpy arrays and torch tensors raise when compared for truth, so the keep-or-scrub
|
|
decision must fall on the scrubbed copy instead of breaking the caller's log call."""
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "request sent")
|
|
record.payload = extra
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
|
|
assert record.payload == scrubbed
|
|
assert json.loads(JsonFormatter().format(record))["payload"] == scrubbed
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"extra",
|
|
(
|
|
{1: "sk-1234567890abcdefghij"},
|
|
{"model": {1: "sk-1234567890abcdefghij"}},
|
|
_nest("sk-1234567890abcdefghij", 101),
|
|
_RequestExtra(model="gpt-4o", attempt=2, api_key="sk-1234567890abcdefghij"),
|
|
{"gpt-4o", "sk-1234567890abcdefghij", 1},
|
|
),
|
|
ids=("int_key", "nested_int_key", "deeper_than_safe_dumps", "dataclass_hidden_field", "unsortable_set"),
|
|
)
|
|
def test_extra_the_filter_cannot_fully_inspect_never_keeps_its_secret(monkeypatch, extra):
|
|
"""Whatever safe_dumps would skip (non-string keys, anything past its depth limit,
|
|
fields a repr hides) must not ride the original object past the redacted stamp."""
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "request sent")
|
|
record.payload = extra
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
rendered = JsonFormatter().format(record)
|
|
|
|
assert record.payload is not extra
|
|
assert "sk-1234567890abcdefghij" not in str(record.payload)
|
|
assert "sk-1234567890abcdefghij" not in rendered
|
|
|
|
|
|
def test_secret_free_set_comes_back_as_its_json_shape(monkeypatch):
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "request sent")
|
|
record.payload = {"gpt-4o", "gpt-4o-mini"}
|
|
|
|
assert SecretRedactionFilter().filter(record) is True
|
|
|
|
assert record.payload == ["gpt-4o", "gpt-4o-mini"]
|
|
assert json.loads(JsonFormatter().format(record))["payload"] == ["gpt-4o", "gpt-4o-mini"]
|
|
|
|
|
|
def test_unscrubbed_record_is_still_redacted_by_the_formatter(monkeypatch):
|
|
"""Records that never met SecretRedactionFilter (uvicorn's, in JSON mode) keep
|
|
their formatter-side redaction."""
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.INFO, "key sk-1234567890abcdefghij")
|
|
|
|
assert "sk-1234567890abcdefghij" not in JsonFormatter().format(record)
|
|
assert "sk-1234567890abcdefghij" not in CorrelationPlainFormatter(_PLAIN_LOG_FORMAT).format(record)
|
|
|
|
|
|
def test_set_session_id_bounds_length():
|
|
"""set_session_id() must bound length so an oversized caller-supplied value
|
|
isn't repeated across every log line for the request."""
|
|
token = set_session_id("a" * 1000)
|
|
try:
|
|
assert len(session_id_var.get()) == 256
|
|
finally:
|
|
session_id_var.reset(token)
|
|
|
|
|
|
class _FakeStream:
|
|
def __init__(self, tty: bool) -> None:
|
|
self._tty = tty
|
|
|
|
def isatty(self) -> bool:
|
|
return self._tty
|
|
|
|
|
|
def test_records_below_warning_go_to_stdout_and_the_rest_to_stderr(capsys):
|
|
logger = logging.getLogger("test_level_routing")
|
|
logger.handlers.clear()
|
|
logger.propagate = False
|
|
logger.setLevel(logging.DEBUG)
|
|
handler = LevelRoutingStreamHandler()
|
|
handler.setFormatter(logging.Formatter("%(levelname)s %(message)s"))
|
|
logger.addHandler(handler)
|
|
|
|
try:
|
|
logger.debug("d")
|
|
logger.info("i")
|
|
logger.warning("w")
|
|
logger.error("e")
|
|
logger.critical("c")
|
|
finally:
|
|
logger.handlers.clear()
|
|
|
|
out, err = capsys.readouterr()
|
|
assert out.splitlines() == ["DEBUG d", "INFO i"]
|
|
assert err.splitlines() == ["WARNING w", "ERROR e", "CRITICAL c"]
|
|
|
|
|
|
def test_verbose_loggers_route_records_by_level():
|
|
for lg in (verbose_logger, verbose_router_logger, verbose_proxy_logger):
|
|
assert any(isinstance(h, LevelRoutingStreamHandler) for h in lg.handlers), lg.name
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"stdout_tty, stderr_tty, no_color, want_color",
|
|
[
|
|
(True, True, None, True),
|
|
(False, False, None, False),
|
|
(False, True, None, False),
|
|
(True, False, None, False),
|
|
(True, True, "1", False),
|
|
(True, True, "", True),
|
|
],
|
|
)
|
|
def test_plain_log_format_colorizes_only_for_a_terminal(monkeypatch, stdout_tty, stderr_tty, no_color, want_color):
|
|
if no_color is None:
|
|
monkeypatch.delenv("NO_COLOR", raising=False)
|
|
else:
|
|
monkeypatch.setenv("NO_COLOR", no_color)
|
|
|
|
fmt = _plain_log_format(_FakeStream(stdout_tty), _FakeStream(stderr_tty))
|
|
|
|
assert fmt == (_COLOR_LOG_FORMAT if want_color else _PLAIN_LOG_FORMAT)
|
|
assert ("\033[" in fmt) is want_color
|
|
|
|
|
|
def test_plain_format_carries_no_ansi_codes():
|
|
assert "\033[" not in _PLAIN_LOG_FORMAT
|
|
|
|
|
|
class _Brokenstream:
|
|
"""A write-only shim without isatty, like GUI log redirectors install."""
|
|
|
|
|
|
class _ClosedStream:
|
|
closed = True
|
|
|
|
def isatty(self) -> bool:
|
|
raise ValueError("I/O operation on closed file")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"stdout, stderr",
|
|
[
|
|
(None, None),
|
|
(_FakeStream(True), None),
|
|
(_Brokenstream(), _FakeStream(True)),
|
|
(_ClosedStream(), _FakeStream(True)),
|
|
],
|
|
)
|
|
def test_plain_log_format_survives_hostile_streams(stdout, stderr):
|
|
"""sys.stdout/sys.stderr can be None, shimmed, or closed; import must not crash."""
|
|
assert _plain_log_format(stdout, stderr) == _PLAIN_LOG_FORMAT
|
|
|
|
|
|
def test_level_routing_handler_falls_back_to_stderr_when_stdout_is_unusable(monkeypatch, capsys):
|
|
logger = logging.getLogger("test_level_routing_fallback")
|
|
logger.handlers.clear()
|
|
logger.propagate = False
|
|
logger.setLevel(logging.DEBUG)
|
|
handler = LevelRoutingStreamHandler()
|
|
handler.setFormatter(logging.Formatter("%(levelname)s %(message)s"))
|
|
logger.addHandler(handler)
|
|
|
|
try:
|
|
monkeypatch.setattr(sys, "stdout", None)
|
|
logger.info("stdout is gone")
|
|
finally:
|
|
logger.handlers.clear()
|
|
|
|
err = capsys.readouterr().err
|
|
assert "INFO stdout is gone" in err
|
|
assert "--- Logging error ---" not in err
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"value, want",
|
|
[
|
|
("true", True),
|
|
("True", True),
|
|
("TRUE", True),
|
|
("false", False),
|
|
("False", False),
|
|
("0", False),
|
|
("1", False),
|
|
("", False),
|
|
(None, False),
|
|
],
|
|
)
|
|
def test_parse_json_logs_env_enables_only_on_true(value, want):
|
|
"""JSON_LOGS=false / 0 must not enable JSON logs (LIT-5558)."""
|
|
assert _parse_json_logs_env(value) is want
|
|
|
|
|
|
def test_plain_log_format_survives_none_streams():
|
|
"""sys.stdout/sys.stderr can be None in embedded interpreters; import must not crash."""
|
|
assert _plain_log_format(None, None) == _PLAIN_LOG_FORMAT
|
|
assert _plain_log_format(_FakeStream(True), None) == _PLAIN_LOG_FORMAT
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Access-log redaction (LIT-5909)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
_LEAKED_KEY = "sk-mx5ous1o9Iezz5fj3pkLuA"
|
|
|
|
|
|
def _access_record(full_path: str) -> logging.LogRecord:
|
|
"""A record shaped exactly like the one uvicorn.access emits per request."""
|
|
return logging.LogRecord(
|
|
name="uvicorn.access",
|
|
level=logging.INFO,
|
|
pathname="",
|
|
lineno=0,
|
|
msg='%s - "%s %s HTTP/%s" %d',
|
|
args=("127.0.0.1:1", "GET", full_path, "1.1", 200),
|
|
exc_info=None,
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"full_path",
|
|
[
|
|
f"/key/info?key={_LEAKED_KEY}",
|
|
f"/global/spend/report?api_key={_LEAKED_KEY}&start_date=2026-08-01",
|
|
f"/key/spend/report?api_key={_LEAKED_KEY}",
|
|
f"/spend/logs?api_key={_LEAKED_KEY}",
|
|
f"/user/daily/activity?api_key={_LEAKED_KEY}",
|
|
f"/gemini/v1beta/models/gemini-2.0-flash:generateContent?key={_LEAKED_KEY}",
|
|
],
|
|
)
|
|
def test_access_log_filter_redacts_a_credential_query_parameter(full_path):
|
|
record = _access_record(full_path)
|
|
assert AccessLogRedactionFilter().filter(record) is True
|
|
assert _LEAKED_KEY not in record.getMessage()
|
|
assert "REDACTED" in record.getMessage()
|
|
|
|
|
|
def test_access_log_filter_keeps_the_record_formattable_by_uvicorn():
|
|
"""uvicorn's AccessFormatter unpacks record.args, so the filter must scrub the
|
|
args in place rather than collapse them the way SecretRedactionFilter does."""
|
|
from uvicorn.logging import AccessFormatter
|
|
|
|
record = _access_record(f"/key/info?key={_LEAKED_KEY}")
|
|
AccessLogRedactionFilter().filter(record)
|
|
assert isinstance(record.args, tuple)
|
|
assert len(record.args) == 5
|
|
|
|
formatted = AccessFormatter('%(client_addr)s - "%(request_line)s" %(status_code)s', use_colors=False).format(record)
|
|
assert _LEAKED_KEY not in formatted
|
|
assert "GET" in formatted
|
|
assert "200 OK" in formatted
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"full_path, want",
|
|
[
|
|
# The delimiter must survive so the logged request line stays well formed.
|
|
(f"/key/info?key={_LEAKED_KEY}&page=2", "/key/info?REDACTED&page=2"),
|
|
("/download?sig=AbCd1234%2Fxy&page=2", "/download?REDACTED&page=2"),
|
|
(
|
|
f"/global/spend/report?api_key={_LEAKED_KEY}&start_date=2026-01-01",
|
|
"/global/spend/report?REDACTED&start_date=2026-01-01",
|
|
),
|
|
("/sso/callback?client_secret=abcdefgh12345&state=xyz", "/sso/callback?REDACTED&state=xyz"),
|
|
(f"/v1/models?token={_LEAKED_KEY}&page=2", "/v1/models?REDACTED&page=2"),
|
|
],
|
|
)
|
|
def test_access_log_filter_keeps_the_query_delimiter(full_path, want):
|
|
record = _access_record(full_path)
|
|
AccessLogRedactionFilter().filter(record)
|
|
assert record.args[2] == want
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"full_path, want",
|
|
[
|
|
# Both the param name and the value are encoded, so neither is literal text
|
|
# the patterns can see, yet the request parser decodes it into a working key.
|
|
(f"/key/info?k%65y=sk%2D{_LEAKED_KEY[3:]}", "/key/info?REDACTED"),
|
|
(f"/key/info?k%65y=sk%2D{_LEAKED_KEY[3:]}&page=2", "/key/info?REDACTED"),
|
|
(f"/v1/models/sk%2D{_LEAKED_KEY[3:]}", "REDACTED"),
|
|
# A decoded credential must never be echoed back: it can carry a newline and
|
|
# forge a following log line.
|
|
(f"/v1/models?k%65y=sk%2D{_LEAKED_KEY[3:]}%0AINFO:%20forged", "/v1/models?REDACTED"),
|
|
],
|
|
)
|
|
def test_access_log_filter_redacts_a_percent_encoded_credential(full_path, want):
|
|
record = _access_record(full_path)
|
|
AccessLogRedactionFilter().filter(record)
|
|
assert record.args[2] == want
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"full_path",
|
|
[
|
|
"/v1/models?filter=gpt%2D4o&page=2",
|
|
"/gemini/v1beta/models/gemini-2.0-flash%3AgenerateContent",
|
|
],
|
|
)
|
|
def test_access_log_filter_leaves_harmless_percent_encoding_alone(full_path):
|
|
"""Decoding is a detector, not a rewrite, so a request line with no credential
|
|
in it survives encoded exactly as the client sent it."""
|
|
record = _access_record(full_path)
|
|
AccessLogRedactionFilter().filter(record)
|
|
assert record.args[2] == full_path
|
|
|
|
|
|
def test_access_log_filter_caps_how_much_of_a_request_target_it_scans():
|
|
"""The request target is the only input to the secret regex an unauthenticated
|
|
caller controls end to end, so it is bounded before it is scanned, and the
|
|
dropped tail must not reach the log either."""
|
|
record = _access_record("/v1/models?u=" + "a://" * 8192 + f"&key={_LEAKED_KEY}")
|
|
|
|
started = time.perf_counter()
|
|
AccessLogRedactionFilter().filter(record)
|
|
elapsed = time.perf_counter() - started
|
|
|
|
scrubbed = record.args[2]
|
|
assert _LEAKED_KEY not in scrubbed
|
|
assert len(scrubbed) < 1024
|
|
assert elapsed < 1.0, f"scrubbing one access line took {elapsed:.2f}s"
|
|
|
|
|
|
@pytest.mark.parametrize("chars_before_the_cut", range(1, 12))
|
|
def test_access_log_filter_never_logs_a_half_scanned_credential(chars_before_the_cut):
|
|
"""Cutting mid-value would leave a prefix too short for the key= pattern to match,
|
|
and that prefix would then be logged raw, so the cut lands on a param boundary."""
|
|
prefix = "/v1/models?u="
|
|
padding = _MAX_SCRUBBED_ACCESS_ARG - len(prefix) - len("&key=") - chars_before_the_cut
|
|
record = _access_record(f"{prefix}{'a' * padding}&key={_LEAKED_KEY}")
|
|
|
|
AccessLogRedactionFilter().filter(record)
|
|
|
|
assert f"key={_LEAKED_KEY[:chars_before_the_cut]}" not in record.args[2]
|
|
|
|
|
|
def test_access_log_filter_leaves_a_credential_free_request_line_intact():
|
|
record = _access_record("/v1/chat/completions")
|
|
AccessLogRedactionFilter().filter(record)
|
|
assert record.getMessage() == '127.0.0.1:1 - "GET /v1/chat/completions HTTP/1.1" 200'
|
|
|
|
|
|
def test_access_log_filter_redacts_a_record_that_carries_no_positional_args():
|
|
record = logging.LogRecord(
|
|
name="uvicorn.access",
|
|
level=logging.INFO,
|
|
pathname="",
|
|
lineno=0,
|
|
msg=f'127.0.0.1:1 - "GET /key/info?key={_LEAKED_KEY} HTTP/1.1" 200',
|
|
args=None,
|
|
exc_info=None,
|
|
)
|
|
assert AccessLogRedactionFilter().filter(record) is True
|
|
assert _LEAKED_KEY not in record.getMessage()
|
|
|
|
|
|
def _emit_access_line(full_path: str) -> str:
|
|
"""Hand one real record to uvicorn.access and return what a handler wrote out."""
|
|
from uvicorn.logging import AccessFormatter
|
|
|
|
logger = logging.getLogger("uvicorn.access")
|
|
stream = StringIO()
|
|
handler = logging.StreamHandler(stream)
|
|
handler.setFormatter(AccessFormatter('%(client_addr)s - "%(request_line)s" %(status_code)s', use_colors=False))
|
|
saved_level, saved_propagate = logger.level, logger.propagate
|
|
saved_filters: Final = logger.filters[:]
|
|
logger.filters = [f for f in saved_filters if type(f).__module__.split(".")[0] == "litellm"]
|
|
logger.addHandler(handler)
|
|
logger.setLevel(logging.INFO)
|
|
logger.propagate = False
|
|
try:
|
|
logger.handle(_access_record(full_path))
|
|
finally:
|
|
logger.removeHandler(handler)
|
|
logger.setLevel(saved_level)
|
|
logger.propagate = saved_propagate
|
|
logger.filters = saved_filters
|
|
return stream.getvalue()
|
|
|
|
|
|
def test_uvicorn_access_logger_redacts_a_credential_it_is_handed():
|
|
"""Registration happens at litellm import; without it the filter never runs."""
|
|
emitted = _emit_access_line(f"/key/info?key={_LEAKED_KEY}")
|
|
|
|
assert _LEAKED_KEY not in emitted
|
|
assert "REDACTED" in emitted
|
|
|
|
|
|
def test_access_redaction_survives_the_uvicorn_json_log_config():
|
|
"""litellm hands uvicorn a dictConfig when json_logs is on. dictConfig clears a
|
|
logger's handlers but not its filters, so redaction has to still be attached."""
|
|
import logging.config
|
|
|
|
names = ("uvicorn", "uvicorn.error", "uvicorn.access")
|
|
saved = tuple((logging.getLogger(n), logging.getLogger(n).handlers[:], logging.getLogger(n).level) for n in names)
|
|
try:
|
|
logging.config.dictConfig(_get_uvicorn_json_log_config())
|
|
emitted = _emit_access_line(f"/key/info?key={_LEAKED_KEY}")
|
|
|
|
assert _LEAKED_KEY not in emitted
|
|
assert "REDACTED" in emitted
|
|
finally:
|
|
for lg, handlers, level in saved:
|
|
lg.handlers[:] = handlers
|
|
lg.setLevel(level)
|
|
lg.propagate = True
|
|
|
|
|
|
_DISABLED_ACCESS_LOG_PATHS_RAW = " /health/liveliness , ,/metrics/"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"full_path",
|
|
[
|
|
"/health/liveliness",
|
|
"/health/liveliness?x=1",
|
|
"/health/liveliness?probe=" + "x" * _MAX_SCRUBBED_ACCESS_ARG,
|
|
"/metrics/",
|
|
"/metrics/?format=prometheus&job=a",
|
|
],
|
|
)
|
|
def test_uvicorn_access_logger_drops_a_configured_path(monkeypatch, full_path):
|
|
monkeypatch.setenv("LITELLM_DISABLE_ACCESS_LOG_PATHS", _DISABLED_ACCESS_LOG_PATHS_RAW)
|
|
assert _emit_access_line(full_path) == ""
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"full_path",
|
|
["/v1/chat/completions", "/health", "/health/liveliness/", "/metrics", "/v1/models?health=/health/liveliness"],
|
|
)
|
|
def test_uvicorn_access_logger_keeps_an_unconfigured_path(monkeypatch, full_path):
|
|
monkeypatch.setenv("LITELLM_DISABLE_ACCESS_LOG_PATHS", _DISABLED_ACCESS_LOG_PATHS_RAW)
|
|
assert f'"GET {full_path} HTTP/1.1" 200' in _emit_access_line(full_path)
|
|
|
|
|
|
@pytest.mark.parametrize("raw", [None, "", " , ,"])
|
|
def test_uvicorn_access_logger_keeps_every_line_when_no_path_is_configured(monkeypatch, raw):
|
|
if raw is None:
|
|
monkeypatch.delenv("LITELLM_DISABLE_ACCESS_LOG_PATHS", raising=False)
|
|
else:
|
|
monkeypatch.setenv("LITELLM_DISABLE_ACCESS_LOG_PATHS", raw)
|
|
assert '"GET /health/liveliness HTTP/1.1" 200' in _emit_access_line("/health/liveliness")
|
|
|
|
|
|
def test_access_log_path_filter_survives_the_uvicorn_json_log_config(monkeypatch):
|
|
import logging.config
|
|
|
|
monkeypatch.setenv("LITELLM_DISABLE_ACCESS_LOG_PATHS", _DISABLED_ACCESS_LOG_PATHS_RAW)
|
|
names = ("uvicorn", "uvicorn.error", "uvicorn.access")
|
|
saved = tuple((logging.getLogger(n), logging.getLogger(n).handlers[:], logging.getLogger(n).level) for n in names)
|
|
try:
|
|
logging.config.dictConfig(_get_uvicorn_json_log_config())
|
|
|
|
assert _emit_access_line("/health/liveliness?x=1") == ""
|
|
assert '"GET /v1/models HTTP/1.1" 200' in _emit_access_line("/v1/models")
|
|
finally:
|
|
for lg, handlers, level in saved:
|
|
lg.handlers[:] = handlers
|
|
lg.setLevel(level)
|
|
lg.propagate = True
|
|
|
|
|
|
@pytest.mark.parametrize("args", [None, ("127.0.0.1:1", "GET", 42)])
|
|
def test_access_log_path_filter_keeps_a_record_without_a_string_path_arg(monkeypatch, args):
|
|
monkeypatch.setenv("LITELLM_DISABLE_ACCESS_LOG_PATHS", "/health/liveliness")
|
|
record = logging.LogRecord(
|
|
name="uvicorn.access",
|
|
level=logging.INFO,
|
|
pathname="",
|
|
lineno=0,
|
|
msg='127.0.0.1:1 - "GET /health/liveliness HTTP/1.1" 200',
|
|
args=args,
|
|
exc_info=None,
|
|
)
|
|
assert AccessLogPathFilter().filter(record) is True
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_diagnostic_filter_scrubs_exc_stack_and_nested_extras(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
secret = "sk-" + "q" * 48
|
|
try:
|
|
raise ValueError(f"upstream rejected {secret}")
|
|
except ValueError:
|
|
record = _make_record(logging.ERROR, "call failed", exc_info=sys.exc_info())
|
|
record.stack_info = f"Stack (most recent call last): {secret}"
|
|
record.payload = {
|
|
"api_key": secret,
|
|
"items": [secret, "ok"],
|
|
"tags": {secret},
|
|
"pair": (secret, "ok"),
|
|
"count": 2,
|
|
}
|
|
|
|
assert DiagnosticProcessingFilter().filter(record) is True
|
|
|
|
assert secret not in (record.exc_text or "")
|
|
assert secret not in (record.stack_info or "")
|
|
assert secret not in repr(record.payload)
|
|
assert record.payload["count"] == 2
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_diagnostic_filter_stamps_records_so_a_second_pass_is_free(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
record = _make_record(logging.WARNING, "api_key=secret123")
|
|
diagnostic_filter = DiagnosticProcessingFilter()
|
|
|
|
assert diagnostic_filter.filter(record) is True
|
|
assert diagnostic_filter.filter(record) is True
|
|
assert record.getMessage() == "REDACTED"
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_json_formatter_scrubs_unfiltered_extras(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
secret = "sk-" + "q" * 48
|
|
record = _make_record(logging.INFO, "response complete")
|
|
record.payload = {"api_key": secret, "nested": {"list": [secret]}}
|
|
|
|
rendered = JsonFormatter().format(record)
|
|
|
|
assert secret not in rendered
|
|
assert "REDACTED" in rendered
|
|
|
|
|
|
@pytest.mark.parametrize("native", (False, True), ids=("python", "rust"))
|
|
def test_diagnostic_filter_redacts_a_non_string_message_object(monkeypatch, native):
|
|
if native:
|
|
pytest.importorskip("litellm.rust_bridge._native")
|
|
monkeypatch.setenv("LITELLM_RUST", "1" if native else "0")
|
|
monkeypatch.setattr("litellm._logging._ENABLE_SECRET_REDACTION", True)
|
|
secret = "sk-" + "q" * 48
|
|
record = _make_record(logging.ERROR, {"api_key": secret})
|
|
|
|
assert DiagnosticProcessingFilter().filter(record) is True
|
|
|
|
assert secret not in record.getMessage()
|