diff --git a/.circleci/scripts/run_integration.sh b/.circleci/scripts/run_integration.sh index 08b0281b30f..7b88f23349a 100644 --- a/.circleci/scripts/run_integration.sh +++ b/.circleci/scripts/run_integration.sh @@ -9,7 +9,6 @@ fi suite="${1:?integration suite required}" results="test-results/integration-${suite}" mkdir -p "$results" -shard_timeout=11m integration_identity="$(.venv/bin/python -c 'import uuid; print(uuid.uuid4().hex)')" upstream_pid="" proxy_pid="" @@ -131,6 +130,7 @@ start_proxy() { fi setsid env -i PATH="$PATH" HOME="$HOME" PYTHONPATH="$PYTHONPATH" INTEGRATION_RUN_ID="$integration_identity" \ DATABASE_URL="$DATABASE_URL" REDIS_HOST="$REDIS_HOST" REDIS_PORT="$REDIS_PORT" \ + INTEGRATION_UPSTREAM_URL="$INTEGRATION_UPSTREAM_URL" \ LITELLM_MASTER_KEY="$LITELLM_MASTER_KEY" LITELLM_SALT_KEY="$LITELLM_SALT_KEY" LITELLM_UI_PATH="$LITELLM_UI_PATH" PROXY_BASE_URL="http://127.0.0.1:$port" \ LITELLM_MODE=PRODUCTION STORE_MODEL_IN_DB=True "${cost_map_env[@]}" \ AWS_EC2_METADATA_DISABLED=true DO_NOT_TRACK=1 \ @@ -176,7 +176,7 @@ if [ "$suite" = browser ]; then exit 0 fi -timeout --signal=TERM --kill-after=20s "$shard_timeout" env -i PATH="$PATH" HOME="$HOME" PYTHONPATH="$PYTHONPATH" \ +env -i PATH="$PATH" HOME="$HOME" PYTHONPATH="$PYTHONPATH" \ INTEGRATION_RUN_ID="$integration_identity" \ DATABASE_URL="$DATABASE_URL" REDIS_HOST="$REDIS_HOST" REDIS_PORT="$REDIS_PORT" \ INTEGRATION_PROXY_URL="$INTEGRATION_PROXY_URL" INTEGRATION_PEER_URL="$INTEGRATION_PEER_URL" \ diff --git a/.github/e2e-stack/select_tests.py b/.github/e2e-stack/select_tests.py index 2386b184e54..e425c313d6a 100644 --- a/.github/e2e-stack/select_tests.py +++ b/.github/e2e-stack/select_tests.py @@ -10,6 +10,8 @@ UNSUPPORTED: Final = re.compile( r"|^tests/e2e/batches/test_managed_files_enforcement_e2e\.py$" r"|^tests/e2e/guardrails/test_presidio_masking_e2e\.py$" r"|^tests/e2e/logging/test_otel_v2_langfuse_generation_output_e2e\.py$" + r"|^tests/e2e/logging/test_langsmith_batch_serialization_e2e\.py$" + r"|^tests/e2e/secret_manager/" ) HARNESS: Final = re.compile( r"^tests/e2e/[A-Za-z0-9_.-]+\.(py|ini)$" diff --git a/.github/e2e-stack/up.sh b/.github/e2e-stack/up.sh index 928b58e93bb..931b5eb2169 100755 --- a/.github/e2e-stack/up.sh +++ b/.github/e2e-stack/up.sh @@ -24,6 +24,7 @@ DATABASE_USER="${E2E_DATABASE_USER:-litellm}" DATABASE_PASSWORD="${E2E_DATABASE_PASSWORD:-dbpassword9090}" DATABASE_NAME="${E2E_DATABASE_NAME:-litellm}" JAEGER_OTLP_PORT="${E2E_JAEGER_OTLP_PORT:-4318}" +JAEGER_OTLP_TLS_PORT="${E2E_JAEGER_OTLP_TLS_PORT:-4319}" JAEGER_QUERY_PORT="${E2E_JAEGER_QUERY_PORT:-16686}" KEYCLOAK_PORT="${E2E_KEYCLOAK_PORT:-8081}" @@ -122,7 +123,7 @@ SERVER_ENV=( "CONFIG_FILE_PATH=${CONFIG_PATH}" "STORE_MODEL_IN_DB=True" "OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf" - "OTEL_EXPORTER_OTLP_ENDPOINT=http://127.0.0.1:${JAEGER_OTLP_PORT}" + "OTEL_EXPORTER_OTLP_ENDPOINT=https://127.0.0.1:${JAEGER_OTLP_TLS_PORT}" "SSL_CERT_FILE=${CERTS_DIR}/ca-bundle.pem" "PYTHONPATH=${REPO_ROOT}" "JWT_PUBLIC_KEY_URL=http://127.0.0.1:${KEYCLOAK_PORT}/realms/litellm-e2e/protocol/openid-connect/certs" @@ -147,16 +148,12 @@ start_server() { echo $! > "${PIDS_DIR}/${name}.pid" } -start_server backend uv run --no-sync uvicorn backend.main:app --host 0.0.0.0 --port "${BACKEND_PORT}" -start_server gateway-1 uv run --no-sync uvicorn gateway.main:app --workers 1 --host 0.0.0.0 --port "${GATEWAY_PORT_1}" -start_server gateway-2 uv run --no-sync uvicorn gateway.main:app --workers 1 --host 0.0.0.0 --port "${GATEWAY_PORT_2}" - if [[ "$(uname)" == "Linux" ]]; then NGINX_UPSTREAM_HOST=127.0.0.1 NGINX_DOCKER_ARGS=(--network host) else NGINX_UPSTREAM_HOST=host.docker.internal - NGINX_DOCKER_ARGS=(-p "${LB_PORT}:${LB_PORT}") + NGINX_DOCKER_ARGS=(-p "${LB_PORT}:${LB_PORT}" -p "${JAEGER_OTLP_TLS_PORT}:${JAEGER_OTLP_TLS_PORT}") fi cat > "${STACK_DIR}/nginx.conf" </dev/null 2>&1 || true docker run -d --name e2e-nginx "${NGINX_DOCKER_ARGS[@]}" \ - -v "${STACK_DIR}/nginx.conf:/etc/nginx/nginx.conf:ro" "${NGINX_IMAGE}" >/dev/null + -v "${STACK_DIR}/nginx.conf:/etc/nginx/nginx.conf:ro" \ + -v "${CERTS_DIR}:/certs:ro" "${NGINX_IMAGE}" >/dev/null + +wait_for "Jaeger OTLP TLS listener" \ + "curl -sS --cacert ${CERTS_DIR}/ca.crt https://127.0.0.1:${JAEGER_OTLP_TLS_PORT}/ -o /dev/null -w '%{http_code}' | grep -qE '^[2345]'" + +start_server backend uv run --no-sync uvicorn backend.main:app --host 0.0.0.0 --port "${BACKEND_PORT}" +start_server gateway-1 uv run --no-sync uvicorn gateway.main:app --workers 1 --host 0.0.0.0 --port "${GATEWAY_PORT_1}" +start_server gateway-2 uv run --no-sync uvicorn gateway.main:app --workers 1 --host 0.0.0.0 --port "${GATEWAY_PORT_2}" wait_for "backend" "curl -fs http://127.0.0.1:${BACKEND_PORT}/health/liveliness >/dev/null" 300 wait_for "gateway-1" "curl -fs http://127.0.0.1:${GATEWAY_PORT_1}/health/liveliness >/dev/null" 300 @@ -206,6 +220,7 @@ LITELLM_MASTER_KEY=${MASTER_KEY} REDIS_HOST=127.0.0.1 REDIS_PORT=${REDIS_PORT} E2E_OTEL_QUERY_URL=http://127.0.0.1:${JAEGER_QUERY_PORT} +E2E_OTEL_EXPORTER_ENDPOINT=https://127.0.0.1:${JAEGER_OTLP_TLS_PORT} E2E_KEYCLOAK_URL=http://127.0.0.1:${KEYCLOAK_PORT} E2E_KEYCLOAK_ADMIN_USER=admin E2E_KEYCLOAK_ADMIN_PASSWORD=e2e-ephemeral-idp-not-a-secret diff --git a/.github/workflows/_test-unit-base.yml b/.github/workflows/_test-unit-base.yml index f4d4fb54ba6..8faddd11df8 100644 --- a/.github/workflows/_test-unit-base.yml +++ b/.github/workflows/_test-unit-base.yml @@ -4,7 +4,13 @@ on: workflow_call: inputs: test-path: - description: "Pytest path(s) to run" + description: >- + Space-separated pytest paths to run. A path that no longer exists is + dropped with a warning instead of being passed to pytest, because one + missing path makes pytest-xdist collect nothing and report exit 5, which + the step treats as a drained shard. Options are passed through as + written, so use the `--flag=value` form: a bare `--ignore path` would + have its path existence-checked like any other token. required: true type: string workers: @@ -165,14 +171,22 @@ jobs: DIST: ${{ inputs.dist }} COVERAGE_CORE: sysmon run: | - found_path=false - for path in ${TEST_PATH}; do - if [ -e "${path%%::*}" ]; then - found_path=true - break - fi + pytest_args=() + existing_paths=0 + for token in ${TEST_PATH:?}; do + case "${token}" in + -*) pytest_args+=("${token}") ;; + *) + if [ -e "${token%%::*}" ]; then + pytest_args+=("${token}") + existing_paths=$((existing_paths + 1)) + else + echo "::warning::${token} does not exist; drop it from this shard's test-path" + fi + ;; + esac done - if [ "$found_path" = false ]; then + if [ "${existing_paths}" -eq 0 ]; then echo "No path in TEST_PATH exists (${TEST_PATH}); nothing to run" exit 0 fi @@ -181,7 +195,7 @@ jobs: xdist_args=(-n "${WORKERS}" --dist="${DIST}") fi set +e - uv run --no-sync pytest ${TEST_PATH:?} \ + uv run --no-sync pytest "${pytest_args[@]}" \ --tb=short -vv \ --maxfail="${MAX_FAILURES}" \ "${xdist_args[@]}" \ diff --git a/.github/workflows/compat-matrix-image.yml b/.github/workflows/compat-matrix-image.yml new file mode 100644 index 00000000000..c554096cd7e --- /dev/null +++ b/.github/workflows/compat-matrix-image.yml @@ -0,0 +1,33 @@ +name: Compat Matrix Image + +on: + pull_request: + paths: + - tests/e2e/claude_code/cron_vm/** + - .github/workflows/compat-matrix-image.yml + workflow_dispatch: + +permissions: {} + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + compat-matrix-image: + name: compat-matrix-image + runs-on: ubuntu-latest + timeout-minutes: 15 + permissions: + contents: read + steps: + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + with: + persist-credentials: false + + - name: Build the Render cron image + run: docker build -f tests/e2e/claude_code/cron_vm/Dockerfile -t compat-matrix:${{ github.sha }} tests/e2e + + - name: Run the pinned binaries as the cron user + run: | + docker run --rm compat-matrix:${{ github.sha }} bash -c 'set -e; whoami; claude --version; gh --version; uv --version' diff --git a/.github/workflows/issue_fixed_comment.yml b/.github/workflows/issue_fixed_comment.yml index 92993d319a7..b98a86c4dfa 100644 --- a/.github/workflows/issue_fixed_comment.yml +++ b/.github/workflows/issue_fixed_comment.yml @@ -6,8 +6,12 @@ on: workflow_dispatch: inputs: issue_number: - description: "Closed issue number to comment on manually." - required: true + description: "Closed issue number to comment on and close the superseded pull requests of. Ignored by a sweep." + required: false + sweep: + description: "Close every open pull request whose linked issues were all fixed on the default branch. Reads every open pull request, so run it at most once an hour." + type: boolean + default: false pull_request: paths: - .github/workflows/issue_fixed_comment.yml @@ -39,16 +43,17 @@ jobs: with: bun-version: "1.4.0" - - name: Test the closer lookup, the release placement and the comment + - name: Test the closer lookup, the release placement, the comment and the superseded pull request close run: bun test scripts/comment-fixed-issue.test.ts comment-fixed-issue: if: github.event_name != 'pull_request' && github.repository == 'BerriAI/litellm' runs-on: ubuntu-latest - timeout-minutes: 5 + timeout-minutes: 15 permissions: contents: read issues: write + pull-requests: write steps: - name: Checkout scripts uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 @@ -59,13 +64,16 @@ jobs: - name: Setup Bun uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0 with: - # Exact version, never latest: the next step holds an issues: write token + # Exact version, never latest: the next step holds issues: write and pull-requests: write tokens bun-version: "1.4.0" - - name: Name the release that carries the fix + - name: Name the release that carries the fix and close the pull requests it supersedes + shell: bash run: bun run scripts/comment-fixed-issue.ts | tee -a "${GITHUB_STEP_SUMMARY}" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number || github.event.inputs.issue_number }} + SWEEP: ${{ github.event.inputs.sweep }} DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} DRY_RUN: ${{ vars.ISSUE_FIXED_COMMENT_ENABLED != 'true' }} + CLOSE_PRS_DRY_RUN: ${{ vars.ISSUE_FIXED_CLOSE_PRS_ENABLED != 'true' }} diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index 4bf41dc249c..64e16b512e1 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -105,6 +105,16 @@ jobs: with: python-version: "3.12" + - uses: ./.github/actions/setup-uv-with-retries + with: + version: "0.10.9" + + - name: Install Python dependencies for the bridge tests + working-directory: . + run: | + uv sync --frozen --no-install-project + echo "PYTHONPATH=$PWD/.venv/lib/$(ls .venv/lib)/site-packages" >> "$GITHUB_ENV" + - run: rustup toolchain install --no-self-update - uses: taiki-e/install-action@d438492cf8a250514fa2d34b30bc3c0dc37c65ff # v2.87.8 diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 49e6d7040d4..ac60a9b5f05 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -107,26 +107,18 @@ jobs: tests/test_litellm/batches tests/test_litellm/secret_managers tests/test_litellm/a2a_protocol - tests/test_litellm/anthropic_interface tests/test_litellm/chat_completions tests/test_litellm/completion_extras - tests/test_litellm/compression tests/test_litellm/containers tests/test_litellm/endpoints - tests/test_litellm/models - tests/test_litellm/repositories tests/test_litellm/images tests/test_litellm/interactions tests/test_litellm/messages tests/test_litellm/ocr tests/test_litellm/passthrough tests/test_litellm/rag - tests/test_litellm/realtime_api tests/test_litellm/rerank_api tests/test_litellm/rust_bridge - tests/test_litellm/sandbox - tests/test_litellm/skills - tests/test_litellm/test_router tests/test_litellm/vector_stores tests/test_litellm/videos tests/test_litellm/test_*.py diff --git a/Dockerfile b/Dockerfile index 759dac76795..4dcecf3ea3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ # syntax=docker/dockerfile:1.7 # Base image for building -ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d # Runtime image -ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d ARG UV_IMAGE=ghcr.io/astral-sh/uv:0.11.7@sha256:240fb85ab0f263ef12f492d8476aa3a2e4e1e333f7d67fbdd923d00a506a516a # Pinned by digest like the other base images; bump explicitly on Node upgrades. ARG UI_BUILD_IMAGE=node:24.19-alpine3.24@sha256:d32cdf619f63fe0471182d08996dd516c6275bb5fd31ae06e55a570bd9e1ad43 diff --git a/backend/Dockerfile b/backend/Dockerfile index 57e0a43a98d..59f836b55f8 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ -ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d -ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d +ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d ARG UV_IMAGE=ghcr.io/astral-sh/uv:0.11.7@sha256:240fb85ab0f263ef12f492d8476aa3a2e4e1e333f7d67fbdd923d00a506a516a FROM $UV_IMAGE AS uvbin diff --git a/docker/Dockerfile.database b/docker/Dockerfile.database index b0bf935c616..61b6faae691 100644 --- a/docker/Dockerfile.database +++ b/docker/Dockerfile.database @@ -1,10 +1,10 @@ # syntax=docker/dockerfile:1.7 # Base image for building -ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d # Runtime image -ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d ARG UV_IMAGE=ghcr.io/astral-sh/uv:0.11.7@sha256:240fb85ab0f263ef12f492d8476aa3a2e4e1e333f7d67fbdd923d00a506a516a # Pinned by digest like the other base images; bump explicitly on Node upgrades. ARG UI_BUILD_IMAGE=node:24.19-alpine3.24@sha256:d32cdf619f63fe0471182d08996dd516c6275bb5fd31ae06e55a570bd9e1ad43 diff --git a/docker/Dockerfile.non_root b/docker/Dockerfile.non_root index 5d729046678..d4c07d56d90 100644 --- a/docker/Dockerfile.non_root +++ b/docker/Dockerfile.non_root @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1.7 # Base images -ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d -ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d +ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d ARG PROXY_EXTRAS_SOURCE=published ARG UV_IMAGE=ghcr.io/astral-sh/uv:0.11.7@sha256:240fb85ab0f263ef12f492d8476aa3a2e4e1e333f7d67fbdd923d00a506a516a # Pinned by digest like the other base images; bump explicitly on Node upgrades. diff --git a/enterprise/pyproject.toml b/enterprise/pyproject.toml index 729f3264706..8509600ad96 100644 --- a/enterprise/pyproject.toml +++ b/enterprise/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "litellm-enterprise" -version = "0.1.69" +version = "0.1.70" description = "Package for LiteLLM Enterprise features" readme = "README.md" requires-python = ">=3.9" @@ -26,7 +26,7 @@ required-version = ">=0.10.9" module-root = "" [tool.commitizen] -version = "0.1.69" +version = "0.1.70" version_files = [ "pyproject.toml:^version", "../pyproject.toml:litellm-enterprise==", diff --git a/gateway/Dockerfile b/gateway/Dockerfile index 33d3791dbba..8045a8b64cb 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,5 +1,5 @@ -ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d -ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d +ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d ARG UV_IMAGE=ghcr.io/astral-sh/uv:0.11.7@sha256:240fb85ab0f263ef12f492d8476aa3a2e4e1e333f7d67fbdd923d00a506a516a # Checksum from https://www.pgbouncer.org/downloads/ (the Wolfi repo only carries 1.24.x) ARG PGBOUNCER_VERSION=1.25.2 diff --git a/gateway/routes/allowlist.py b/gateway/routes/allowlist.py index fe58e2dd58c..c4a3d3f7473 100644 --- a/gateway/routes/allowlist.py +++ b/gateway/routes/allowlist.py @@ -131,6 +131,7 @@ GATEWAY_EXACT_PATHS: frozenset[str] = frozenset( "/redoc", "/test", "/debug/memory/summary", + "/api/event_logging/batch", } ) diff --git a/helm/litellm/templates/ingress.yaml b/helm/litellm/templates/ingress.yaml index e6717821a57..e9f7ed4ec3f 100644 --- a/helm/litellm/templates/ingress.yaml +++ b/helm/litellm/templates/ingress.yaml @@ -61,7 +61,7 @@ "/v1/fine-tuning" "/fine-tuning" "/v1/responses" "/responses" "/v1/threads" "/threads" "/v1/assistants" "/assistants" "/v1/vector_stores" "/vector_stores" "/v1/indexes" "/v1/models" "/models" "/openai" "/engines" - "/v1/messages" "/messages" "/v1/skills" "/v1/a2a" "/a2a" + "/v1/messages" "/messages" "/v1/skills" "/v1/a2a" "/a2a" "/api/event_logging" "/v1/rerank" "/v2/rerank" "/rerank" "/v1/ocr" "/ocr" "/v1/rag" "/rag" "/v1/video" "/v1/videos" "/video" "/videos" "/v1/search" "/search" "/v1/containers" "/containers" "/v1/evals" "/v1/memory" "/queue/chat" diff --git a/litellm-proxy-extras/pyproject.toml b/litellm-proxy-extras/pyproject.toml index fb9022f89a5..e9a4ff90b9e 100644 --- a/litellm-proxy-extras/pyproject.toml +++ b/litellm-proxy-extras/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "litellm-proxy-extras" -version = "0.4.100" +version = "0.4.101" description = "Additional files for the LiteLLM Proxy. Reduces the size of the main litellm package." readme = "README.md" requires-python = ">=3.9" @@ -26,7 +26,7 @@ required-version = ">=0.10.9" module-root = "" [tool.commitizen] -version = "0.4.100" +version = "0.4.101" version_files = [ "pyproject.toml:^version", "../pyproject.toml:litellm-proxy-extras==", diff --git a/litellm-rust/Cargo.lock b/litellm-rust/Cargo.lock index 76004c5d978..332d8b3dcf0 100644 --- a/litellm-rust/Cargo.lock +++ b/litellm-rust/Cargo.lock @@ -2727,9 +2727,13 @@ dependencies = [ "litellm-auth-types", "litellm-cache", "litellm-cache-response", + "litellm-cache-testing", + "reqwest 0.12.28", + "rstest", "serde_json", "tokio", "url", + "wiremock", ] [[package]] @@ -2737,6 +2741,7 @@ name = "litellm-cache-disk" version = "0.1.0" dependencies = [ "litellm-cache", + "litellm-cache-testing", "py_literal", "rand 0.8.7", "rstest", @@ -2755,8 +2760,10 @@ dependencies = [ "litellm-auth-gcp", "litellm-auth-types", "litellm-cache", + "litellm-cache-testing", "percent-encoding", "reqwest 0.12.28", + "rstest", "serde_json", "tokio", "wiremock", @@ -2767,8 +2774,8 @@ name = "litellm-cache-memory" version = "0.1.0" dependencies = [ "litellm-cache", + "litellm-cache-testing", "rstest", - "serde_json", "tokio", ] @@ -2776,9 +2783,10 @@ dependencies = [ name = "litellm-cache-qdrant-semantic" version = "0.1.0" dependencies = [ + "futures-executor", "futures-util", "litellm-cache", - "litellm-cache-response", + "litellm-cache-testing", "qdrant-client", "reqwest 0.12.28", "rstest", @@ -2797,9 +2805,11 @@ name = "litellm-cache-redis" version = "0.1.0" dependencies = [ "litellm-cache", + "litellm-cache-testing", "r2d2", "redis", "redis-test", + "rstest", "serde_json", "tokio", ] @@ -2810,10 +2820,10 @@ version = "0.1.0" dependencies = [ "litellm-cache", "litellm-cache-redis", - "litellm-cache-response", - "r2d2", + "litellm-cache-testing", "redis", "redis-test", + "rstest", "serde_json", "sha2 0.10.9", "tokio", @@ -2829,6 +2839,7 @@ dependencies = [ "py_literal", "redis", "redis-test", + "rstest", "serde", "serde_json", "sha2 0.10.9", @@ -2841,22 +2852,35 @@ version = "0.1.0" dependencies = [ "aws-credential-types", "aws-sdk-s3", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", + "futures-util", + "http 1.4.2", "litellm-auth-aws", "litellm-cache", + "litellm-cache-testing", + "reqwest 0.12.28", + "rstest", "serde_json", "tokio", "wiremock", ] +[[package]] +name = "litellm-cache-testing" +version = "0.1.0" +dependencies = [ + "litellm-cache", +] + [[package]] name = "litellm-cache-valkey-semantic" version = "0.1.0" dependencies = [ "litellm-cache", "litellm-cache-redis", - "litellm-cache-response", + "litellm-cache-testing", "redis", "redis-test", "rstest", @@ -2922,6 +2946,7 @@ name = "litellm-core-utils" version = "0.1.0" dependencies = [ "fancy-regex 0.19.2", + "litellm-tracing", "litellm-types", "rstest", "serde", @@ -2932,6 +2957,14 @@ dependencies = [ "url", ] +[[package]] +name = "litellm-cost" +version = "0.1.0" +dependencies = [ + "criterion", + "proptest", +] + [[package]] name = "litellm-framing" version = "0.1.0" @@ -3022,6 +3055,20 @@ dependencies = [ "url", ] +[[package]] +name = "litellm-model-catalog" +version = "0.1.0" +dependencies = [ + "criterion", + "indexmap 2.14.0", + "litellm-model-catalog", + "rstest", + "schemars 1.2.2", + "serde", + "serde_json", + "thiserror 2.0.19", +] + [[package]] name = "litellm-python-bridge" version = "0.1.0" @@ -3029,6 +3076,7 @@ dependencies = [ "aws-sdk-secretsmanager", "bytes", "criterion", + "fancy-regex 0.19.2", "futures-util", "litellm-auth", "litellm-auth-aws", @@ -3047,6 +3095,7 @@ dependencies = [ "litellm-callbacks-legacy-python", "litellm-core", "litellm-core-utils", + "litellm-host", "litellm-host-python", "litellm-http", "litellm-llms", @@ -3054,6 +3103,7 @@ dependencies = [ "litellm-secrets-aws", "litellm-secrets-types", "litellm-token-counter", + "litellm-tracing", "litellm-types", "pyo3", "pyo3-async-runtimes", @@ -3072,6 +3122,21 @@ dependencies = [ "wiremock", ] +[[package]] +name = "litellm-python-compat" +version = "0.1.0" +dependencies = [ + "criterion", + "hex", + "num-bigint 0.4.8", + "num-traits", + "rstest", + "serde", + "serde-pickle", + "serde_json", + "thiserror 2.0.19", +] + [[package]] name = "litellm-secrets" version = "0.1.0" @@ -3111,11 +3176,11 @@ dependencies = [ "litellm-auth-aws", "litellm-core-utils", "litellm-secrets-types", + "litellm-tracing", "rstest", "serde_json", "thiserror 2.0.19", "tokio", - "tracing", "veil", "wiremock", ] @@ -3147,6 +3212,7 @@ dependencies = [ "base64 0.22.1", "litellm-core-utils", "litellm-secrets-types", + "litellm-tracing", "moka", "percent-encoding", "reqwest 0.12.28", @@ -3155,7 +3221,6 @@ dependencies = [ "serde_json", "thiserror 2.0.19", "tokio", - "tracing", "veil", "wiremock", ] @@ -3270,6 +3335,19 @@ dependencies = [ "tiktoken-rs", ] +[[package]] +name = "litellm-tracing" +version = "0.1.0" +dependencies = [ + "fancy-regex 0.19.2", + "percent-encoding", + "rstest", + "serde_json", + "tokio", + "tracing", + "tracing-subscriber", +] + [[package]] name = "litellm-types" version = "0.1.0" @@ -4709,10 +4787,23 @@ checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" dependencies = [ "dyn-clone", "ref-cast", + "schemars_derive", "serde", "serde_json", ] +[[package]] +name = "schemars_derive" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98c67716b46af2f0b8cf752abc930f6f9aecfbf671ecfb531db8a31dbe4e2ba" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 3.0.0", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -4801,6 +4892,17 @@ dependencies = [ "syn 3.0.0", ] +[[package]] +name = "serde_derive_internals" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.0", +] + [[package]] name = "serde_json" version = "1.0.150" diff --git a/litellm-rust/Cargo.toml b/litellm-rust/Cargo.toml index 813d0713128..9d05c8d2b98 100644 --- a/litellm-rust/Cargo.toml +++ b/litellm-rust/Cargo.toml @@ -9,6 +9,8 @@ license = "MIT" repository = "https://github.com/BerriAI/litellm" [workspace.dependencies] +litellm-tracing = { path = "crates/tracing" } +tracing = "0.1" litellm-core = { path = "crates/core" } litellm-host = { path = "crates/host" } litellm-callbacks-legacy-python = { path = "crates/callbacks-legacy-python" } @@ -39,6 +41,7 @@ litellm-cache-disk = { path = "crates/cache-disk" } litellm-cache-redis-semantic = { path = "crates/cache-redis-semantic" } litellm-cache-response = { path = "crates/cache-response" } litellm-cache-qdrant-semantic = { path = "crates/cache-qdrant-semantic" } +litellm-cache-testing = { path = "crates/cache-testing" } litellm-token-counter = { path = "crates/token-counter" } litellm-token-counter-fast = { path = "crates/token-counter-fast" } litellm-token-counter-huggingface = { path = "crates/token-counter-huggingface" } diff --git a/litellm-rust/crates/cache-azure-blob/Cargo.toml b/litellm-rust/crates/cache-azure-blob/Cargo.toml index 55abaff1975..baa1b0f5482 100644 --- a/litellm-rust/crates/cache-azure-blob/Cargo.toml +++ b/litellm-rust/crates/cache-azure-blob/Cargo.toml @@ -14,9 +14,14 @@ async-trait = "0.1" azure_core = "1.1.0" azure_storage_blob = "1.1.0" futures-util.workspace = true +reqwest.workspace = true tokio.workspace = true url.workspace = true [dev-dependencies] litellm-cache-response.workspace = true +litellm-cache-testing.workspace = true +rstest.workspace = true serde_json.workspace = true +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } +wiremock = "0.6.5" diff --git a/litellm-rust/crates/cache-azure-blob/src/cache.rs b/litellm-rust/crates/cache-azure-blob/src/cache.rs index 6a872a0d6e6..489b08d485e 100644 --- a/litellm-rust/crates/cache-azure-blob/src/cache.rs +++ b/litellm-rust/crates/cache-azure-blob/src/cache.rs @@ -3,7 +3,7 @@ use std::{sync::Arc, time::Duration}; use azure_core::{ credentials::TokenCredential, error::ErrorKind, - http::{ClientOptions, RequestContent}, + http::{ClientOptions, RequestContent, Transport}, }; use azure_storage_blob::{ BlobContainerClient, BlobContainerClientOptions, @@ -11,13 +11,12 @@ use azure_storage_blob::{ }; use futures_util::{TryStreamExt, future::try_join_all}; use litellm_cache::{ - BaseCache, BatchCache, CacheCodec, CacheConnectionResult, CacheConnectionStatus, Error, - ExactCacheContext, FlushCache, + BaseCache, BatchCache, CacheCodec, DisconnectCache, Error, ExactCacheContext, FlushCache, }; use tokio::runtime::Handle; use url::Url; -use crate::credential::AzureBlobCredential; +use crate::{credential::AzureBlobCredential, transport::ReqwestTransport}; pub struct AzureBlobCache { container: BlobContainerClient, @@ -28,9 +27,11 @@ pub struct AzureBlobCache { } impl AzureBlobCache { + /// `http` is the host's pooled client; the SDK sends every request through it. pub async fn connect( account_url: &str, container: &str, + http: reqwest::Client, codec: C, runtime: Handle, ) -> Result { @@ -38,7 +39,10 @@ impl AzureBlobCache { account_url, container, Some(Arc::new(AzureBlobCredential::default())), - ClientOptions::default(), + ClientOptions { + transport: Some(Transport::new(Arc::new(ReqwestTransport(http)))), + ..ClientOptions::default() + }, codec, runtime, ) @@ -152,7 +156,11 @@ impl AzureBlobCache { } fn block_on(&self, future: impl Future) -> T { - self.runtime.block_on(future) + if Handle::try_current().is_ok() { + tokio::task::block_in_place(|| self.runtime.block_on(future)) + } else { + self.runtime.block_on(future) + } } } @@ -217,25 +225,6 @@ impl BaseCache for AzureBlobCache { .await .map(drop) } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - Ok(match self.container.get_properties(None).await { - Ok(_) => CacheConnectionResult { - status: CacheConnectionStatus::Success, - message: "Azure Blob cache connection test successful".into(), - error: None, - }, - Err(error) => CacheConnectionResult { - status: CacheConnectionStatus::Failed, - message: format!("Azure Blob connection failed: {error}"), - error: Some(error.to_string()), - }, - }) - } } impl BatchCache for AzureBlobCache {} @@ -250,5 +239,10 @@ impl FlushCache for AzureBlobCache { } } -#[cfg(test)] -mod tests; +impl DisconnectCache for AzureBlobCache { + /// Python closes its two SDK clients; the Rust clients hold no connection of their own + /// (the pooled transport belongs to the host), so there is nothing to release. + async fn disconnect(&self) -> Result<(), Error> { + Ok(()) + } +} diff --git a/litellm-rust/crates/cache-azure-blob/src/cache/tests.rs b/litellm-rust/crates/cache-azure-blob/src/cache/tests.rs deleted file mode 100644 index f8736ab069b..00000000000 --- a/litellm-rust/crates/cache-azure-blob/src/cache/tests.rs +++ /dev/null @@ -1,746 +0,0 @@ -use std::{ - collections::BTreeMap, - sync::{Arc, Mutex}, - time::Duration, -}; - -use azure_core::http::{ - AsyncRawResponse, Body, ClientOptions, HttpClient, Method, Request, StatusCode, Transport, - headers::{HeaderName, Headers}, -}; -use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheConnectionStatus, Error, ExactCacheContext, FlushCache, -}; -use litellm_cache_response::{ - CacheEntry, CacheKeyField, CacheKeyInput, ResponseCache, ResponseCacheCodec, - ResponseCacheRequest, cache_key, -}; -use serde_json::json; -use tokio::runtime::Runtime; - -use super::AzureBlobCache; - -const ACCOUNT_URL: &str = "https://example.blob.core.windows.net"; -const CONTAINER: &str = "litellm-cache"; -const IF_NONE_MATCH: HeaderName = HeaderName::from_static("if-none-match"); -const ERROR_CODE: HeaderName = HeaderName::from_static("x-ms-error-code"); - -#[derive(Clone, Debug, PartialEq, Eq)] -struct RecordedRequest { - method: Method, - path: String, - query: String, - if_none_match: Option, -} - -#[derive(Default)] -struct FakeState { - container_exists: bool, - blobs: BTreeMap>, - requests: Vec, - failing: bool, - precondition_conflicts: bool, -} - -#[derive(Clone, Default)] -struct FakeBlobService { - state: Arc>, -} - -impl std::fmt::Debug for FakeBlobService { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.write_str("FakeBlobService") - } -} - -impl FakeBlobService { - fn with_existing_container() -> Self { - let service = Self::default(); - service.state.lock().unwrap().container_exists = true; - service - } - - fn blob(&self, name: &str) -> Option> { - self.state.lock().unwrap().blobs.get(name).cloned() - } - - fn blob_names(&self) -> Vec { - self.state.lock().unwrap().blobs.keys().cloned().collect() - } - - fn seed_blob(&self, name: &str, bytes: &[u8]) { - self.state - .lock() - .unwrap() - .blobs - .insert(name.to_string(), bytes.to_vec()); - } - - fn set_failing(&self, failing: bool) { - self.state.lock().unwrap().failing = failing; - } - - fn set_precondition_conflicts(&self, enabled: bool) { - self.state.lock().unwrap().precondition_conflicts = enabled; - } - - fn requests(&self) -> Vec { - self.state.lock().unwrap().requests.clone() - } - - fn container_exists(&self) -> bool { - self.state.lock().unwrap().container_exists - } - - fn respond(status: StatusCode, error_code: Option<&str>, body: Vec) -> AsyncRawResponse { - let mut headers = Headers::new(); - if let Some(code) = error_code { - headers.insert(ERROR_CODE, code.to_string()); - } - AsyncRawResponse::from_bytes(status, headers, body) - } - - fn list_body(state: &FakeState) -> Vec { - let mut xml = String::from( - r#""#, - ); - for name in state.blobs.keys() { - xml.push_str(&format!( - "{name}BlockBlob" - )); - } - xml.push_str(""); - xml.into_bytes() - } -} - -#[async_trait::async_trait] -impl HttpClient for FakeBlobService { - async fn execute_request(&self, request: &Request) -> azure_core::Result { - let mut state = self.state.lock().unwrap(); - let path = request.url().path().to_string(); - let query = request.url().query().unwrap_or_default().to_string(); - let if_none_match = request - .headers() - .get_optional_str(&IF_NONE_MATCH) - .map(str::to_owned); - state.requests.push(RecordedRequest { - method: request.method(), - path: path.clone(), - query: query.clone(), - if_none_match: if_none_match.clone(), - }); - if state.failing { - return Ok(Self::respond( - StatusCode::Forbidden, - Some("AuthorizationFailure"), - Vec::new(), - )); - } - let container_path = format!("/{CONTAINER}"); - let blob_name = path - .strip_prefix(&format!("{container_path}/")) - .map(str::to_owned); - let is_container = path == container_path && query.contains("restype=container"); - let response = match (request.method(), is_container, blob_name) { - (Method::Put, true, None) if state.container_exists => Self::respond( - StatusCode::Conflict, - Some("ContainerAlreadyExists"), - Vec::new(), - ), - (Method::Put, true, None) => { - state.container_exists = true; - Self::respond(StatusCode::Created, None, Vec::new()) - } - (Method::Get, true, None) if query.contains("comp=list") => { - Self::respond(StatusCode::Ok, None, Self::list_body(&state)) - } - (Method::Get, true, None) if state.container_exists => { - Self::respond(StatusCode::Ok, None, Vec::new()) - } - (Method::Get, true, None) => { - Self::respond(StatusCode::NotFound, Some("ContainerNotFound"), Vec::new()) - } - (Method::Put, false, Some(name)) => { - if if_none_match.as_deref() == Some("*") && state.blobs.contains_key(&name) { - if state.precondition_conflicts { - Self::respond( - StatusCode::PreconditionFailed, - Some("ConditionNotMet"), - Vec::new(), - ) - } else { - Self::respond(StatusCode::Conflict, Some("BlobAlreadyExists"), Vec::new()) - } - } else { - let bytes = match request.body() { - Body::Bytes(bytes) => bytes.to_vec(), - Body::SeekableStream(_) => panic!("unexpected streaming upload"), - }; - state.blobs.insert(name, bytes); - Self::respond(StatusCode::Created, None, Vec::new()) - } - } - (Method::Get, false, Some(name)) => match state.blobs.get(&name) { - Some(bytes) => Self::respond(StatusCode::Ok, None, bytes.clone()), - None => Self::respond(StatusCode::NotFound, Some("BlobNotFound"), Vec::new()), - }, - (Method::Delete, false, Some(name)) => match state.blobs.remove(&name) { - Some(_) => Self::respond(StatusCode::Accepted, None, Vec::new()), - None => Self::respond(StatusCode::NotFound, Some("BlobNotFound"), Vec::new()), - }, - (method, _, _) => panic!("unexpected request {method:?} {path}?{query}"), - }; - Ok(response) - } -} - -struct Fixture { - runtime: Runtime, - service: FakeBlobService, - cache: Arc>, -} - -impl Fixture { - fn new(service: FakeBlobService) -> Self { - let runtime = Runtime::new().unwrap(); - let cache = runtime - .block_on(Self::connect(&service, runtime.handle().clone())) - .unwrap(); - Self { - runtime, - service, - cache: Arc::new(cache), - } - } - - async fn connect( - service: &FakeBlobService, - handle: tokio::runtime::Handle, - ) -> Result, Error> { - AzureBlobCache::connect_with_options( - ACCOUNT_URL, - CONTAINER, - None, - ClientOptions { - transport: Some(Transport::new(Arc::new(service.clone()))), - ..ClientOptions::default() - }, - ResponseCacheCodec, - handle, - ) - .await - } - - fn response_cache(&self) -> ResponseCache> { - ResponseCache::new(self.cache.clone()) - } - - fn stored_json(&self, key: &str) -> serde_json::Value { - serde_json::from_slice(&self.service.blob(key).expect("blob should exist")).unwrap() - } -} - -fn request(model: &str) -> ResponseCacheRequest { - ResponseCacheRequest::new(CacheKeyInput { - fields: vec![CacheKeyField { - name: "model".into(), - value: Some(model.into()), - api_parameter: true, - internal_parameter: false, - }], - preset: None, - namespace: None, - include_provider_parameters: false, - }) -} - -fn now() -> Duration { - Duration::from_secs(1_700_000_000) -} - -fn entry(value: serde_json::Value) -> CacheEntry { - CacheEntry { - timestamp: Some(1_700_000_000.5), - response: value, - } -} - -fn no_ttl() -> ExactCacheContext { - ExactCacheContext::default() -} - -fn with_ttl(seconds: u64) -> ExactCacheContext { - ExactCacheContext { - ttl: Some(Duration::from_secs(seconds)), - } -} - -#[test] -fn connect_creates_the_container_once() { - let fixture = Fixture::new(FakeBlobService::default()); - assert!(fixture.service.container_exists()); - assert_eq!( - fixture.service.requests(), - vec![RecordedRequest { - method: Method::Put, - path: format!("/{CONTAINER}"), - query: "restype=container".into(), - if_none_match: None, - }] - ); - assert_eq!(fixture.cache.account_url(), ACCOUNT_URL); - assert_eq!(fixture.cache.container_name(), CONTAINER); -} - -#[test] -fn connect_accepts_an_existing_container() { - let fixture = Fixture::new(FakeBlobService::with_existing_container()); - assert!(fixture.service.container_exists()); - assert_eq!(fixture.service.requests().len(), 1); -} - -#[test] -fn connect_accepts_account_urls_with_trailing_slash() { - let runtime = Runtime::new().unwrap(); - let service = FakeBlobService::default(); - let cache = runtime - .block_on(AzureBlobCache::connect_with_options( - "https://example.blob.core.windows.net/", - CONTAINER, - None, - ClientOptions { - transport: Some(Transport::new(Arc::new(service.clone()))), - ..ClientOptions::default() - }, - ResponseCacheCodec, - runtime.handle().clone(), - )) - .unwrap(); - assert_eq!(service.requests()[0].path, format!("/{CONTAINER}")); - assert_eq!(cache.account_url(), "https://example.blob.core.windows.net"); -} - -#[test] -fn connect_keeps_account_url_query_parameters_on_the_container_path() { - let runtime = Runtime::new().unwrap(); - let service = FakeBlobService::default(); - runtime - .block_on(AzureBlobCache::connect_with_options( - "https://example.blob.core.windows.net/?sv=2024-01-01&sig=abc", - CONTAINER, - None, - ClientOptions { - transport: Some(Transport::new(Arc::new(service.clone()))), - ..ClientOptions::default() - }, - ResponseCacheCodec, - runtime.handle().clone(), - )) - .unwrap(); - let create = &service.requests()[0]; - assert_eq!(create.path, format!("/{CONTAINER}")); - assert!(create.query.contains("sig=abc")); -} - -#[test] -fn connect_surfaces_service_failures() { - let runtime = Runtime::new().unwrap(); - let service = FakeBlobService::default(); - service.set_failing(true); - let result = runtime.block_on(Fixture::connect(&service, runtime.handle().clone())); - assert!(matches!(result, Err(Error::Unavailable))); -} - -#[test] -fn sync_set_and_get_round_trip_python_json_shape() { - let fixture = Fixture::new(FakeBlobService::default()); - let value = entry(json!({"choices": [{"message": {"content": "héllo 🌍"}}]})); - fixture - .cache - .set_cache("key-1", value.clone(), &no_ttl()) - .unwrap(); - - assert_eq!( - fixture.stored_json("key-1"), - json!({ - "timestamp": 1_700_000_000.5, - "response": {"choices": [{"message": {"content": "héllo 🌍"}}]} - }) - ); - assert_eq!( - fixture.cache.get_cache("key-1", &no_ttl()).unwrap(), - Some(value) - ); -} - -#[test] -fn sync_set_does_not_overwrite_an_existing_blob() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture - .cache - .set_cache("key", entry(json!({"v": "first"})), &no_ttl()) - .unwrap(); - fixture - .cache - .set_cache("key", entry(json!({"v": "second"})), &no_ttl()) - .unwrap(); - - assert_eq!( - fixture.stored_json("key")["response"], - json!({"v": "first"}) - ); - let uploads: Vec<_> = fixture - .service - .requests() - .into_iter() - .filter(|request| request.method == Method::Put && request.path.ends_with("/key")) - .collect(); - assert_eq!(uploads.len(), 2); - assert!( - uploads - .iter() - .all(|request| request.if_none_match.as_deref() == Some("*")) - ); -} - -#[test] -fn sync_set_treats_a_precondition_conflict_as_an_existing_blob() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture.service.set_precondition_conflicts(true); - fixture - .cache - .set_cache("key", entry(json!({"v": "first"})), &no_ttl()) - .unwrap(); - fixture - .cache - .set_cache("key", entry(json!({"v": "second"})), &no_ttl()) - .unwrap(); - - assert_eq!( - fixture.stored_json("key")["response"], - json!({"v": "first"}) - ); -} - -#[test] -fn async_set_overwrites_an_existing_blob() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture.runtime.block_on(async { - fixture - .cache - .async_set_cache("key", entry(json!({"v": "first"})), no_ttl()) - .await - .unwrap(); - fixture - .cache - .async_set_cache("key", entry(json!({"v": "second"})), no_ttl()) - .await - .unwrap(); - assert_eq!( - fixture - .cache - .async_get_cache("key", &no_ttl()) - .await - .unwrap(), - Some(entry(json!({"v": "second"}))) - ); - }); - assert_eq!( - fixture.stored_json("key")["response"], - json!({"v": "second"}) - ); - assert!( - fixture - .service - .requests() - .iter() - .filter(|request| request.method == Method::Put && request.path.ends_with("/key")) - .all(|request| request.if_none_match.is_none()) - ); -} - -#[test] -fn missing_blobs_are_misses() { - let fixture = Fixture::new(FakeBlobService::default()); - assert_eq!(fixture.cache.get_cache("absent", &no_ttl()).unwrap(), None); - assert_eq!( - fixture - .runtime - .block_on(fixture.cache.async_get_cache("absent", &no_ttl())) - .unwrap(), - None - ); -} - -#[test] -fn ttl_is_ignored_and_entries_never_expire() { - let fixture = Fixture::new(FakeBlobService::default()); - assert_eq!(fixture.cache.get_ttl(&with_ttl(1)), None); - assert_eq!(fixture.cache.get_ttl(&no_ttl()), None); - - fixture - .cache - .set_cache("key", entry(json!("value")), &with_ttl(1)) - .unwrap(); - std::thread::sleep(Duration::from_millis(1100)); - assert_eq!( - fixture.cache.get_cache("key", &with_ttl(1)).unwrap(), - Some(entry(json!("value"))) - ); - assert!( - fixture - .service - .requests() - .iter() - .all(|request| !request.query.contains("expiry")) - ); -} - -#[test] -fn malformed_blobs_are_invalid_entries_and_response_cache_misses() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture.service.seed_blob("broken-json", b"{not json"); - fixture - .service - .seed_blob("broken-utf8", &[0xff, 0xfe, 0x22]); - fixture - .service - .seed_blob("wrong-shape", br#"{"timestamp": "yesterday"}"#); - - for key in ["broken-json", "broken-utf8", "wrong-shape"] { - assert!(matches!( - fixture.cache.get_cache(key, &no_ttl()), - Err(Error::InvalidEntry) - )); - } - - let response_cache = fixture.response_cache(); - let broken = request("broken"); - fixture - .service - .seed_blob(&cache_key(&broken.key), b"{not json"); - assert_eq!(response_cache.lookup(&broken, now()).unwrap(), None); - assert_eq!( - fixture - .runtime - .block_on(response_cache.async_lookup(&broken, now())) - .unwrap(), - None - ); -} - -#[test] -fn batch_get_preserves_order_and_marks_misses_and_invalid_entries() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture - .cache - .set_cache("a", entry(json!("A")), &no_ttl()) - .unwrap(); - fixture - .cache - .set_cache("c", entry(json!("C")), &no_ttl()) - .unwrap(); - fixture.service.seed_blob("bad", b"nope"); - let keys = ["c", "missing", "a", "bad"].map(String::from); - - let sync = fixture.cache.batch_get_cache(&keys, &no_ttl()).unwrap(); - assert_eq!( - sync, - vec![ - BatchEntry::Hit(entry(json!("C"))), - BatchEntry::Miss, - BatchEntry::Hit(entry(json!("A"))), - BatchEntry::Invalid, - ] - ); - - let asynchronous = fixture - .runtime - .block_on(fixture.cache.async_batch_get_cache(keys.to_vec(), no_ttl())) - .unwrap(); - assert_eq!(asynchronous, sync); - - let response_cache = fixture.response_cache(); - let requests = [request("hit"), request("missing"), request("bad")]; - response_cache - .store(&requests[0], json!("HIT"), now()) - .unwrap(); - fixture - .service - .seed_blob(&cache_key(&requests[2].key), b"nope"); - let hits = response_cache.lookup_batch(&requests, now()).unwrap(); - assert_eq!(hits.values, vec![Some(json!("HIT")), None, None]); - assert_eq!(hits.missing_indices, vec![1, 2]); - let async_hits = fixture - .runtime - .block_on(response_cache.async_lookup_batch(&requests, now())) - .unwrap(); - assert_eq!(async_hits.values, hits.values); -} - -#[test] -fn async_pipeline_writes_every_entry_with_overwrite() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture.service.seed_blob("k2", b"stale"); - fixture - .runtime - .block_on(fixture.cache.async_set_cache_pipeline( - vec![ - ("k1".into(), entry(json!({"n": 1}))), - ("k2".into(), entry(json!({"n": 2}))), - ("k3".into(), entry(json!({"n": 3}))), - ], - with_ttl(30), - )) - .unwrap(); - assert_eq!(fixture.service.blob_names(), ["k1", "k2", "k3"]); - assert_eq!(fixture.stored_json("k2")["response"], json!({"n": 2})); -} - -#[test] -fn flush_deletes_every_blob_in_the_container() { - let fixture = Fixture::new(FakeBlobService::default()); - for key in ["x", "y", "z"] { - fixture - .cache - .set_cache(key, entry(json!(key)), &no_ttl()) - .unwrap(); - } - fixture.cache.flush_cache().unwrap(); - assert!(fixture.service.blob_names().is_empty()); - assert!(fixture.service.container_exists()); - - fixture - .cache - .set_cache("again", entry(json!(1)), &no_ttl()) - .unwrap(); - fixture - .runtime - .block_on(fixture.cache.async_flush_cache()) - .unwrap(); - assert!(fixture.service.blob_names().is_empty()); -} - -#[test] -fn service_failures_map_to_unavailable() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture.service.set_failing(true); - assert!(matches!( - fixture.cache.get_cache("key", &no_ttl()), - Err(Error::Unavailable) - )); - assert!(matches!( - fixture.cache.set_cache("key", entry(json!(1)), &no_ttl()), - Err(Error::Unavailable) - )); - assert!(matches!( - fixture.cache.flush_cache(), - Err(Error::Unavailable) - )); - assert!(matches!( - fixture.runtime.block_on( - fixture - .cache - .async_set_cache_pipeline(vec![("k".into(), entry(json!(1)))], no_ttl()) - ), - Err(Error::Unavailable) - )); -} - -#[test] -fn test_connection_reports_container_reachability() { - let fixture = Fixture::new(FakeBlobService::default()); - let ok = fixture - .runtime - .block_on(fixture.cache.test_connection()) - .unwrap(); - assert_eq!(ok.status, CacheConnectionStatus::Success); - assert!(ok.error.is_none()); - - fixture.service.set_failing(true); - let failed = fixture - .runtime - .block_on(fixture.cache.test_connection()) - .unwrap(); - assert_eq!(failed.status, CacheConnectionStatus::Failed); - assert!(failed.error.is_some()); -} - -#[test] -fn disconnect_is_idempotent_and_keeps_data() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture - .cache - .set_cache("key", entry(json!(1)), &no_ttl()) - .unwrap(); - fixture.runtime.block_on(async { - fixture.cache.disconnect().await.unwrap(); - fixture.cache.disconnect().await.unwrap(); - }); - assert_eq!( - fixture.cache.get_cache("key", &no_ttl()).unwrap(), - Some(entry(json!(1))) - ); -} - -#[test] -fn response_cache_stores_and_reads_through_the_backend() { - let fixture = Fixture::new(FakeBlobService::default()); - let response_cache = fixture.response_cache(); - let mut request = request("gpt"); - request.context = with_ttl(60); - let response = json!({"id": "chatcmpl-1"}); - response_cache - .store(&request, response.clone(), now()) - .unwrap(); - assert_eq!( - fixture.stored_json(&cache_key(&request.key)), - json!({"timestamp": 1_700_000_000.0, "response": {"id": "chatcmpl-1"}}) - ); - assert_eq!( - response_cache - .lookup(&request, now() + Duration::from_secs(3600)) - .unwrap(), - Some(response.clone()) - ); - assert_eq!( - fixture - .runtime - .block_on(response_cache.async_lookup(&request, now() + Duration::from_secs(3600))) - .unwrap(), - Some(response.clone()) - ); - fixture.runtime.block_on(async { - response_cache - .async_store(&request, json!("replaced"), now()) - .await - .unwrap(); - assert_eq!( - response_cache.async_lookup(&request, now()).await.unwrap(), - Some(json!("replaced")) - ); - response_cache.async_flush().await.unwrap(); - assert_eq!( - response_cache.async_lookup(&request, now()).await.unwrap(), - None - ); - }); -} - -#[test] -fn non_object_responses_are_written_serialized_like_python() { - let fixture = Fixture::new(FakeBlobService::default()); - fixture - .cache - .set_cache("s", entry(json!("plain")), &no_ttl()) - .unwrap(); - assert_eq!( - fixture.stored_json("s"), - json!({"timestamp": 1_700_000_000.5, "response": "\"plain\""}) - ); - assert_eq!( - fixture.cache.get_cache("s", &no_ttl()).unwrap(), - Some(entry(json!("plain"))) - ); -} diff --git a/litellm-rust/crates/cache-azure-blob/src/lib.rs b/litellm-rust/crates/cache-azure-blob/src/lib.rs index 5ae752c111d..6bcfe130576 100644 --- a/litellm-rust/crates/cache-azure-blob/src/lib.rs +++ b/litellm-rust/crates/cache-azure-blob/src/lib.rs @@ -1,5 +1,7 @@ mod cache; mod credential; +mod transport; pub use cache::AzureBlobCache; pub use credential::AzureBlobCredential; +pub use transport::ReqwestTransport; diff --git a/litellm-rust/crates/cache-azure-blob/src/tests.rs b/litellm-rust/crates/cache-azure-blob/src/tests.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/litellm-rust/crates/cache-azure-blob/src/transport.rs b/litellm-rust/crates/cache-azure-blob/src/transport.rs new file mode 100644 index 00000000000..ed038b8d69d --- /dev/null +++ b/litellm-rust/crates/cache-azure-blob/src/transport.rs @@ -0,0 +1,49 @@ +use azure_core::{ + error::ErrorKind, + http::{ + AsyncRawResponse, Body, HttpClient, Request, + headers::{HeaderName, HeaderValue, Headers}, + }, +}; +use futures_util::TryStreamExt; + +#[derive(Debug)] +pub struct ReqwestTransport(pub reqwest::Client); + +#[async_trait::async_trait] +impl HttpClient for ReqwestTransport { + async fn execute_request(&self, request: &Request) -> azure_core::Result { + let method = reqwest::Method::from_bytes(request.method().as_ref().as_bytes()) + .map_err(|error| azure_core::Error::new(ErrorKind::Other, error))?; + let mut outgoing = self.0.request(method, request.url().as_str()); + for (name, value) in request.headers().iter() { + outgoing = outgoing.header(name.as_str(), value.as_str()); + } + let outgoing = match request.body().clone() { + Body::Bytes(bytes) => outgoing.body(bytes), + Body::SeekableStream(stream) => outgoing.body(reqwest::Body::wrap_stream(stream)), + }; + let response = outgoing.send().await.map_err(|error| { + let kind = if error.is_connect() { + ErrorKind::Connection + } else { + ErrorKind::Io + }; + azure_core::Error::new(kind, error) + })?; + let status = response.status().as_u16().into(); + let mut headers = Headers::new(); + for (name, value) in response.headers() { + if let Ok(value) = value.to_str() { + headers.insert( + HeaderName::from(name.as_str().to_owned()), + HeaderValue::from(value.to_owned()), + ); + } + } + let body = response + .bytes_stream() + .map_err(|error| azure_core::Error::new(ErrorKind::Io, error)); + Ok(AsyncRawResponse::new(status, headers, Box::pin(body))) + } +} diff --git a/litellm-rust/crates/cache-azure-blob/tests/cache.rs b/litellm-rust/crates/cache-azure-blob/tests/cache.rs new file mode 100644 index 00000000000..b9f50b824b3 --- /dev/null +++ b/litellm-rust/crates/cache-azure-blob/tests/cache.rs @@ -0,0 +1,494 @@ +mod support; + +use std::{sync::Arc, time::Duration}; + +use azure_core::http::Method; +use litellm_cache::{ + BaseCache, BatchCache, BatchEntry, DisconnectCache, Error, ExactCacheContext, FlushCache, +}; +use litellm_cache_azure_blob::AzureBlobCache; +use litellm_cache_response::{ + CacheEntry, CacheKeyField, CacheKeyInput, ResponseCache, ResponseCacheCodec, + ResponseCacheRequest, cache_key, +}; +use rstest::{fixture, rstest}; +use serde_json::json; +use support::{ACCOUNT_URL, CONTAINER, FakeBlobService, RecordedRequest}; +use tokio::runtime::Runtime; + +type Fixture = support::Fixture; + +#[fixture] +fn fixture() -> Fixture { + Fixture::new(FakeBlobService::default(), ResponseCacheCodec) +} + +fn response_cache(fixture: &Fixture) -> ResponseCache> { + ResponseCache::new(fixture.cache.clone()) +} + +fn request(model: &str) -> ResponseCacheRequest { + ResponseCacheRequest::new(CacheKeyInput { + fields: vec![CacheKeyField { + name: "model".into(), + value: Some(model.into()), + api_parameter: true, + internal_parameter: false, + }], + preset: None, + namespace: None, + include_provider_parameters: false, + }) +} + +fn now() -> Duration { + Duration::from_secs(1_700_000_000) +} + +fn entry(value: serde_json::Value) -> CacheEntry { + CacheEntry { + timestamp: Some(1_700_000_000.5), + response: value, + } +} + +fn no_ttl() -> ExactCacheContext { + ExactCacheContext::default() +} + +fn with_ttl(seconds: u64) -> ExactCacheContext { + ExactCacheContext { + ttl: Some(Duration::from_secs(seconds)), + } +} + +fn connect_to(account_url: &str) -> (FakeBlobService, AzureBlobCache) { + let runtime = Runtime::new().unwrap(); + let service = FakeBlobService::default(); + let cache = runtime + .block_on(support::connect( + &service, + account_url, + ResponseCacheCodec, + runtime.handle().clone(), + )) + .unwrap(); + (service, cache) +} + +#[rstest] +fn connect_creates_the_container_once(fixture: Fixture) { + assert!(fixture.service.container_exists()); + assert_eq!( + fixture.service.requests(), + vec![RecordedRequest { + method: Method::Put, + path: format!("/{CONTAINER}"), + query: "restype=container".into(), + if_none_match: None, + }] + ); + assert_eq!(fixture.cache.account_url(), ACCOUNT_URL); + assert_eq!(fixture.cache.container_name(), CONTAINER); +} + +#[rstest] +fn connect_accepts_an_existing_container() { + let fixture = Fixture::new( + FakeBlobService::with_existing_container(), + ResponseCacheCodec, + ); + assert!(fixture.service.container_exists()); + assert_eq!(fixture.service.requests().len(), 1); +} + +#[rstest] +fn connect_accepts_account_urls_with_trailing_slash() { + let (service, cache) = connect_to("https://example.blob.core.windows.net/"); + assert_eq!(service.requests()[0].path, format!("/{CONTAINER}")); + assert_eq!(cache.account_url(), "https://example.blob.core.windows.net"); +} + +#[rstest] +fn connect_keeps_account_url_query_parameters_on_the_container_path() { + let (service, _) = connect_to("https://example.blob.core.windows.net/?sv=2024-01-01&sig=abc"); + let create = &service.requests()[0]; + assert_eq!(create.path, format!("/{CONTAINER}")); + assert!(create.query.contains("sig=abc")); +} + +#[rstest] +fn connect_surfaces_service_failures() { + let runtime = Runtime::new().unwrap(); + let service = FakeBlobService::default(); + service.set_failing(true); + let result = runtime.block_on(support::connect( + &service, + ACCOUNT_URL, + ResponseCacheCodec, + runtime.handle().clone(), + )); + assert!(matches!(result, Err(Error::Unavailable))); +} + +#[rstest] +fn sync_set_and_get_round_trip_python_json_shape(fixture: Fixture) { + let value = entry(json!({"choices": [{"message": {"content": "héllo 🌍"}}]})); + fixture + .cache + .set_cache("key-1", value.clone(), &no_ttl()) + .unwrap(); + + assert_eq!( + fixture.stored_json("key-1"), + json!({ + "timestamp": 1_700_000_000.5, + "response": {"choices": [{"message": {"content": "héllo 🌍"}}]} + }) + ); + assert_eq!( + fixture.cache.get_cache("key-1", &no_ttl()).unwrap(), + Some(value) + ); +} + +#[rstest] +#[case::blob_already_exists(false)] +#[case::precondition_conflict(true)] +fn sync_set_does_not_overwrite_an_existing_blob(fixture: Fixture, #[case] precondition: bool) { + fixture.service.set_precondition_conflicts(precondition); + fixture + .cache + .set_cache("key", entry(json!({"v": "first"})), &no_ttl()) + .unwrap(); + fixture + .cache + .set_cache("key", entry(json!({"v": "second"})), &no_ttl()) + .unwrap(); + + assert_eq!( + fixture.stored_json("key")["response"], + json!({"v": "first"}) + ); + let uploads: Vec<_> = fixture + .service + .requests() + .into_iter() + .filter(|request| request.method == Method::Put && request.path.ends_with("/key")) + .collect(); + assert_eq!(uploads.len(), 2); + assert!( + uploads + .iter() + .all(|request| request.if_none_match.as_deref() == Some("*")) + ); +} + +#[rstest] +fn async_set_overwrites_an_existing_blob(fixture: Fixture) { + fixture.runtime.block_on(async { + fixture + .cache + .async_set_cache("key", entry(json!({"v": "first"})), no_ttl()) + .await + .unwrap(); + fixture + .cache + .async_set_cache("key", entry(json!({"v": "second"})), no_ttl()) + .await + .unwrap(); + assert_eq!( + fixture + .cache + .async_get_cache("key", &no_ttl()) + .await + .unwrap(), + Some(entry(json!({"v": "second"}))) + ); + }); + assert_eq!( + fixture.stored_json("key")["response"], + json!({"v": "second"}) + ); + assert!( + fixture + .service + .requests() + .iter() + .filter(|request| request.method == Method::Put && request.path.ends_with("/key")) + .all(|request| request.if_none_match.is_none()) + ); +} + +#[rstest] +fn missing_blobs_are_misses(fixture: Fixture) { + assert_eq!(fixture.cache.get_cache("absent", &no_ttl()).unwrap(), None); + assert_eq!( + fixture + .runtime + .block_on(fixture.cache.async_get_cache("absent", &no_ttl())) + .unwrap(), + None + ); +} + +#[rstest] +fn ttl_is_ignored_and_entries_never_expire(fixture: Fixture) { + assert_eq!(fixture.cache.get_ttl(&with_ttl(1)), None); + assert_eq!(fixture.cache.get_ttl(&no_ttl()), None); + + fixture + .cache + .set_cache("key", entry(json!("value")), &with_ttl(1)) + .unwrap(); + std::thread::sleep(Duration::from_millis(1100)); + assert_eq!( + fixture.cache.get_cache("key", &with_ttl(1)).unwrap(), + Some(entry(json!("value"))) + ); + assert!( + fixture + .service + .requests() + .iter() + .all(|request| !request.query.contains("expiry")) + ); +} + +#[rstest] +#[case::broken_json("broken-json", b"{not json".as_slice())] +#[case::broken_utf8("broken-utf8", &[0xff, 0xfe, 0x22])] +#[case::wrong_shape("wrong-shape", br#"{"timestamp": "yesterday"}"#.as_slice())] +fn malformed_blobs_are_invalid_entries(fixture: Fixture, #[case] key: &str, #[case] bytes: &[u8]) { + fixture.service.seed_blob(key, bytes); + assert!(matches!( + fixture.cache.get_cache(key, &no_ttl()), + Err(Error::InvalidEntry) + )); +} + +#[rstest] +fn malformed_blobs_are_response_cache_misses(fixture: Fixture) { + let response_cache = response_cache(&fixture); + let broken = request("broken"); + fixture + .service + .seed_blob(&cache_key(&broken.key), b"{not json"); + assert_eq!(response_cache.lookup(&broken, now()).unwrap(), None); + assert_eq!( + fixture + .runtime + .block_on(response_cache.async_lookup(&broken, now())) + .unwrap(), + None + ); +} + +#[rstest] +fn batch_get_preserves_order_and_marks_misses_and_invalid_entries(fixture: Fixture) { + fixture + .cache + .set_cache("a", entry(json!("A")), &no_ttl()) + .unwrap(); + fixture + .cache + .set_cache("c", entry(json!("C")), &no_ttl()) + .unwrap(); + fixture.service.seed_blob("bad", b"nope"); + let keys = ["c", "missing", "a", "bad"].map(String::from); + + let sync = fixture.cache.batch_get_cache(&keys, &no_ttl()).unwrap(); + assert_eq!( + sync, + vec![ + BatchEntry::Hit(entry(json!("C"))), + BatchEntry::Miss, + BatchEntry::Hit(entry(json!("A"))), + BatchEntry::Invalid, + ] + ); + + let asynchronous = fixture + .runtime + .block_on(fixture.cache.async_batch_get_cache(keys.to_vec(), no_ttl())) + .unwrap(); + assert_eq!(asynchronous, sync); + + let response_cache = response_cache(&fixture); + let requests = [request("hit"), request("missing"), request("bad")]; + response_cache + .store(&requests[0], json!("HIT"), now()) + .unwrap(); + fixture + .service + .seed_blob(&cache_key(&requests[2].key), b"nope"); + let hits = response_cache.lookup_batch(&requests, now()).unwrap(); + assert_eq!(hits.values, vec![Some(json!("HIT")), None, None]); + assert_eq!(hits.missing_indices, vec![1, 2]); + let async_hits = fixture + .runtime + .block_on(response_cache.async_lookup_batch(&requests, now())) + .unwrap(); + assert_eq!(async_hits.values, hits.values); +} + +#[rstest] +fn async_pipeline_writes_every_entry_with_overwrite(fixture: Fixture) { + fixture.service.seed_blob("k2", b"stale"); + fixture + .runtime + .block_on(fixture.cache.async_set_cache_pipeline( + vec![ + ("k1".into(), entry(json!({"n": 1}))), + ("k2".into(), entry(json!({"n": 2}))), + ("k3".into(), entry(json!({"n": 3}))), + ], + with_ttl(30), + )) + .unwrap(); + assert_eq!(fixture.service.blob_names(), ["k1", "k2", "k3"]); + assert_eq!(fixture.stored_json("k2")["response"], json!({"n": 2})); +} + +#[rstest] +fn flush_deletes_every_blob_in_the_container(fixture: Fixture) { + for key in ["x", "y", "z"] { + fixture + .cache + .set_cache(key, entry(json!(key)), &no_ttl()) + .unwrap(); + } + fixture.cache.flush_cache().unwrap(); + assert!(fixture.service.blob_names().is_empty()); + assert!(fixture.service.container_exists()); + + fixture + .cache + .set_cache("again", entry(json!(1)), &no_ttl()) + .unwrap(); + fixture + .runtime + .block_on(fixture.cache.async_flush_cache()) + .unwrap(); + assert!(fixture.service.blob_names().is_empty()); +} + +#[rstest] +fn service_failures_map_to_unavailable(fixture: Fixture) { + fixture.service.set_failing(true); + assert!(matches!( + fixture.cache.get_cache("key", &no_ttl()), + Err(Error::Unavailable) + )); + assert!(matches!( + fixture.cache.set_cache("key", entry(json!(1)), &no_ttl()), + Err(Error::Unavailable) + )); + assert!(matches!( + fixture.cache.flush_cache(), + Err(Error::Unavailable) + )); + assert!(matches!( + fixture.runtime.block_on( + fixture + .cache + .async_set_cache_pipeline(vec![("k".into(), entry(json!(1)))], no_ttl()) + ), + Err(Error::Unavailable) + )); +} + +#[rstest] +fn disconnect_is_idempotent_and_keeps_data(fixture: Fixture) { + fixture + .cache + .set_cache("key", entry(json!(1)), &no_ttl()) + .unwrap(); + fixture.runtime.block_on(async { + fixture.cache.disconnect().await.unwrap(); + fixture.cache.disconnect().await.unwrap(); + }); + assert_eq!( + fixture.cache.get_cache("key", &no_ttl()).unwrap(), + Some(entry(json!(1))) + ); +} + +#[rstest] +fn response_cache_stores_and_reads_through_the_backend(fixture: Fixture) { + let response_cache = response_cache(&fixture); + let mut request = request("gpt"); + request.context = with_ttl(60); + let response = json!({"id": "chatcmpl-1"}); + response_cache + .store(&request, response.clone(), now()) + .unwrap(); + assert_eq!( + fixture.stored_json(&cache_key(&request.key)), + json!({"timestamp": 1_700_000_000.0, "response": {"id": "chatcmpl-1"}}) + ); + assert_eq!( + response_cache + .lookup(&request, now() + Duration::from_secs(3600)) + .unwrap(), + Some(response.clone()) + ); + assert_eq!( + fixture + .runtime + .block_on(response_cache.async_lookup(&request, now() + Duration::from_secs(3600))) + .unwrap(), + Some(response.clone()) + ); + fixture.runtime.block_on(async { + response_cache + .async_store(&request, json!("replaced"), now()) + .await + .unwrap(); + assert_eq!( + response_cache.async_lookup(&request, now()).await.unwrap(), + Some(json!("replaced")) + ); + response_cache.async_flush().await.unwrap(); + assert_eq!( + response_cache.async_lookup(&request, now()).await.unwrap(), + None + ); + }); +} + +#[rstest] +fn non_object_responses_are_written_serialized_like_python(fixture: Fixture) { + fixture + .cache + .set_cache("s", entry(json!("plain")), &no_ttl()) + .unwrap(); + assert_eq!( + fixture.stored_json("s"), + json!({"timestamp": 1_700_000_000.5, "response": "\"plain\""}) + ); + assert_eq!( + fixture.cache.get_cache("s", &no_ttl()).unwrap(), + Some(entry(json!("plain"))) + ); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn sync_methods_block_inside_a_multi_thread_runtime() { + let service = FakeBlobService::default(); + let cache = support::connect( + &service, + ACCOUNT_URL, + ResponseCacheCodec, + tokio::runtime::Handle::current(), + ) + .await + .map(Arc::new) + .unwrap(); + cache.set_cache("key", entry(json!(1)), &no_ttl()).unwrap(); + assert_eq!( + cache.get_cache("key", &no_ttl()).unwrap(), + Some(entry(json!(1))) + ); +} diff --git a/litellm-rust/crates/cache-azure-blob/tests/contract.rs b/litellm-rust/crates/cache-azure-blob/tests/contract.rs new file mode 100644 index 00000000000..585ca26bbd7 --- /dev/null +++ b/litellm-rust/crates/cache-azure-blob/tests/contract.rs @@ -0,0 +1,81 @@ +mod support; + +use litellm_cache::{ExactCacheContext, JsonCodec}; +use litellm_cache_azure_blob::AzureBlobCache; +use litellm_cache_testing as contract; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use support::{ACCOUNT_URL, FakeBlobService}; +use tokio::runtime::Handle; + +#[fixture] +async fn azure() -> AzureBlobCache> { + support::connect( + &FakeBlobService::default(), + ACCOUNT_URL, + JsonCodec::new(), + Handle::current(), + ) + .await + .unwrap() +} + +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext::default() +} + +const PREFIX: &str = "contract:"; + +// `overwrite_replaces` does not apply: sync `set_cache` never overwrites a blob, as in Python. + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn hit_and_miss( + #[future(awt)] azure: AzureBlobCache>, + context: ExactCacheContext, +) { + contract::hit_and_miss(&azure, context, PREFIX, json!({"answer": 42})).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn sync_async_equivalence( + #[future(awt)] azure: AzureBlobCache>, + context: ExactCacheContext, +) { + contract::sync_async_equivalence(&azure, context, PREFIX, json!("first"), json!([2])).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn pipeline_writes_every_entry( + #[future(awt)] azure: AzureBlobCache>, + context: ExactCacheContext, +) { + contract::pipeline_writes_every_entry( + &azure, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn batch_preserves_order( + #[future(awt)] azure: AzureBlobCache>, + context: ExactCacheContext, +) { + contract::batch_preserves_order(&azure, context, PREFIX, json!("first"), json!(2)).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn flush_clears( + #[future(awt)] azure: AzureBlobCache>, + context: ExactCacheContext, +) { + contract::flush_clears(&azure, context, PREFIX, json!("value")).await; +} diff --git a/litellm-rust/crates/cache-azure-blob/tests/support/mod.rs b/litellm-rust/crates/cache-azure-blob/tests/support/mod.rs new file mode 100644 index 00000000000..f908151c22e --- /dev/null +++ b/litellm-rust/crates/cache-azure-blob/tests/support/mod.rs @@ -0,0 +1,239 @@ +#![allow(dead_code)] + +use std::{ + collections::BTreeMap, + sync::{Arc, Mutex}, +}; + +use azure_core::http::{ + AsyncRawResponse, Body, ClientOptions, HttpClient, Method, Request, StatusCode, Transport, + headers::{HeaderName, Headers}, +}; +use litellm_cache::{CacheCodec, Error}; +use litellm_cache_azure_blob::AzureBlobCache; +use tokio::runtime::{Handle, Runtime}; + +pub const ACCOUNT_URL: &str = "https://example.blob.core.windows.net"; +pub const CONTAINER: &str = "litellm-cache"; +const IF_NONE_MATCH: HeaderName = HeaderName::from_static("if-none-match"); +const ERROR_CODE: HeaderName = HeaderName::from_static("x-ms-error-code"); + +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct RecordedRequest { + pub method: Method, + pub path: String, + pub query: String, + pub if_none_match: Option, +} + +#[derive(Default)] +struct FakeState { + container_exists: bool, + blobs: BTreeMap>, + requests: Vec, + failing: bool, + precondition_conflicts: bool, +} + +#[derive(Clone, Default)] +pub struct FakeBlobService { + state: Arc>, +} + +impl std::fmt::Debug for FakeBlobService { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.write_str("FakeBlobService") + } +} + +impl FakeBlobService { + pub fn with_existing_container() -> Self { + let service = Self::default(); + service.state.lock().unwrap().container_exists = true; + service + } + + pub fn blob(&self, name: &str) -> Option> { + self.state.lock().unwrap().blobs.get(name).cloned() + } + + pub fn blob_names(&self) -> Vec { + self.state.lock().unwrap().blobs.keys().cloned().collect() + } + + pub fn seed_blob(&self, name: &str, bytes: &[u8]) { + self.state + .lock() + .unwrap() + .blobs + .insert(name.to_string(), bytes.to_vec()); + } + + pub fn set_failing(&self, failing: bool) { + self.state.lock().unwrap().failing = failing; + } + + pub fn set_precondition_conflicts(&self, enabled: bool) { + self.state.lock().unwrap().precondition_conflicts = enabled; + } + + pub fn requests(&self) -> Vec { + self.state.lock().unwrap().requests.clone() + } + + pub fn container_exists(&self) -> bool { + self.state.lock().unwrap().container_exists + } + + fn respond(status: StatusCode, error_code: Option<&str>, body: Vec) -> AsyncRawResponse { + let mut headers = Headers::new(); + if let Some(code) = error_code { + headers.insert(ERROR_CODE, code.to_string()); + } + AsyncRawResponse::from_bytes(status, headers, body) + } + + fn list_body(state: &FakeState) -> Vec { + let mut xml = String::from( + r#""#, + ); + for name in state.blobs.keys() { + xml.push_str(&format!( + "{name}BlockBlob" + )); + } + xml.push_str(""); + xml.into_bytes() + } +} + +#[async_trait::async_trait] +impl HttpClient for FakeBlobService { + async fn execute_request(&self, request: &Request) -> azure_core::Result { + let mut state = self.state.lock().unwrap(); + let path = request.url().path().to_string(); + let query = request.url().query().unwrap_or_default().to_string(); + let if_none_match = request + .headers() + .get_optional_str(&IF_NONE_MATCH) + .map(str::to_owned); + state.requests.push(RecordedRequest { + method: request.method(), + path: path.clone(), + query: query.clone(), + if_none_match: if_none_match.clone(), + }); + if state.failing { + return Ok(Self::respond( + StatusCode::Forbidden, + Some("AuthorizationFailure"), + Vec::new(), + )); + } + let container_path = format!("/{CONTAINER}"); + let blob_name = path + .strip_prefix(&format!("{container_path}/")) + .map(str::to_owned); + let is_container = path == container_path && query.contains("restype=container"); + let response = match (request.method(), is_container, blob_name) { + (Method::Put, true, None) if state.container_exists => Self::respond( + StatusCode::Conflict, + Some("ContainerAlreadyExists"), + Vec::new(), + ), + (Method::Put, true, None) => { + state.container_exists = true; + Self::respond(StatusCode::Created, None, Vec::new()) + } + (Method::Get, true, None) if query.contains("comp=list") => { + Self::respond(StatusCode::Ok, None, Self::list_body(&state)) + } + (Method::Get, true, None) if state.container_exists => { + Self::respond(StatusCode::Ok, None, Vec::new()) + } + (Method::Get, true, None) => { + Self::respond(StatusCode::NotFound, Some("ContainerNotFound"), Vec::new()) + } + (Method::Put, false, Some(name)) => { + if if_none_match.as_deref() == Some("*") && state.blobs.contains_key(&name) { + if state.precondition_conflicts { + Self::respond( + StatusCode::PreconditionFailed, + Some("ConditionNotMet"), + Vec::new(), + ) + } else { + Self::respond(StatusCode::Conflict, Some("BlobAlreadyExists"), Vec::new()) + } + } else { + let bytes = match request.body() { + Body::Bytes(bytes) => bytes.to_vec(), + Body::SeekableStream(_) => panic!("unexpected streaming upload"), + }; + state.blobs.insert(name, bytes); + Self::respond(StatusCode::Created, None, Vec::new()) + } + } + (Method::Get, false, Some(name)) => match state.blobs.get(&name) { + Some(bytes) => Self::respond(StatusCode::Ok, None, bytes.clone()), + None => Self::respond(StatusCode::NotFound, Some("BlobNotFound"), Vec::new()), + }, + (Method::Delete, false, Some(name)) => match state.blobs.remove(&name) { + Some(_) => Self::respond(StatusCode::Accepted, None, Vec::new()), + None => Self::respond(StatusCode::NotFound, Some("BlobNotFound"), Vec::new()), + }, + (method, _, _) => panic!("unexpected request {method:?} {path}?{query}"), + }; + Ok(response) + } +} + +pub async fn connect( + service: &FakeBlobService, + account_url: &str, + codec: C, + handle: Handle, +) -> Result, Error> { + AzureBlobCache::connect_with_options( + account_url, + CONTAINER, + None, + ClientOptions { + transport: Some(Transport::new(Arc::new(service.clone()))), + ..ClientOptions::default() + }, + codec, + handle, + ) + .await +} + +/// A cache on its own fake service and runtime, so sync methods run outside any runtime. +pub struct Fixture { + pub runtime: Runtime, + pub service: FakeBlobService, + pub cache: Arc>, +} + +impl Fixture { + pub fn new(service: FakeBlobService, codec: C) -> Self { + let runtime = Runtime::new().unwrap(); + let cache = runtime + .block_on(connect( + &service, + ACCOUNT_URL, + codec, + runtime.handle().clone(), + )) + .unwrap(); + Self { + runtime, + service, + cache: Arc::new(cache), + } + } + + pub fn stored_json(&self, key: &str) -> serde_json::Value { + serde_json::from_slice(&self.service.blob(key).expect("blob should exist")).unwrap() + } +} diff --git a/litellm-rust/crates/cache-azure-blob/tests/transport.rs b/litellm-rust/crates/cache-azure-blob/tests/transport.rs new file mode 100644 index 00000000000..cd1e10aa3d8 --- /dev/null +++ b/litellm-rust/crates/cache-azure-blob/tests/transport.rs @@ -0,0 +1,90 @@ +use std::sync::Arc; + +use azure_core::http::{ClientOptions, Transport}; +use litellm_cache::{BaseCache, ExactCacheContext, JsonCodec}; +use litellm_cache_azure_blob::{AzureBlobCache, ReqwestTransport}; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use tokio::runtime::Handle; +use wiremock::{ + Mock, MockServer, ResponseTemplate, + matchers::{body_json, header, method, path, query_param}, +}; + +#[fixture] +async fn server() -> MockServer { + let server = MockServer::start().await; + Mock::given(method("PUT")) + .and(path("/litellm-cache")) + .and(query_param("restype", "container")) + .respond_with(ResponseTemplate::new(201)) + .expect(1) + .mount(&server) + .await; + server +} + +async fn connect(server: &MockServer) -> AzureBlobCache> { + AzureBlobCache::connect_with_options( + &server.uri(), + "litellm-cache", + None, + ClientOptions { + transport: Some(Transport::new(Arc::new(ReqwestTransport( + reqwest::Client::new(), + )))), + ..ClientOptions::default() + }, + JsonCodec::new(), + Handle::current(), + ) + .await + .unwrap() +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn uploads_go_through_the_host_client(#[future(awt)] server: MockServer) { + Mock::given(method("PUT")) + .and(path("/litellm-cache/key")) + .and(header("if-none-match", "*")) + .and(body_json(json!({"answer": 1}))) + .respond_with(ResponseTemplate::new(201)) + .expect(1) + .mount(&server) + .await; + connect(&server) + .await + .set_cache("key", json!({"answer": 1}), &ExactCacheContext::default()) + .unwrap(); +} + +#[rstest] +#[case::hit( + ResponseTemplate::new(200).set_body_json(json!({"answer": 2})), + Some(json!({"answer": 2})) +)] +#[case::blob_not_found( + ResponseTemplate::new(404).insert_header("x-ms-error-code", "BlobNotFound"), + None +)] +#[tokio::test(flavor = "multi_thread")] +async fn downloads_map_the_host_client_response( + #[future(awt)] server: MockServer, + #[case] response: ResponseTemplate, + #[case] expected: Option, +) { + Mock::given(method("GET")) + .and(path("/litellm-cache/key")) + .respond_with(response) + .mount(&server) + .await; + assert_eq!( + connect(&server) + .await + .async_get_cache("key", &ExactCacheContext::default()) + .await + .unwrap(), + expected + ); +} diff --git a/litellm-rust/crates/cache-disk/Cargo.toml b/litellm-rust/crates/cache-disk/Cargo.toml index b96994b3b55..5cb75f7f129 100644 --- a/litellm-rust/crates/cache-disk/Cargo.toml +++ b/litellm-rust/crates/cache-disk/Cargo.toml @@ -15,5 +15,6 @@ serde_json.workspace = true tokio.workspace = true [dev-dependencies] +litellm-cache-testing.workspace = true rstest.workspace = true tempfile = "3.27.0" diff --git a/litellm-rust/crates/cache-disk/src/cache.rs b/litellm-rust/crates/cache-disk/src/cache.rs index 8e1223309b4..b8a2c6ed1e4 100644 --- a/litellm-rust/crates/cache-disk/src/cache.rs +++ b/litellm-rust/crates/cache-disk/src/cache.rs @@ -5,8 +5,8 @@ use std::{ }; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheCodec, CacheConnectionResult, CacheConnectionStatus, - CounterCache, DeleteCache, Error, ExactCacheContext, FlushCache, + BaseCache, BatchCache, BatchEntry, CacheCodec, CounterCache, DeleteCache, DisconnectCache, + Error, ExactCacheContext, FlushCache, }; use crate::{DiskStore, DiskcacheSqliteStore, PythonDiskCacheAdapter, StoredValue, ValueAdapter}; @@ -150,29 +150,6 @@ impl BaseCache for DiskCache Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - let result = Self::run_blocking(Arc::clone(&self.store), |store| { - store.probe().map(|_| CacheConnectionResult { - status: CacheConnectionStatus::Success, - message: "Disk cache connection test successful".into(), - error: None, - }) - }) - .await; - Ok(match result { - Ok(result) => result, - Err(error) => CacheConnectionResult { - status: CacheConnectionStatus::Failed, - message: format!("Disk cache connection failed: {error}"), - error: Some(error.to_string()), - }, - }) - } } impl BatchCache for DiskCache { @@ -241,9 +218,13 @@ impl FlushCache for DiskCache, D: DiskStore, A: ValueAdapter> CounterCache - for DiskCache -{ +impl DisconnectCache for DiskCache { + async fn disconnect(&self) -> Result<(), Error> { + Ok(()) + } +} + +impl CounterCache for DiskCache { fn increment_cache( &self, key: &str, @@ -264,6 +245,7 @@ impl, D: DiskStore, A: ValueAdapter> CounterCache key: &str, amount: f64, context: ExactCacheContext, + _refresh_ttl: bool, ) -> Result { let key = key.to_string(); let adapter = Arc::clone(&self.adapter); diff --git a/litellm-rust/crates/cache-disk/src/sqlite.rs b/litellm-rust/crates/cache-disk/src/sqlite.rs index 9a36f8af6ad..24c2be2e1c5 100644 --- a/litellm-rust/crates/cache-disk/src/sqlite.rs +++ b/litellm-rust/crates/cache-disk/src/sqlite.rs @@ -544,18 +544,6 @@ impl DiskStore for DiskcacheSqliteStore { } } } - - fn probe(&self) -> Result<(), Error> { - let connection = self.connection.lock().map_err(|_| Error::Unavailable)?; - connection - .query_row( - "SELECT value FROM Settings WHERE key = 'count'", - [], - |row| row.get::<_, i64>(0), - ) - .map(|_| ()) - .map_err(|_| Error::Unavailable) - } } fn default_settings() -> HashMap { diff --git a/litellm-rust/crates/cache-disk/src/store.rs b/litellm-rust/crates/cache-disk/src/store.rs index ed167317cf0..b5c12003cee 100644 --- a/litellm-rust/crates/cache-disk/src/store.rs +++ b/litellm-rust/crates/cache-disk/src/store.rs @@ -29,5 +29,4 @@ pub trait DiskStore: Send + Sync + 'static { now: f64, apply: &mut dyn FnMut(Option) -> Result<(StoredValue, Option), Error>, ) -> Result<(), Error>; - fn probe(&self) -> Result<(), Error>; } diff --git a/litellm-rust/crates/cache-disk/tests/cache.rs b/litellm-rust/crates/cache-disk/tests/cache.rs index dd1f2b1f04e..8c817a8a829 100644 --- a/litellm-rust/crates/cache-disk/tests/cache.rs +++ b/litellm-rust/crates/cache-disk/tests/cache.rs @@ -7,8 +7,8 @@ use std::{ }; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheCodec, CounterCache, DeleteCache, ExactCacheContext, - FlushCache, JsonCodec, + BaseCache, BatchCache, BatchEntry, CacheCodec, CounterCache, DeleteCache, DisconnectCache, + ExactCacheContext, FlushCache, JsonCodec, }; use litellm_cache_disk::{DiskCache, DiskStore, DiskcacheSqliteStore, StoredValue, ValueAdapter}; use rstest::{fixture, rstest}; @@ -395,7 +395,7 @@ fn delete_flush_and_spilled_file_replacement_clean_up_storage(sandbox: Sandbox) #[rstest] #[tokio::test] -async fn async_operations_connection_and_delete_match_sync_operations(sandbox: Sandbox) { +async fn async_operations_disconnect_and_delete_match_sync_operations(sandbox: Sandbox) { let cache = sandbox.cache::(); let context = ExactCacheContext { ttl: Some(Duration::from_secs(60)), @@ -424,8 +424,101 @@ async fn async_operations_connection_and_delete_match_sync_operations(sandbox: S ); cache.async_delete_cache("a").await.unwrap(); cache.async_flush_cache().await.unwrap(); + cache.disconnect().await.unwrap(); +} + +#[derive(Clone, Copy, Debug)] +enum Increment { + Sync, + Async { refresh_ttl: bool }, +} + +impl Increment { + async fn apply( + self, + cache: &DiskCache>, + key: &str, + amount: f64, + context: ExactCacheContext, + ) -> f64 { + match self { + Self::Sync => cache.increment_cache(key, amount, context).unwrap(), + Self::Async { refresh_ttl } => cache + .async_increment(key, amount, context, refresh_ttl) + .await + .unwrap(), + } + } +} + +#[rstest] +#[case::sync_missing(Increment::Sync, None, 3.0, 3.0)] +#[case::sync_existing_int(Increment::Sync, Some(json!(7)), 5.0, 12.0)] +#[case::sync_non_int(Increment::Sync, Some(json!("not-a-number")), 4.0, 4.0)] +#[case::async_missing(Increment::Async { refresh_ttl: false }, None, 2.0, 2.0)] +#[case::async_existing_int(Increment::Async { refresh_ttl: false }, Some(json!(10)), 5.0, 15.0)] +#[case::async_non_int(Increment::Async { refresh_ttl: false }, Some(json!("corrupt")), 9.0, 9.0)] +#[case::async_refresh_ttl_is_ignored(Increment::Async { refresh_ttl: true }, Some(json!(1)), 1.0, 2.0)] +#[tokio::test] +async fn increments_read_back_through_get_cache( + sandbox: Sandbox, + #[case] increment: Increment, + #[case] initial: Option, + #[case] amount: f64, + #[case] expected: f64, +) { + let cache = sandbox.cache::(); + let context = ExactCacheContext::default(); + if let Some(initial) = initial { + cache + .async_set_cache("counter", initial, context.clone()) + .await + .unwrap(); + } assert_eq!( - cache.test_connection().await.unwrap().status, - litellm_cache::CacheConnectionStatus::Success + increment + .apply(&cache, "counter", amount, context.clone()) + .await, + expected + ); + assert_eq!( + cache.get_cache("counter", &context).unwrap(), + Some(json!(expected as i64)) ); } + +#[rstest] +#[case::without_refresh(false)] +#[case::with_refresh(true)] +#[tokio::test] +async fn async_increment_rewrites_ttl_on_every_write(sandbox: Sandbox, #[case] refresh_ttl: bool) { + let cache = sandbox.cache::(); + let expiry = || { + sandbox + .db() + .query_row( + "SELECT expire_time IS NOT NULL FROM Cache WHERE key = 'counter'", + [], + |row| row.get::<_, bool>(0), + ) + .unwrap() + }; + let ttl = ExactCacheContext { + ttl: Some(Duration::from_secs(60)), + }; + cache + .async_increment("counter", 1.0, ttl.clone(), refresh_ttl) + .await + .unwrap(); + assert!(expiry()); + cache + .async_increment("counter", 1.0, ExactCacheContext::default(), refresh_ttl) + .await + .unwrap(); + assert!(!expiry()); + cache + .async_increment("counter", 1.0, ttl, refresh_ttl) + .await + .unwrap(); + assert!(expiry()); +} diff --git a/litellm-rust/crates/cache-disk/tests/contract.rs b/litellm-rust/crates/cache-disk/tests/contract.rs new file mode 100644 index 00000000000..257252cb90c --- /dev/null +++ b/litellm-rust/crates/cache-disk/tests/contract.rs @@ -0,0 +1,82 @@ +use litellm_cache::{ExactCacheContext, JsonCodec}; +use litellm_cache_disk::DiskCache; +use litellm_cache_testing as contract; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use tempfile::TempDir; + +struct Disk { + cache: DiskCache>, + _directory: TempDir, +} + +#[fixture] +fn disk() -> Disk { + let directory = tempfile::tempdir().unwrap(); + Disk { + cache: DiskCache::open(directory.path(), JsonCodec::new()).unwrap(), + _directory: directory, + } +} + +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext::default() +} + +const PREFIX: &str = "contract:"; + +#[rstest] +#[tokio::test] +async fn hit_and_miss(disk: Disk, context: ExactCacheContext) { + contract::hit_and_miss(&disk.cache, context, PREFIX, json!({"answer": 42})).await; +} + +#[rstest] +#[tokio::test] +async fn sync_async_equivalence(disk: Disk, context: ExactCacheContext) { + contract::sync_async_equivalence(&disk.cache, context, PREFIX, json!("first"), json!([2])) + .await; +} + +#[rstest] +#[tokio::test] +async fn overwrite_replaces(disk: Disk, context: ExactCacheContext) { + contract::overwrite_replaces(&disk.cache, context, PREFIX, json!(1), json!({"b": 2})).await; +} + +#[rstest] +#[tokio::test] +async fn pipeline_writes_every_entry(disk: Disk, context: ExactCacheContext) { + contract::pipeline_writes_every_entry( + &disk.cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; +} + +#[rstest] +#[tokio::test] +async fn batch_preserves_order(disk: Disk, context: ExactCacheContext) { + contract::batch_preserves_order(&disk.cache, context, PREFIX, json!("first"), json!(2)).await; +} + +#[rstest] +#[tokio::test] +async fn delete_removes_key(disk: Disk, context: ExactCacheContext) { + contract::delete_removes_key(&disk.cache, context, PREFIX, json!("value")).await; +} + +#[rstest] +#[tokio::test] +async fn flush_clears(disk: Disk, context: ExactCacheContext) { + contract::flush_clears(&disk.cache, context, PREFIX, json!("value")).await; +} + +#[rstest] +#[tokio::test] +async fn counter_accumulates(disk: Disk, context: ExactCacheContext) { + contract::counter_accumulates(&disk.cache, context, PREFIX).await; +} diff --git a/litellm-rust/crates/cache-gcs/Cargo.toml b/litellm-rust/crates/cache-gcs/Cargo.toml index 4ec60bcfa3b..da0acf554f9 100644 --- a/litellm-rust/crates/cache-gcs/Cargo.toml +++ b/litellm-rust/crates/cache-gcs/Cargo.toml @@ -15,6 +15,8 @@ reqwest.workspace = true tokio.workspace = true [dev-dependencies] +litellm-cache-testing.workspace = true +rstest.workspace = true serde_json.workspace = true tokio.workspace = true wiremock = "0.6.5" diff --git a/litellm-rust/crates/cache-gcs/src/cache.rs b/litellm-rust/crates/cache-gcs/src/cache.rs index 65282ac99d5..a8a7fbc9a7b 100644 --- a/litellm-rust/crates/cache-gcs/src/cache.rs +++ b/litellm-rust/crates/cache-gcs/src/cache.rs @@ -2,7 +2,7 @@ use std::{future::Future, sync::Arc, time::Duration}; use futures_util::future::try_join_all; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheCodec, CacheConnectionResult, Error, ExactCacheContext, + BaseCache, BatchCache, BatchEntry, CacheCodec, DisconnectCache, Error, ExactCacheContext, FlushCache, }; use percent_encoding::{AsciiSet, NON_ALPHANUMERIC, percent_encode}; @@ -53,25 +53,25 @@ pub struct GcsCache { } impl GcsCache { - pub fn new(config: GcsConfig, codec: S) -> Result { + pub fn new(config: GcsConfig, client: Client, codec: S) -> Self { let token = Arc::new(GcpTokenSource::new(config.path_service_account.clone())); - Self::with_token_source(config, codec, token) + Self::with_token_source(config, client, codec, token) } pub fn with_token_source( config: GcsConfig, + client: Client, codec: S, token: Arc, - ) -> Result { - let client = Client::builder().build().map_err(|_| Error::Unavailable)?; + ) -> Self { let key_prefix = key_prefix(config.gcs_path.as_deref()); - Ok(Self { + Self { config, key_prefix, client, token, codec, - }) + } } pub fn bucket_name(&self) -> &str { @@ -154,26 +154,26 @@ impl GcsCache { F: Future> + Send, T: Send, { - let run = || { + let run = |future: F| { tokio::runtime::Builder::new_current_thread() .enable_all() .build() .map_err(|_| Error::Unavailable) .and_then(|runtime| runtime.block_on(future)) }; - if let Ok(handle) = tokio::runtime::Handle::try_current() { - if handle.runtime_flavor() == tokio::runtime::RuntimeFlavor::MultiThread { - return tokio::task::block_in_place(run); + match tokio::runtime::Handle::try_current() { + Ok(handle) if handle.runtime_flavor() == tokio::runtime::RuntimeFlavor::MultiThread => { + tokio::task::block_in_place(|| handle.block_on(future)) } - return std::thread::scope(|scope| { + Ok(_) => std::thread::scope(|scope| { scope - .spawn(run) + .spawn(|| run(future)) .join() .map_err(|_| Error::Unavailable) .and_then(|result| result) - }); + }), + Err(_) => run(future), } - run() } } @@ -222,14 +222,12 @@ impl BaseCache for GcsCache { .await .map(|_| ()) } +} +impl DisconnectCache for GcsCache { async fn disconnect(&self) -> Result<(), Error> { Ok(()) } - - async fn test_connection(&self) -> Result { - Err(Error::UnsupportedOperation) - } } impl BatchCache for GcsCache { diff --git a/litellm-rust/crates/cache-gcs/tests/cache.rs b/litellm-rust/crates/cache-gcs/tests/cache.rs index 45eecf01cec..cdce6a00bdd 100644 --- a/litellm-rust/crates/cache-gcs/tests/cache.rs +++ b/litellm-rust/crates/cache-gcs/tests/cache.rs @@ -1,37 +1,32 @@ -use std::{sync::Arc, time::Duration}; +mod support; + +use std::{future::Future, pin::Pin, sync::Arc, time::Duration}; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheContext, Error, ExactCacheContext, FlushCache, - JsonCodec, + BaseCache, BatchCache, BatchEntry, CacheContext, DisconnectCache, Error, ExactCacheContext, + FlushCache, }; -use litellm_cache_gcs::{GcsCache, GcsConfig, StaticTokenSource, TokenSource, key_prefix}; -use serde_json::json; +use litellm_cache_gcs::{GcsCache, GcsConfig, TokenSource, key_prefix}; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use support::FakeBucket; use wiremock::{ Mock, MockServer, ResponseTemplate, matchers::{body_bytes, header, method, path, query_param}, }; -fn config(server: &MockServer, gcs_path: Option<&str>) -> GcsConfig { - GcsConfig { - bucket_name: "bucket".into(), - gcs_path: gcs_path.map(str::to_string), - path_service_account: None, - endpoint: server.uri(), - } +#[fixture] +async fn server() -> MockServer { + MockServer::start().await } -fn cache(server: &MockServer, gcs_path: Option<&str>) -> GcsCache> { - GcsCache::with_token_source( - config(server, gcs_path), - JsonCodec::new(), - Arc::new(StaticTokenSource("tok".into())), - ) - .unwrap() +fn context() -> ExactCacheContext { + ExactCacheContext::default() } +#[rstest] #[tokio::test] -async fn set_writes_encoded_object_and_headers() { - let server = MockServer::start().await; +async fn set_writes_encoded_object_and_headers(#[future(awt)] server: MockServer) { Mock::given(method("POST")) .and(path("/upload/storage/v1/b/bucket/o")) .and(query_param("uploadType", "media")) @@ -42,12 +37,8 @@ async fn set_writes_encoded_object_and_headers() { .expect(1) .mount(&server) .await; - cache(&server, Some("cache/")) - .set_cache( - "team:a b/c", - json!({"value": "entry"}), - &ExactCacheContext::default(), - ) + support::cache(&server, Some("cache/")) + .set_cache("team:a b/c", json!({"value": "entry"}), &context()) .unwrap(); let requests = server.received_requests().await.unwrap(); assert_eq!(requests.len(), 1); @@ -57,103 +48,108 @@ async fn set_writes_encoded_object_and_headers() { ); } +#[rstest] +#[case::hit( + "hit", + ResponseTemplate::new(200).set_body_json(json!({"value": "entry"})), + Ok(Some(json!({"value": "entry"}))) +)] +#[case::missing("missing", ResponseTemplate::new(404), Ok(None))] +#[case::server_error("server-error", ResponseTemplate::new(500), Err(Error::Unavailable))] +#[case::invalid( + "invalid", + ResponseTemplate::new(200).set_body_string("not json"), + Err(Error::InvalidEntry) +)] #[tokio::test] -async fn get_maps_statuses_and_decode_failures() { - let server = MockServer::start().await; +async fn get_maps_statuses_and_decode_failures( + #[future(awt)] server: MockServer, + #[case] key: &str, + #[case] response: ResponseTemplate, + #[case] expected: Result, Error>, +) { Mock::given(method("GET")) - .and(path("/storage/v1/b/bucket/o/hit")) + .and(path(format!("/storage/v1/b/bucket/o/{key}"))) .and(query_param("alt", "media")) - .respond_with(ResponseTemplate::new(200).set_body_json(json!({"value": "entry"}))) + .respond_with(response) .mount(&server) .await; - Mock::given(method("GET")) - .and(path("/storage/v1/b/bucket/o/missing")) - .respond_with(ResponseTemplate::new(404)) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/storage/v1/b/bucket/o/server-error")) - .respond_with(ResponseTemplate::new(500)) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/storage/v1/b/bucket/o/invalid")) - .respond_with(ResponseTemplate::new(200).set_body_string("not json")) - .mount(&server) - .await; - - let cache = cache(&server, None); - assert_eq!( - cache - .get_cache("hit", &ExactCacheContext::default()) - .unwrap(), - Some(json!({"value": "entry"})) - ); - assert_eq!( - cache - .get_cache("missing", &ExactCacheContext::default()) - .unwrap(), - None - ); - assert_eq!( - cache - .get_cache("server-error", &ExactCacheContext::default()) - .unwrap_err(), - Error::Unavailable - ); - assert_eq!( - cache - .get_cache("invalid", &ExactCacheContext::default()) - .unwrap_err(), - Error::InvalidEntry - ); + let cache = support::cache(&server, None); + assert_eq!(cache.get_cache(key, &context()), expected); + assert_eq!(cache.async_get_cache(key, &context()).await, expected); } -#[test] -fn key_prefix_normalizes_paths() { - assert_eq!(key_prefix(None), ""); - assert_eq!(key_prefix(Some("a/b/")), "a/b/"); - assert_eq!(key_prefix(Some("a/b")), "a/b/"); - assert_eq!(key_prefix(Some("")), ""); +#[rstest] +#[case::none(None, "")] +#[case::trailing_slash(Some("a/b/"), "a/b/")] +#[case::no_trailing_slash(Some("a/b"), "a/b/")] +#[case::empty(Some(""), "")] +fn key_prefix_normalizes_paths(#[case] gcs_path: Option<&str>, #[case] expected: &str) { + assert_eq!(key_prefix(gcs_path), expected); } +#[rstest] #[tokio::test] -async fn object_names_use_python_quote_encoding() { - let server = MockServer::start().await; +async fn cache_exposes_its_configuration(#[future(awt)] server: MockServer) { + let cache = GcsCache::new( + GcsConfig { + path_service_account: Some("/secrets/sa.json".into()), + ..support::config(&server, Some("folder")) + }, + reqwest::Client::new(), + litellm_cache::JsonCodec::::new(), + ); + assert_eq!(cache.bucket_name(), "bucket"); + assert_eq!(cache.key_prefix(), "folder/"); + assert_eq!(cache.path_service_account(), Some("/secrets/sa.json")); + assert_eq!(cache.object_name("k"), "folder/k"); +} + +#[rstest] +#[case::punctuation("a~b-c_d.e/f g%h", "uploadType=media&name=p%2Fa~b-c_d.e%2Ff%20g%25h")] +#[case::utf8("ключ", "uploadType=media&name=p%2F%D0%BA%D0%BB%D1%8E%D1%87")] +#[tokio::test] +async fn object_names_use_python_quote_encoding( + #[future(awt)] server: MockServer, + #[case] key: &str, + #[case] query: &str, +) { Mock::given(method("POST")) .and(path("/upload/storage/v1/b/bucket/o")) .and(query_param("uploadType", "media")) .respond_with(ResponseTemplate::new(200)) + .expect(1) + .mount(&server) + .await; + support::cache(&server, Some("p/")) + .async_set_cache(key, json!({"value": key}), context()) + .await + .unwrap(); + let requests = server.received_requests().await.unwrap(); + assert_eq!(requests[0].url.query(), Some(query)); +} + +#[rstest] +#[tokio::test] +async fn object_names_are_encoded_in_the_download_path(#[future(awt)] server: MockServer) { + Mock::given(method("GET")) + .and(path("/storage/v1/b/bucket/o/p%2Fa%3Ab%20c")) + .and(query_param("alt", "media")) + .respond_with(ResponseTemplate::new(200).set_body_json(json!(1))) .expect(2) .mount(&server) .await; - let cache = cache(&server, Some("p/")); - cache - .set_cache( - "a~b-c_d.e/f g%h", - json!({"value": "punctuation"}), - &ExactCacheContext::default(), - ) - .unwrap(); - cache - .set_cache( - "ключ", - json!({"value": "utf8"}), - &ExactCacheContext::default(), - ) - .unwrap(); - let requests = server.received_requests().await.unwrap(); - let queries: Vec<_> = requests - .iter() - .filter_map(|request| request.url.query()) - .collect(); - assert!(queries.contains(&"uploadType=media&name=p%2Fa~b-c_d.e%2Ff%20g%25h")); - assert!(queries.contains(&"uploadType=media&name=p%2F%D0%BA%D0%BB%D1%8E%D1%87")); + let cache = support::cache(&server, Some("p")); + assert_eq!(cache.get_cache("a:b c", &context()), Ok(Some(json!(1)))); + assert_eq!( + cache.async_get_cache("a:b c", &context()).await, + Ok(Some(json!(1))) + ); } +#[rstest] #[tokio::test] -async fn ignores_ttl_and_writes_pipeline_concurrently() { - let server = MockServer::start().await; +async fn ignores_ttl_and_writes_pipeline_concurrently(#[future(awt)] server: MockServer) { for key in ["one", "two", "three"] { Mock::given(method("POST")) .and(path("/upload/storage/v1/b/bucket/o")) @@ -164,12 +160,10 @@ async fn ignores_ttl_and_writes_pipeline_concurrently() { .mount(&server) .await; } - let cache = cache(&server, None); - assert_eq!(cache.get_ttl(&ExactCacheContext::default()), None); - assert_eq!( - cache.get_ttl(&ExactCacheContext::default().with_ttl(Some(Duration::from_secs(5)))), - None - ); + let cache = support::cache(&server, None); + let with_ttl = context().with_ttl(Some(Duration::from_secs(5))); + assert_eq!(cache.get_ttl(&context()), None); + assert_eq!(cache.get_ttl(&with_ttl), None); cache .async_set_cache_pipeline( vec![ @@ -177,15 +171,15 @@ async fn ignores_ttl_and_writes_pipeline_concurrently() { ("two".into(), json!({"key": "two"})), ("three".into(), json!({"key": "three"})), ], - ExactCacheContext::default().with_ttl(Some(Duration::from_secs(5))), + with_ttl, ) .await .unwrap(); } +#[rstest] #[tokio::test] -async fn async_batch_get_preserves_hits_misses_and_invalid_entries() { - let server = MockServer::start().await; +async fn batch_get_preserves_hits_misses_and_invalid_entries(#[future(awt)] server: MockServer) { Mock::given(method("GET")) .and(path("/storage/v1/b/bucket/o/hit")) .respond_with(ResponseTemplate::new(200).set_body_json(json!({"value": "entry"}))) @@ -201,122 +195,83 @@ async fn async_batch_get_preserves_hits_misses_and_invalid_entries() { .respond_with(ResponseTemplate::new(200).set_body_string("not json")) .mount(&server) .await; + let cache = support::cache(&server, None); + let keys = vec!["hit".to_string(), "missing".into(), "invalid".into()]; + let expected = vec![ + BatchEntry::Hit(json!({"value": "entry"})), + BatchEntry::Miss, + BatchEntry::Invalid, + ]; + assert_eq!(cache.batch_get_cache(&keys, &context()).unwrap(), expected); assert_eq!( - cache(&server, None) - .async_batch_get_cache( - vec!["hit".into(), "missing".into(), "invalid".into()], - ExactCacheContext::default(), - ) - .await - .unwrap(), - vec![ - BatchEntry::Hit(json!({"value": "entry"})), - BatchEntry::Miss, - BatchEntry::Invalid, - ] + cache.async_batch_get_cache(keys, context()).await.unwrap(), + expected ); } +#[rstest] #[tokio::test] -async fn lifecycle_operations_are_noops_and_connection_test_is_unsupported() { - let server = MockServer::start().await; - let cache = cache(&server, None); +async fn flush_and_disconnect_are_noops_like_python(#[future(awt)] server: MockServer) { + let cache = support::cache(&server, None); assert_eq!(cache.flush_cache(), Ok(())); + assert_eq!(cache.async_flush_cache().await, Ok(())); assert_eq!(cache.disconnect().await, Ok(())); - assert_eq!( - cache.test_connection().await, - Err(Error::UnsupportedOperation) - ); + assert!(server.received_requests().await.unwrap().is_empty()); } -#[test] +fn round_trip(cache: &support::JsonGcsCache) -> Result, Error> { + cache.set_cache("key", json!({"value": "entry"}), &context())?; + cache.get_cache("key", &context()) +} + +#[rstest] fn sync_operations_work_without_an_active_runtime() { let runtime = tokio::runtime::Builder::new_multi_thread() .enable_all() .build() .unwrap(); - let server = runtime.block_on(MockServer::start()); - runtime.block_on( - Mock::given(method("POST")) - .and(path("/upload/storage/v1/b/bucket/o")) - .respond_with(ResponseTemplate::new(200)) - .mount(&server), - ); - runtime.block_on( - Mock::given(method("GET")) - .and(path("/storage/v1/b/bucket/o/key")) - .respond_with(ResponseTemplate::new(200).set_body_json(json!({"value": "entry"}))) - .mount(&server), - ); - let cache = cache(&server, None); - cache - .set_cache( - "key", - json!({"value": "entry"}), - &ExactCacheContext::default(), - ) - .unwrap(); - assert_eq!( - cache - .get_cache("key", &ExactCacheContext::default()) - .unwrap(), - Some(json!({"value": "entry"})) - ); + let server = runtime.block_on(FakeBucket::serve()); + let cache = support::cache(&server, None); + assert_eq!(round_trip(&cache), Ok(Some(json!({"value": "entry"})))); } +#[rstest] #[tokio::test(flavor = "multi_thread")] async fn sync_operations_work_inside_a_multi_thread_runtime() { - let server = MockServer::start().await; - Mock::given(method("POST")) - .and(path("/upload/storage/v1/b/bucket/o")) - .respond_with(ResponseTemplate::new(200)) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/storage/v1/b/bucket/o/key")) - .respond_with(ResponseTemplate::new(200).set_body_json(json!({"value": "entry"}))) - .mount(&server) - .await; - let cache = cache(&server, None); - cache - .set_cache( - "key", - json!({"value": "entry"}), - &ExactCacheContext::default(), - ) - .unwrap(); - assert_eq!( - cache - .get_cache("key", &ExactCacheContext::default()) - .unwrap(), - Some(json!({"value": "entry"})) - ); + let server = FakeBucket::serve().await; + let cache = support::cache(&server, None); + assert_eq!(round_trip(&cache), Ok(Some(json!({"value": "entry"})))); +} + +#[rstest] +#[tokio::test] +async fn sync_operations_work_inside_a_current_thread_runtime() { + let server = FakeBucket::serve().await; + let cache = support::cache(&server, None); + assert_eq!(round_trip(&cache), Ok(Some(json!({"value": "entry"})))); } struct FailingTokenSource; impl TokenSource for FailingTokenSource { - fn bearer_token( - &self, - ) -> std::pin::Pin> + Send + '_>> - { + fn bearer_token(&self) -> Pin> + Send + '_>> { Box::pin(async { Err(Error::Unavailable) }) } } +#[rstest] #[tokio::test] -async fn token_source_failure_skips_http() { - let server = MockServer::start().await; - let cache = GcsCache::with_token_source( - config(&server, None), - JsonCodec::::new(), - Arc::new(FailingTokenSource), - ) - .unwrap(); +async fn token_source_failure_skips_http(#[future(awt)] server: MockServer) { + let cache = support::cache_with_token(&server, None, Arc::new(FailingTokenSource)); + assert_eq!( + cache.get_cache("key", &context()).unwrap_err(), + Error::Unavailable + ); assert_eq!( cache - .get_cache("key", &ExactCacheContext::default()) + .async_set_cache("key", json!(1), context()) + .await .unwrap_err(), Error::Unavailable ); diff --git a/litellm-rust/crates/cache-gcs/tests/contract.rs b/litellm-rust/crates/cache-gcs/tests/contract.rs new file mode 100644 index 00000000000..5841d0db642 --- /dev/null +++ b/litellm-rust/crates/cache-gcs/tests/contract.rs @@ -0,0 +1,65 @@ +mod support; + +use litellm_cache::ExactCacheContext; +use litellm_cache_testing as contract; +use rstest::{fixture, rstest}; +use serde_json::json; +use support::{FakeBucket, JsonGcsCache}; +use wiremock::MockServer; + +struct Gcs { + cache: JsonGcsCache, + _server: MockServer, +} + +#[fixture] +async fn gcs() -> Gcs { + let server = FakeBucket::serve().await; + Gcs { + cache: support::cache(&server, Some("contract")), + _server: server, + } +} + +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext::default() +} + +const PREFIX: &str = "contract:"; + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn hit_and_miss(#[future(awt)] gcs: Gcs, context: ExactCacheContext) { + contract::hit_and_miss(&gcs.cache, context, PREFIX, json!({"answer": 42})).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn sync_async_equivalence(#[future(awt)] gcs: Gcs, context: ExactCacheContext) { + contract::sync_async_equivalence(&gcs.cache, context, PREFIX, json!("first"), json!([2])).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn overwrite_replaces(#[future(awt)] gcs: Gcs, context: ExactCacheContext) { + contract::overwrite_replaces(&gcs.cache, context, PREFIX, json!(1), json!({"b": 2})).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn pipeline_writes_every_entry(#[future(awt)] gcs: Gcs, context: ExactCacheContext) { + contract::pipeline_writes_every_entry( + &gcs.cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn batch_preserves_order(#[future(awt)] gcs: Gcs, context: ExactCacheContext) { + contract::batch_preserves_order(&gcs.cache, context, PREFIX, json!("first"), json!(2)).await; +} diff --git a/litellm-rust/crates/cache-gcs/tests/support/mod.rs b/litellm-rust/crates/cache-gcs/tests/support/mod.rs new file mode 100644 index 00000000000..6097f0ee1bd --- /dev/null +++ b/litellm-rust/crates/cache-gcs/tests/support/mod.rs @@ -0,0 +1,87 @@ +#![allow(dead_code)] + +use std::{ + collections::HashMap, + sync::{Arc, Mutex}, +}; + +use litellm_cache::JsonCodec; +use litellm_cache_gcs::{GcsCache, GcsConfig, StaticTokenSource, TokenSource}; +use percent_encoding::percent_decode_str; +use serde_json::Value; +use wiremock::{Mock, MockServer, Request, Respond, ResponseTemplate, http::Method, matchers::any}; + +pub type JsonGcsCache = GcsCache>; + +pub fn config(server: &MockServer, gcs_path: Option<&str>) -> GcsConfig { + GcsConfig { + bucket_name: "bucket".into(), + gcs_path: gcs_path.map(str::to_string), + path_service_account: None, + endpoint: server.uri(), + } +} + +pub fn cache_with_token( + server: &MockServer, + gcs_path: Option<&str>, + token: Arc, +) -> JsonGcsCache { + GcsCache::with_token_source( + config(server, gcs_path), + reqwest::Client::new(), + JsonCodec::new(), + token, + ) +} + +pub fn cache(server: &MockServer, gcs_path: Option<&str>) -> JsonGcsCache { + cache_with_token(server, gcs_path, Arc::new(StaticTokenSource("tok".into()))) +} + +/// An in-memory bucket speaking the JSON API's media upload and `alt=media` download. +#[derive(Clone, Default)] +pub struct FakeBucket { + objects: Arc>>>, +} + +impl FakeBucket { + pub async fn serve() -> MockServer { + let server = MockServer::start().await; + Mock::given(any()) + .respond_with(Self::default()) + .mount(&server) + .await; + server + } +} + +impl Respond for FakeBucket { + fn respond(&self, request: &Request) -> ResponseTemplate { + let mut objects = self.objects.lock().unwrap(); + match request.method { + Method::POST => { + let name = request + .url + .query_pairs() + .find_map(|(key, value)| (key == "name").then(|| value.into_owned())) + .expect("uploads carry the object name"); + objects.insert(name, request.body.clone()); + ResponseTemplate::new(200) + } + Method::GET => { + let encoded = request + .url + .path() + .strip_prefix("/storage/v1/b/bucket/o/") + .expect("downloads address an object"); + let name = percent_decode_str(encoded).decode_utf8().unwrap(); + match objects.get(name.as_ref()) { + Some(body) => ResponseTemplate::new(200).set_body_bytes(body.clone()), + None => ResponseTemplate::new(404), + } + } + _ => ResponseTemplate::new(405), + } + } +} diff --git a/litellm-rust/crates/cache-memory/Cargo.toml b/litellm-rust/crates/cache-memory/Cargo.toml index 86ab01564c8..88124f5401e 100644 --- a/litellm-rust/crates/cache-memory/Cargo.toml +++ b/litellm-rust/crates/cache-memory/Cargo.toml @@ -9,6 +9,6 @@ repository.workspace = true litellm-cache.workspace = true [dev-dependencies] -serde_json.workspace = true +litellm-cache-testing.workspace = true rstest.workspace = true tokio.workspace = true diff --git a/litellm-rust/crates/cache-memory/src/cache.rs b/litellm-rust/crates/cache-memory/src/cache.rs index 85850c1d925..74476559cbe 100644 --- a/litellm-rust/crates/cache-memory/src/cache.rs +++ b/litellm-rust/crates/cache-memory/src/cache.rs @@ -7,8 +7,8 @@ use std::{ }; use litellm_cache::{ - BaseCache, BatchCache, CacheConnectionResult, CacheConnectionStatus, ClaimCache, CounterCache, - DeleteCache, Error, ExactCacheContext, FlushCache, IncrementOperation, SetCache, TtlCache, + BaseCache, BatchCache, ClaimCache, CounterCache, DeleteCache, DisconnectCache, Error, + ExactCacheContext, FlushCache, SetCache, TtlCache, }; const DEFAULT_MAX_SIZE_IN_MEMORY: usize = 200; @@ -75,7 +75,9 @@ impl InMemoryCache { expiration_heap: BinaryHeap::new(), }), max_size_in_memory: max_size_in_memory.unwrap_or(DEFAULT_MAX_SIZE_IN_MEMORY), - default_ttl: default_ttl.unwrap_or(DEFAULT_TTL), + default_ttl: default_ttl + .filter(|ttl| !ttl.is_zero()) + .unwrap_or(DEFAULT_TTL), max_entry_bytes, measure_value, now: Arc::new(now), @@ -91,21 +93,9 @@ impl InMemoryCache { if self.max_size_in_memory == 0 { return Ok(CacheWrite::Disabled); } - if let (Some(limit), Some(measure)) = (self.max_entry_bytes, &self.measure_value) - && measure(&value)? > limit - { - return Ok(CacheWrite::TooLarge); - } let now = (self.now)(); let mut state = self.state.lock().map_err(|_| Error::Unavailable)?; - let key = key.into(); - Self::evict(&mut state, self.max_size_in_memory, now, &key); - let expiration = state.expirations.get(&key).copied(); - if expiration.is_none_or(|expiration| expiration < now) { - Self::set_expiration(&mut state, &key, now + ttl.unwrap_or(self.default_ttl)); - } - state.values.insert(key, value); - Ok(CacheWrite::Stored) + self.store(&mut state, key.into(), value, ttl, now) } pub fn get_cache(&self, key: &str) -> Result, Error> { @@ -121,6 +111,70 @@ impl InMemoryCache { Ok(state.values.get(key).cloned()) } + /// `check_value_size`: whether `value` fits `max_entry_bytes`. Always `true` without a + /// limit and a measure, since typed values have no generic size. + pub fn check_value_size(&self, value: &V) -> Result { + match (self.max_entry_bytes, &self.measure_value) { + (Some(limit), Some(measure)) => Ok(measure(value)? <= limit), + _ => Ok(true), + } + } + + /// `evict_cache`: drops expired entries, then the earliest-expiring ones until a new key + /// fits. + pub fn evict_cache(&self) -> Result<(), Error> { + let now = (self.now)(); + let mut state = self.state.lock().map_err(|_| Error::Unavailable)?; + Self::evict(&mut state, self.max_size_in_memory, now, None); + Ok(()) + } + + /// `evict_element_if_expired`: `true` when `key` had expired and was removed. + pub fn evict_element_if_expired(&self, key: &str) -> Result { + let now = (self.now)(); + let mut state = self.state.lock().map_err(|_| Error::Unavailable)?; + let expired = state + .expirations + .get(key) + .is_some_and(|expiration| *expiration < now); + if expired { + Self::remove(&mut state, key); + } + Ok(expired) + } + + /// `allow_ttl_override`: a write may set the TTL when the key has none or it has passed. + pub fn allow_ttl_override(&self, key: &str) -> Result { + let now = (self.now)(); + Ok(self + .expires_at(key)? + .is_none_or(|expiration| expiration < now)) + } + + /// The number of stored entries, expired ones included until they are evicted. + pub fn len(&self) -> Result { + Ok(self + .state + .lock() + .map_err(|_| Error::Unavailable)? + .values + .len()) + } + + pub fn is_empty(&self) -> Result { + Ok(self.len()? == 0) + } + + /// Entries in the expiration heap, stale ones included; bounded by eviction. + pub fn expiration_heap_len(&self) -> Result { + Ok(self + .state + .lock() + .map_err(|_| Error::Unavailable)? + .expiration_heap + .len()) + } + pub fn max_size_in_memory(&self) -> usize { self.max_size_in_memory } @@ -172,7 +226,9 @@ impl InMemoryCache { Ok(()) } - fn evict(state: &mut CacheState, capacity: usize, now: Duration, key: &str) { + /// Writing an existing `key` never evicts another entry, unlike Python, which pops the + /// earliest-expiring entry whenever the cache is full. + fn evict(state: &mut CacheState, capacity: usize, now: Duration, key: Option<&str>) { while let Some(Reverse((expiration, key))) = state.expiration_heap.peek().cloned() { if state.expirations.get(&key).copied() != Some(expiration) { state.expiration_heap.pop(); @@ -183,7 +239,7 @@ impl InMemoryCache { break; } } - if state.values.contains_key(key) { + if key.is_some_and(|key| state.values.contains_key(key)) { return; } while state.values.len() >= capacity { @@ -209,6 +265,40 @@ impl InMemoryCache { state.values.remove(key); state.expirations.remove(key); } + + /// `get_cache` under the held lock: an expired entry is removed and reads as missing. + fn live(state: &mut CacheState, key: &str, now: Duration) -> Option { + if state + .expirations + .get(key) + .is_some_and(|expiration| *expiration < now) + { + Self::remove(state, key); + } + state.values.get(key).cloned() + } + + /// Python `set_cache` under the held lock: evict first (even when `key` already exists), + /// then skip oversized values, then write, keeping a live key's expiry. + fn store( + &self, + state: &mut CacheState, + key: String, + value: V, + ttl: Option, + now: Duration, + ) -> Result { + Self::evict(state, self.max_size_in_memory, now, None); + if !self.check_value_size(&value)? { + return Ok(CacheWrite::TooLarge); + } + let expiration = state.expirations.get(&key).copied(); + if expiration.is_none_or(|expiration| expiration < now) { + Self::set_expiration(state, &key, now + ttl.unwrap_or(self.default_ttl)); + } + state.values.insert(key, value); + Ok(CacheWrite::Stored) + } } impl ClaimCache for InMemoryCache @@ -227,7 +317,7 @@ where } let now = (self.now)(); let mut state = self.state.lock().map_err(|_| Error::Unavailable)?; - Self::evict(&mut state, self.max_size_in_memory, now, key); + Self::evict(&mut state, self.max_size_in_memory, now, Some(key)); let existing = state .values .get(key) @@ -262,38 +352,12 @@ impl CounterCache for InMemoryCache { } let now = (self.now)(); let mut state = self.state.lock().map_err(|_| Error::Unavailable)?; - Self::evict(&mut state, self.max_size_in_memory, now, key); - let value = state.values.get(key).copied().unwrap_or_default() + amount; - if !state.expirations.contains_key(key) { - Self::set_expiration( - &mut state, - key, - now + self.get_ttl(&context).unwrap_or(self.default_ttl), - ); - } - state.values.insert(key.into(), value); + let value = Self::live(&mut state, key, now).unwrap_or_default() + amount; + self.store(&mut state, key.into(), value, self.get_ttl(&context), now)?; Ok(value) } } -impl InMemoryCache { - pub async fn async_increment_pipeline( - &self, - operations: Vec, - ) -> Result, Error> { - operations - .into_iter() - .map(|operation| { - self.increment_cache( - &operation.key, - operation.amount, - ExactCacheContext { ttl: operation.ttl }, - ) - }) - .collect() - } -} - impl BaseCache for InMemoryCache { type Value = V; type Context = ExactCacheContext; @@ -315,18 +379,12 @@ impl BaseCache for InMemoryCache { fn get_cache(&self, key: &str, _: &ExactCacheContext) -> Result, Error> { self.get_cache(key) } +} +impl DisconnectCache for InMemoryCache { async fn disconnect(&self) -> Result<(), Error> { Ok(()) } - - async fn test_connection(&self) -> Result { - Ok(CacheConnectionResult { - status: CacheConnectionStatus::Success, - message: "In-memory cache connection test successful".into(), - error: None, - }) - } } impl BatchCache for InMemoryCache {} @@ -367,34 +425,9 @@ where } let now = (self.now)(); let mut state = self.state.lock().map_err(|_| Error::Unavailable)?; - Self::evict(&mut state, self.max_size_in_memory, now, key); - let mut stored = state.values.get(key).cloned().unwrap_or_default(); + let mut stored = Self::live(&mut state, key, now).unwrap_or_default(); stored.extend(values.iter().cloned()); - if let (Some(limit), Some(measure)) = (self.max_entry_bytes, &self.measure_value) - && measure(&stored)? > limit - { - return Ok(values); - } - if !state.expirations.contains_key(key) { - Self::set_expiration(&mut state, key, now + ttl.unwrap_or(self.default_ttl)); - } - state.values.insert(key.into(), stored); + self.store(&mut state, key.into(), stored, ttl, now)?; Ok(values) } } - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn repeated_increments_keep_one_heap_entry_per_expiration() { - let cache = InMemoryCache::::new(Some(4), None); - for _ in 0..100 { - cache - .increment_cache("counter", 1.0, ExactCacheContext::default()) - .unwrap(); - } - assert_eq!(cache.state.lock().unwrap().expiration_heap.len(), 1); - } -} diff --git a/litellm-rust/crates/cache-memory/tests/cache.rs b/litellm-rust/crates/cache-memory/tests/cache.rs index 0df0319b990..ce7d6ac8a98 100644 --- a/litellm-rust/crates/cache-memory/tests/cache.rs +++ b/litellm-rust/crates/cache-memory/tests/cache.rs @@ -8,111 +8,296 @@ use std::{ }; use litellm_cache::{ - BaseCache, CacheBackend, CacheConnectionStatus, ClaimCache, CounterCache, DeleteCache, Error, - ExactCacheContext, IncrementOperation, SetCache, get_cache, set_cache, + BaseCache, BatchCache, BatchEntry, CacheBackend, ClaimCache, CounterCache, DeleteCache, + DisconnectCache, Error, ExactCacheContext, FlushCache, IncrementOperation, SetCache, TtlCache, + get_cache, set_cache, }; use litellm_cache_memory::{CacheWrite, InMemoryCache}; use rstest::{fixture, rstest}; +type Clock = Arc; + #[fixture] -fn clock() -> Arc { +fn clock() -> Clock { Arc::new(AtomicU64::new(100)) } -fn cache(clock: Arc, capacity: usize) -> InMemoryCache { +fn cache_with(clock: &Clock, capacity: usize) -> InMemoryCache { + let clock = clock.clone(); InMemoryCache::with_clock(Some(capacity), Some(Duration::from_secs(60)), move || { - Duration::from_secs(clock.load(Ordering::SeqCst)) + Duration::from_millis(clock.load(Ordering::SeqCst) * 1000) }) } +fn cache(clock: &Clock, capacity: usize) -> InMemoryCache { + cache_with(clock, capacity) +} + +fn at(clock: &Clock, seconds: u64) { + clock.store(seconds, Ordering::SeqCst); +} + +fn secs(seconds: u64) -> Option { + Some(Duration::from_secs(seconds)) +} + +fn ttl(seconds: u64) -> ExactCacheContext { + ExactCacheContext { ttl: secs(seconds) } +} + +fn measured(capacity: usize) -> InMemoryCache { + InMemoryCache::with_clock_and_size_measurement( + Some(capacity), + secs(60), + Some(4), + Some(Arc::new(|value: &String| { + if value.is_empty() { + return Err(Error::InvalidEntry); + } + Ok(value.len()) + })), + || Duration::from_secs(100), + ) +} + #[rstest] -fn default_explicit_and_override_ttls_follow_python_rules(clock: Arc) { - let cache = cache(clock.clone(), 4); +fn default_explicit_and_override_ttls_follow_python_rules(clock: Clock) { + let cache = cache(&clock, 4); cache.set_cache("key", "first".into(), None).unwrap(); - assert_eq!( - cache.expires_at("key").unwrap(), - Some(Duration::from_secs(160)) - ); - cache - .set_cache("key", "second".into(), Some(Duration::from_secs(10))) - .unwrap(); - assert_eq!( - cache.expires_at("key").unwrap(), - Some(Duration::from_secs(160)) - ); - clock.store(160, Ordering::SeqCst); + assert_eq!(cache.expires_at("key").unwrap(), secs(160)); + cache.set_cache("key", "second".into(), secs(10)).unwrap(); + assert_eq!(cache.expires_at("key").unwrap(), secs(160)); + at(&clock, 160); assert_eq!(cache.get_cache("key").unwrap(), Some("second".into())); - clock.store(161, Ordering::SeqCst); + at(&clock, 161); assert_eq!(cache.get_cache("key").unwrap(), None); - cache - .set_cache("key", "third".into(), Some(Duration::from_secs(10))) - .unwrap(); - assert_eq!( - cache.expires_at("key").unwrap(), - Some(Duration::from_secs(171)) - ); + assert_eq!(cache.expires_at("key").unwrap(), None); + cache.set_cache("key", "third".into(), secs(10)).unwrap(); + assert_eq!(cache.expires_at("key").unwrap(), secs(171)); } #[rstest] -fn write_at_expiry_boundary_refreshes_ttl(clock: Arc) { - let cache = cache(clock.clone(), 4); - cache - .set_cache("key", "first".into(), Some(Duration::from_secs(10))) - .unwrap(); - clock.store(110, Ordering::SeqCst); - cache - .set_cache("key", "second".into(), Some(Duration::from_secs(10))) - .unwrap(); - assert_eq!( - cache.expires_at("key").unwrap(), - Some(Duration::from_secs(120)) - ); - clock.store(115, Ordering::SeqCst); +#[case::unset(None, secs(600))] +#[case::zero_falls_back_like_python_or(Some(Duration::ZERO), secs(600))] +#[case::explicit(secs(5), secs(5))] +fn default_ttl_falls_back_to_ten_minutes( + #[case] default_ttl: Option, + #[case] expected: Option, +) { + let cache = InMemoryCache::::with_clock(None, default_ttl, || Duration::ZERO); + assert_eq!(cache.get_ttl(&ExactCacheContext::default()), expected); + cache.set_cache("key", "value".into(), None).unwrap(); + assert_eq!(cache.expires_at("key").unwrap(), expected); + assert_eq!(cache.max_size_in_memory(), 200); +} + +#[rstest] +fn write_at_expiry_boundary_refreshes_ttl(clock: Clock) { + let cache = cache(&clock, 4); + cache.set_cache("key", "first".into(), secs(10)).unwrap(); + at(&clock, 110); + cache.set_cache("key", "second".into(), secs(10)).unwrap(); + assert_eq!(cache.expires_at("key").unwrap(), secs(120)); + at(&clock, 115); assert_eq!(cache.get_cache("key").unwrap(), Some("second".into())); } #[rstest] -fn capacity_evicts_earliest_and_ignores_stale_heap_entries(clock: Arc) { - let cache = cache(clock, 2); - cache - .set_cache("early", "a".into(), Some(Duration::from_secs(10))) - .unwrap(); - cache - .set_cache("late", "b".into(), Some(Duration::from_secs(20))) - .unwrap(); +fn expired_key_without_a_read_allows_a_ttl_override(clock: Clock) { + let cache = cache(&clock, 4); + cache.set_cache("key", "first".into(), secs(1)).unwrap(); + assert_eq!(cache.allow_ttl_override("key"), Ok(false)); + at(&clock, 102); + assert_eq!(cache.allow_ttl_override("key"), Ok(true)); + cache.set_cache("key", "second".into(), secs(1)).unwrap(); + assert_eq!(cache.expires_at("key").unwrap(), secs(103)); + assert_eq!(cache.allow_ttl_override("missing"), Ok(true)); +} + +#[rstest] +fn capacity_evicts_earliest_and_ignores_stale_heap_entries(clock: Clock) { + let cache = cache(&clock, 2); + cache.set_cache("early", "a".into(), secs(10)).unwrap(); + cache.set_cache("late", "b".into(), secs(20)).unwrap(); cache.delete_cache("early").unwrap(); - cache - .set_cache("new", "c".into(), Some(Duration::from_secs(30))) - .unwrap(); + cache.set_cache("new", "c".into(), secs(30)).unwrap(); assert_eq!(cache.get_cache("late").unwrap(), Some("b".into())); - cache - .set_cache("last", "d".into(), Some(Duration::from_secs(40))) - .unwrap(); + cache.set_cache("last", "d".into(), secs(40)).unwrap(); assert_eq!(cache.get_cache("late").unwrap(), None); } -#[test] -fn disabled_size_limited_and_validated_writes_are_observable() { - let cache = |capacity| { - InMemoryCache::with_clock_and_size_measurement( - Some(capacity), - Some(Duration::from_secs(60)), - Some(4), - Some(Arc::new(|value: &String| { - if value.is_empty() { - return Err(Error::InvalidEntry); - } - Ok(value.len()) - })), - || Duration::from_secs(100), - ) - }; - let disabled = cache(0); +#[rstest] +fn max_size_is_respected_when_every_item_has_a_long_ttl(clock: Clock) { + let cache = cache(&clock, 3); + for index in 0..3 { + at(&clock, 100 + index); + cache + .set_cache( + format!("key_{index}"), + format!("value_{index}"), + secs(86_400), + ) + .unwrap(); + } + assert_eq!(cache.len(), Ok(3)); + cache + .set_cache("key_3", "value_3".into(), secs(86_400)) + .unwrap(); + assert_eq!(cache.len(), Ok(3)); + assert_eq!(cache.get_cache("key_0").unwrap(), None); + assert_eq!(cache.expires_at("key_0").unwrap(), None); + for key in ["key_1", "key_2", "key_3"] { + assert!(cache.get_cache(key).unwrap().is_some(), "{key}"); + } +} + +#[rstest] +fn expired_items_are_evicted_before_live_ones(clock: Clock) { + let cache = cache(&clock, 3); + cache.set_cache("expired_1", "1".into(), secs(1)).unwrap(); + cache.set_cache("expired_2", "2".into(), secs(1)).unwrap(); + cache + .set_cache("long_lived", "3".into(), secs(86_400)) + .unwrap(); + assert_eq!(cache.len(), Ok(3)); + at(&clock, 102); + cache + .set_cache("new_item", "4".into(), secs(86_400)) + .unwrap(); + assert_eq!(cache.len(), Ok(2)); + assert_eq!(cache.get_cache("long_lived").unwrap(), Some("3".into())); + assert_eq!(cache.get_cache("new_item").unwrap(), Some("4".into())); + for key in ["expired_1", "expired_2"] { + assert_eq!(cache.expires_at(key).unwrap(), None, "{key}"); + } +} + +#[rstest] +fn injected_clock_controls_expiry_and_eviction(clock: Clock) { + let cache = cache(&clock, 2); + at(&clock, 0); + cache + .set_cache("first", "original".into(), secs(10)) + .unwrap(); + at(&clock, 9); + cache.set_cache("second", "survivor".into(), None).unwrap(); + assert_eq!(cache.get_cache("first").unwrap(), Some("original".into())); + at(&clock, 11); + assert_eq!(cache.get_cache("first").unwrap(), None); + cache + .set_cache("third", "replacement".into(), None) + .unwrap(); + assert_eq!(cache.get_cache("second").unwrap(), Some("survivor".into())); + at(&clock, 70); + cache.set_cache("fourth", "new".into(), None).unwrap(); + assert_eq!(cache.get_cache("second").unwrap(), None); assert_eq!( - disabled.set_cache("a", "x".into(), None).unwrap(), + cache.get_cache("third").unwrap(), + Some("replacement".into()) + ); + assert_eq!(cache.get_cache("fourth").unwrap(), Some("new".into())); +} + +#[rstest] +fn rewriting_one_key_keeps_one_heap_entry(clock: Clock) { + let cache = cache(&clock, 10); + for index in 0..1_000 { + cache + .set_cache("hot_key", format!("value_{index}"), secs(60)) + .unwrap(); + } + assert_eq!(cache.expiration_heap_len(), Ok(1)); +} + +#[rstest] +fn repeated_increments_keep_one_heap_entry_per_expiration() { + let cache = InMemoryCache::::new(Some(4), None); + for _ in 0..100 { + cache + .increment_cache("counter", 1.0, ExactCacheContext::default()) + .unwrap(); + } + assert_eq!(cache.expiration_heap_len(), Ok(1)); +} + +#[rstest] +fn reinserting_expired_keys_below_capacity_prunes_the_heap(clock: Clock) { + let cache = cache(&clock, 200); + for cycle in 0..3 { + for index in 0..5 { + cache + .set_cache(format!("key_{index}"), format!("value_{cycle}"), secs(1)) + .unwrap(); + } + at(&clock, 100 + 2 * (cycle + 1)); + } + for index in 0..5 { + cache + .set_cache(format!("key_{index}"), "final".into(), secs(1)) + .unwrap(); + } + assert_eq!(cache.len(), Ok(5)); + assert_eq!(cache.expiration_heap_len(), Ok(5)); +} + +#[rstest] +fn evict_cache_drops_expired_entries_then_makes_room(clock: Clock) { + let cache = cache(&clock, 2); + assert_eq!(cache.is_empty(), Ok(true)); + cache.set_cache("short", "a".into(), secs(1)).unwrap(); + cache.set_cache("long", "b".into(), secs(50)).unwrap(); + at(&clock, 102); + cache.evict_cache().unwrap(); + assert_eq!(cache.len(), Ok(1)); + assert_eq!(cache.expires_at("short").unwrap(), None); + cache.set_cache("longer", "c".into(), secs(90)).unwrap(); + cache.evict_cache().unwrap(); + assert_eq!(cache.len(), Ok(1)); + assert_eq!(cache.get_cache("long").unwrap(), None); + assert_eq!(cache.get_cache("longer").unwrap(), Some("c".into())); +} + +#[rstest] +fn evict_element_if_expired_reports_removal(clock: Clock) { + let cache = cache(&clock, 4); + cache.set_cache("key", "value".into(), secs(10)).unwrap(); + assert_eq!(cache.evict_element_if_expired("key"), Ok(false)); + assert_eq!(cache.evict_element_if_expired("missing"), Ok(false)); + at(&clock, 110); + assert_eq!(cache.evict_element_if_expired("key"), Ok(false)); + at(&clock, 111); + assert_eq!(cache.evict_element_if_expired("key"), Ok(true)); + assert_eq!(cache.len(), Ok(0)); + assert_eq!(cache.expires_at("key").unwrap(), None); +} + +#[rstest] +#[case::fits("ok", Ok(true))] +#[case::at_limit("four", Ok(true))] +#[case::too_large("oversized", Ok(false))] +#[case::measure_error("", Err(Error::InvalidEntry))] +fn check_value_size_applies_the_entry_limit( + #[case] value: &str, + #[case] expected: Result, +) { + assert_eq!(measured(2).check_value_size(&value.to_string()), expected); +} + +#[rstest] +fn values_are_unbounded_without_a_measure() { + let cache = InMemoryCache::::default(); + assert_eq!(cache.max_entry_bytes(), None); + assert_eq!(cache.check_value_size(&"x".repeat(1 << 20)), Ok(true)); +} + +#[rstest] +fn disabled_size_limited_and_validated_writes_are_observable() { + assert_eq!( + measured(0).set_cache("a", "x".into(), None).unwrap(), CacheWrite::Disabled ); - let cache = cache(2); + let cache = measured(2); + assert_eq!(cache.max_entry_bytes(), Some(4)); assert_eq!( cache.set_cache("large", "oversized".into(), None).unwrap(), CacheWrite::TooLarge @@ -132,30 +317,21 @@ fn disabled_size_limited_and_validated_writes_are_observable() { assert_eq!(cache.get_cache("small").unwrap(), None); } +#[rstest] #[tokio::test] -async fn connection_test_matches_python_result_contract() { +async fn disconnect_is_a_no_op_that_keeps_entries() { let cache = InMemoryCache::::default(); - let result = BaseCache::test_connection(&cache).await.unwrap(); - assert_eq!(result.status, CacheConnectionStatus::Success); - assert_eq!(result.message, "In-memory cache connection test successful"); - assert_eq!(result.error, None); - assert_eq!( - serde_json::to_value(result).unwrap(), - serde_json::json!({ - "status": "success", - "message": "In-memory cache connection test successful" - }) - ); + cache.set_cache("key", "value".into(), None).unwrap(); + cache.disconnect().await.unwrap(); + assert_eq!(cache.get_cache("key").unwrap(), Some("value".into())); } +#[rstest] #[tokio::test] -async fn generic_consumers_share_typed_values_and_honor_expiration() { - let clock = clock(); - let cache: CacheBackend> = Arc::new(cache(clock.clone(), 4)); +async fn generic_consumers_share_typed_values_and_honor_expiration(clock: Clock) { + let cache: CacheBackend> = Arc::new(self::cache(&clock, 4)); let reader = Arc::clone(&cache); - let context = ExactCacheContext { - ttl: Some(Duration::from_secs(5)), - }; + let context = ttl(5); set_cache(cache.as_ref(), "sync", "first".into(), &context).unwrap(); assert_eq!( get_cache(reader.as_ref(), "sync", &context).unwrap(), @@ -181,7 +357,7 @@ async fn generic_consumers_share_typed_values_and_honor_expiration() { reader.async_get_cache("async", &context).await.unwrap(), None ); - clock.store(106, Ordering::SeqCst); + at(&clock, 106); assert_eq!(get_cache(reader.as_ref(), "sync", &context).unwrap(), None); assert_eq!( reader.async_get_cache("batch", &context).await.unwrap(), @@ -189,34 +365,95 @@ async fn generic_consumers_share_typed_values_and_honor_expiration() { ); } -#[test] -fn claims_are_atomic_and_refresh_eligible_winners() { - let clock = clock(); - let cache = InMemoryCache::with_clock(Some(4), Some(Duration::from_secs(60)), { - let clock = clock.clone(); - move || Duration::from_secs(clock.load(Ordering::SeqCst)) - }); - let context = ExactCacheContext { - ttl: Some(Duration::from_secs(10)), - }; +#[rstest] +#[case::context_ttl(ttl(5), secs(105))] +#[case::default_ttl(ExactCacheContext::default(), secs(160))] +#[tokio::test] +async fn pipeline_writes_use_the_context_ttl_or_the_default( + clock: Clock, + #[case] context: ExactCacheContext, + #[case] expected: Option, +) { + let cache = cache(&clock, 4); + cache + .async_set_cache_pipeline( + vec![("a".into(), "1".into()), ("b".into(), "2".into())], + context, + ) + .await + .unwrap(); + assert_eq!(cache.expires_at("a").unwrap(), expected); + assert_eq!(cache.expires_at("b").unwrap(), expected); +} + +#[rstest] +#[tokio::test] +async fn batch_reads_return_one_entry_per_key_and_drop_expired_ones(clock: Clock) { + let cache = cache(&clock, 4); + cache.set_cache("short", "a".into(), secs(1)).unwrap(); + cache.set_cache("long", "b".into(), secs(50)).unwrap(); + let keys = vec!["short".to_string(), "missing".into(), "long".into()]; + assert_eq!( + cache + .batch_get_cache(&keys, &ExactCacheContext::default()) + .unwrap(), + [ + BatchEntry::Hit("a".to_string()), + BatchEntry::Miss, + BatchEntry::Hit("b".into()), + ] + ); + at(&clock, 102); + assert_eq!( + cache + .async_batch_get_cache(keys, ExactCacheContext::default()) + .await + .unwrap(), + [ + BatchEntry::Miss, + BatchEntry::Miss, + BatchEntry::Hit("b".into()) + ] + ); +} + +#[rstest] +#[tokio::test] +async fn flush_clears_values_and_expirations(clock: Clock) { + let cache = cache(&clock, 4); + cache.set_cache("a", "1".into(), None).unwrap(); + cache.set_cache("b", "2".into(), None).unwrap(); + cache.flush_cache().unwrap(); + assert_eq!(cache.len(), Ok(0)); + assert_eq!(cache.expiration_heap_len(), Ok(0)); + cache.set_cache("c", "3".into(), None).unwrap(); + FlushCache::async_flush_cache(&cache).await.unwrap(); + assert_eq!(cache.is_empty(), Ok(true)); + assert_eq!( + cache.async_get_oldest_n_keys(5).await.unwrap(), + Vec::::new() + ); +} + +#[rstest] +fn claims_are_atomic_and_refresh_eligible_winners(clock: Clock) { + let cache = cache(&clock, 4); + let context = ttl(10); assert_eq!( cache .claim_cache("affinity", "first".to_string(), &[], context.clone()) .unwrap(), "first" ); - clock.store(103, Ordering::SeqCst); + at(&clock, 103); assert_eq!( cache .claim_cache("affinity", "second".to_string(), &[], context.clone()) .unwrap(), "first" ); - assert_eq!( - cache.expires_at("affinity").unwrap(), - Some(Duration::from_secs(110)) - ); - clock.store(105, Ordering::SeqCst); + assert_eq!(cache.expires_at("affinity").unwrap(), secs(110)); + at(&clock, 105); assert_eq!( cache .claim_cache( @@ -228,13 +465,10 @@ fn claims_are_atomic_and_refresh_eligible_winners() { .unwrap(), "first" ); - assert_eq!( - cache.expires_at("affinity").unwrap(), - Some(Duration::from_secs(115)) - ); + assert_eq!(cache.expires_at("affinity").unwrap(), secs(115)); } -#[test] +#[rstest] fn counters_increment_under_one_lock() { let cache = InMemoryCache::::default(); assert_eq!( @@ -250,44 +484,107 @@ fn counters_increment_under_one_lock() { } #[rstest] -fn rewriting_an_existing_key_at_capacity_keeps_other_entries(clock: Arc) { - let cache = cache(clock, 2); - cache - .set_cache("hot", "1".into(), Some(Duration::from_secs(10))) - .unwrap(); - cache - .set_cache("cold", "2".into(), Some(Duration::from_secs(20))) - .unwrap(); +fn concurrent_increments_are_atomic() { + let cache = Arc::new(InMemoryCache::::default()); + cache.set_cache("counter", 1000.0, None).unwrap(); + let threads = (0..8) + .map(|_| { + let cache = cache.clone(); + std::thread::spawn(move || { + cache + .increment_cache("counter", 1.0, ExactCacheContext::default()) + .unwrap() + }) + }) + .collect::>(); + for thread in threads { + thread.join().unwrap(); + } + assert_eq!(cache.get_cache("counter").unwrap(), Some(1008.0)); +} + +#[rstest] +#[case::window_semantics(false)] +#[case::refresh_ttl_is_ignored(true)] +#[tokio::test] +async fn async_increment_delegates_to_the_locked_sync_path( + clock: Clock, + #[case] refresh_ttl: bool, +) { + let cache = cache_with::(&clock, 4); + assert_eq!( + cache + .async_increment("counter", 2.0, ttl(10), refresh_ttl) + .await, + Ok(2.0) + ); + at(&clock, 105); + assert_eq!( + cache + .async_increment("counter", 3.0, ttl(10), refresh_ttl) + .await, + Ok(5.0) + ); + assert_eq!(cache.get_cache("counter").unwrap(), Some(5.0)); + assert_eq!(cache.expires_at("counter").unwrap(), secs(110)); +} + +#[rstest] +fn expired_counters_restart_from_zero_with_a_new_ttl(clock: Clock) { + let cache = cache_with::(&clock, 4); + cache.increment_cache("counter", 2.0, ttl(10)).unwrap(); + at(&clock, 111); + assert_eq!(cache.increment_cache("counter", 1.0, ttl(10)), Ok(1.0)); + assert_eq!(cache.expires_at("counter").unwrap(), secs(121)); +} + +/// Python `InMemoryCache.set_cache` runs `evict_cache()` before every insert, and step 2 evicts +/// the earliest expiry while `len(cache_dict) >= max_size_in_memory`, even when the key being +/// written already exists. +#[rstest] +fn overwriting_an_existing_key_at_capacity_evicts_the_earliest_expiry_like_python(clock: Clock) { + let cache = cache(&clock, 2); + cache.set_cache("hot", "1".into(), secs(10)).unwrap(); + cache.set_cache("cold", "2".into(), secs(20)).unwrap(); cache.set_cache("cold", "3".into(), None).unwrap(); - assert_eq!(cache.get_cache("hot").unwrap(), Some("1".into())); + + assert_eq!(cache.get_cache("hot").unwrap(), None); assert_eq!(cache.get_cache("cold").unwrap(), Some("3".into())); +} + +/// `claim_cache` has no Python counterpart; it never evicts another entry for a key it holds. +#[rstest] +fn claiming_an_existing_key_at_capacity_keeps_other_entries(clock: Clock) { + let cache = cache(&clock, 2); + cache.set_cache("hot", "1".into(), secs(10)).unwrap(); + cache.set_cache("cold", "2".into(), secs(20)).unwrap(); cache .claim_cache("cold", "4".into(), &[], ExactCacheContext::default()) .unwrap(); assert_eq!(cache.get_cache("hot").unwrap(), Some("1".into())); - - cache.set_cache("new", "5".into(), None).unwrap(); - assert_eq!(cache.get_cache("hot").unwrap(), None); - assert_eq!(cache.get_cache("cold").unwrap(), Some("3".into())); - assert_eq!(cache.get_cache("new").unwrap(), Some("5".into())); + assert_eq!(cache.get_cache("cold").unwrap(), Some("2".into())); } -#[test] -fn incrementing_an_existing_counter_at_capacity_keeps_every_counter() { - let cache = InMemoryCache::::new(Some(2), None); +/// Python `increment_cache` is `get_cache` then `set_cache`, so at capacity the write evicts +/// the earliest expiry first: equal expiries tie-break on the key, and the value read before +/// eviction is the one written back. +#[rstest] +fn incrementing_at_capacity_evicts_the_earliest_expiry_like_python(clock: Clock) { + let cache = cache_with::(&clock, 2); for key in ["a", "b", "a", "b"] { cache .increment_cache(key, 1.0, ExactCacheContext::default()) .unwrap(); } - assert_eq!(cache.get_cache("a").unwrap(), Some(2.0)); + assert_eq!(cache.get_cache("a").unwrap(), None); assert_eq!(cache.get_cache("b").unwrap(), Some(2.0)); } -#[test] -fn disabled_cache_does_not_retain_claims_or_counters() { +#[rstest] +#[tokio::test] +async fn disabled_cache_does_not_retain_claims_counters_or_sets() { let claims = InMemoryCache::::new(Some(0), None); assert_eq!( claims @@ -305,62 +602,128 @@ fn disabled_cache_does_not_retain_claims_or_counters() { 2.0 ); assert_eq!(counters.get_cache("key").unwrap(), None); + + let sets = InMemoryCache::>::new(Some(0), None); + assert_eq!( + sets.async_set_cache_sadd("key", vec!["a".into()], None) + .await + .unwrap(), + ["a"] + ); + assert_eq!(sets.get_cache("key").unwrap(), None); } +#[rstest] #[tokio::test] -async fn ttl_and_oldest_key_operations_use_the_stored_expirations() { - let clock = Arc::new(AtomicU64::new(100)); - let cache = cache(clock, 3); - cache - .set_cache("later", "2".into(), Some(Duration::from_secs(20))) - .unwrap(); - cache - .set_cache("first", "1".into(), Some(Duration::from_secs(10))) - .unwrap(); +async fn ttl_and_oldest_key_operations_use_the_stored_expirations(clock: Clock) { + let cache = cache(&clock, 3); + cache.set_cache("later", "2".into(), secs(20)).unwrap(); + cache.set_cache("first", "1".into(), secs(10)).unwrap(); + cache.set_cache("latest", "3".into(), secs(30)).unwrap(); + assert_eq!(cache.async_get_ttl("first").await.unwrap(), secs(110)); assert_eq!( - cache.async_get_ttl("first").await.unwrap(), - Some(Duration::from_secs(110)) + TtlCache::async_get_ttl(&cache, "later").await.unwrap(), + secs(120) ); assert_eq!(cache.async_get_oldest_n_keys(1).await.unwrap(), ["first"]); + assert_eq!( + cache.async_get_oldest_n_keys(10).await.unwrap(), + ["first", "later", "latest"] + ); + assert_eq!( + cache.async_get_oldest_n_keys(0).await.unwrap(), + Vec::::new() + ); assert_eq!(cache.async_get_ttl("missing").await.unwrap(), None); } +#[rstest] #[tokio::test] -async fn increment_pipeline_preserves_operation_order() { - let cache = InMemoryCache::::new(Some(3), None); +async fn increment_pipeline_preserves_operation_order(clock: Clock) { + let cache = cache_with::(&clock, 3); + let operation = |key: &str, amount, ttl| IncrementOperation { + key: key.into(), + amount, + ttl: secs(ttl), + }; assert_eq!( cache .async_increment_pipeline(vec![ - IncrementOperation { - key: "a".into(), - amount: 1.0, - ttl: Some(Duration::from_secs(10)), - }, - IncrementOperation { - key: "a".into(), - amount: 2.0, - ttl: Some(Duration::from_secs(20)), - }, + operation("a", 1.0, 10), + operation("b", 5.0, 30), + operation("a", 2.0, 20), ]) .await .unwrap(), - [1.0, 3.0] + [1.0, 5.0, 3.0] ); assert_eq!(cache.get_cache("a").unwrap(), Some(3.0)); + assert_eq!(cache.expires_at("a").unwrap(), secs(110)); + assert_eq!(cache.expires_at("b").unwrap(), secs(130)); + assert_eq!( + cache.async_increment_pipeline(Vec::new()).await.unwrap(), + Vec::::new() + ); } +#[rstest] #[tokio::test] -async fn set_capability_preserves_python_result_and_deduplicates_storage() { - let cache = InMemoryCache::>::new(None, None); - let inserted = vec!["a".into(), "a".into(), "b".into()]; +async fn set_capability_preserves_python_result_and_deduplicates_storage(clock: Clock) { + let cache = cache_with::>(&clock, 4); + let inserted = vec!["a".to_string(), "a".into(), "b".into()]; assert_eq!( cache - .async_set_cache_sadd("members", inserted.clone(), None) + .async_set_cache_sadd("members", inserted.clone(), secs(10)) .await .unwrap(), inserted ); + assert_eq!( + cache + .async_set_cache_sadd("members", vec!["c".into()], secs(99)) + .await + .unwrap(), + ["c"] + ); + assert_eq!( + cache.get_cache("members").unwrap(), + Some(HashSet::from(["a".into(), "b".into(), "c".into()])) + ); + assert_eq!(cache.expires_at("members").unwrap(), secs(110)); + at(&clock, 111); + cache + .async_set_cache_sadd("members", vec!["d".into()], None) + .await + .unwrap(); + assert_eq!( + cache.get_cache("members").unwrap(), + Some(HashSet::from(["d".into()])) + ); + assert_eq!(cache.expires_at("members").unwrap(), secs(171)); +} + +#[rstest] +#[tokio::test] +async fn oversized_set_additions_are_not_stored() { + let cache = InMemoryCache::>::with_clock_and_size_measurement( + Some(4), + None, + Some(2), + Some(Arc::new(|value: &HashSet| Ok(value.len()))), + || Duration::ZERO, + ); + cache + .async_set_cache_sadd("members", vec!["a".into(), "b".into()], None) + .await + .unwrap(); + assert_eq!( + cache + .async_set_cache_sadd("members", vec!["c".into()], None) + .await + .unwrap(), + ["c"] + ); assert_eq!( cache.get_cache("members").unwrap(), Some(HashSet::from(["a".into(), "b".into()])) diff --git a/litellm-rust/crates/cache-memory/tests/contract.rs b/litellm-rust/crates/cache-memory/tests/contract.rs new file mode 100644 index 00000000000..860de1ed798 --- /dev/null +++ b/litellm-rust/crates/cache-memory/tests/contract.rs @@ -0,0 +1,98 @@ +use std::time::Duration; + +use litellm_cache::ExactCacheContext; +use litellm_cache_memory::InMemoryCache; +use litellm_cache_testing as contract; +use rstest::{fixture, rstest}; + +#[fixture] +fn strings() -> InMemoryCache { + InMemoryCache::new(Some(16), None) +} + +#[fixture] +fn counters() -> InMemoryCache { + InMemoryCache::new(Some(16), None) +} + +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext { + ttl: Some(Duration::from_secs(60)), + } +} + +#[rstest] +#[tokio::test] +async fn hit_and_miss(strings: InMemoryCache, context: ExactCacheContext) { + contract::hit_and_miss(&strings, context, "memory:", "value".into()).await; +} + +#[rstest] +#[tokio::test] +async fn sync_async_equivalence(strings: InMemoryCache, context: ExactCacheContext) { + contract::sync_async_equivalence( + &strings, + context, + "memory:", + "first".into(), + "second".into(), + ) + .await; +} + +#[rstest] +#[tokio::test] +async fn overwrite_replaces(strings: InMemoryCache, context: ExactCacheContext) { + contract::overwrite_replaces( + &strings, + context, + "memory:", + "first".into(), + "second".into(), + ) + .await; +} + +#[rstest] +#[tokio::test] +async fn pipeline_writes_every_entry(strings: InMemoryCache, context: ExactCacheContext) { + contract::pipeline_writes_every_entry( + &strings, + context, + "memory:", + vec!["a".into(), "b".into(), "c".into()], + ) + .await; +} + +#[rstest] +#[tokio::test] +async fn batch_preserves_order(strings: InMemoryCache, context: ExactCacheContext) { + contract::batch_preserves_order( + &strings, + context, + "memory:", + "first".into(), + "second".into(), + ) + .await; +} + +#[rstest] +#[tokio::test] +async fn delete_removes_key(strings: InMemoryCache, context: ExactCacheContext) { + contract::delete_removes_key(&strings, context, "memory:", "value".into()).await; +} + +#[rstest] +#[tokio::test] +async fn flush_clears(strings: InMemoryCache, context: ExactCacheContext) { + contract::flush_clears(&strings, context, "memory:", "value".into()).await; +} + +#[rstest] +#[tokio::test] +async fn counter_accumulates(counters: InMemoryCache, context: ExactCacheContext) { + contract::counter_accumulates(&counters, context, "memory:").await; +} diff --git a/litellm-rust/crates/cache-qdrant-semantic/Cargo.toml b/litellm-rust/crates/cache-qdrant-semantic/Cargo.toml index 09d6a9637f3..950c2db7491 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/Cargo.toml +++ b/litellm-rust/crates/cache-qdrant-semantic/Cargo.toml @@ -17,7 +17,8 @@ tokio.workspace = true uuid.workspace = true [dev-dependencies] -litellm-cache-response.workspace = true +futures-executor = "0.3" +litellm-cache-testing.workspace = true rstest.workspace = true tonic = "0.14" tonic-prost = "0.14" diff --git a/litellm-rust/crates/cache-qdrant-semantic/src/semantic.rs b/litellm-rust/crates/cache-qdrant-semantic/src/cache.rs similarity index 72% rename from litellm-rust/crates/cache-qdrant-semantic/src/semantic.rs rename to litellm-rust/crates/cache-qdrant-semantic/src/cache.rs index fb165ed5a8e..a140e0af174 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/src/semantic.rs +++ b/litellm-rust/crates/cache-qdrant-semantic/src/cache.rs @@ -1,7 +1,8 @@ -use std::future::Future; - use futures_util::future::try_join_all; -use litellm_cache::{BaseCache, CacheCodec, CacheConnectionResult, Error, SemanticCacheContext}; +use litellm_cache::{ + BaseCache, CacheCodec, Error, SemanticCacheContext, + semantic::{Embedder, SemanticCache, SemanticLookup, prompt_from_messages}, +}; use qdrant_client::{ Payload, Qdrant, qdrant::{ @@ -14,26 +15,7 @@ use qdrant_client::{ use serde_json::{Map, Value, json}; use uuid::Uuid; -use crate::prompt_from_messages; - -pub trait Embedder: Send + Sync + 'static { - fn model(&self) -> &str; - fn embed(&self, input: &str) -> impl Future, Error>> + Send; -} - -#[derive(Clone, Debug, PartialEq)] -pub enum Quantization { - Binary, - Scalar, - Product, -} - -pub struct QdrantSemanticConfig { - pub collection_name: String, - pub similarity_threshold: f64, - pub vector_size: u64, - pub quantization: Quantization, -} +use crate::{QdrantSemanticConfig, Quantization}; pub struct QdrantSemanticCache { client: Qdrant, @@ -100,14 +82,9 @@ impl QdrantSemanticCache { &self.embedder } + /// Python reads `kwargs["messages"]` unguarded, so a request without messages fails. fn prompt(context: &SemanticCacheContext) -> Result { - let Some(messages) = context.messages.as_ref().and_then(Value::as_array) else { - return Err(Error::MissingPrompt); - }; - if messages.is_empty() { - return Err(Error::MissingPrompt); - } - Ok(prompt_from_messages(messages)) + prompt_from_messages(context).ok_or(Error::MissingPrompt) } async fn set( @@ -117,7 +94,10 @@ impl QdrantSemanticCache { context: &SemanticCacheContext, ) -> Result<(), Error> { let prompt = Self::prompt(context)?; - let vector = self.embedder.embed(&prompt).await?; + let vector = self + .embedder + .async_embed(&prompt, context.metadata.as_ref()) + .await?; let response = String::from_utf8(self.codec.encode(&value)?).map_err(|_| Error::InvalidEntry)?; let payload = Payload::try_from(json!({ @@ -147,9 +127,12 @@ impl QdrantSemanticCache { &self, key: &str, context: &SemanticCacheContext, - ) -> Result, Error> { + ) -> Result, Error> { let prompt = Self::prompt(context)?; - let vector = self.embedder.embed(&prompt).await?; + let vector = self + .embedder + .async_embed(&prompt, context.metadata.as_ref()) + .await?; let result = self .client .search_points( @@ -171,20 +154,27 @@ impl QdrantSemanticCache { .await .map_err(|_| Error::Unavailable)?; let Some(point) = result.result.into_iter().next() else { - return Ok(None); + return Ok(SemanticLookup::miss(Some(0.0))); }; let payload: Map = Payload::from(point.payload).into(); - if payload.get("litellm_cache_key").and_then(Value::as_str) != Some(key) { - return Ok(None); + if !payload + .get("litellm_cache_key") + .is_some_and(|cached| python_str(cached).as_deref() == Some(key)) + { + return Ok(SemanticLookup::miss(Some(0.0))); } - if f64::from(point.score) < self.config.similarity_threshold { - return Ok(None); + let similarity = f64::from(point.score); + if similarity < self.config.similarity_threshold { + return Ok(SemanticLookup::miss(Some(similarity))); } let response = payload .get("response") .and_then(Value::as_str) .ok_or(Error::InvalidEntry)?; - self.codec.decode(response.as_bytes()).map(Some) + Ok(SemanticLookup { + value: Some(self.codec.decode(response.as_bytes())?), + similarity: Some(similarity), + }) } } @@ -219,7 +209,8 @@ impl BaseCache for QdrantSemanticCache { } fn get_cache(&self, key: &str, context: &Self::Context) -> Result, Error> { - self.runtime.block_on(self.get(key, context)) + self.get_cache_with_similarity(key, context) + .map(|lookup| lookup.value) } async fn async_set_cache( @@ -236,7 +227,7 @@ impl BaseCache for QdrantSemanticCache { key: &str, context: &Self::Context, ) -> Result, Error> { - self.get(key, context).await + self.get(key, context).await.map(|lookup| lookup.value) } async fn async_set_cache_pipeline( @@ -251,12 +242,36 @@ impl BaseCache for QdrantSemanticCache { .await .map(|_| ()) } +} - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) +/// Python stamps the top point's score, even below the threshold, and `0.0` when there is no +/// point or it belongs to another key. A request without messages fails before any search. +impl SemanticCache for QdrantSemanticCache { + fn get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + self.runtime.block_on(self.get(key, context)) } - async fn test_connection(&self) -> Result { - Err(Error::UnsupportedOperation) + async fn async_get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + self.get(key, context).await + } +} + +/// `str(value)` for the scalar payload values `_payload_matches_cache_key` compares; `None` for +/// null (a pre-isolation point without a key) and for containers, which never equal a key. +fn python_str(value: &Value) -> Option { + match value { + Value::String(text) => Some(text.clone()), + Value::Number(number) => Some(number.to_string()), + Value::Bool(true) => Some("True".into()), + Value::Bool(false) => Some("False".into()), + Value::Null | Value::Array(_) | Value::Object(_) => None, } } diff --git a/litellm-rust/crates/cache-qdrant-semantic/src/config.rs b/litellm-rust/crates/cache-qdrant-semantic/src/config.rs new file mode 100644 index 00000000000..2654c155f23 --- /dev/null +++ b/litellm-rust/crates/cache-qdrant-semantic/src/config.rs @@ -0,0 +1,13 @@ +#[derive(Clone, Debug, PartialEq)] +pub enum Quantization { + Binary, + Scalar, + Product, +} + +pub struct QdrantSemanticConfig { + pub collection_name: String, + pub similarity_threshold: f64, + pub vector_size: u64, + pub quantization: Quantization, +} diff --git a/litellm-rust/crates/cache-qdrant-semantic/src/embedder.rs b/litellm-rust/crates/cache-qdrant-semantic/src/embedder.rs index 47b898d6f4e..340393600f2 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/src/embedder.rs +++ b/litellm-rust/crates/cache-qdrant-semantic/src/embedder.rs @@ -1,11 +1,9 @@ use std::time::Duration; -use litellm_cache::Error; +use litellm_cache::{Error, semantic::Embedder}; use reqwest::Client; use serde_json::Value; -use crate::Embedder; - pub struct OpenAiEmbedder { client: Client, api_base: String, @@ -31,14 +29,16 @@ impl OpenAiEmbedder { timeout: config.timeout, } } -} -impl Embedder for OpenAiEmbedder { - fn model(&self) -> &str { + pub fn model(&self) -> &str { &self.model } +} - async fn embed(&self, input: &str) -> Result, Error> { +/// An OpenAI-compatible `/embeddings` call. It has no router to route on, so `metadata` is +/// unused, and it only embeds asynchronously: sync cache calls block on the cache's runtime. +impl Embedder for OpenAiEmbedder { + async fn async_embed(&self, input: &str, _metadata: Option<&Value>) -> Result, Error> { let request = self .client .post(format!("{}/embeddings", self.api_base)) diff --git a/litellm-rust/crates/cache-qdrant-semantic/src/lib.rs b/litellm-rust/crates/cache-qdrant-semantic/src/lib.rs index 0f346a9155b..3017bc695e2 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/src/lib.rs +++ b/litellm-rust/crates/cache-qdrant-semantic/src/lib.rs @@ -1,7 +1,7 @@ +mod cache; +mod config; mod embedder; -mod prompt; -mod semantic; +pub use cache::QdrantSemanticCache; +pub use config::{QdrantSemanticConfig, Quantization}; pub use embedder::{OpenAiEmbedder, OpenAiEmbedderConfig}; -pub use prompt::prompt_from_messages; -pub use semantic::{Embedder, QdrantSemanticCache, QdrantSemanticConfig, Quantization}; diff --git a/litellm-rust/crates/cache-qdrant-semantic/src/prompt.rs b/litellm-rust/crates/cache-qdrant-semantic/src/prompt.rs deleted file mode 100644 index ef1a2306658..00000000000 --- a/litellm-rust/crates/cache-qdrant-semantic/src/prompt.rs +++ /dev/null @@ -1,59 +0,0 @@ -use serde_json::Value; - -fn search_results_text(search_results: Option<&Value>) -> String { - let Some(Value::Array(results)) = search_results else { - return String::new(); - }; - results - .iter() - .filter_map(Value::as_object) - .flat_map(|result| { - let source = result - .get("source") - .and_then(Value::as_str) - .map(str::to_owned); - let title = result - .get("title") - .and_then(Value::as_str) - .map(str::to_owned); - let content = result - .get("content") - .and_then(Value::as_array) - .into_iter() - .flatten() - .filter_map(Value::as_object) - .filter_map(|block| block.get("text").and_then(Value::as_str).map(str::to_owned)); - let citations = result - .get("citations") - .filter(|value| !value.is_null()) - .map(|value| serde_json::to_string(value).unwrap_or_default()); - source - .into_iter() - .chain(title) - .chain(content) - .chain(citations) - }) - .collect() -} - -pub fn prompt_from_messages(messages: &[Value]) -> String { - messages - .iter() - .filter_map(Value::as_object) - .map(|message| { - let content = match message.get("content") { - Some(Value::String(content)) => content.clone(), - Some(Value::Array(parts)) => parts - .iter() - .filter_map(Value::as_object) - .filter_map(|part| part.get("text").and_then(Value::as_str)) - .collect(), - _ => String::new(), - }; - format!( - "{content}{}", - search_results_text(message.get("search_results")) - ) - }) - .collect() -} diff --git a/litellm-rust/crates/cache-qdrant-semantic/tests/contract.rs b/litellm-rust/crates/cache-qdrant-semantic/tests/contract.rs new file mode 100644 index 00000000000..896b799decf --- /dev/null +++ b/litellm-rust/crates/cache-qdrant-semantic/tests/contract.rs @@ -0,0 +1,91 @@ +//! `overwrite_replaces` does not apply: like Python, every write upserts a new `uuid4` point, +//! so a second write with the same prompt adds a tie instead of replacing the first. + +mod support; + +use std::future::Future; + +use litellm_cache::{JsonCodec, SemanticCacheContext, semantic::PreparedEmbedding}; +use litellm_cache_qdrant_semantic::{QdrantSemanticCache, QdrantSemanticConfig, Quantization}; +use litellm_cache_testing as contract; +use qdrant_client::Qdrant; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use support::{FakeQdrant, FakeState}; + +type Cache = QdrantSemanticCache>; + +const PREFIX: &str = "contract:"; + +#[fixture] +fn context() -> SemanticCacheContext { + SemanticCacheContext { + messages: Some(json!([{"role": "user", "content": "contract prompt"}])), + ..Default::default() + } +} + +/// Runs a contract against a fresh fake Qdrant. The sync cache methods block on the runtime, so +/// the contract is polled on a blocking thread outside the runtime's own executor. +async fn run(check: F) +where + F: FnOnce(Cache) -> Fut + Send + 'static, + Fut: Future, +{ + let server = FakeQdrant::start(FakeState::default()).await; + let runtime = tokio::runtime::Handle::current(); + let cache = QdrantSemanticCache::connect( + Qdrant::from_url(&server.url()).build().unwrap(), + PreparedEmbedding(vec![0.6, 0.8]), + JsonCodec::new(), + QdrantSemanticConfig { + collection_name: "contract".to_owned(), + similarity_threshold: 0.9, + vector_size: 2, + quantization: Quantization::Binary, + }, + runtime.clone(), + ) + .await + .unwrap(); + tokio::task::spawn_blocking(move || { + let _guard = runtime.enter(); + futures_executor::block_on(check(cache)); + }) + .await + .unwrap(); + server.stop(); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn hit_and_miss(context: SemanticCacheContext) { + run(|cache| async move { + contract::hit_and_miss(&cache, context, PREFIX, json!({"answer": 42})).await; + }) + .await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn sync_async_equivalence(context: SemanticCacheContext) { + run(|cache| async move { + contract::sync_async_equivalence(&cache, context, PREFIX, json!("first"), json!([2])).await; + }) + .await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn pipeline_writes_every_entry(context: SemanticCacheContext) { + run(|cache| async move { + contract::pipeline_writes_every_entry( + &cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; + }) + .await; +} diff --git a/litellm-rust/crates/cache-qdrant-semantic/tests/embedder.rs b/litellm-rust/crates/cache-qdrant-semantic/tests/embedder.rs index 6b09448fde8..de0fab0a66f 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/tests/embedder.rs +++ b/litellm-rust/crates/cache-qdrant-semantic/tests/embedder.rs @@ -3,9 +3,10 @@ use std::{ time::Duration, }; -use litellm_cache::Error; -use litellm_cache_qdrant_semantic::{Embedder, OpenAiEmbedder, OpenAiEmbedderConfig}; -use serde_json::Value; +use litellm_cache::{Error, semantic::Embedder}; +use litellm_cache_qdrant_semantic::{OpenAiEmbedder, OpenAiEmbedderConfig}; +use rstest::rstest; +use serde_json::{Value, json}; use tokio::{ io::{AsyncReadExt, AsyncWriteExt}, net::TcpListener, @@ -98,6 +99,7 @@ fn config(base: String, timeout: Option) -> OpenAiEmbedderConfig { } } +#[rstest] #[tokio::test] async fn posts_embeddings_request_and_parses_vector() { let server = TestHttpServer::response("200 OK", r#"{"data":[{"embedding":[0.1,0.2]}]}"#).await; @@ -108,7 +110,14 @@ async fn posts_embeddings_request_and_parses_vector() { Some(Duration::from_secs(1)), ), ); - assert_eq!(embedder.embed("hello").await.unwrap(), vec![0.1, 0.2]); + assert_eq!(embedder.model(), "test-model"); + assert_eq!( + embedder + .async_embed("hello", Some(&json!({"ignored": true}))) + .await + .unwrap(), + vec![0.1, 0.2] + ); let request = server.request.lock().unwrap().clone().unwrap(); let request_text = String::from_utf8(request).unwrap(); assert!(request_text.starts_with("POST /embeddings HTTP/1.1\r\n")); @@ -120,37 +129,50 @@ async fn posts_embeddings_request_and_parses_vector() { assert_eq!(body["encoding_format"], "float"); } +#[rstest] +#[case::error_status("500 Internal Server Error", "{}", 0, None, Err(Error::Unavailable))] +#[case::timed_out( + "200 OK", + r#"{"data":[{"embedding":[0.1,0.2]}]}"#, + 500, + Some(Duration::from_millis(200)), + Err(Error::Unavailable) +)] +#[case::within_timeout( + "200 OK", + r#"{"data":[{"embedding":[0.1,0.2]}]}"#, + 100, + Some(Duration::from_secs(1)), + Ok(vec![0.1, 0.2]) +)] +#[case::missing_embedding("200 OK", r#"{"data":[]}"#, 0, None, Err(Error::Unavailable))] #[tokio::test] -async fn status_and_timeout_errors_are_unavailable() { - let server = TestHttpServer::response("500 Internal Server Error", "{}").await; - let embedder = OpenAiEmbedder::new(reqwest::Client::new(), config(server.base_url(), None)); - assert_eq!(embedder.embed("hello").await, Err(Error::Unavailable)); - - let server = TestHttpServer::response_after( - "200 OK", - r#"{"data":[{"embedding":[0.1,0.2]}]}"#, - Duration::from_millis(500), - ) - .await; - let embedder = OpenAiEmbedder::new( - reqwest::Client::new(), - config(server.base_url(), Some(Duration::from_millis(200))), - ); - assert_eq!(embedder.embed("hello").await, Err(Error::Unavailable)); - - let server = TestHttpServer::response_after( - "200 OK", - r#"{"data":[{"embedding":[0.1,0.2]}]}"#, - Duration::from_millis(100), - ) - .await; - let embedder = OpenAiEmbedder::new( - reqwest::Client::new(), - config(server.base_url(), Some(Duration::from_secs(1))), - ); - assert_eq!(embedder.embed("hello").await.unwrap(), vec![0.1, 0.2]); +async fn status_timeout_and_body_errors_are_unavailable( + #[case] status: &str, + #[case] body: &str, + #[case] delay_ms: u64, + #[case] timeout: Option, + #[case] expected: Result, Error>, +) { + let server = + TestHttpServer::response_after(status, body, Duration::from_millis(delay_ms)).await; + let embedder = OpenAiEmbedder::new(reqwest::Client::new(), config(server.base_url(), timeout)); + assert_eq!(embedder.async_embed("hello", None).await, expected); } +#[rstest] +fn sync_embedding_is_unsupported() { + let embedder = OpenAiEmbedder::new( + reqwest::Client::new(), + config("http://127.0.0.1:9".to_owned(), None), + ); + assert_eq!( + embedder.embed("hello", None), + Err(Error::UnsupportedOperation) + ); +} + +#[rstest] #[tokio::test] async fn uses_the_injected_client() { let server = TestHttpServer::response("200 OK", r#"{"data":[{"embedding":[0.1,0.2]}]}"#).await; @@ -159,7 +181,10 @@ async fn uses_the_injected_client() { .build() .unwrap(); let embedder = OpenAiEmbedder::new(client, config(server.base_url(), None)); - assert_eq!(embedder.embed("hello").await.unwrap(), vec![0.1, 0.2]); + assert_eq!( + embedder.async_embed("hello", None).await.unwrap(), + vec![0.1, 0.2] + ); let request = server.request.lock().unwrap().clone().unwrap(); let request_text = String::from_utf8(request).unwrap(); assert!(request_text.contains("\r\nuser-agent: litellm-embedder-test\r\n")); diff --git a/litellm-rust/crates/cache-qdrant-semantic/tests/prompt.rs b/litellm-rust/crates/cache-qdrant-semantic/tests/prompt.rs deleted file mode 100644 index 38cd9e2f908..00000000000 --- a/litellm-rust/crates/cache-qdrant-semantic/tests/prompt.rs +++ /dev/null @@ -1,38 +0,0 @@ -use litellm_cache_qdrant_semantic::prompt_from_messages; -use serde_json::json; - -#[test] -fn prompt_matches_python_message_content_rules() { - let messages = vec![ - json!({"role": "user", "content": "hello"}), - json!({ - "role": "user", - "content": [ - {"type": "text", "text": "world"}, - {"type": "image_url", "image_url": {"url": "ignored"}}, - {"type": "text", "text": "!"}, - ], - }), - ]; - - assert_eq!(prompt_from_messages(&messages), "helloworld!"); -} - -#[test] -fn prompt_includes_search_result_text_and_compact_citations() { - let messages = vec![json!({ - "role": "tool", - "content": null, - "search_results": [{ - "source": "source", - "title": "title", - "content": [{"text": "body"}], - "citations": {"page": 1, "section": "intro"}, - }], - })]; - - assert_eq!( - prompt_from_messages(&messages), - r#"sourcetitlebody{"page":1,"section":"intro"}"# - ); -} diff --git a/litellm-rust/crates/cache-qdrant-semantic/tests/qdrant.rs b/litellm-rust/crates/cache-qdrant-semantic/tests/qdrant.rs index c7522c0b313..fe25c503a36 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/tests/qdrant.rs +++ b/litellm-rust/crates/cache-qdrant-semantic/tests/qdrant.rs @@ -1,27 +1,32 @@ -#[path = "support/mod.rs"] mod support; -use std::{collections::HashMap, sync::Arc, time::Duration}; +use std::{ + collections::HashMap, + sync::{Arc, Mutex}, + time::Duration, +}; -use litellm_cache::{BaseCache, CacheCodec, CacheContext, Error, SemanticCacheContext}; -use litellm_cache_qdrant_semantic::{ - Embedder, QdrantSemanticCache, QdrantSemanticConfig, Quantization, +use litellm_cache::{ + BaseCache, CacheContext, Error, JsonCodec, SemanticCacheContext, + semantic::{Embedder, SemanticCache, SemanticLookup}, }; -use litellm_cache_response::{ - CacheEntry, CacheKeyInput, ResponseCache, ResponseCacheCodec, ResponseCacheRequest, -}; -use qdrant_client::Payload; +use litellm_cache_qdrant_semantic::{QdrantSemanticCache, QdrantSemanticConfig, Quantization}; use qdrant_client::{ - Qdrant, + Payload, Qdrant, qdrant::{self, CompressionRatio, Distance, PointId, QuantizationType, Value, VectorParams}, }; +use rstest::{fixture, rstest}; use serde_json::{Value as JsonValue, json}; - use support::{FakeQdrant, FakeState, StoredPoint}; +type Calls = Arc)>>>; +type Cache = QdrantSemanticCache>; + +/// Embeds known prompts, fails on anything else, and records every call. #[derive(Clone)] struct FixedEmbedder { vectors: Arc>>, + calls: Calls, } impl FixedEmbedder { @@ -33,16 +38,21 @@ impl FixedEmbedder { .map(|(prompt, vector)| (prompt.to_owned(), vector)) .collect(), ), + calls: Calls::default(), } } } impl Embedder for FixedEmbedder { - fn model(&self) -> &str { - "fixed" - } - - async fn embed(&self, input: &str) -> Result, Error> { + async fn async_embed( + &self, + input: &str, + metadata: Option<&JsonValue>, + ) -> Result, Error> { + self.calls + .lock() + .unwrap() + .push((input.to_owned(), metadata.cloned())); self.vectors.get(input).cloned().ok_or(Error::Unavailable) } } @@ -63,22 +73,20 @@ fn context(prompt: &str) -> SemanticCacheContext { } } -fn value(response: JsonValue) -> CacheEntry { - CacheEntry { - timestamp: Some(1.0), - response, - } +#[fixture] +fn entry() -> JsonValue { + json!({"timestamp": 1.0, "response": {"answer": 42}}) } async fn connect( server: &FakeQdrant, vectors: impl IntoIterator)>, -) -> QdrantSemanticCache { +) -> Cache { let client = Qdrant::from_url(&server.url()).build().unwrap(); QdrantSemanticCache::connect( client, FixedEmbedder::new(vectors), - ResponseCacheCodec, + JsonCodec::new(), config(Quantization::Binary), tokio::runtime::Handle::current(), ) @@ -86,72 +94,70 @@ async fn connect( .unwrap() } +#[rstest] +#[case::binary(Quantization::Binary)] +#[case::scalar(Quantization::Scalar)] +#[case::product(Quantization::Product)] #[tokio::test(flavor = "multi_thread")] -#[expect( - deprecated, - reason = "the test verifies Qdrant's legacy always_ram quantization contract" -)] -async fn connect_sets_collection_quantization_and_index() { - for (quantization, expected) in [ - (Quantization::Binary, 0), - (Quantization::Scalar, 1), - (Quantization::Product, 2), - ] { - let server = FakeQdrant::start(FakeState::default()).await; - let client = Qdrant::from_url(&server.url()).build().unwrap(); - QdrantSemanticCache::connect( - client, - FixedEmbedder::new([]), - ResponseCacheCodec, - config(quantization), - tokio::runtime::Handle::current(), - ) - .await +async fn connect_sets_collection_quantization_and_index(#[case] quantization: Quantization) { + let server = FakeQdrant::start(FakeState::default()).await; + let client = Qdrant::from_url(&server.url()).build().unwrap(); + QdrantSemanticCache::connect( + client, + FixedEmbedder::new([]), + JsonCodec::::new(), + config(quantization.clone()), + tokio::runtime::Handle::current(), + ) + .await + .unwrap(); + let state = server.state.lock().unwrap(); + let request = &state.created_collections[0]; + let Some(qdrant::vectors_config::Config::Params(VectorParams { size, distance, .. })) = request + .vectors_config + .as_ref() + .and_then(|config| config.config.clone()) + else { + panic!("missing vector params"); + }; + assert_eq!(size, 2); + assert_eq!(distance, Distance::Cosine as i32); + let quantization_config = request + .quantization_config + .as_ref() + .unwrap() + .quantization .unwrap(); - let state = server.state.lock().unwrap(); - let request = &state.created_collections[0]; - let Some(qdrant::vectors_config::Config::Params(VectorParams { size, distance, .. })) = - request - .vectors_config - .as_ref() - .and_then(|config| config.config.clone()) - else { - panic!("missing vector params"); - }; - assert_eq!(size, 2); - assert_eq!(distance, Distance::Cosine as i32); - let quantization_config = request - .quantization_config - .as_ref() - .unwrap() - .quantization - .unwrap(); - match (expected, quantization_config) { - (0, qdrant::quantization_config::Quantization::Binary(binary)) => { - assert_eq!(binary.always_ram, Some(false)); - } - (1, qdrant::quantization_config::Quantization::Scalar(scalar)) => { - assert_eq!(scalar.r#type, QuantizationType::Int8 as i32); - assert_eq!(scalar.quantile, Some(0.99)); - assert_eq!(scalar.always_ram, Some(false)); - } - (2, qdrant::quantization_config::Quantization::Product(product)) => { - assert_eq!(product.compression, CompressionRatio::X16 as i32); - assert_eq!(product.always_ram, Some(false)); - } - _ => panic!("unexpected quantization"), + #[expect( + deprecated, + reason = "the test verifies Qdrant's legacy always_ram quantization contract" + )] + match (quantization, quantization_config) { + (Quantization::Binary, qdrant::quantization_config::Quantization::Binary(binary)) => { + assert_eq!(binary.always_ram, Some(false)); } - assert!(state.index_creations >= 1); - assert_eq!(state.field_indexes[0].collection_name, "semantic"); - assert_eq!(state.field_indexes[0].field_name, "litellm_cache_key"); - assert_eq!( - state.field_indexes[0].field_type, - Some(qdrant::FieldType::Keyword as i32) - ); - server.stop(); + (Quantization::Scalar, qdrant::quantization_config::Quantization::Scalar(scalar)) => { + assert_eq!(scalar.r#type, QuantizationType::Int8 as i32); + assert_eq!(scalar.quantile, Some(0.99)); + assert_eq!(scalar.always_ram, Some(false)); + } + (Quantization::Product, qdrant::quantization_config::Quantization::Product(product)) => { + assert_eq!(product.compression, CompressionRatio::X16 as i32); + assert_eq!(product.always_ram, Some(false)); + } + _ => panic!("unexpected quantization"), } + assert!(state.index_creations >= 1); + assert_eq!(state.field_indexes[0].collection_name, "semantic"); + assert_eq!(state.field_indexes[0].field_name, "litellm_cache_key"); + assert_eq!( + state.field_indexes[0].field_type, + Some(qdrant::FieldType::Keyword as i32) + ); + server.stop(); } +#[rstest] #[tokio::test(flavor = "multi_thread")] async fn existing_collection_skips_create_and_index_failure_is_non_fatal() { let server = FakeQdrant::start(FakeState { @@ -160,19 +166,25 @@ async fn existing_collection_skips_create_and_index_failure_is_non_fatal() { ..Default::default() }) .await; - let _cache = connect(&server, [("hello", vec![1.0, 0.0])]).await; + let cache = connect(&server, [("hello", vec![1.0, 0.0])]).await; + assert_eq!(cache.collection_name(), "semantic"); + assert_eq!(cache.similarity_threshold(), 0.9); + assert_eq!(cache.vector_size(), 2); let state = server.state.lock().unwrap(); assert!(state.created_collections.is_empty()); assert!(state.index_creations >= 1); server.stop(); } +#[rstest] #[tokio::test(flavor = "multi_thread")] -async fn async_and_sync_set_get_store_exact_payload() { +async fn async_and_sync_set_get_store_exact_payload(entry: JsonValue) { let server = FakeQdrant::start(FakeState::default()).await; let cache = Arc::new(connect(&server, [("hello", vec![1.0, 0.0])]).await); - let ctx = context("hello"); - let entry = value(json!({"answer": 42})); + let ctx = SemanticCacheContext { + metadata: Some(json!({"tenant": "team"})), + ..context("hello") + }; cache .async_set_cache("key", entry.clone(), ctx.clone()) .await @@ -188,10 +200,8 @@ async fn async_and_sync_set_get_store_exact_payload() { payload_keys.sort(); assert_eq!(payload_keys, ["litellm_cache_key", "response", "text"]); assert_eq!(payload["litellm_cache_key"], Value::from("key")); - assert_eq!( - payload["response"], - Value::from(String::from_utf8(ResponseCacheCodec.encode(&entry).unwrap()).unwrap()) - ); + assert_eq!(payload["text"], Value::from("hello")); + assert_eq!(payload["response"], Value::from(entry.to_string())); } let sync_entry = entry.clone(); let sync_cache = cache.clone(); @@ -207,208 +217,276 @@ async fn async_and_sync_set_get_store_exact_payload() { }) .await .unwrap(); + assert_eq!( + *cache.embedder().calls.lock().unwrap(), + vec![("hello".to_owned(), ctx.metadata.clone()); 4] + ); server.stop(); } +#[rstest] +#[case::content_parts_skip_images( + json!([ + {"role": "user", "content": "hello"}, + { + "role": "user", + "content": [ + {"type": "text", "text": "world"}, + {"type": "image_url", "image_url": {"url": "ignored"}}, + {"type": "text", "text": "!"}, + ], + }, + ]), + "helloworld!" +)] +#[case::search_results_and_compact_citations( + json!([{ + "role": "tool", + "content": null, + "search_results": [{ + "source": "source", + "title": "title", + "content": [{"text": "body"}], + "citations": {"page": 1, "section": "intro"}, + }], + }]), + r#"sourcetitlebody{"page":1,"section":"intro"}"# +)] #[tokio::test(flavor = "multi_thread")] -async fn misses_and_payload_validation_are_safe() { +async fn prompt_matches_python_message_rules( + #[case] messages: JsonValue, + #[case] prompt: &'static str, + entry: JsonValue, +) { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, [(prompt, vec![1.0, 0.0])]).await; + let context = SemanticCacheContext { + messages: Some(messages), + ..Default::default() + }; + + cache.async_set_cache("key", entry, context).await.unwrap(); + + assert_eq!(cache.embedder().calls.lock().unwrap()[0].0, prompt); + assert_eq!( + server.state.lock().unwrap().points[0].payload["text"], + Value::from(prompt) + ); + server.stop(); +} + +#[rstest] +#[case::no_messages(SemanticCacheContext::default())] +#[case::empty_messages(SemanticCacheContext { messages: Some(json!([])), ..Default::default() })] +#[case::responses_input_is_not_read(SemanticCacheContext { input: Some(json!("hello")), ..Default::default() })] +#[tokio::test(flavor = "multi_thread")] +async fn requests_without_messages_are_missing_a_prompt( + #[case] context: SemanticCacheContext, + entry: JsonValue, +) { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, [("hello", vec![1.0, 0.0])]).await; + + assert_eq!( + cache.async_set_cache("key", entry, context.clone()).await, + Err(Error::MissingPrompt) + ); + assert_eq!( + cache.async_get_cache("key", &context).await, + Err(Error::MissingPrompt) + ); + assert!(cache.embedder().calls.lock().unwrap().is_empty()); + server.stop(); +} + +#[rstest] +#[case::other_key("other", "hello", None)] +#[case::below_similarity_threshold("key", "near", None)] +#[tokio::test(flavor = "multi_thread")] +async fn misses_and_payload_validation_are_safe( + #[case] key: &str, + #[case] prompt: &str, + #[case] numeric_key_point: Option, + entry: JsonValue, +) { let server = FakeQdrant::start(FakeState::default()).await; let cache = connect( &server, [("hello", vec![1.0, 0.0]), ("near", vec![0.7, 0.71414286])], ) .await; - let entry = value(json!({"answer": 1})); cache .async_set_cache("key", entry, context("hello")) .await .unwrap(); + if let Some(id) = numeric_key_point { + server.insert_point(StoredPoint { + id: Some(PointId::from(id)), + vector: vec![1.0, 0.0], + payload: Payload::try_from(json!({ + "litellm_cache_key": id, + "response": "{}", + })) + .unwrap() + .into(), + }); + } + assert_eq!( - cache - .async_get_cache("other", &context("hello")) - .await - .unwrap(), - None - ); - assert_eq!( - cache - .async_get_cache("key", &context("near")) - .await - .unwrap(), - None - ); - server.insert_point(StoredPoint { - id: Some(PointId::from(99_u64)), - vector: vec![1.0, 0.0], - payload: Payload::try_from(json!({ - "litellm_cache_key": 99, - "response": "{}", - })) - .unwrap() - .into(), - }); - assert_eq!( - cache - .async_get_cache("99", &context("hello")) - .await - .unwrap(), + cache.async_get_cache(key, &context(prompt)).await.unwrap(), None ); server.stop(); } +#[rstest] +#[case::hit("key", context("hello"), Ok((true, Some(1.0))))] +#[case::below_similarity_threshold("key", context("near"), Ok((false, Some(0.7))))] +#[case::no_results("other", context("hello"), Ok((false, Some(0.0))))] +#[case::no_prompt("key", SemanticCacheContext::default(), Err(Error::MissingPrompt))] #[tokio::test(flavor = "multi_thread")] -async fn decoding_errors_missing_prompt_pipeline_and_ttl_behave_as_required() { +async fn lookup_reports_python_semantic_similarity( + #[case] key: &'static str, + #[case] context: SemanticCacheContext, + #[case] expected: Result<(bool, Option), Error>, + #[values(false, true)] use_async: bool, + entry: JsonValue, +) { let server = FakeQdrant::start(FakeState::default()).await; - let cache = connect(&server, [("one", vec![1.0, 0.0]), ("two", vec![0.0, 1.0])]).await; - let empty = SemanticCacheContext::default(); - assert_eq!( - cache - .async_set_cache("key", value(json!({})), empty.clone()) - .await, - Err(Error::MissingPrompt) + let cache = Arc::new( + connect( + &server, + [("hello", vec![1.0, 0.0]), ("near", vec![0.7, 0.71414286])], + ) + .await, ); + cache + .async_set_cache("key", entry.clone(), self::context("hello")) + .await + .unwrap(); + server.insert_point(StoredPoint { + id: Some(PointId::from(99_u64)), + vector: vec![1.0, 0.0], + payload: Payload::try_from(json!({"litellm_cache_key": 99, "response": "{}"})) + .unwrap() + .into(), + }); + + let lookup = if use_async { + cache.async_get_cache_with_similarity(key, &context).await + } else { + let cache = Arc::clone(&cache); + tokio::task::spawn_blocking(move || cache.get_cache_with_similarity(key, &context)) + .await + .unwrap() + }; + + match (lookup, expected) { + (Ok(SemanticLookup { value, similarity }), Ok((hit, expected))) => { + assert_eq!(value, hit.then_some(entry)); + assert_eq!(similarity.is_some(), expected.is_some()); + if let (Some(similarity), Some(expected)) = (similarity, expected) { + assert!((similarity - expected).abs() < 1e-6, "{similarity}"); + } + } + (lookup, expected) => assert_eq!(lookup.map(|_| ()), expected.map(|_| ())), + } + server.stop(); +} + +#[rstest] +#[case::codec_decodes_the_payload(Some(json!("{\"a\":1}")), Ok(Some(json!({"a": 1}))))] +#[case::undecodable_response(Some(json!("not json")), Err(Error::InvalidEntry))] +#[case::non_string_response(Some(json!(1)), Err(Error::InvalidEntry))] +#[case::missing_response(None, Err(Error::InvalidEntry))] +#[tokio::test(flavor = "multi_thread")] +async fn stored_responses_go_through_the_codec( + #[case] response: Option, + #[case] expected: Result, Error>, +) { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, [("hello", vec![1.0, 0.0])]).await; + let mut payload = serde_json::Map::new(); + payload.insert("litellm_cache_key".to_owned(), json!("key")); + if let Some(response) = response { + payload.insert("response".to_owned(), response); + } + server.insert_point(StoredPoint { + id: Some(PointId::from(1_u64)), + vector: vec![1.0, 0.0], + payload: Payload::try_from(JsonValue::Object(payload)) + .unwrap() + .into(), + }); + assert_eq!( - cache.async_get_cache("key", &empty).await, - Err(Error::MissingPrompt) + cache.async_get_cache("key", &context("hello")).await, + expected ); + server.stop(); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn embedding_failures_propagate() { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, []).await; + assert_eq!( cache.async_get_cache("key", &context("unknown")).await, Err(Error::Unavailable) ); + server.stop(); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn ttl_is_ignored_and_entries_do_not_expire(entry: JsonValue) { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, [("one", vec![1.0, 0.0])]).await; + let ctx = context("one").with_ttl(Some(Duration::from_secs(1))); + + assert_eq!(cache.get_ttl(&ctx), None); cache - .async_set_cache( - "ttl", - value(json!({"ttl": true})), - context("one").with_ttl(Some(Duration::from_secs(1))), - ) + .async_set_cache("ttl", entry, ctx.clone()) .await .unwrap(); tokio::time::sleep(Duration::from_millis(1_100)).await; - assert!( - cache - .async_get_cache( - "ttl", - &context("one").with_ttl(Some(Duration::from_secs(1))), - ) - .await - .unwrap() - .is_some() - ); + assert!(cache.async_get_cache("ttl", &ctx).await.unwrap().is_some()); + server.stop(); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn pipeline_upserts_each_entry_and_waits_for_indexing() { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, [("one", vec![1.0, 0.0])]).await; + cache .async_set_cache_pipeline( vec![ - ("one".to_owned(), value(json!({"n": 1}))), - ("two".to_owned(), value(json!({"n": 2}))), + ("one".to_owned(), json!({"n": 1})), + ("two".to_owned(), json!({"n": 2})), ], context("one"), ) .await .unwrap(); - assert!( - cache - .async_get_cache("one", &context("one")) - .await - .unwrap() - .is_some() - ); - assert!( - cache - .async_get_cache("two", &context("one")) - .await - .unwrap() - .is_some() - ); + + for (key, value) in [("one", json!({"n": 1})), ("two", json!({"n": 2}))] { + assert_eq!( + cache.async_get_cache(key, &context("one")).await.unwrap(), + Some(value) + ); + } assert_eq!( server.state.lock().unwrap().upsert_waits, - vec![Some(true), Some(true), Some(true)] - ); - assert_eq!(cache.get_ttl(&context("one")), None); - assert_eq!( - cache.test_connection().await, - Err(Error::UnsupportedOperation) - ); - server.stop(); -} - -#[tokio::test(flavor = "multi_thread")] -async fn response_payloads_decode_and_invalid_entries_fail() { - let server = FakeQdrant::start(FakeState::default()).await; - let cache = connect(&server, [("hello", vec![1.0, 0.0])]).await; - for (key, response) in [ - ("python", json!("{'timestamp': 1.0, 'response': {'a': 1}}")), - ("garbage", json!("not json")), - ("missing", json!("unused")), - ] { - let mut payload = serde_json::Map::new(); - payload.insert("litellm_cache_key".to_owned(), json!(key)); - if key != "missing" { - payload.insert("response".to_owned(), response); - } - server.insert_point(StoredPoint { - id: Some(PointId::from(key.len() as u64)), - vector: vec![1.0, 0.0], - payload: Payload::try_from(JsonValue::Object(payload)) - .unwrap() - .into(), - }); - } - assert_eq!( - cache - .async_get_cache("python", &context("hello")) - .await - .unwrap(), - Some(value(json!({"a": 1}))) - ); - assert_eq!( - cache.async_get_cache("garbage", &context("hello")).await, - Err(Error::InvalidEntry) - ); - assert_eq!( - cache.async_get_cache("missing", &context("hello")).await, - Err(Error::InvalidEntry) - ); - server.stop(); -} - -#[tokio::test(flavor = "multi_thread")] -async fn response_cache_facade_turns_invalid_entry_into_miss() { - let server = FakeQdrant::start(FakeState::default()).await; - let cache = Arc::new(connect(&server, [("hello", vec![1.0, 0.0])]).await); - let request = ResponseCacheRequest::::new(CacheKeyInput { - preset: Some("key".to_owned()), - ..Default::default() - }) - .with_context(context("hello")); - let response = json!({"answer": 42}); - let facade = ResponseCache::new(cache.clone()); - facade - .async_store(&request, response.clone(), Duration::from_secs(1)) - .await - .unwrap(); - assert_eq!( - facade - .async_lookup(&request, Duration::from_secs(1)) - .await - .unwrap(), - Some(response) - ); - { - let mut state = server.state.lock().unwrap(); - state.points[0] - .payload - .insert("response".to_owned(), Value::from("not json")); - } - assert_eq!( - facade - .async_lookup(&request, Duration::from_secs(1)) - .await - .unwrap(), - None + vec![Some(true), Some(true)] ); server.stop(); } +#[rstest] #[tokio::test(flavor = "multi_thread")] async fn stopped_qdrant_server_maps_to_unavailable() { let server = FakeQdrant::start(FakeState::default()).await; @@ -420,3 +498,28 @@ async fn stopped_qdrant_server_maps_to_unavailable() { Err(Error::Unavailable) ); } + +/// `_payload_matches_cache_key` compares `str(cached_key) == str(key)`, so a point whose stored +/// key is the number 99 answers a lookup for `"99"`. +#[rstest] +#[tokio::test(flavor = "multi_thread")] +async fn numeric_stored_cache_keys_match_like_python_str() { + let server = FakeQdrant::start(FakeState::default()).await; + let cache = connect(&server, [("hello", vec![1.0, 0.0])]).await; + server.insert_point(StoredPoint { + id: Some(PointId::from(99_u64)), + vector: vec![1.0, 0.0], + payload: Payload::try_from(json!({"litellm_cache_key": 99, "response": "{}"})) + .unwrap() + .into(), + }); + + let lookup = cache + .async_get_cache_with_similarity("99", &context("hello")) + .await + .unwrap(); + + assert_eq!(lookup.value, Some(json!({}))); + assert!((lookup.similarity.unwrap() - 1.0).abs() < 1e-6); + server.stop(); +} diff --git a/litellm-rust/crates/cache-qdrant-semantic/tests/support/mod.rs b/litellm-rust/crates/cache-qdrant-semantic/tests/support/mod.rs index 9a556ae7df5..695fceeac44 100644 --- a/litellm-rust/crates/cache-qdrant-semantic/tests/support/mod.rs +++ b/litellm-rust/crates/cache-qdrant-semantic/tests/support/mod.rs @@ -1,15 +1,16 @@ +#![allow(dead_code)] + use std::{ collections::{HashMap, HashSet}, net::SocketAddr, sync::{Arc, Mutex}, }; -use qdrant_client::qdrant::collections_server::CollectionsServer; use qdrant_client::qdrant::{ self, CollectionExists, CollectionExistsRequest, CollectionExistsResponse, CollectionOperationResponse, CreateCollection, CreateFieldIndexCollection, Filter, PointId, PointsOperationResponse, ScoredPoint, SearchPoints, SearchResponse, Value, Vector, Vectors, - collections_server::Collections, + collections_server::{Collections, CollectionsServer}, points_server::{Points, PointsServer}, }; use tokio::sync::oneshot; diff --git a/litellm-rust/crates/cache-redis-semantic/Cargo.toml b/litellm-rust/crates/cache-redis-semantic/Cargo.toml index 9a8755a189e..fe5a317cec0 100644 --- a/litellm-rust/crates/cache-redis-semantic/Cargo.toml +++ b/litellm-rust/crates/cache-redis-semantic/Cargo.toml @@ -8,14 +8,12 @@ repository.workspace = true [dependencies] litellm-cache.workspace = true litellm-cache-redis.workspace = true -litellm-cache-response.workspace = true redis = { version = "1.7.0", features = ["tls-rustls"] } -r2d2 = "0.8.10" -serde_json.workspace = true sha2.workspace = true -tokio.workspace = true [dev-dependencies] +litellm-cache-testing.workspace = true redis-test = "1.0.4" +rstest.workspace = true serde_json.workspace = true tokio.workspace = true diff --git a/litellm-rust/crates/cache-redis-semantic/src/cache.rs b/litellm-rust/crates/cache-redis-semantic/src/cache.rs index e0ac31f3630..02feb3cbdf4 100644 --- a/litellm-rust/crates/cache-redis-semantic/src/cache.rs +++ b/litellm-rust/crates/cache-redis-semantic/src/cache.rs @@ -1,105 +1,36 @@ use std::{ - future::Future, - sync::{Arc, OnceLock}, + sync::Arc, time::{Duration, SystemTime, UNIX_EPOCH}, }; use litellm_cache::{ - BaseCache, CacheCodec, CacheConnectionResult, CacheConnectionStatus, Error, - SemanticCacheContext, + BaseCache, CacheCodec, Error, SemanticCacheContext, + semantic::{Embedder, SemanticCache, SemanticLookup, prompt_from_context}, }; use litellm_cache_redis::{ RedisTopology, connection::{ConnectionRef, Connections}, }; -use litellm_cache_response::{CacheEntry, ResponseCacheCodec}; -use serde_json::Value; use sha2::{Digest, Sha256}; -use crate::prompt::prompt_from_context; - -const CACHE_KEY_FIELD: &str = "litellm_cache_key"; -const VECTOR_FIELD: &str = "prompt_vector"; - -pub trait Embedder: Send + Sync + 'static { - fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error>; - - fn async_embed( - &self, - prompt: &str, - metadata: Option<&Value>, - ) -> impl Future, Error>> + Send; -} - -#[derive(Clone, Debug)] -pub struct RedisSemanticConfig { - pub index_name: String, - pub similarity_threshold: f32, -} +use crate::{ + RedisSemanticConfig, + index::{CACHE_KEY_FIELD, Index, VECTOR_FIELD}, + reply::{bytes_field, first_document, number_field, string_field}, +}; struct Inner { - index_name: String, + index: Index, distance_threshold: f64, - resolved_index: OnceLock, - codec: ResponseCacheCodec, clock: fn() -> f64, } impl Inner { - fn new(config: RedisSemanticConfig) -> Self { + fn new(config: RedisSemanticConfig, clock: fn() -> f64) -> Self { Self { - index_name: config.index_name, + index: Index::new(config.index_name), distance_threshold: 1.0 - f64::from(config.similarity_threshold), - resolved_index: OnceLock::new(), - codec: ResponseCacheCodec, - clock: timestamp, - } - } - - fn ensure_index( - &self, - connection: &mut ConnectionRef<'_>, - dims: usize, - ) -> Result { - if let Some(name) = self.resolved_index.get() { - return Ok(name.clone()); - } - let name = match index_compatible(connection, &self.index_name, dims)? { - Some(true) => self.index_name.clone(), - Some(false) => self.isolated_index(connection, dims)?, - None => match create_index(connection, &self.index_name, dims) { - Ok(()) => self.index_name.clone(), - Err(_) => match index_compatible(connection, &self.index_name, dims)? { - Some(true) => self.index_name.clone(), - Some(false) => self.isolated_index(connection, dims)?, - None => return Err(Error::Unavailable), - }, - }, - }; - let _ = self.resolved_index.set(name.clone()); - Ok(name) - } - - fn isolated_index( - &self, - connection: &mut ConnectionRef<'_>, - dims: usize, - ) -> Result { - let name = format!("{}_isolated", self.index_name); - match index_compatible(connection, &name, dims)? { - Some(true) => Ok(name), - Some(false) => { - redis::cmd("FT.DROPINDEX") - .arg(&name) - .query::<()>(connection) - .map_err(|_| Error::Unavailable)?; - create_index(connection, &name, dims)?; - Ok(name) - } - None => { - create_index(connection, &name, dims)?; - Ok(name) - } + clock, } } @@ -107,15 +38,14 @@ impl Inner { &self, connection: &mut ConnectionRef<'_>, tag: &str, - value: &CacheEntry, + response: Vec, prompt: &str, vector: &[f32], ttl: Option, ) -> Result<(), Error> { - let index = self.ensure_index(connection, vector.len())?; + let index = self.index.ensure(connection, vector.len())?; let entry_id = entry_id(prompt, tag); let hash_key = format!("{index}:{entry_id}"); - let response = self.codec.encode(value)?; redis::cmd("HSET") .arg(&hash_key) .arg("entry_id") @@ -149,8 +79,8 @@ impl Inner { connection: &mut ConnectionRef<'_>, tag: &str, vector: &[f32], - ) -> Result, Error> { - let index = self.ensure_index(connection, vector.len())?; + ) -> Result>, Error> { + let index = self.index.ensure(connection, vector.len())?; let query = format!( "(@{CACHE_KEY_FIELD}:{{{}}})=>[KNN 1 @{VECTOR_FIELD} $vector AS vector_distance]", escape_tag(tag) @@ -183,57 +113,80 @@ impl Inner { .query::(connection) .map_err(|_| Error::Unavailable)?; let Some(fields) = first_document(&result) else { - return Ok(None); + return Ok(SemanticLookup::miss(Some(0.0))); }; if string_field(fields, CACHE_KEY_FIELD).as_deref() != Some(tag) { - return Ok(None); + return Ok(SemanticLookup::miss(Some(0.0))); } - if number_field(fields, "vector_distance") - .is_none_or(|distance| distance > self.distance_threshold) - { - return Ok(None); - } - let Some(response) = bytes_field(fields, "response") else { - return Ok(None); + // redisvl's range query only returns entries within the distance threshold, so a + // farther hit reads as no result. + let Some(distance) = number_field(fields, "vector_distance") + .filter(|distance| *distance <= self.distance_threshold) + else { + return Ok(SemanticLookup::miss(Some(0.0))); }; - self.codec.decode(&response).map(Some) - } -} - -pub struct RedisSemanticCache { - connections: Arc>, - embedder: E, - inner: Arc, -} - -impl RedisSemanticCache { - pub fn new(url: &str, embedder: E, config: RedisSemanticConfig) -> Result { - Ok(Self { - connections: Arc::new(Connections::open(url, &RedisTopology::Standalone)?), - embedder, - inner: Arc::new(Inner::new(config)), + let Some(response) = bytes_field(fields, "response") else { + return Ok(SemanticLookup::miss(Some(0.0))); + }; + Ok(SemanticLookup { + value: Some(response), + similarity: Some(1.0 - distance), }) } } -impl RedisSemanticCache { - pub fn with_connection(connection: C, embedder: E, config: RedisSemanticConfig) -> Self { +/// `RedisSemanticCache`: a redisvl-compatible semantic index on Redis Stack. Values go through +/// the injected codec, so the response layer decides what a cached entry is. +pub struct RedisSemanticCache { + connections: Arc>, + embedder: E, + codec: S, + inner: Arc, +} + +impl RedisSemanticCache { + pub fn new( + url: &str, + embedder: E, + codec: S, + config: RedisSemanticConfig, + ) -> Result { + Ok(Self { + connections: Arc::new(Connections::open(url, &RedisTopology::Standalone)?), + embedder, + codec, + inner: Arc::new(Inner::new(config, timestamp)), + }) + } +} + +impl RedisSemanticCache +where + E: Embedder, + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + pub fn with_connection( + connection: C, + embedder: E, + codec: S, + config: RedisSemanticConfig, + ) -> Self { Self { connections: Arc::new(Connections::fixed(connection)), embedder, - inner: Arc::new(Inner::new(config)), + codec, + inner: Arc::new(Inner::new(config, timestamp)), } } pub fn with_clock(self, clock: fn() -> f64) -> Self { + let config = RedisSemanticConfig { + index_name: self.index_name().to_owned(), + similarity_threshold: self.similarity_threshold(), + }; Self { - inner: Arc::new(Inner { - index_name: self.inner.index_name.clone(), - distance_threshold: self.inner.distance_threshold, - resolved_index: OnceLock::new(), - codec: self.inner.codec, - clock, - }), + inner: Arc::new(Inner::new(config, clock)), ..self } } @@ -243,7 +196,7 @@ impl RedisSemanticCache< } pub fn index_name(&self) -> &str { - &self.inner.index_name + self.inner.index.name() } pub fn similarity_threshold(&self) -> f32 { @@ -253,12 +206,25 @@ impl RedisSemanticCache< fn tag<'a>(key: &'a str, context: &'a SemanticCacheContext) -> &'a str { context.scope.as_deref().unwrap_or(key) } + + fn decode(&self, lookup: SemanticLookup>) -> Result, Error> { + Ok(SemanticLookup { + value: lookup + .value + .map(|bytes| self.codec.decode(&bytes)) + .transpose()?, + similarity: lookup.similarity, + }) + } } -impl BaseCache - for RedisSemanticCache +impl BaseCache for RedisSemanticCache +where + E: Embedder, + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, { - type Value = CacheEntry; + type Value = S::Value; type Context = SemanticCacheContext; fn get_ttl(&self, context: &Self::Context) -> Option { @@ -274,22 +240,18 @@ impl BaseCache let Some(prompt) = prompt_from_context(context) else { return Ok(()); }; + let response = self.codec.encode(&value)?; let vector = self.embedder.embed(&prompt, context.metadata.as_ref())?; - let tag = Self::tag(key, context).to_string(); + let tag = Self::tag(key, context); self.connections.execute(|connection| { self.inner - .store(connection, &tag, &value, &prompt, &vector, context.ttl) + .store(connection, tag, response, &prompt, &vector, context.ttl) }) } fn get_cache(&self, key: &str, context: &Self::Context) -> Result, Error> { - let Some(prompt) = prompt_from_context(context) else { - return Ok(None); - }; - let vector = self.embedder.embed(&prompt, context.metadata.as_ref())?; - let tag = Self::tag(key, context).to_string(); - self.connections - .execute(|connection| self.inner.lookup(connection, &tag, &vector)) + self.get_cache_with_similarity(key, context) + .map(|lookup| lookup.value) } async fn async_set_cache( @@ -301,14 +263,15 @@ impl BaseCache let Some(prompt) = prompt_from_context(&context) else { return Ok(()); }; + let response = self.codec.encode(&value)?; let vector = self .embedder .async_embed(&prompt, context.metadata.as_ref()) .await?; - let tag = Self::tag(key, &context).to_string(); + let tag = Self::tag(key, &context).to_owned(); let inner = Arc::clone(&self.inner); Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - inner.store(connection, &tag, &value, &prompt, &vector, context.ttl) + inner.store(connection, &tag, response, &prompt, &vector, context.ttl) }) .await } @@ -318,49 +281,54 @@ impl BaseCache key: &str, context: &Self::Context, ) -> Result, Error> { + self.async_get_cache_with_similarity(key, context) + .await + .map(|lookup| lookup.value) + } +} + +/// Python stamps a similarity of `0.0` when there is no prompt or no hit in the key's scope. +impl SemanticCache for RedisSemanticCache +where + E: Embedder, + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { let Some(prompt) = prompt_from_context(context) else { - return Ok(None); + return Ok(SemanticLookup::miss(Some(0.0))); + }; + let vector = self.embedder.embed(&prompt, context.metadata.as_ref())?; + let tag = Self::tag(key, context); + let lookup = self + .connections + .execute(|connection| self.inner.lookup(connection, tag, &vector))?; + self.decode(lookup) + } + + async fn async_get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + let Some(prompt) = prompt_from_context(context) else { + return Ok(SemanticLookup::miss(Some(0.0))); }; let vector = self .embedder .async_embed(&prompt, context.metadata.as_ref()) .await?; - let tag = Self::tag(key, context).to_string(); + let tag = Self::tag(key, context).to_owned(); let inner = Arc::clone(&self.inner); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { + let lookup = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { inner.lookup(connection, &tag, &vector) }) - .await - } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - match Connections::run_blocking(Arc::clone(&self.connections), |connection| { - Ok(match redis::cmd("PING").query::(connection) { - Ok(_) => CacheConnectionResult { - status: CacheConnectionStatus::Success, - message: "Redis cache connection test successful".into(), - error: None, - }, - Err(error) => CacheConnectionResult { - status: CacheConnectionStatus::Failed, - message: format!("Redis connection failed: {error}"), - error: Some(error.to_string()), - }, - }) - }) - .await - { - Ok(result) => Ok(result), - Err(error) => Ok(CacheConnectionResult { - status: CacheConnectionStatus::Failed, - message: format!("Redis connection failed: {error}"), - error: Some(error.to_string()), - }), - } + .await?; + self.decode(lookup) } } @@ -387,228 +355,46 @@ fn vector_buffer(vector: &[f32]) -> Vec { } fn escape_tag(value: &str) -> String { - value - .chars() - .flat_map(|ch| { - if matches!( - ch, - ',' | '.' - | '<' - | '>' - | '{' - | '}' - | '[' - | ']' - | '\\' - | '"' - | '\'' - | ':' - | ';' - | '!' - | '@' - | '#' - | '$' - | '%' - | '^' - | '&' - | '*' - | '(' - | ')' - | '-' - | '+' - | '=' - | '~' - | '|' - | '/' - | ' ' - | '?' - ) { - vec!['\\', ch] - } else { - vec![ch] - } - }) - .collect() -} - -fn create_index(connection: &mut ConnectionRef<'_>, name: &str, dims: usize) -> Result<(), Error> { - redis::cmd("FT.CREATE") - .arg(name) - .arg("ON") - .arg("HASH") - .arg("PREFIX") - .arg(1) - .arg(name) - .arg("SCORE") - .arg(1.0) - .arg("SCHEMA") - .arg("prompt") - .arg("TEXT") - .arg("WEIGHT") - .arg(1) - .arg("response") - .arg("TEXT") - .arg("WEIGHT") - .arg(1) - .arg("inserted_at") - .arg("NUMERIC") - .arg("updated_at") - .arg("NUMERIC") - .arg(VECTOR_FIELD) - .arg("VECTOR") - .arg("FLAT") - .arg(6) - .arg("TYPE") - .arg("FLOAT32") - .arg("DIM") - .arg(dims) - .arg("DISTANCE_METRIC") - .arg("COSINE") - .arg(CACHE_KEY_FIELD) - .arg("TAG") - .arg("SEPARATOR") - .arg(",") - .query::<()>(connection) - .map_err(|_| Error::Unavailable) -} - -fn index_compatible( - connection: &mut ConnectionRef<'_>, - name: &str, - dims: usize, -) -> Result, Error> { - let info = match redis::cmd("FT.INFO") - .arg(name) - .query::(connection) - { - Ok(info) => info, - Err(error) if unknown_index(&error) => return Ok(None), - Err(_) => return Err(Error::Unavailable), - }; - Ok(Some(schema_compatible(&info, dims))) -} - -fn unknown_index(error: &redis::RedisError) -> bool { - let message = error.to_string().to_lowercase(); - message.contains("unknown") && message.contains("index") -} - -fn schema_compatible(info: &redis::Value, dims: usize) -> bool { - let redis::Value::Array(entries) = info else { - return false; - }; - let attributes = entries - .as_chunks::<2>() - .0 - .iter() - .find(|pair| string_value(&pair[0]).as_deref() == Some("attributes")) - .map(|pair| &pair[1]); - let Some(redis::Value::Array(attributes)) = attributes else { - return false; - }; - let fields = attributes - .iter() - .map(|attribute| { - let redis::Value::Array(attribute) = attribute else { - return (None, None, None, None, None); - }; - let mut name = None; - let mut field_type = None; - let mut dim = None; - let mut data_type = None; - let mut distance_metric = None; - for pair in attribute.as_chunks::<2>().0 { - match string_value(&pair[0]).as_deref() { - Some("identifier") => name = string_value(&pair[1]), - Some("type") => field_type = string_value(&pair[1]), - Some("dim") => dim = number_value(&pair[1]), - Some("data_type") => data_type = string_value(&pair[1]), - Some("distance_metric") => distance_metric = string_value(&pair[1]), - _ => {} - } - } - (name, field_type, dim, data_type, distance_metric) - }) - .collect::>(); - let has_field = |name: &str, field_type: &str| { - fields - .iter() - .any(|(n, t, ..)| n.as_deref() == Some(name) && t.as_deref() == Some(field_type)) - }; - has_field("prompt", "TEXT") - && has_field("response", "TEXT") - && has_field("inserted_at", "NUMERIC") - && has_field("updated_at", "NUMERIC") - && has_field(CACHE_KEY_FIELD, "TAG") - && fields.iter().any(|(n, t, d, data, metric)| { - n.as_deref() == Some(VECTOR_FIELD) - && t.as_deref() == Some("VECTOR") - && *d == Some(dims as f64) - && data - .as_deref() - .is_some_and(|data| data.eq_ignore_ascii_case("float32")) - && metric - .as_deref() - .is_some_and(|metric| metric.eq_ignore_ascii_case("cosine")) - }) -} - -fn string_value(value: &redis::Value) -> Option { - match value { - redis::Value::BulkString(bytes) => String::from_utf8(bytes.clone()).ok(), - redis::Value::SimpleString(text) => Some(text.clone()), - redis::Value::VerbatimString { text, .. } => Some(text.clone()), - _ => None, - } -} - -fn number_value(value: &redis::Value) -> Option { - match value { - redis::Value::Int(number) => Some(*number as f64), - redis::Value::Double(number) => Some(*number), - _ => string_value(value).and_then(|text| text.parse().ok()), - } -} - -fn first_document(result: &redis::Value) -> Option<&[redis::Value]> { - let redis::Value::Array(items) = result else { - return None; - }; - let [count, _document_id, fields, ..] = items.as_slice() else { - return None; - }; - if !matches!(count, redis::Value::Int(count) if *count > 0) { - return None; - } - match fields { - redis::Value::Array(fields) => Some(fields.as_slice()), - _ => None, - } -} - -fn field_value<'a>(fields: &'a [redis::Value], name: &str) -> Option<&'a redis::Value> { - fields - .as_chunks::<2>() - .0 - .iter() - .find(|pair| string_value(&pair[0]).as_deref() == Some(name)) - .map(|pair| &pair[1]) -} - -fn string_field(fields: &[redis::Value], name: &str) -> Option { - field_value(fields, name).and_then(string_value) -} - -fn number_field(fields: &[redis::Value], name: &str) -> Option { - field_value(fields, name).and_then(number_value) -} - -fn bytes_field(fields: &[redis::Value], name: &str) -> Option> { - match field_value(fields, name)? { - redis::Value::BulkString(bytes) => Some(bytes.clone()), - redis::Value::SimpleString(text) => Some(text.clone().into_bytes()), - _ => None, + let mut escaped = String::with_capacity(value.len()); + for ch in value.chars() { + if matches!( + ch, + ',' | '.' + | '<' + | '>' + | '{' + | '}' + | '[' + | ']' + | '\\' + | '"' + | '\'' + | ':' + | ';' + | '!' + | '@' + | '#' + | '$' + | '%' + | '^' + | '&' + | '*' + | '(' + | ')' + | '-' + | '+' + | '=' + | '~' + | '|' + | '/' + | ' ' + | '?' + ) { + escaped.push('\\'); + } + escaped.push(ch); } + escaped } fn ttl_seconds(ttl: Duration) -> u64 { diff --git a/litellm-rust/crates/cache-redis-semantic/src/config.rs b/litellm-rust/crates/cache-redis-semantic/src/config.rs new file mode 100644 index 00000000000..6b810628be7 --- /dev/null +++ b/litellm-rust/crates/cache-redis-semantic/src/config.rs @@ -0,0 +1,8 @@ +/// `RedisSemanticCache.DEFAULT_REDIS_INDEX_NAME`. +pub const DEFAULT_INDEX_NAME: &str = "litellm_semantic_cache_index"; + +#[derive(Clone, Debug)] +pub struct RedisSemanticConfig { + pub index_name: String, + pub similarity_threshold: f32, +} diff --git a/litellm-rust/crates/cache-redis-semantic/src/index.rs b/litellm-rust/crates/cache-redis-semantic/src/index.rs new file mode 100644 index 00000000000..c141e47003a --- /dev/null +++ b/litellm-rust/crates/cache-redis-semantic/src/index.rs @@ -0,0 +1,205 @@ +use std::sync::OnceLock; + +use litellm_cache::Error; +use litellm_cache_redis::connection::ConnectionRef; + +use crate::reply::{number_value, string_value}; + +pub(crate) const CACHE_KEY_FIELD: &str = "litellm_cache_key"; +pub(crate) const VECTOR_FIELD: &str = "prompt_vector"; + +/// The redisvl `SemanticCache` index, resolved once per cache: the configured name when its +/// schema fits, else `_isolated`, recreated when that one is stale too. +pub(crate) struct Index { + name: String, + resolved: OnceLock, +} + +impl Index { + pub(crate) fn new(name: String) -> Self { + Self { + name, + resolved: OnceLock::new(), + } + } + + pub(crate) fn name(&self) -> &str { + &self.name + } + + pub(crate) fn ensure( + &self, + connection: &mut ConnectionRef<'_>, + dims: usize, + ) -> Result { + if let Some(name) = self.resolved.get() { + return Ok(name.clone()); + } + let name = match index_compatible(connection, &self.name, dims)? { + Some(true) => self.name.clone(), + Some(false) => self.isolated(connection, dims)?, + None => match create_index(connection, &self.name, dims) { + Ok(()) => self.name.clone(), + Err(_) => match index_compatible(connection, &self.name, dims)? { + Some(true) => self.name.clone(), + Some(false) => self.isolated(connection, dims)?, + None => return Err(Error::Unavailable), + }, + }, + }; + let _ = self.resolved.set(name.clone()); + Ok(name) + } + + fn isolated(&self, connection: &mut ConnectionRef<'_>, dims: usize) -> Result { + let name = format!("{}_isolated", self.name); + match index_compatible(connection, &name, dims)? { + Some(true) => Ok(name), + Some(false) => { + redis::cmd("FT.DROPINDEX") + .arg(&name) + .query::<()>(connection) + .map_err(|_| Error::Unavailable)?; + create_index(connection, &name, dims)?; + Ok(name) + } + None => { + create_index(connection, &name, dims)?; + Ok(name) + } + } + } +} + +fn create_index(connection: &mut ConnectionRef<'_>, name: &str, dims: usize) -> Result<(), Error> { + redis::cmd("FT.CREATE") + .arg(name) + .arg("ON") + .arg("HASH") + .arg("PREFIX") + .arg(1) + .arg(name) + .arg("SCORE") + .arg(1.0) + .arg("SCHEMA") + .arg("prompt") + .arg("TEXT") + .arg("WEIGHT") + .arg(1) + .arg("response") + .arg("TEXT") + .arg("WEIGHT") + .arg(1) + .arg("inserted_at") + .arg("NUMERIC") + .arg("updated_at") + .arg("NUMERIC") + .arg(VECTOR_FIELD) + .arg("VECTOR") + .arg("FLAT") + .arg(6) + .arg("TYPE") + .arg("FLOAT32") + .arg("DIM") + .arg(dims) + .arg("DISTANCE_METRIC") + .arg("COSINE") + .arg(CACHE_KEY_FIELD) + .arg("TAG") + .arg("SEPARATOR") + .arg(",") + .query::<()>(connection) + .map_err(|_| Error::Unavailable) +} + +fn index_compatible( + connection: &mut ConnectionRef<'_>, + name: &str, + dims: usize, +) -> Result, Error> { + let info = match redis::cmd("FT.INFO") + .arg(name) + .query::(connection) + { + Ok(info) => info, + Err(error) if unknown_index(&error) => return Ok(None), + Err(_) => return Err(Error::Unavailable), + }; + Ok(Some(schema_compatible(&info, dims))) +} + +fn unknown_index(error: &redis::RedisError) -> bool { + let message = error.to_string().to_lowercase(); + message.contains("unknown") && message.contains("index") +} + +struct Attribute { + name: Option, + field_type: Option, + dim: Option, + data_type: Option, + distance_metric: Option, +} + +fn attribute(value: &redis::Value) -> Option { + let redis::Value::Array(pairs) = value else { + return None; + }; + let mut attribute = Attribute { + name: None, + field_type: None, + dim: None, + data_type: None, + distance_metric: None, + }; + for pair in pairs.as_chunks::<2>().0 { + match string_value(&pair[0]).as_deref() { + Some("identifier") => attribute.name = string_value(&pair[1]), + Some("type") => attribute.field_type = string_value(&pair[1]), + Some("dim") => attribute.dim = number_value(&pair[1]), + Some("data_type") => attribute.data_type = string_value(&pair[1]), + Some("distance_metric") => attribute.distance_metric = string_value(&pair[1]), + _ => {} + } + } + Some(attribute) +} + +fn schema_compatible(info: &redis::Value, dims: usize) -> bool { + let redis::Value::Array(entries) = info else { + return false; + }; + let attributes = entries + .as_chunks::<2>() + .0 + .iter() + .find(|pair| string_value(&pair[0]).as_deref() == Some("attributes")) + .map(|pair| &pair[1]); + let Some(redis::Value::Array(attributes)) = attributes else { + return false; + }; + let fields = attributes.iter().filter_map(attribute).collect::>(); + let has_field = |name: &str, field_type: &str| { + fields.iter().any(|field| { + field.name.as_deref() == Some(name) && field.field_type.as_deref() == Some(field_type) + }) + }; + has_field("prompt", "TEXT") + && has_field("response", "TEXT") + && has_field("inserted_at", "NUMERIC") + && has_field("updated_at", "NUMERIC") + && has_field(CACHE_KEY_FIELD, "TAG") + && fields.iter().any(|field| { + field.name.as_deref() == Some(VECTOR_FIELD) + && field.field_type.as_deref() == Some("VECTOR") + && field.dim == Some(dims as f64) + && field + .data_type + .as_deref() + .is_some_and(|data| data.eq_ignore_ascii_case("float32")) + && field + .distance_metric + .as_deref() + .is_some_and(|metric| metric.eq_ignore_ascii_case("cosine")) + }) +} diff --git a/litellm-rust/crates/cache-redis-semantic/src/lib.rs b/litellm-rust/crates/cache-redis-semantic/src/lib.rs index 51d0b4ba5f3..251323df6cf 100644 --- a/litellm-rust/crates/cache-redis-semantic/src/lib.rs +++ b/litellm-rust/crates/cache-redis-semantic/src/lib.rs @@ -1,5 +1,7 @@ mod cache; -mod prompt; +mod config; +mod index; +mod reply; -pub use cache::{Embedder, RedisSemanticCache, RedisSemanticConfig}; -pub use prompt::prompt_from_context; +pub use cache::RedisSemanticCache; +pub use config::{DEFAULT_INDEX_NAME, RedisSemanticConfig}; diff --git a/litellm-rust/crates/cache-redis-semantic/src/prompt.rs b/litellm-rust/crates/cache-redis-semantic/src/prompt.rs deleted file mode 100644 index b9c38e98d77..00000000000 --- a/litellm-rust/crates/cache-redis-semantic/src/prompt.rs +++ /dev/null @@ -1,97 +0,0 @@ -use litellm_cache::SemanticCacheContext; -use serde_json::Value; - -pub fn prompt_from_context(context: &SemanticCacheContext) -> Option { - if let Some(messages) = context.messages.as_ref().and_then(Value::as_array) - && !messages.is_empty() - { - return Some(messages_text(messages)); - } - let input = context.input.as_ref()?; - let mut parts = Vec::new(); - collect_input_text(input, &mut parts); - let prompt = parts.join("\n").trim().to_string(); - (!prompt.is_empty()).then_some(prompt) -} - -fn messages_text(messages: &[Value]) -> String { - let mut text = String::new(); - for message in messages { - let Some(message) = message.as_object() else { - continue; - }; - match message.get("content") { - Some(Value::String(content)) => text.push_str(content), - Some(Value::Array(parts)) => { - for part in parts { - if let Some(text_content) = part.get("text").and_then(Value::as_str) { - text.push_str(text_content); - } - } - } - _ => {} - } - text.push_str(&search_results_text(message.get("search_results"))); - } - text -} - -fn search_results_text(search_results: Option<&Value>) -> String { - let Some(Value::Array(results)) = search_results else { - return String::new(); - }; - let mut text = String::new(); - for result in results { - let Some(result) = result.as_object() else { - continue; - }; - for key in ["source", "title"] { - if let Some(value) = result.get(key).and_then(Value::as_str) { - text.push_str(value); - } - } - if let Some(Value::Array(content)) = result.get("content") { - for block in content { - if let Some(value) = block.get("text").and_then(Value::as_str) { - text.push_str(value); - } - } - } - if let Some(citations) = result.get("citations") { - text.push_str(&citations.to_string()); - } - } - text -} - -fn collect_input_text(value: &Value, parts: &mut Vec) { - match value { - Value::String(text) => { - let trimmed = text.trim(); - if !trimmed.is_empty() { - parts.push(trimmed.to_string()); - } - } - Value::Array(items) => { - for item in items { - collect_input_text(item, parts); - } - } - Value::Object(map) => { - if let Some(content) = map.get("content").filter(|content| !content.is_null()) { - collect_input_text(content, parts); - return; - } - for key in ["text", "output", "input_text", "output_text"] { - if let Some(Value::String(text)) = map.get(key) { - let trimmed = text.trim(); - if !trimmed.is_empty() { - parts.push(trimmed.to_string()); - return; - } - } - } - } - _ => {} - } -} diff --git a/litellm-rust/crates/cache-redis-semantic/src/reply.rs b/litellm-rust/crates/cache-redis-semantic/src/reply.rs new file mode 100644 index 00000000000..24cbd573cde --- /dev/null +++ b/litellm-rust/crates/cache-redis-semantic/src/reply.rs @@ -0,0 +1,57 @@ +pub(crate) fn string_value(value: &redis::Value) -> Option { + match value { + redis::Value::BulkString(bytes) => String::from_utf8(bytes.clone()).ok(), + redis::Value::SimpleString(text) => Some(text.clone()), + redis::Value::VerbatimString { text, .. } => Some(text.clone()), + _ => None, + } +} + +pub(crate) fn number_value(value: &redis::Value) -> Option { + match value { + redis::Value::Int(number) => Some(*number as f64), + redis::Value::Double(number) => Some(*number), + _ => string_value(value).and_then(|text| text.parse().ok()), + } +} + +pub(crate) fn first_document(result: &redis::Value) -> Option<&[redis::Value]> { + let redis::Value::Array(items) = result else { + return None; + }; + let [count, _document_id, fields, ..] = items.as_slice() else { + return None; + }; + if !matches!(count, redis::Value::Int(count) if *count > 0) { + return None; + } + match fields { + redis::Value::Array(fields) => Some(fields.as_slice()), + _ => None, + } +} + +fn field_value<'a>(fields: &'a [redis::Value], name: &str) -> Option<&'a redis::Value> { + fields + .as_chunks::<2>() + .0 + .iter() + .find(|pair| string_value(&pair[0]).as_deref() == Some(name)) + .map(|pair| &pair[1]) +} + +pub(crate) fn string_field(fields: &[redis::Value], name: &str) -> Option { + field_value(fields, name).and_then(string_value) +} + +pub(crate) fn number_field(fields: &[redis::Value], name: &str) -> Option { + field_value(fields, name).and_then(number_value) +} + +pub(crate) fn bytes_field(fields: &[redis::Value], name: &str) -> Option> { + match field_value(fields, name)? { + redis::Value::BulkString(bytes) => Some(bytes.clone()), + redis::Value::SimpleString(text) => Some(text.clone().into_bytes()), + _ => None, + } +} diff --git a/litellm-rust/crates/cache-redis-semantic/tests/cache.rs b/litellm-rust/crates/cache-redis-semantic/tests/cache.rs index 233b87ec52f..fa4ac00e767 100644 --- a/litellm-rust/crates/cache-redis-semantic/tests/cache.rs +++ b/litellm-rust/crates/cache-redis-semantic/tests/cache.rs @@ -1,55 +1,26 @@ -use std::{ - collections::HashMap, - sync::{Arc, Mutex}, - time::Duration, -}; +mod support; -use litellm_cache::{BaseCache, CacheCodec, Error, SemanticCacheContext}; -use litellm_cache_redis_semantic::{Embedder, RedisSemanticCache, RedisSemanticConfig}; -use litellm_cache_response::{CacheEntry, ResponseCacheCodec}; +use std::time::Duration; + +use litellm_cache::{ + BaseCache, Error, JsonCodec, SemanticCacheContext, + semantic::{SemanticCache, SemanticLookup}, +}; +use litellm_cache_redis_semantic::{DEFAULT_INDEX_NAME, RedisSemanticCache, RedisSemanticConfig}; use redis_test::{MockCmd, MockRedisConnection}; +use rstest::{fixture, rstest}; use serde_json::{Value, json}; use sha2::{Digest, Sha256}; +use support::FakeEmbedder; -const INDEX: &str = "litellm_semantic_cache_index"; +const INDEX: &str = DEFAULT_INDEX_NAME; +const PROMPT: &str = "hello prompt"; +const CLOCK: fn() -> f64 = || 1700000000.5; +const VECTOR: [f32; 3] = [0.1, 0.2, 0.3]; -struct FakeEmbedder { - vectors: HashMap>, - calls: Arc>>, -} - -impl FakeEmbedder { - fn new(vectors: &[(&str, &[f32])]) -> (Self, Arc>>) { - let calls = Arc::new(Mutex::new(Vec::new())); - ( - Self { - vectors: vectors - .iter() - .map(|(prompt, vector)| (prompt.to_string(), vector.to_vec())) - .collect(), - calls: Arc::clone(&calls), - }, - calls, - ) - } -} - -impl Embedder for FakeEmbedder { - fn embed(&self, prompt: &str, _: Option<&Value>) -> Result, Error> { - self.calls.lock().unwrap().push(prompt.to_string()); - - Ok(self - .vectors - .get(prompt) - .cloned() - .unwrap_or_else(|| vec![0.1, 0.2, 0.3])) - } - - async fn async_embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { - self.embed(prompt, metadata) - } -} +type MockCache = RedisSemanticCache, MockRedisConnection>; +#[fixture] fn config() -> RedisSemanticConfig { RedisSemanticConfig { index_name: INDEX.into(), @@ -57,6 +28,16 @@ fn config() -> RedisSemanticConfig { } } +#[fixture] +fn entry() -> Value { + json!({"timestamp": 1.0, "response": {"answer": "yes"}}) +} + +#[fixture] +fn context() -> SemanticCacheContext { + messages_context(vec![json!({"role": "user", "content": PROMPT})]) +} + fn messages_context(messages: Vec) -> SemanticCacheContext { SemanticCacheContext { messages: Some(Value::Array(messages)), @@ -64,15 +45,18 @@ fn messages_context(messages: Vec) -> SemanticCacheContext { } } -fn entry() -> CacheEntry { - CacheEntry { - timestamp: Some(1.0), - response: json!({"answer": "yes"}), - } +fn cache(commands: Vec, embedder: FakeEmbedder) -> MockCache { + RedisSemanticCache::with_connection( + MockRedisConnection::new(commands).assert_all_commands_consumed(), + embedder, + JsonCodec::new(), + config(), + ) + .with_clock(CLOCK) } -fn encoded(entry: &CacheEntry) -> Vec { - ResponseCacheCodec.encode(entry).unwrap() +fn encoded(value: &Value) -> Vec { + serde_json::to_vec(value).unwrap() } fn vector_bytes(vector: &[f32]) -> Vec { @@ -98,6 +82,17 @@ fn unknown_index_error() -> redis::RedisError { redis::RedisError::from((redis::ErrorKind::Extension, "Unknown index name")) } +fn info_missing(index: &str) -> MockCmd { + MockCmd::new( + redis::cmd("FT.INFO").arg(index), + Err::(unknown_index_error()), + ) +} + +fn info(index: &str, value: redis::Value) -> MockCmd { + MockCmd::new(redis::cmd("FT.INFO").arg(index), Ok(value)) +} + fn attribute(name: &str, field_type: &str, extra: Vec) -> redis::Value { let mut parts = vec![ s("identifier"), @@ -137,10 +132,6 @@ fn vector_attribute_with(dims: i64, data_type: &str, distance_metric: &str) -> r ) } -fn vector_attribute(dims: i64) -> redis::Value { - vector_attribute_with(dims, "FLOAT32", "COSINE") -} - fn info_with_vector(vector: redis::Value) -> redis::Value { index_info(vec![ attribute("prompt", "TEXT", vec![]), @@ -153,7 +144,7 @@ fn info_with_vector(vector: redis::Value) -> redis::Value { } fn compatible_info(dims: i64) -> redis::Value { - info_with_vector(vector_attribute(dims)) + info_with_vector(vector_attribute_with(dims, "FLOAT32", "COSINE")) } fn unscoped_info(dims: i64) -> redis::Value { @@ -162,10 +153,14 @@ fn unscoped_info(dims: i64) -> redis::Value { attribute("response", "TEXT", vec![]), attribute("inserted_at", "NUMERIC", vec![]), attribute("updated_at", "NUMERIC", vec![]), - vector_attribute(dims), + vector_attribute_with(dims, "FLOAT32", "COSINE"), ]) } +fn create_index(name: &str, dims: usize) -> MockCmd { + MockCmd::new(create_index_command(name, dims), Ok("OK")) +} + fn create_index_command(name: &str, dims: usize) -> redis::Cmd { let mut command = redis::cmd("FT.CREATE"); command @@ -207,7 +202,34 @@ fn create_index_command(name: &str, dims: usize) -> redis::Cmd { command } -fn search_command(index: &str, tag: &str, vector: &[f32]) -> redis::Cmd { +fn hset(index: &str, prompt: &str, tag: &str, vector: &[f32], value: &Value) -> MockCmd { + MockCmd::new( + redis::cmd("HSET") + .arg(format!("{index}:{}", entry_id(prompt, tag))) + .arg("entry_id") + .arg(entry_id(prompt, tag)) + .arg("prompt") + .arg(prompt) + .arg("response") + .arg(encoded(value)) + .arg("prompt_vector") + .arg(vector_bytes(vector)) + .arg("inserted_at") + .arg("1700000000.5") + .arg("updated_at") + .arg("1700000000.5") + .arg("litellm_cache_key") + .arg(tag), + Ok(7), + ) +} + +fn search( + index: &str, + tag: &str, + vector: &[f32], + reply: redis::RedisResult, +) -> MockCmd { let mut command = redis::cmd("FT.SEARCH"); command .arg(index) @@ -236,33 +258,29 @@ fn search_command(index: &str, tag: &str, vector: &[f32]) -> redis::Cmd { .arg(2) .arg("vector") .arg(vector_bytes(vector)); - command + MockCmd::new(command, reply) } -fn hit_fields(tag: &str, distance: &str, response: Vec) -> redis::Value { - redis::Value::Array(vec![ - s("entry_id"), - s("stored-id"), - s("prompt"), - s("hello prompt"), - s("response"), - redis::Value::BulkString(response), - s("inserted_at"), - s("1700000000.5"), - s("updated_at"), - s("1700000000.5"), - s("litellm_cache_key"), - s(tag), - s("vector_distance"), - s(distance), - ]) -} - -fn search_result(fields: redis::Value) -> redis::Value { +fn hit(tag: &str, distance: &str, response: Vec) -> redis::Value { redis::Value::Array(vec![ redis::Value::Int(1), s("litellm_semantic_cache_index:stored-id"), - fields, + redis::Value::Array(vec![ + s("entry_id"), + s("stored-id"), + s("prompt"), + s(PROMPT), + s("response"), + redis::Value::BulkString(response), + s("inserted_at"), + s("1700000000.5"), + s("updated_at"), + s("1700000000.5"), + s("litellm_cache_key"), + s(tag), + s("vector_distance"), + s(distance), + ]), ]) } @@ -270,685 +288,452 @@ fn empty_result() -> redis::Value { redis::Value::Array(vec![redis::Value::Int(0)]) } -#[test] -fn store_creates_index_and_writes_hash_with_expire() { - let vector = vec![0.1f32, 0.2, 0.3]; - let prompt = "hello prompt"; - let tag = "key1"; - let hash_key = format!("{INDEX}:{}", entry_id(prompt, tag)); - let value = entry(); - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("FT.INFO").arg(INDEX), - Err::(unknown_index_error()), - ), - MockCmd::new(create_index_command(INDEX, 3), Ok("OK")), - MockCmd::new( - redis::cmd("HSET") - .arg(&hash_key) - .arg("entry_id") - .arg(entry_id(prompt, tag)) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&value)) - .arg("prompt_vector") - .arg(vector_bytes(&vector)) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg(tag), - Ok(7), - ), - MockCmd::new(redis::cmd("EXPIRE").arg(&hash_key).arg(5), Ok(1)), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[(prompt, &vector)]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); - - let context = SemanticCacheContext { - ttl: Some(Duration::from_secs(5)), - ..messages_context(vec![json!({"role": "user", "content": prompt})]) +#[rstest] +#[case::creates_index_and_expires(false, Some(Duration::from_secs(5)), Some(5))] +#[case::existing_index_without_ttl(true, None, None)] +#[case::fractional_ttl_rounds_up(true, Some(Duration::from_millis(1500)), Some(2))] +fn store_writes_the_redisvl_hash( + #[case] index_exists: bool, + #[case] ttl: Option, + #[case] expire: Option, + entry: Value, + context: SemanticCacheContext, +) { + let hash_key = format!("{INDEX}:{}", entry_id(PROMPT, "key1")); + let mut commands = if index_exists { + vec![info(INDEX, compatible_info(3))] + } else { + vec![info_missing(INDEX), create_index(INDEX, 3)] }; - cache.set_cache(tag, value, &context).unwrap(); -} - -#[test] -fn store_without_ttl_skips_expire() { - let prompt = "hello prompt"; - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - redis::cmd("HSET") - .arg(format!("{INDEX}:{}", entry_id(prompt, "key1"))) - .arg("entry_id") - .arg(entry_id(prompt, "key1")) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&entry())) - .arg("prompt_vector") - .arg(vector_bytes(&[0.1f32, 0.2, 0.3])) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg("key1"), - Ok(7), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); + commands.push(hset(INDEX, PROMPT, "key1", &VECTOR, &entry)); + commands.extend( + expire.map(|seconds| MockCmd::new(redis::cmd("EXPIRE").arg(&hash_key).arg(seconds), Ok(1))), + ); + let cache = cache(commands, FakeEmbedder::new(&[])); cache - .set_cache( - "key1", - entry(), - &messages_context(vec![json!({"role": "user", "content": prompt})]), - ) + .set_cache("key1", entry, &SemanticCacheContext { ttl, ..context }) .unwrap(); } -#[test] -fn lookup_returns_hit_below_distance_threshold() { - let vector = vec![0.1f32, 0.2, 0.3]; - let value = entry(); - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - search_command(INDEX, "key1", &vector), - Ok(search_result(hit_fields("key1", "0.05", encoded(&value)))), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()); - - let hit = cache - .get_cache( - "key1", - &messages_context(vec![json!({"role": "user", "content": "hello prompt"})]), - ) - .unwrap(); - assert_eq!(hit, Some(value)); -} - -#[test] -fn lookup_misses_above_distance_threshold_and_on_tag_mismatch() { - let vector = vec![0.1f32, 0.2, 0.3]; - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - search_command(INDEX, "key1", &vector), - Ok(search_result(hit_fields("key1", "0.5", encoded(&entry())))), - ), - MockCmd::new( - search_command(INDEX, "key1", &vector), - Ok(search_result(hit_fields( - "other", - "0.05", - encoded(&entry()), - ))), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()); - let context = messages_context(vec![json!({"role": "user", "content": "hello prompt"})]); - - assert_eq!(cache.get_cache("key1", &context).unwrap(), None); - assert_eq!(cache.get_cache("key1", &context).unwrap(), None); -} - -#[test] -fn lookup_returns_invalid_entry_on_malformed_response() { - let vector = vec![0.1f32, 0.2, 0.3]; - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - search_command(INDEX, "key1", &vector), - Ok(search_result(hit_fields( +#[rstest] +#[case::below_distance_threshold("key1", "0.05", None, Ok(Some(entry())))] +#[case::above_distance_threshold("key1", "0.5", None, Ok(None))] +#[case::other_cache_key("other", "0.05", None, Ok(None))] +#[case::malformed_response("key1", "0.05", Some(b"not json!".as_slice()), Err(Error::InvalidEntry))] +fn lookup_applies_threshold_scope_and_codec( + #[case] stored_tag: &str, + #[case] distance: &str, + #[case] response: Option<&[u8]>, + #[case] expected: Result, Error>, + entry: Value, + context: SemanticCacheContext, +) { + let response = response.map_or_else(|| encoded(&entry), <[u8]>::to_vec); + let cache = cache( + vec![ + info(INDEX, compatible_info(3)), + search( + INDEX, "key1", - "0.05", - b"not json!".to_vec(), - ))), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()); - - assert_eq!( - cache - .get_cache( - "key1", - &messages_context(vec![json!({"role": "user", "content": "hello prompt"})]) - ) - .unwrap_err(), - Error::InvalidEntry + &VECTOR, + Ok(hit(stored_tag, distance, response)), + ), + ], + FakeEmbedder::new(&[]), ); + + assert_eq!(cache.get_cache("key1", &context), expected); } -#[test] -fn missing_prompt_is_noop_and_never_embeds() { - let connection = MockRedisConnection::new(Vec::::new()).assert_all_commands_consumed(); - let (embedder, calls) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()); +#[rstest] +#[case::hit(context(), Some(hit("key1", "0.05", encoded(&entry()))), Some(entry()), Some(1.0 - 0.05))] +#[case::beyond_distance_threshold(context(), Some(hit("key1", "0.5", encoded(&entry()))), None, Some(0.0))] +#[case::no_results(context(), Some(empty_result()), None, Some(0.0))] +#[case::other_cache_key(context(), Some(hit("other", "0.05", encoded(&entry()))), None, Some(0.0))] +#[case::no_prompt(SemanticCacheContext::default(), None, None, Some(0.0))] +#[tokio::test] +async fn lookup_reports_python_semantic_similarity( + #[case] context: SemanticCacheContext, + #[case] reply: Option, + #[case] value: Option, + #[case] similarity: Option, + #[values(false, true)] use_async: bool, +) { + let commands = reply.map_or_else(Vec::new, |reply| { + vec![ + info(INDEX, compatible_info(3)), + search(INDEX, "key1", &VECTOR, Ok(reply)), + ] + }); + let cache = cache(commands, FakeEmbedder::new(&[])); + let lookup = if use_async { + cache + .async_get_cache_with_similarity("key1", &context) + .await + } else { + cache.get_cache_with_similarity("key1", &context) + }; + + assert_eq!(lookup, Ok(SemanticLookup { value, similarity })); +} + +#[rstest] +#[tokio::test] +async fn missing_prompt_is_a_noop_that_never_embeds(entry: Value) { + let embedder = FakeEmbedder::new(&[]); + let calls = embedder.calls.clone(); + let cache = cache(Vec::new(), embedder); let context = SemanticCacheContext::default(); - cache.set_cache("key1", entry(), &context).unwrap(); + + cache.set_cache("key1", entry.clone(), &context).unwrap(); assert_eq!(cache.get_cache("key1", &context).unwrap(), None); + cache + .async_set_cache("key1", entry, context.clone()) + .await + .unwrap(); + assert_eq!(cache.async_get_cache("key1", &context).await.unwrap(), None); assert!(calls.lock().unwrap().is_empty()); } -#[test] -fn scope_overrides_key_as_filter_tag() { - let vector = vec![0.1f32, 0.2, 0.3]; - let prompt = "hello prompt"; - let value = entry(); - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - redis::cmd("HSET") - .arg(format!("{INDEX}:{}", entry_id(prompt, "scope-a"))) - .arg("entry_id") - .arg(entry_id(prompt, "scope-a")) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&value)) - .arg("prompt_vector") - .arg(vector_bytes(&vector)) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg("scope-a"), - Ok(7), - ), - MockCmd::new( - search_command(INDEX, "scope\\-a", &vector), - Ok(search_result(hit_fields( - "scope-a", - "0.05", - encoded(&value), - ))), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); +#[rstest] +fn scope_overrides_key_as_filter_tag(entry: Value, context: SemanticCacheContext) { + let cache = cache( + vec![ + info(INDEX, compatible_info(3)), + hset(INDEX, PROMPT, "scope-a", &VECTOR, &entry), + search( + INDEX, + "scope\\-a", + &VECTOR, + Ok(hit("scope-a", "0.05", encoded(&entry))), + ), + ], + FakeEmbedder::new(&[]), + ); let context = SemanticCacheContext { scope: Some("scope-a".into()), - ..messages_context(vec![json!({"role": "user", "content": prompt})]) + ..context }; - cache.set_cache("key1", value.clone(), &context).unwrap(); - assert_eq!(cache.get_cache("key1", &context).unwrap(), Some(value)); + cache.set_cache("key1", entry.clone(), &context).unwrap(); + assert_eq!(cache.get_cache("key1", &context).unwrap(), Some(entry)); } -#[test] -fn incompatible_schema_falls_back_to_isolated_index() { - let prompt = "hello prompt"; - let tag = "key1"; +#[rstest] +#[case::unscoped_schema(unscoped_info(3))] +#[case::wrong_distance_metric(info_with_vector(vector_attribute_with(3, "FLOAT32", "L2")))] +#[case::wrong_data_type(info_with_vector(vector_attribute_with(3, "FLOAT64", "COSINE")))] +fn incompatible_schema_falls_back_to_isolated_index( + #[case] base_info: redis::Value, + entry: Value, + context: SemanticCacheContext, +) { let isolated = format!("{INDEX}_isolated"); - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(unscoped_info(3))), - MockCmd::new( - redis::cmd("FT.INFO").arg(&isolated), - Err::(unknown_index_error()), - ), - MockCmd::new(create_index_command(&isolated, 3), Ok("OK")), - MockCmd::new( - redis::cmd("HSET") - .arg(format!("{isolated}:{}", entry_id(prompt, tag))) - .arg("entry_id") - .arg(entry_id(prompt, tag)) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&entry())) - .arg("prompt_vector") - .arg(vector_bytes(&[0.1f32, 0.2, 0.3])) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg(tag), - Ok(7), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); - - cache - .set_cache( - tag, - entry(), - &messages_context(vec![json!({"role": "user", "content": prompt})]), - ) - .unwrap(); -} - -#[test] -fn create_index_race_rechecks_schema_and_stores() { - let prompt = "hello prompt"; - let tag = "key1"; - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("FT.INFO").arg(INDEX), - Err::(unknown_index_error()), - ), - MockCmd::new( - create_index_command(INDEX, 3), - Err::<&str, _>(redis::RedisError::from(( - redis::ErrorKind::Extension, - "Index already exists", - ))), - ), - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - redis::cmd("HSET") - .arg(format!("{INDEX}:{}", entry_id(prompt, tag))) - .arg("entry_id") - .arg(entry_id(prompt, tag)) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&entry())) - .arg("prompt_vector") - .arg(vector_bytes(&[0.1f32, 0.2, 0.3])) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg(tag), - Ok(7), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); - - cache - .set_cache( - tag, - entry(), - &messages_context(vec![json!({"role": "user", "content": prompt})]), - ) - .unwrap(); -} - -#[test] -fn wrong_distance_metric_falls_back_to_isolated_index() { - let prompt = "hello prompt"; - let tag = "key1"; - let isolated = format!("{INDEX}_isolated"); - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("FT.INFO").arg(INDEX), - Ok(info_with_vector(vector_attribute_with(3, "FLOAT32", "L2"))), - ), - MockCmd::new( - redis::cmd("FT.INFO").arg(&isolated), - Err::(unknown_index_error()), - ), - MockCmd::new(create_index_command(&isolated, 3), Ok("OK")), - MockCmd::new( - redis::cmd("HSET") - .arg(format!("{isolated}:{}", entry_id(prompt, tag))) - .arg("entry_id") - .arg(entry_id(prompt, tag)) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&entry())) - .arg("prompt_vector") - .arg(vector_bytes(&[0.1f32, 0.2, 0.3])) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg(tag), - Ok(7), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); - - cache - .set_cache( - tag, - entry(), - &messages_context(vec![json!({"role": "user", "content": prompt})]), - ) - .unwrap(); -} - -#[test] -fn tag_special_characters_are_escaped_in_search_filter() { - let vector = vec![0.1f32, 0.2, 0.3]; - let tag = "a:b, c|d"; - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - search_command(INDEX, "a\\:b\\,\\ c\\|d", &vector), - Ok(empty_result()), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()); - - assert_eq!( - cache - .get_cache( - tag, - &messages_context(vec![json!({"role": "user", "content": "hello prompt"})]) - ) - .unwrap(), - None - ); -} - -#[test] -fn prompt_extraction_matches_python_message_and_input_shapes() { - let vector = vec![0.1f32, 0.2, 0.3]; - let lookups = 5; - let mut commands = vec![MockCmd::new( - redis::cmd("FT.INFO").arg(INDEX), - Ok(compatible_info(3)), - )]; - for _ in 0..lookups { - commands.push(MockCmd::new( - search_command(INDEX, "key1", &vector), - Ok(empty_result()), - )); - } - let connection = MockRedisConnection::new(commands).assert_all_commands_consumed(); - let (embedder, calls) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()); - - cache - .get_cache( - "key1", - &messages_context(vec![ - json!({"role": "user", "content": [{"type": "text", "text": "first"}, {"type": "text", "text": "second"}]}), - json!({"role": "assistant", "content": "reply"}), - ]), - ) - .unwrap(); - cache - .get_cache( - "key1", - &SemanticCacheContext { - input: Some(json!(" plain input ")), - ..Default::default() - }, - ) - .unwrap(); - cache - .get_cache( - "key1", - &SemanticCacheContext { - input: Some( - json!([{"content": [{"type": "input_text", "text": "nested"}]}, "tail"]), - ), - ..Default::default() - }, - ) - .unwrap(); - cache - .get_cache( - "key1", - &SemanticCacheContext { - input: Some(json!({"output_text": " result text "})), - ..Default::default() - }, - ) - .unwrap(); - cache - .get_cache( - "key1", - &messages_context(vec![json!({ - "role": "user", - "content": "question", - "search_results": [{"source": "src", "title": "t", "content": [{"text": "found"}], "citations": {"a": 1}}], - })]), - ) - .unwrap(); - - assert_eq!( - *calls.lock().unwrap(), + let cache = cache( vec![ - "firstsecondreply", - "plain input", - "nested\ntail", - "result text", - "questionsrctfound{\"a\":1}", - ] + info(INDEX, base_info), + info_missing(&isolated), + create_index(&isolated, 3), + hset(&isolated, PROMPT, "key1", &VECTOR, &entry), + ], + FakeEmbedder::new(&[]), ); + + cache.set_cache("key1", entry, &context).unwrap(); } -#[test] -fn ttl_passes_through_context_only() { - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection( - MockRedisConnection::new(Vec::::new()), - embedder, - config(), +#[rstest] +fn create_index_race_rechecks_schema_and_stores(entry: Value, context: SemanticCacheContext) { + let cache = cache( + vec![ + info_missing(INDEX), + MockCmd::new( + create_index_command(INDEX, 3), + Err::<&str, _>(redis::RedisError::from(( + redis::ErrorKind::Extension, + "Index already exists", + ))), + ), + info(INDEX, compatible_info(3)), + hset(INDEX, PROMPT, "key1", &VECTOR, &entry), + ], + FakeEmbedder::new(&[]), ); - assert_eq!(cache.get_ttl(&SemanticCacheContext::default()), None); + + cache.set_cache("key1", entry, &context).unwrap(); +} + +#[rstest] +#[case::punctuation_and_spaces("a:b, c|d", "a\\:b\\,\\ c\\|d")] +#[case::braces_and_dots("{x}.y", "\\{x\\}\\.y")] +#[case::plain("key1", "key1")] +fn tag_special_characters_are_escaped_in_search_filter( + #[case] tag: &str, + #[case] escaped: &str, + context: SemanticCacheContext, +) { + let cache = cache( + vec![ + info(INDEX, compatible_info(3)), + search(INDEX, escaped, &VECTOR, Ok(empty_result())), + ], + FakeEmbedder::new(&[]), + ); + + assert_eq!(cache.get_cache(tag, &context).unwrap(), None); +} + +#[rstest] +#[case::content_parts( + SemanticCacheContext { + messages: Some(json!([ + {"role": "user", "content": [{"type": "text", "text": "first"}, {"type": "text", "text": "second"}]}, + {"role": "assistant", "content": "reply"}, + ])), + ..Default::default() + }, + "firstsecondreply" +)] +#[case::responses_string_input( + SemanticCacheContext { input: Some(json!(" plain input ")), ..Default::default() }, + "plain input" +)] +#[case::responses_nested_input( + SemanticCacheContext { + input: Some(json!([{"content": [{"type": "input_text", "text": "nested"}]}, "tail"])), + ..Default::default() + }, + "nested\ntail" +)] +#[case::responses_output_text( + SemanticCacheContext { input: Some(json!({"output_text": " result text "})), ..Default::default() }, + "result text" +)] +#[case::search_results( + messages_context(vec![json!({ + "role": "user", + "content": "question", + "search_results": [{"source": "src", "title": "t", "content": [{"text": "found"}], "citations": {"a": 1}}], + })]), + "questionsrctfound{\"a\":1}" +)] +#[case::empty_messages_fall_back_to_input( + SemanticCacheContext { messages: Some(json!([])), input: Some(json!("fallback")), ..Default::default() }, + "fallback" +)] +fn prompt_extraction_matches_python_message_and_input_shapes( + #[case] context: SemanticCacheContext, + #[case] prompt: &str, +) { + let embedder = FakeEmbedder::new(&[]); + let calls = embedder.calls.clone(); + let cache = cache( + vec![ + info(INDEX, compatible_info(3)), + search(INDEX, "key1", &VECTOR, Ok(empty_result())), + ], + embedder, + ); + + cache.get_cache("key1", &context).unwrap(); + + assert_eq!(*calls.lock().unwrap(), vec![(prompt.to_owned(), None)]); +} + +#[rstest] +#[case(None)] +#[case(Some(Duration::from_secs(9)))] +fn ttl_passes_through_context_only(#[case] ttl: Option) { + let cache = cache(Vec::new(), FakeEmbedder::new(&[])); + assert_eq!( cache.get_ttl(&SemanticCacheContext { - ttl: Some(Duration::from_secs(9)), + ttl, ..Default::default() }), - Some(Duration::from_secs(9)) + ttl ); } +#[rstest] #[tokio::test] -async fn async_paths_embed_then_run_blocking_redis_work() { - let vector = vec![0.1f32, 0.2, 0.3]; - let prompt = "hello prompt"; - let tag = "key1"; - let hash_key = format!("{INDEX}:{}", entry_id(prompt, tag)); - let value = entry(); - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(3))), - MockCmd::new( - redis::cmd("HSET") - .arg(&hash_key) - .arg("entry_id") - .arg(entry_id(prompt, tag)) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&value)) - .arg("prompt_vector") - .arg(vector_bytes(&vector)) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg(tag), - Ok(7), - ), - MockCmd::new( - search_command(INDEX, tag, &vector), - Ok(search_result(hit_fields(tag, "0.05", encoded(&value)))), - ), - ]) - .assert_all_commands_consumed(); - let (embedder, _) = FakeEmbedder::new(&[]); - let cache = RedisSemanticCache::with_connection(connection, embedder, config()) - .with_clock(|| 1700000000.5); - let context = messages_context(vec![json!({"role": "user", "content": prompt})]); +async fn async_paths_embed_with_metadata_then_run_blocking_redis_work( + entry: Value, + context: SemanticCacheContext, +) { + let embedder = FakeEmbedder::new(&[]); + let calls = embedder.calls.clone(); + let cache = cache( + vec![ + info(INDEX, compatible_info(3)), + hset(INDEX, PROMPT, "key1", &VECTOR, &entry), + search( + INDEX, + "key1", + &VECTOR, + Ok(hit("key1", "0.05", encoded(&entry))), + ), + ], + embedder, + ); + let context = SemanticCacheContext { + metadata: Some(json!({"tenant": "team"})), + ..context + }; cache - .async_set_cache(tag, value.clone(), context.clone()) + .async_set_cache("key1", entry.clone(), context.clone()) .await .unwrap(); assert_eq!( - cache.async_get_cache(tag, &context).await.unwrap(), - Some(value) + cache.async_get_cache("key1", &context).await.unwrap(), + Some(entry) + ); + assert_eq!( + *calls.lock().unwrap(), + vec![(PROMPT.to_owned(), context.metadata.clone()); 2] ); } -#[test] -fn shared_base_index_across_dimensions_replaces_the_isolated_index() { +#[rstest] +fn accessors_report_the_config(config: RedisSemanticConfig) { + let cache = cache(Vec::new(), FakeEmbedder::new(&[])); + + assert_eq!(cache.index_name(), config.index_name); + assert!((cache.similarity_threshold() - config.similarity_threshold).abs() < 1e-6); +} + +#[rstest] +fn shared_base_index_across_dimensions_replaces_the_isolated_index(entry: Value) { // Pins parity with Python's `_isolated` + overwrite=True flow. let prompt = "shared prompt"; - let tag = "key1"; let isolated = format!("{INDEX}_isolated"); - let value = entry(); let context = || messages_context(vec![json!({"role": "user", "content": prompt})]); - let store_hash = |index: &str, vector: &[f32]| { - MockCmd::new( - redis::cmd("HSET") - .arg(format!("{index}:{}", entry_id(prompt, tag))) - .arg("entry_id") - .arg(entry_id(prompt, tag)) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(encoded(&value)) - .arg("prompt_vector") - .arg(vector_bytes(vector)) - .arg("inserted_at") - .arg("1700000000.5") - .arg("updated_at") - .arg("1700000000.5") - .arg("litellm_cache_key") - .arg(tag), - Ok(7), - ) - }; let vector_a = vec![0.1f32; 8]; - let connection_a = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("FT.INFO").arg(INDEX), - Err::(unknown_index_error()), - ), - MockCmd::new(create_index_command(INDEX, 8), Ok("OK")), - store_hash(INDEX, &vector_a), - ]) - .assert_all_commands_consumed(); - let (embedder_a, _) = FakeEmbedder::new(&[(prompt, &vector_a)]); - let worker_a = RedisSemanticCache::with_connection(connection_a, embedder_a, config()) - .with_clock(|| 1700000000.5); - worker_a.set_cache(tag, value.clone(), &context()).unwrap(); + let worker_a = cache( + vec![ + info_missing(INDEX), + create_index(INDEX, 8), + hset(INDEX, prompt, "key1", &vector_a, &entry), + ], + FakeEmbedder::new(&[(prompt, &vector_a)]), + ); + worker_a + .set_cache("key1", entry.clone(), &context()) + .unwrap(); let vector_b = vec![0.2f32; 4]; - let connection_b = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(8))), - MockCmd::new( - redis::cmd("FT.INFO").arg(&isolated), - Err::(unknown_index_error()), - ), - MockCmd::new(create_index_command(&isolated, 4), Ok("OK")), - store_hash(&isolated, &vector_b), - MockCmd::new( - search_command(&isolated, tag, &vector_b), - Ok(search_result(hit_fields(tag, "0.0", encoded(&value)))), - ), - MockCmd::new( - search_command(&isolated, tag, &vector_b), - Err::(redis::RedisError::from(( - redis::ErrorKind::Extension, - "Vector dimension mismatch", - ))), - ), - ]) - .assert_all_commands_consumed(); - let (embedder_b, _) = FakeEmbedder::new(&[(prompt, &vector_b)]); - let worker_b = RedisSemanticCache::with_connection(connection_b, embedder_b, config()) - .with_clock(|| 1700000000.5); - worker_b.set_cache(tag, value.clone(), &context()).unwrap(); + let worker_b = cache( + vec![ + info(INDEX, compatible_info(8)), + info_missing(&isolated), + create_index(&isolated, 4), + hset(&isolated, prompt, "key1", &vector_b, &entry), + search( + &isolated, + "key1", + &vector_b, + Ok(hit("key1", "0.0", encoded(&entry))), + ), + search( + &isolated, + "key1", + &vector_b, + Err(redis::RedisError::from(( + redis::ErrorKind::Extension, + "Vector dimension mismatch", + ))), + ), + ], + FakeEmbedder::new(&[(prompt, &vector_b)]), + ); + worker_b + .set_cache("key1", entry.clone(), &context()) + .unwrap(); assert_eq!( - worker_b.get_cache(tag, &context()).unwrap(), - Some(value.clone()) + worker_b.get_cache("key1", &context()).unwrap(), + Some(entry.clone()) ); let vector_c = vec![0.3f32; 16]; - let connection_c = MockRedisConnection::new([ - MockCmd::new(redis::cmd("FT.INFO").arg(INDEX), Ok(compatible_info(8))), - MockCmd::new(redis::cmd("FT.INFO").arg(&isolated), Ok(compatible_info(4))), - MockCmd::new(redis::cmd("FT.DROPINDEX").arg(&isolated), Ok("OK")), - MockCmd::new(create_index_command(&isolated, 16), Ok("OK")), - store_hash(&isolated, &vector_c), - ]) - .assert_all_commands_consumed(); - let (embedder_c, _) = FakeEmbedder::new(&[(prompt, &vector_c)]); - let worker_c = RedisSemanticCache::with_connection(connection_c, embedder_c, config()) - .with_clock(|| 1700000000.5); - worker_c.set_cache(tag, value.clone(), &context()).unwrap(); + let worker_c = cache( + vec![ + info(INDEX, compatible_info(8)), + info(&isolated, compatible_info(4)), + MockCmd::new(redis::cmd("FT.DROPINDEX").arg(&isolated), Ok("OK")), + create_index(&isolated, 16), + hset(&isolated, prompt, "key1", &vector_c, &entry), + ], + FakeEmbedder::new(&[(prompt, &vector_c)]), + ); + worker_c + .set_cache("key1", entry.clone(), &context()) + .unwrap(); assert_eq!( - worker_b.get_cache(tag, &context()).unwrap_err(), + worker_b.get_cache("key1", &context()).unwrap_err(), Error::Unavailable ); } -#[test] -fn live_shared_index_is_replaced_across_dimensions() { - let Ok(url) = std::env::var("LITELLM_REDIS_STACK_URL") else { +#[fixture] +fn redis_stack_url() -> Option { + std::env::var("LITELLM_REDIS_STACK_URL").ok() +} + +fn live_cache( + url: &str, + index_name: &str, + prompt: &str, + vector: Vec, +) -> RedisSemanticCache> { + RedisSemanticCache::new( + url, + FakeEmbedder::new(&[(prompt, vector.as_slice())]), + JsonCodec::::new(), + RedisSemanticConfig { + index_name: index_name.to_owned(), + similarity_threshold: 0.9, + }, + ) + .unwrap() +} + +#[rstest] +fn live_shared_index_is_replaced_across_dimensions(redis_stack_url: Option, entry: Value) { + let Some(url) = redis_stack_url else { return; }; // Pins parity with Python's `_isolated` + overwrite=True flow. let base = format!("rust_semantic_shared_{}", std::process::id()); let isolated = format!("{base}_isolated"); let prompt = "shared live prompt"; - let tag = "key1"; let context = || messages_context(vec![json!({"role": "user", "content": prompt})]); - let value = entry(); - let worker = |vector: Vec| { - let (embedder, _) = FakeEmbedder::new(&[(prompt, vector.as_slice())]); - RedisSemanticCache::new( - &url, - embedder, - RedisSemanticConfig { - index_name: base.clone(), - similarity_threshold: 0.9, - }, - ) - .unwrap() - }; - let worker_a = worker(vec![0.1f32; 8]); - worker_a.set_cache(tag, value.clone(), &context()).unwrap(); + let worker_a = live_cache(&url, &base, prompt, vec![0.1f32; 8]); + worker_a + .set_cache("key1", entry.clone(), &context()) + .unwrap(); - let worker_b = worker(vec![0.2f32; 4]); - worker_b.set_cache(tag, value.clone(), &context()).unwrap(); + let worker_b = live_cache(&url, &base, prompt, vec![0.2f32; 4]); + worker_b + .set_cache("key1", entry.clone(), &context()) + .unwrap(); assert_eq!( - worker_b.get_cache(tag, &context()).unwrap(), - Some(value.clone()) + worker_b.get_cache("key1", &context()).unwrap(), + Some(entry.clone()) ); - let worker_c = worker(vec![0.3f32; 16]); - worker_c.set_cache(tag, value.clone(), &context()).unwrap(); + let worker_c = live_cache(&url, &base, prompt, vec![0.3f32; 16]); + worker_c + .set_cache("key1", entry.clone(), &context()) + .unwrap(); assert_eq!( - worker_b.get_cache(tag, &context()).unwrap_err(), + worker_b.get_cache("key1", &context()).unwrap_err(), Error::Unavailable ); @@ -961,39 +746,29 @@ fn live_shared_index_is_replaced_across_dimensions() { } } -#[test] -fn live_store_lookup_and_ttl_against_redis_stack() { - let Ok(url) = std::env::var("LITELLM_REDIS_STACK_URL") else { +#[rstest] +fn live_store_lookup_and_ttl_against_redis_stack(redis_stack_url: Option, entry: Value) { + let Some(url) = redis_stack_url else { return; }; - let vector = vec![0.1f32, 0.2, 0.3, 0.4]; let prompt = "rust semantic cache live prompt"; - let tag = "live-key"; let index_name = format!("rust_semantic_test_{}", std::process::id()); - let (embedder, _) = FakeEmbedder::new(&[(prompt, &vector)]); - let cache = RedisSemanticCache::new( - &url, - embedder, - RedisSemanticConfig { - index_name: index_name.clone(), - similarity_threshold: 0.9, - }, - ) - .unwrap(); + let cache = live_cache(&url, &index_name, prompt, vec![0.1, 0.2, 0.3, 0.4]); let context = SemanticCacheContext { ttl: Some(Duration::from_secs(120)), ..messages_context(vec![json!({"role": "user", "content": prompt})]) }; - let value = entry(); - cache.set_cache(tag, value.clone(), &context).unwrap(); - assert_eq!(cache.get_cache(tag, &context).unwrap(), Some(value)); + cache + .set_cache("live-key", entry.clone(), &context) + .unwrap(); + assert_eq!(cache.get_cache("live-key", &context).unwrap(), Some(entry)); assert_eq!(cache.get_cache("other-key", &context).unwrap(), None); let mut connection = redis::Client::open(url).unwrap().get_connection().unwrap(); let ttl: i64 = redis::Commands::ttl( &mut connection, - format!("{index_name}:{}", entry_id(prompt, tag)), + format!("{index_name}:{}", entry_id(prompt, "live-key")), ) .unwrap(); assert!( diff --git a/litellm-rust/crates/cache-redis-semantic/tests/contract.rs b/litellm-rust/crates/cache-redis-semantic/tests/contract.rs new file mode 100644 index 00000000000..fb3cda9616e --- /dev/null +++ b/litellm-rust/crates/cache-redis-semantic/tests/contract.rs @@ -0,0 +1,63 @@ +mod support; + +use litellm_cache::{JsonCodec, SemanticCacheContext, semantic::PreparedEmbedding}; +use litellm_cache_redis_semantic::{DEFAULT_INDEX_NAME, RedisSemanticCache, RedisSemanticConfig}; +use litellm_cache_testing as contract; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use support::FakeSearch; + +type Cache = RedisSemanticCache, FakeSearch>; + +const PREFIX: &str = "contract:"; + +#[fixture] +fn cache() -> Cache { + RedisSemanticCache::with_connection( + FakeSearch::default(), + PreparedEmbedding(vec![0.6, 0.8]), + JsonCodec::new(), + RedisSemanticConfig { + index_name: DEFAULT_INDEX_NAME.into(), + similarity_threshold: 0.9, + }, + ) +} + +#[fixture] +fn context() -> SemanticCacheContext { + SemanticCacheContext { + messages: Some(json!([{"role": "user", "content": "contract prompt"}])), + ..Default::default() + } +} + +#[rstest] +#[tokio::test] +async fn hit_and_miss(cache: Cache, context: SemanticCacheContext) { + contract::hit_and_miss(&cache, context, PREFIX, json!({"answer": 42})).await; +} + +#[rstest] +#[tokio::test] +async fn sync_async_equivalence(cache: Cache, context: SemanticCacheContext) { + contract::sync_async_equivalence(&cache, context, PREFIX, json!("first"), json!([2])).await; +} + +#[rstest] +#[tokio::test] +async fn overwrite_replaces(cache: Cache, context: SemanticCacheContext) { + contract::overwrite_replaces(&cache, context, PREFIX, json!(1), json!({"b": 2})).await; +} + +#[rstest] +#[tokio::test] +async fn pipeline_writes_every_entry(cache: Cache, context: SemanticCacheContext) { + contract::pipeline_writes_every_entry( + &cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; +} diff --git a/litellm-rust/crates/cache-redis-semantic/tests/support/mod.rs b/litellm-rust/crates/cache-redis-semantic/tests/support/mod.rs new file mode 100644 index 00000000000..0f5c2985c36 --- /dev/null +++ b/litellm-rust/crates/cache-redis-semantic/tests/support/mod.rs @@ -0,0 +1,299 @@ +#![allow(dead_code)] + +use std::{ + collections::{BTreeMap, HashMap}, + sync::{Arc, Mutex}, +}; + +use litellm_cache::{Error, semantic::Embedder}; +use serde_json::Value; + +pub type EmbedCalls = Arc)>>>; + +/// Embeds known prompts to fixed vectors, anything else to `[0.1, 0.2, 0.3]`, and records every +/// prompt with its metadata. +pub struct FakeEmbedder { + vectors: HashMap>, + pub calls: EmbedCalls, +} + +impl FakeEmbedder { + pub fn new(vectors: &[(&str, &[f32])]) -> Self { + Self { + vectors: vectors + .iter() + .map(|(prompt, vector)| ((*prompt).to_owned(), vector.to_vec())) + .collect(), + calls: EmbedCalls::default(), + } + } +} + +impl Embedder for FakeEmbedder { + fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { + self.calls + .lock() + .unwrap() + .push((prompt.to_owned(), metadata.cloned())); + Ok(self + .vectors + .get(prompt) + .cloned() + .unwrap_or_else(|| vec![0.1, 0.2, 0.3])) + } + + async fn async_embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { + self.embed(prompt, metadata) + } +} + +struct FakeIndex { + prefix: Vec, + dims: usize, + vector_field: String, +} + +#[derive(Default)] +struct SearchState { + indexes: HashMap, + hashes: BTreeMap, BTreeMap>>, +} + +/// An in-memory Redis Stack speaking the `FT.*`, `HSET` and `EXPIRE` subset the semantic cache +/// sends, with exact cosine KNN over the hashes under an index prefix. +#[derive(Clone, Default)] +pub struct FakeSearch { + state: Arc>, +} + +impl FakeSearch { + fn run(&self, args: Vec>) -> redis::RedisResult { + let mut state = self.state.lock().unwrap(); + let text = |index: usize| String::from_utf8_lossy(&args[index]).into_owned(); + match text(0).to_uppercase().as_str() { + "FT.CREATE" => { + let name = text(1); + if state.indexes.contains_key(&name) { + return Err(error("Index already exists")); + } + let position = |token: &str| args.iter().position(|arg| arg == token.as_bytes()); + let prefix = args[position("PREFIX").unwrap() + 2].clone(); + let dims = text(position("DIM").unwrap() + 1).parse().unwrap(); + let vector_field = text(position("VECTOR").unwrap() - 1); + state.indexes.insert( + name, + FakeIndex { + prefix, + dims, + vector_field, + }, + ); + Ok(redis::Value::Okay) + } + "FT.INFO" => { + let index = state + .indexes + .get(&text(1)) + .ok_or_else(|| error("Unknown index name"))?; + Ok(index_info(index)) + } + "FT.DROPINDEX" => { + state.indexes.remove(&text(1)); + Ok(redis::Value::Okay) + } + "HSET" => { + let hash = state.hashes.entry(args[1].clone()).or_default(); + for pair in args[2..].chunks(2) { + hash.insert( + String::from_utf8_lossy(&pair[0]).into_owned(), + pair[1].clone(), + ); + } + Ok(redis::Value::Int(((args.len() - 2) / 2) as i64)) + } + "EXPIRE" => Ok(redis::Value::Int(i64::from( + state.hashes.contains_key(&args[1]), + ))), + "FT.SEARCH" => { + let index = state + .indexes + .get(&text(1)) + .ok_or_else(|| error("no such index"))?; + let query = text(2); + let tag = query_tag(&query); + let params = args.iter().position(|arg| arg == b"PARAMS").unwrap(); + let vector = floats(&args[params + 3]); + let best = state + .hashes + .iter() + .filter(|(key, _)| key.starts_with(&index.prefix)) + .filter(|(_, fields)| { + fields.get("litellm_cache_key").map(Vec::as_slice) == Some(tag.as_bytes()) + }) + .filter_map(|(key, fields)| { + let stored = floats(fields.get(&index.vector_field)?); + (stored.len() == index.dims) + .then(|| (key, fields, 1.0 - cosine(&vector, &stored))) + }) + .min_by(|left, right| left.2.total_cmp(&right.2)); + let Some((key, fields, distance)) = best else { + return Ok(redis::Value::Array(vec![redis::Value::Int(0)])); + }; + let mut reply = fields + .iter() + .filter(|(name, _)| **name != index.vector_field) + .flat_map(|(name, value)| [bulk(name.as_bytes()), bulk(value)]) + .collect::>(); + reply.extend([ + bulk(b"vector_distance"), + bulk(distance.to_string().as_bytes()), + ]); + Ok(redis::Value::Array(vec![ + redis::Value::Int(1), + bulk(key), + redis::Value::Array(reply), + ])) + } + "PING" => Ok(redis::Value::SimpleString("PONG".into())), + _ => Err(error("unsupported command")), + } + } +} + +impl redis::ConnectionLike for FakeSearch { + fn req_packed_command(&mut self, command: &[u8]) -> redis::RedisResult { + let mut commands = parse_commands(command); + self.run(commands.remove(0)) + } + + fn req_packed_commands( + &mut self, + commands: &[u8], + offset: usize, + count: usize, + ) -> redis::RedisResult> { + let replies = parse_commands(commands) + .into_iter() + .map(|args| self.run(args)) + .collect::>>()?; + Ok(replies.into_iter().skip(offset).take(count).collect()) + } + + fn get_db(&self) -> i64 { + 0 + } + + fn check_connection(&mut self) -> bool { + true + } + + fn is_open(&self) -> bool { + true + } +} + +fn error(message: &'static str) -> redis::RedisError { + redis::RedisError::from((redis::ErrorKind::Extension, message)) +} + +fn bulk(bytes: &[u8]) -> redis::Value { + redis::Value::BulkString(bytes.to_vec()) +} + +fn index_info(index: &FakeIndex) -> redis::Value { + let attribute = |name: &str, field_type: &str| { + redis::Value::Array(vec![ + bulk(b"identifier"), + bulk(name.as_bytes()), + bulk(b"type"), + bulk(field_type.as_bytes()), + ]) + }; + redis::Value::Array(vec![ + bulk(b"attributes"), + redis::Value::Array(vec![ + attribute("prompt", "TEXT"), + attribute("response", "TEXT"), + attribute("inserted_at", "NUMERIC"), + attribute("updated_at", "NUMERIC"), + attribute("litellm_cache_key", "TAG"), + redis::Value::Array(vec![ + bulk(b"identifier"), + bulk(index.vector_field.as_bytes()), + bulk(b"type"), + bulk(b"VECTOR"), + bulk(b"dim"), + redis::Value::Int(index.dims as i64), + bulk(b"data_type"), + bulk(b"FLOAT32"), + bulk(b"distance_metric"), + bulk(b"COSINE"), + ]), + ]), + ]) +} + +/// The tag inside `@litellm_cache_key:{...}`, with query escapes removed. +fn query_tag(query: &str) -> String { + let start = query.find("@litellm_cache_key:{").unwrap() + "@litellm_cache_key:{".len(); + let mut tag = String::new(); + let mut characters = query[start..].chars(); + while let Some(character) = characters.next() { + match character { + '\\' => tag.extend(characters.next()), + '}' => break, + character => tag.push(character), + } + } + tag +} + +fn floats(bytes: &[u8]) -> Vec { + bytes + .as_chunks::<4>() + .0 + .iter() + .map(|chunk| f32::from_le_bytes(*chunk)) + .collect() +} + +fn cosine(left: &[f32], right: &[f32]) -> f64 { + let dot = left + .iter() + .zip(right) + .map(|(left, right)| f64::from(*left) * f64::from(*right)) + .sum::(); + let norm = |vector: &[f32]| { + vector + .iter() + .map(|value| f64::from(*value).powi(2)) + .sum::() + .sqrt() + }; + dot / (norm(left) * norm(right)) +} + +/// Splits a packed RESP request into each command's arguments. +fn parse_commands(mut bytes: &[u8]) -> Vec>> { + let line = |bytes: &mut &[u8]| { + let end = bytes + .windows(2) + .position(|window| window == b"\r\n") + .unwrap(); + let text = String::from_utf8(bytes[1..end].to_vec()).unwrap(); + *bytes = &bytes[end + 2..]; + text.parse::().unwrap() + }; + let mut commands = Vec::new(); + while !bytes.is_empty() { + let count = line(&mut bytes); + let mut args = Vec::with_capacity(count); + for _ in 0..count { + let length = line(&mut bytes); + args.push(bytes[..length].to_vec()); + bytes = &bytes[length + 2..]; + } + commands.push(args); + } + commands +} diff --git a/litellm-rust/crates/cache-redis/Cargo.toml b/litellm-rust/crates/cache-redis/Cargo.toml index ea937098698..a234286a338 100644 --- a/litellm-rust/crates/cache-redis/Cargo.toml +++ b/litellm-rust/crates/cache-redis/Cargo.toml @@ -12,5 +12,7 @@ r2d2 = "0.8.10" tokio.workspace = true [dev-dependencies] +litellm-cache-testing.workspace = true redis-test = "1.0.4" +rstest.workspace = true serde_json.workspace = true diff --git a/litellm-rust/crates/cache-redis/src/cache.rs b/litellm-rust/crates/cache-redis/src/cache.rs index 24399c9b2f9..ebcf0b6916b 100644 --- a/litellm-rust/crates/cache-redis/src/cache.rs +++ b/litellm-rust/crates/cache-redis/src/cache.rs @@ -1,110 +1,25 @@ use std::{ - sync::{Arc, Mutex}, + sync::{Arc, OnceLock}, time::Duration, }; -use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheCodec, CacheConnectionResult, CacheConnectionStatus, - ClaimCache, CounterCache, DeleteCache, Error, ExactCacheContext, FlushCache, -}; -use redis::Commands; +use litellm_cache::{BatchEntry, CacheCodec, Error}; -use crate::topology::RedisTopology; - -mod connection; -mod operations; - -pub use connection::ConnectionRef; -use connection::{ClusterConnectionManager, ConnectionManager}; - -pub use operations::{ - RedisArg, RedisLpopOperation, RedisLpopResult, RedisRpushOperation, RedisScript, +use crate::{ + connection::{ConnectionRef, Connections}, + topology::RedisTopology, }; const DEFAULT_TTL: Duration = Duration::from_secs(600); -const REDIS_TIMEOUT: Duration = Duration::from_secs(5); -const REDIS_POOL_SIZE: u32 = 16; - -const INCREMENT_SCRIPT: &str = concat!( - "local value = redis.call('INCRBYFLOAT', KEYS[1], ARGV[1]); ", - "if redis.call('TTL', KEYS[1]) == -1 then ", - "redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return value" -); - -const CLAIM_SCRIPT: &str = concat!( - "local current = redis.call('GET', KEYS[1]); ", - "if ARGV[1] == '' then if current ~= false and current ~= '' then return 0; end; ", - "elseif current ~= ARGV[1] then return 0; end; ", - "if ARGV[3] ~= '' then redis.call('SET', KEYS[1], ARGV[3], 'EX', ARGV[2]); ", - "elseif ARGV[4] == '1' then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return 1" -); -const CLAIM_ATTEMPTS: usize = 8; - -#[allow(private_interfaces)] -pub enum Connections { - Pool(r2d2::Pool), - Cluster(r2d2::Pool), - Fixed(Mutex), -} - -impl Connections -where - C: redis::ConnectionLike + Send + 'static, -{ - pub fn execute( - &self, - operation: impl FnOnce(&mut ConnectionRef<'_>) -> Result, - ) -> Result { - match self { - Self::Pool(pool) => { - let mut pooled = pool.get().map_err(|_| Error::Unavailable)?; - let result = operation(&mut ConnectionRef::Node(&mut pooled.connection)); - pooled.failed = matches!(result, Err(Error::Unavailable)); - result - } - Self::Cluster(pool) => { - let mut pooled = pool.get().map_err(|_| Error::Unavailable)?; - let result = operation(&mut ConnectionRef::Cluster(&mut pooled.connection)); - pooled.failed = matches!(result, Err(Error::Unavailable)); - result - } - Self::Fixed(connection) => { - let mut connection = connection.lock().map_err(|_| Error::Unavailable)?; - operation(&mut ConnectionRef::Node(&mut *connection)) - } - } - } - - pub async fn run_blocking(connections: Arc, operation: F) -> Result - where - T: Send + 'static, - F: FnOnce(&mut ConnectionRef<'_>) -> Result + Send + 'static, - { - tokio::task::spawn_blocking(move || connections.execute(operation)) - .await - .map_err(|_| Error::Unavailable)? - } - - pub fn fixed(connection: C) -> Self { - Self::Fixed(Mutex::new(connection)) - } - - pub fn open(url: &str, topology: &RedisTopology) -> Result { - match topology { - RedisTopology::Standalone => Ok(Self::Pool(pool(ConnectionManager::open(url)?)?)), - RedisTopology::Cluster { startup_nodes } => Ok(Self::Cluster(pool( - ClusterConnectionManager::open(url, startup_nodes)?, - )?)), - } - } -} pub struct RedisCache { - connections: Arc>, - default_ttl: Duration, - codec: S, - namespace: Option, - topology: RedisTopology, + pub(crate) connections: Arc>, + pub(crate) default_ttl: Duration, + pub(crate) codec: S, + pub(crate) namespace: Option, + pub(crate) topology: RedisTopology, + /// The server's major version, read from `INFO` once, like Python's `redis_version`. + pub(crate) major_version: Arc>, } impl RedisCache { @@ -125,20 +40,11 @@ impl RedisCache { codec, namespace: None, topology: topology.clone(), + major_version: Arc::default(), }) } } -fn pool(manager: M) -> Result, Error> { - r2d2::Pool::builder() - .max_size(REDIS_POOL_SIZE) - .min_idle(Some(0)) - .connection_timeout(REDIS_TIMEOUT) - .test_on_check_out(false) - .build(manager) - .map_err(|_| Error::Unavailable) -} - impl RedisCache where S: CacheCodec, @@ -151,6 +57,7 @@ where codec, namespace: None, topology: RedisTopology::Standalone, + major_version: Arc::default(), } } @@ -169,11 +76,52 @@ where &self.topology } - fn namespaced_key(&self, key: &str) -> String { + pub(crate) fn namespaced_key(&self, key: &str) -> String { namespaced_key(self.namespace.as_deref(), key) } - fn namespaced_pattern(&self) -> Result { + pub(crate) fn namespaced_keys(&self, keys: &[String]) -> Vec { + keys.iter().map(|key| self.namespaced_key(key)).collect() + } + + /// Whole seconds for `ttl`, falling back to the default TTL like Python's `get_ttl`. + pub(crate) fn ttl_or_default(&self, ttl: Option) -> u64 { + ttl_seconds(ttl.unwrap_or(self.default_ttl)) + } + + pub(crate) fn execute( + &self, + operation: impl FnOnce(&mut ConnectionRef<'_>) -> Result, + ) -> Result { + self.connections.execute(operation) + } + + /// `_parse_redis_major_version`: the major version from `INFO`, or + /// `DEFAULT_REDIS_MAJOR_VERSION` when `INFO` fails or its version does not parse. The first + /// answer is kept, as Python reads `redis_version` once at construction. + pub(crate) async fn major_version(&self) -> u32 { + if let Some(version) = self.major_version.get() { + return *version; + } + let info = self + .run(|connection| connection.node_text(&redis::cmd("INFO"))) + .await; + let version = info + .ok() + .and_then(|info| parse_major_version(&info)) + .unwrap_or_else(default_major_version); + *self.major_version.get_or_init(|| version) + } + + pub(crate) async fn run(&self, operation: F) -> Result + where + T: Send + 'static, + F: FnOnce(&mut ConnectionRef<'_>) -> Result + Send + 'static, + { + Connections::run_blocking(Arc::clone(&self.connections), operation).await + } + + pub(crate) fn namespaced_pattern(&self) -> Result { let namespace = self.namespace.as_ref().ok_or(Error::UnscopedFlush)?; let escaped: String = namespace .chars() @@ -188,18 +136,7 @@ where Ok(format!("{escaped}:*")) } - fn flush_matching(connection: &mut ConnectionRef<'_>, pattern: &str) -> Result<(), Error> { - connection.scan(pattern, 1000, |connection, keys| { - if !keys.is_empty() { - connection - .del::<_, usize>(keys) - .map_err(|_| Error::Unavailable)?; - } - Ok(true) - }) - } - - fn decode_response(&self, value: redis::Value) -> Result, Error> { + pub(crate) fn decode_response(&self, value: redis::Value) -> Result, Error> { match value { redis::Value::Nil => Ok(None), redis::Value::BulkString(bytes) => self.codec.decode(&bytes).map(Some), @@ -208,7 +145,10 @@ where } } - fn decode_batch_response(&self, value: redis::Value) -> Result, Error> { + pub(crate) fn decode_batch_response( + &self, + value: redis::Value, + ) -> Result, Error> { match self.decode_response(value) { Ok(Some(value)) => Ok(BatchEntry::Hit(value)), Ok(None) => Ok(BatchEntry::Miss), @@ -216,15 +156,9 @@ where Err(error) => Err(error), } } - - fn ttl_seconds(ttl: Duration) -> u64 { - ttl.as_secs() - .saturating_add(u64::from(ttl.subsec_nanos() > 0)) - .max(1) - } } -fn namespaced_key(namespace: Option<&str>, key: &str) -> String { +pub(crate) fn namespaced_key(namespace: Option<&str>, key: &str) -> String { match namespace { Some(namespace) if !key.starts_with(&format!("{namespace}:")) => { format!("{namespace}:{key}") @@ -233,469 +167,26 @@ fn namespaced_key(namespace: Option<&str>, key: &str) -> String { } } -impl BaseCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - type Value = S::Value; - type Context = ExactCacheContext; +pub(crate) fn ttl_seconds(ttl: Duration) -> u64 { + ttl.as_secs() + .saturating_add(u64::from(ttl.subsec_nanos() > 0)) + .max(1) +} - fn get_ttl(&self, context: &Self::Context) -> Option { - context.ttl.or(Some(self.default_ttl)) - } - - fn set_cache( - &self, - key: &str, - value: Self::Value, - context: &ExactCacheContext, - ) -> Result<(), Error> { - let payload = self.codec.encode(&value)?; - let ttl = Self::ttl_seconds(self.get_ttl(context).unwrap_or(self.default_ttl)); - let key = self.namespaced_key(key); - self.connections.execute(|connection| { - connection - .set_ex::<_, _, ()>(key, payload, ttl) - .map_err(|_| Error::Unavailable) - }) - } - - fn get_cache(&self, key: &str, _: &ExactCacheContext) -> Result, Error> { - let key = self.namespaced_key(key); - let value = self.connections.execute(|connection| { - connection - .get::<_, redis::Value>(key) - .map_err(|_| Error::Unavailable) - })?; - self.decode_response(value) - } - - async fn async_set_cache( - &self, - key: &str, - value: Self::Value, - context: ExactCacheContext, - ) -> Result<(), Error> { - let payload = self.codec.encode(&value)?; - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(self.get_ttl(&context).unwrap_or(self.default_ttl)); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - connection - .set_ex::<_, _, ()>(key, payload, ttl) - .map_err(|_| Error::Unavailable) - }) - .await - } - - async fn async_get_cache( - &self, - key: &str, - _: &ExactCacheContext, - ) -> Result, Error> { - let key = self.namespaced_key(key); - let value = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - connection - .get::<_, redis::Value>(key) - .map_err(|_| Error::Unavailable) - }) - .await?; - self.decode_response(value) - } - - async fn async_set_cache_pipeline( - &self, - cache_list: Vec<(String, Self::Value)>, - context: ExactCacheContext, - ) -> Result<(), Error> { - let entries = cache_list - .into_iter() - .map(|(key, value)| { - self.codec - .encode(&value) - .map(|payload| (self.namespaced_key(&key), payload)) - }) - .collect::, _>>()?; - let ttl = Self::ttl_seconds(self.get_ttl(&context).unwrap_or(self.default_ttl)); - if entries.is_empty() { - return Ok(()); - } - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let commands = entries - .into_iter() - .map(|(key, payload)| { - let mut command = redis::cmd("SETEX"); - command.arg(key).arg(ttl).arg(payload); - command - }) - .collect(); - connection.pipeline(commands).map(drop) - }) - .await - } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - match Connections::run_blocking(Arc::clone(&self.connections), |connection| { - Ok(match connection.ping() { - Ok(_) => CacheConnectionResult { - status: CacheConnectionStatus::Success, - message: "Redis cache connection test successful".into(), - error: None, - }, - Err(error) => CacheConnectionResult { - status: CacheConnectionStatus::Failed, - message: format!("Redis connection failed: {error}"), - error: Some(error.to_string()), - }, - }) - }) - .await - { - Ok(result) => Ok(result), - Err(error) => Ok(CacheConnectionResult { - status: CacheConnectionStatus::Failed, - message: format!("Redis connection failed: {error}"), - error: Some(error.to_string()), - }), - } +fn parse_major_version(info: &str) -> Option { + let version = info + .lines() + .find_map(|line| line.trim().strip_prefix("redis_version:"))? + .trim(); + match version.split_once('.') { + Some((major, _)) => major.parse().ok(), + None => version.parse::().ok().map(|major| major as u32), } } -impl BatchCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - fn batch_get_cache( - &self, - keys: &[String], - _: &ExactCacheContext, - ) -> Result>, Error> { - let keys = keys - .iter() - .map(|key| self.namespaced_key(key)) - .collect::>(); - let values = self.connections.execute(|connection| { - redis::cmd("MGET") - .arg(keys) - .query::>(connection) - .map_err(|_| Error::Unavailable) - })?; - values - .into_iter() - .map(|value| self.decode_batch_response(value)) - .collect() - } - - async fn async_batch_get_cache( - &self, - keys: Vec, - _: ExactCacheContext, - ) -> Result>, Error> { - let keys = keys - .iter() - .map(|key| self.namespaced_key(key)) - .collect::>(); - let values = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - redis::cmd("MGET") - .arg(keys) - .query::>(connection) - .map_err(|_| Error::Unavailable) - }) - .await?; - values - .into_iter() - .map(|value| self.decode_batch_response(value)) - .collect() - } -} - -impl DeleteCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - fn delete_cache(&self, key: &str) -> Result<(), Error> { - let key = self.namespaced_key(key); - self.connections - .execute(|connection| connection.del::<_, ()>(key).map_err(|_| Error::Unavailable)) - } - - async fn async_delete_cache(&self, key: &str) -> Result<(), Error> { - let key = self.namespaced_key(key); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - connection.del::<_, ()>(key).map_err(|_| Error::Unavailable) - }) - .await - } -} - -impl FlushCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - fn flush_cache(&self) -> Result<(), Error> { - let pattern = self.namespaced_pattern()?; - self.connections - .execute(|connection| Self::flush_matching(connection, &pattern)) - } - - async fn async_flush_cache(&self) -> Result<(), Error> { - let pattern = self.namespaced_pattern()?; - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - Self::flush_matching(connection, &pattern) - }) - .await - } -} - -impl CounterCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - fn increment_cache( - &self, - key: &str, - amount: f64, - context: ExactCacheContext, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(self.get_ttl(&context).unwrap_or(self.default_ttl)); - self.connections - .execute(|connection| increment(connection, key, amount, ttl)) - } - - async fn async_increment( - &self, - key: &str, - amount: f64, - context: ExactCacheContext, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(self.get_ttl(&context).unwrap_or(self.default_ttl)); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - increment(connection, key, amount, ttl) - }) - .await - } -} - -fn increment( - connection: &mut ConnectionRef<'_>, - key: String, - amount: f64, - ttl: u64, -) -> Result { - redis::cmd("EVAL") - .arg(INCREMENT_SCRIPT) - .arg(1) - .arg(key) - .arg(amount) - .arg(ttl) - .query(connection) - .map_err(|_| Error::Unavailable) -} - -fn stored_bytes(value: redis::Value) -> Result>, Error> { - match value { - redis::Value::Nil => Ok(None), - redis::Value::BulkString(bytes) => Ok(Some(bytes)), - redis::Value::SimpleString(text) => Ok(Some(text.into_bytes())), - _ => Err(Error::InvalidEntry), - } -} - -/// Eligibility is decided on decoded values, so a pin written by another encoder (Python's -/// `json.dumps` spacing or key order) still matches. The write is a compare-and-set on the -/// bytes that decision was made on, retried when another claimant wins the race. -fn claim( - connection: &mut ConnectionRef<'_>, - codec: &S, - key: &str, - candidate: S::Value, - eligible: &[S::Value], - ttl: u64, -) -> Result -where - S::Value: PartialEq, -{ - let payload = codec.encode(&candidate)?; - if payload.is_empty() { - return Err(Error::InvalidEntry); - } - for _ in 0..CLAIM_ATTEMPTS { - let current = stored_bytes( - connection - .get::<_, redis::Value>(key) - .map_err(|_| Error::Unavailable)?, - )? - .filter(|bytes| !bytes.is_empty()); - let existing = current - .as_deref() - .and_then(|bytes| codec.decode(bytes).ok()) - .filter(|existing| eligible.is_empty() || eligible.contains(existing)); - let refresh = existing - .as_ref() - .is_some_and(|existing| !eligible.is_empty() || *existing == candidate); - let write: &[u8] = if existing.is_some() { b"" } else { &payload }; - let applied = redis::cmd("EVAL") - .arg(CLAIM_SCRIPT) - .arg(1) - .arg(key) - .arg(current.as_deref().unwrap_or_default()) - .arg(ttl) - .arg(write) - .arg(u8::from(refresh)) - .query::(connection) - .map_err(|_| Error::Unavailable)?; - if applied { - return Ok(existing.unwrap_or(candidate)); - } - } - Err(Error::Unavailable) -} - -impl ClaimCache for RedisCache -where - S: CacheCodec + Clone + 'static, - S::Value: PartialEq, - C: redis::ConnectionLike + Send + 'static, -{ - fn claim_cache( - &self, - key: &str, - candidate: S::Value, - eligible: &[S::Value], - context: ExactCacheContext, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(self.get_ttl(&context).unwrap_or(self.default_ttl)); - self.connections - .execute(|connection| claim(connection, &self.codec, &key, candidate, eligible, ttl)) - } - - async fn async_claim_cache( - &self, - key: &str, - candidate: S::Value, - eligible: Vec, - context: ExactCacheContext, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(self.get_ttl(&context).unwrap_or(self.default_ttl)); - let codec = self.codec.clone(); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - claim(connection, &codec, &key, candidate, &eligible, ttl) - }) - .await - } -} - -#[cfg(test)] -mod tests { - use std::time::Duration; - - use litellm_cache::{ - BaseCache, CacheCodec, DeleteCache, ExactCacheContext, FlushCache, JsonCodec, - }; - use redis_test::{MockCmd, MockRedisConnection}; - use serde_json::json; - - use super::RedisCache; - - fn entry() -> serde_json::Value { - json!({"deployment": "model-a", "cooldown_seconds": 30}) - } - - #[test] - fn ttl_seconds_rounds_up_and_keeps_expiration_positive() { - assert_eq!( - RedisCache::>::ttl_seconds(Duration::ZERO), - 1 - ); - assert_eq!( - RedisCache::>::ttl_seconds(Duration::from_millis(1500)), - 2 - ); - assert_eq!( - RedisCache::>::ttl_seconds(Duration::from_secs(15)), - 15 - ); - } - - #[test] - fn redis_commands_round_trip_entries_and_delete_only_namespaced_keys() { - let value = entry(); - let payload = JsonCodec::::new() - .encode(&value) - .unwrap(); - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("SETEX") - .arg("litellm-cache:key") - .arg(600) - .arg(payload.clone()), - Ok("OK"), - ), - MockCmd::new(redis::cmd("GET").arg("litellm-cache:key"), Ok(payload)), - MockCmd::new(redis::cmd("DEL").arg("litellm-cache:key"), Ok(1u32)), - ]) - .assert_all_commands_consumed(); - let cache = - RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("litellm-cache".into())); - - cache - .set_cache("key", value.clone(), &ExactCacheContext::default()) - .unwrap(); - assert_eq!( - cache - .get_cache("key", &ExactCacheContext::default()) - .unwrap(), - Some(value) - ); - cache.delete_cache("key").unwrap(); - } - - #[test] - fn flush_scans_and_deletes_only_cache_keys() { - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("SCAN") - .cursor_arg(0) - .arg("MATCH") - .arg("litellm-cache:*") - .arg("COUNT") - .arg(1000), - Ok(redis_test::redis_value!(["0", ["litellm-cache:key"]])), - ), - MockCmd::new(redis::cmd("DEL").arg("litellm-cache:key"), Ok(1u32)), - ]) - .assert_all_commands_consumed(); - let cache = - RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("litellm-cache".into())); - - cache.flush_cache().unwrap(); - } - - #[tokio::test] - async fn test_connection_runs_ping_off_executor() { - let connection = MockRedisConnection::new([MockCmd::new(redis::cmd("PING"), Ok("PONG"))]) - .assert_all_commands_consumed(); - let cache = - RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("litellm-cache".into())); - - assert_eq!( - cache.test_connection().await.unwrap().status, - litellm_cache::CacheConnectionStatus::Success - ); - } +fn default_major_version() -> u32 { + std::env::var("DEFAULT_REDIS_MAJOR_VERSION") + .ok() + .and_then(|value| value.parse().ok()) + .unwrap_or(7) } diff --git a/litellm-rust/crates/cache-redis/src/cache/operations.rs b/litellm-rust/crates/cache-redis/src/cache/operations.rs deleted file mode 100644 index 4345ee879b3..00000000000 --- a/litellm-rust/crates/cache-redis/src/cache/operations.rs +++ /dev/null @@ -1,632 +0,0 @@ -use std::{sync::Arc, time::Duration}; - -use litellm_cache::{ - CacheCodec, CacheScript, ClientInfoCache, Error, IncrementOperation, QueueCache, ScanCache, - ScriptCache, SetCache, TtlCache, -}; -use redis::Commands; - -use super::{ConnectionRef, Connections, RedisCache, namespaced_key}; - -const INCREMENT_WITH_FLOOR_SCRIPT: &str = concat!( - "local count = redis.call('INCRBY', KEYS[1], ARGV[1]); ", - "if count < 0 then count = redis.call('INCRBY', KEYS[1], -count); end; ", - "if redis.call('TTL', KEYS[1]) < 0 then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; ", - "return count" -); -const SET_MAX_SCRIPT: &str = concat!( - "local current = redis.call('GET', KEYS[1]); ", - "if current == false or tonumber(current) < tonumber(ARGV[1]) then ", - "redis.call('SET', KEYS[1], ARGV[1]); ", - "if tonumber(ARGV[2]) > 0 then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; ", - "return ARGV[1]; end; return current" -); - -#[derive(Clone, Debug, PartialEq)] -pub enum RedisArg { - Bytes(Vec), - Integer(i64), - Float(f64), -} - -impl From<&str> for RedisArg { - fn from(value: &str) -> Self { - Self::Bytes(value.as_bytes().to_vec()) - } -} - -impl From for RedisArg { - fn from(value: String) -> Self { - Self::Bytes(value.into_bytes()) - } -} - -impl From> for RedisArg { - fn from(value: Vec) -> Self { - Self::Bytes(value) - } -} - -impl From for RedisArg { - fn from(value: i64) -> Self { - Self::Integer(value) - } -} - -impl From for RedisArg { - fn from(value: f64) -> Self { - Self::Float(value) - } -} - -impl redis::ToRedisArgs for RedisArg { - fn write_redis_args(&self, out: &mut W) - where - W: ?Sized + redis::RedisWrite, - { - match self { - Self::Bytes(value) => value.write_redis_args(out), - Self::Integer(value) => value.write_redis_args(out), - Self::Float(value) => value.write_redis_args(out), - } - } -} - -#[derive(Clone, Debug, PartialEq)] -pub struct RedisRpushOperation { - pub key: String, - pub values: Vec, -} - -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct RedisLpopOperation { - pub key: String, - pub count: Option, -} - -#[derive(Clone, Debug, PartialEq, Eq)] -pub enum RedisLpopResult { - Missing, - Value(Vec), - Values(Vec>), -} - -pub struct RedisScript { - connections: Arc>, - namespace: Option, - source: String, -} - -impl CacheScript for RedisScript -where - C: redis::ConnectionLike + Send + 'static, -{ - type Argument = RedisArg; - type Output = redis::Value; - - async fn invoke( - &self, - keys: Vec, - arguments: Vec, - ) -> Result { - let keys = keys - .into_iter() - .map(|key| namespaced_key(self.namespace.as_deref(), &key)) - .collect::>(); - let connections = Arc::clone(&self.connections); - let source = self.source.clone(); - tokio::task::spawn_blocking(move || { - connections.execute(|connection| { - redis::cmd("EVAL") - .arg(source) - .arg(keys.len()) - .arg(keys) - .arg(arguments) - .query(connection) - .map_err(|_| Error::Unavailable) - }) - }) - .await - .map_err(|_| Error::Unavailable)? - } -} - -impl RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - pub async fn delete_cache_keys(&self, keys: Vec) -> Result { - if keys.is_empty() { - return Ok(0); - } - let keys = keys - .into_iter() - .map(|key| self.namespaced_key(&key)) - .collect::>(); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - connection.del(keys).map_err(|_| Error::Unavailable) - }) - .await - } - - pub fn batch_get_counts(&self, keys: &[String]) -> Result>, Error> { - let keys = keys - .iter() - .map(|key| self.namespaced_key(key)) - .collect::>(); - let values = self.connections.execute(|connection| { - redis::cmd("MGET") - .arg(keys) - .query::>(connection) - .map_err(|_| Error::Unavailable) - })?; - values.into_iter().map(count).collect() - } - - pub async fn async_batch_get_counts( - &self, - keys: Vec, - ) -> Result>, Error> { - let keys = keys - .iter() - .map(|key| self.namespaced_key(key)) - .collect::>(); - let values = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - redis::cmd("MGET") - .arg(keys) - .query::>(connection) - .map_err(|_| Error::Unavailable) - }) - .await?; - values.into_iter().map(count).collect() - } - - pub fn sync_ping(&self) -> Result { - self.connections - .execute(|connection| connection.ping().map_err(|_| Error::Unavailable)) - } - - pub async fn ping(&self) -> Result { - Connections::run_blocking(Arc::clone(&self.connections), |connection| { - connection.ping().map_err(|_| Error::Unavailable) - }) - .await - } - - pub async fn async_get_ttl(&self, key: &str) -> Result, Error> { - let key = self.namespaced_key(key); - let ttl = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - redis::cmd("TTL") - .arg(key) - .query::(connection) - .map_err(|_| Error::Unavailable) - }) - .await?; - Ok((ttl >= 0).then_some(ttl)) - } - - pub async fn async_scan_iter(&self, pattern: &str, count: usize) -> Result, Error> { - let pattern = format!("{}*", self.namespaced_key(pattern)); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let mut matches = Vec::new(); - connection.scan(&pattern, count, |_, keys| { - matches.extend(keys); - Ok(matches.len() < count) - })?; - matches.truncate(count); - Ok(matches) - }) - .await - } - - pub async fn async_set_cache_sadd( - &self, - key: &str, - values: Vec, - ttl: Option, - ) -> Result { - if values.is_empty() { - return Err(Error::InvalidEntry); - } - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(ttl.unwrap_or(self.default_ttl)); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let mut sadd = redis::cmd("SADD"); - sadd.arg(&key).arg(values); - let mut expire = redis::cmd("EXPIRE"); - expire.arg(&key).arg(ttl); - let replies = connection.pipeline(vec![sadd, expire])?; - replies - .into_iter() - .next() - .map(redis::from_redis_value::) - .transpose() - .map_err(|_| Error::Unavailable)? - .ok_or(Error::Unavailable) - }) - .await - } - - pub async fn async_rpush(&self, key: &str, values: Vec) -> Result { - if values.is_empty() { - return Err(Error::InvalidEntry); - } - let key = self.namespaced_key(key); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - redis::cmd("RPUSH") - .arg(key) - .arg(values) - .query(connection) - .map_err(|_| Error::Unavailable) - }) - .await - } - - pub async fn async_rpush_pipeline( - &self, - operations: Vec, - ) -> Result, Error> { - let operations = operations - .into_iter() - .map(|operation| { - if operation.values.is_empty() { - return Err(Error::InvalidEntry); - } - Ok((self.namespaced_key(&operation.key), operation.values)) - }) - .collect::, _>>()?; - if operations.is_empty() { - return Ok(Vec::new()); - } - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let commands = operations - .into_iter() - .map(|(key, values)| { - let mut command = redis::cmd("RPUSH"); - command.arg(key).arg(values); - command - }) - .collect(); - connection - .pipeline(commands)? - .into_iter() - .map(|value| redis::from_redis_value(value).map_err(|_| Error::Unavailable)) - .collect() - }) - .await - } - - pub async fn async_lpop( - &self, - key: &str, - count: Option, - ) -> Result { - let key = self.namespaced_key(key); - let multiple = count.is_some(); - let value = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let mut command = redis::cmd("LPOP"); - command.arg(key); - if let Some(count) = count { - command.arg(count); - } - command - .query::(connection) - .map_err(|_| Error::Unavailable) - }) - .await?; - lpop_result(value, multiple) - } - - pub async fn async_lpop_pipeline( - &self, - operations: Vec, - ) -> Result, Error> { - let operations = operations - .into_iter() - .map(|operation| (self.namespaced_key(&operation.key), operation.count)) - .collect::>(); - if operations.is_empty() { - return Ok(Vec::new()); - } - let multiple = operations - .iter() - .map(|(_, count)| count.is_some()) - .collect::>(); - let values = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let commands = operations - .into_iter() - .map(|(key, count)| { - let mut command = redis::cmd("LPOP"); - command.arg(key); - if let Some(count) = count { - command.arg(count); - } - command - }) - .collect(); - connection.pipeline(commands) - }) - .await?; - values - .into_iter() - .zip(multiple) - .map(|(value, multiple)| lpop_result(value, multiple)) - .collect() - } - - pub async fn async_eval( - &self, - script: String, - keys: Vec, - arguments: Vec, - ) -> Result { - let keys = keys - .into_iter() - .map(|key| self.namespaced_key(&key)) - .collect::>(); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - redis::cmd("EVAL") - .arg(script) - .arg(keys.len()) - .arg(keys) - .arg(arguments) - .query(connection) - .map_err(|_| Error::Unavailable) - }) - .await - } - - pub fn client_list(&self) -> Result { - self.connections - .execute(|connection| connection.node_text(redis::cmd("CLIENT").arg("LIST"))) - } - - pub fn info(&self) -> Result { - self.connections - .execute(|connection| connection.node_text(&redis::cmd("INFO"))) - } - - pub fn flushall(&self) -> Result<(), Error> { - self.connections.execute(|connection| connection.flushall()) - } -} - -impl RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - pub fn increment_with_floor( - &self, - key: &str, - amount: i64, - ttl: Duration, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(ttl); - self.connections - .execute(|connection| increment_with_floor(connection, key, amount, ttl)) - } - - pub async fn async_increment_pipeline( - &self, - operations: Vec, - ) -> Result, Error> { - let operations = operations - .into_iter() - .map(|operation| { - ( - self.namespaced_key(&operation.key), - operation.amount, - operation.ttl.map(Self::ttl_seconds), - ) - }) - .collect::>(); - if operations.is_empty() { - return Ok(Vec::new()); - } - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - let mut commands = Vec::with_capacity(operations.len() * 2); - let mut increments = Vec::with_capacity(operations.len()); - for (key, amount, ttl) in operations { - let mut increment = redis::cmd("INCRBYFLOAT"); - increment.arg(&key).arg(amount); - increments.push(commands.len()); - commands.push(increment); - if let Some(ttl) = ttl { - let mut expire = redis::cmd("EXPIRE"); - expire.arg(key).arg(ttl); - commands.push(expire); - } - } - let mut replies = connection.pipeline(commands)?; - increments - .into_iter() - .map(|index| { - redis::from_redis_value(std::mem::take(&mut replies[index])) - .map_err(|_| Error::Unavailable) - }) - .collect() - }) - .await - } - - pub async fn async_increment_with_floor( - &self, - key: &str, - amount: i64, - ttl: Duration, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(ttl); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - increment_with_floor(connection, key, amount, ttl) - }) - .await - } - - pub async fn async_set_max( - &self, - key: &str, - value: f64, - ttl: Option, - ) -> Result { - let key = self.namespaced_key(key); - let ttl = Self::ttl_seconds(ttl.unwrap_or(self.default_ttl)); - Connections::run_blocking(Arc::clone(&self.connections), move |connection| { - redis::cmd("EVAL") - .arg(SET_MAX_SCRIPT) - .arg(1) - .arg(key) - .arg(value) - .arg(ttl) - .query(connection) - .map_err(|_| Error::Unavailable) - }) - .await - } -} - -fn redis_bytes(value: redis::Value) -> Result, Error> { - match value { - redis::Value::BulkString(bytes) => Ok(bytes), - redis::Value::SimpleString(text) => Ok(text.into_bytes()), - _ => Err(Error::InvalidEntry), - } -} - -fn lpop_result(value: redis::Value, multiple: bool) -> Result { - match value { - redis::Value::Nil => Ok(RedisLpopResult::Missing), - redis::Value::Array(values) if multiple => values - .into_iter() - .map(redis_bytes) - .collect::, _>>() - .map(RedisLpopResult::Values), - value if !multiple => redis_bytes(value).map(RedisLpopResult::Value), - _ => Err(Error::InvalidEntry), - } -} - -fn count(value: redis::Value) -> Result, Error> { - match value { - redis::Value::Nil => Ok(None), - redis::Value::Int(value) => Ok(Some(value)), - redis::Value::BulkString(value) => std::str::from_utf8(&value) - .ok() - .and_then(|value| value.parse().ok()) - .map(Some) - .ok_or(Error::InvalidEntry), - redis::Value::SimpleString(value) => { - value.parse().map(Some).map_err(|_| Error::InvalidEntry) - } - _ => Err(Error::InvalidEntry), - } -} - -fn increment_with_floor( - connection: &mut ConnectionRef<'_>, - key: String, - amount: i64, - ttl: u64, -) -> Result { - redis::cmd("EVAL") - .arg(INCREMENT_WITH_FLOOR_SCRIPT) - .arg(1) - .arg(key) - .arg(amount) - .arg(ttl) - .query(connection) - .map_err(|_| Error::Unavailable) -} - -impl TtlCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - async fn async_get_ttl(&self, key: &str) -> Result, Error> { - RedisCache::async_get_ttl(self, key) - .await - .map(|ttl| ttl.map(|seconds| Duration::from_secs(seconds as u64))) - } -} - -impl ScanCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - async fn async_scan_iter(&self, pattern: &str, count: usize) -> Result, Error> { - RedisCache::async_scan_iter(self, pattern, count).await - } -} - -impl ClientInfoCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - type ClientList = String; - type Info = String; - - fn client_list(&self) -> Result { - RedisCache::client_list(self) - } - - fn info(&self) -> Result { - RedisCache::info(self) - } -} - -impl SetCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - type SetValue = RedisArg; - type SetResult = usize; - - async fn async_set_cache_sadd( - &self, - key: &str, - values: Vec, - ttl: Option, - ) -> Result { - RedisCache::async_set_cache_sadd(self, key, values, ttl).await - } -} - -impl QueueCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - type QueueValue = RedisArg; - type PopResult = RedisLpopResult; - - async fn async_rpush(&self, key: &str, values: Vec) -> Result { - RedisCache::async_rpush(self, key, values).await - } - - async fn async_lpop(&self, key: &str, count: Option) -> Result { - RedisCache::async_lpop(self, key, count).await - } -} - -impl ScriptCache for RedisCache -where - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - type Script = RedisScript; - - fn async_register_script(&self, source: String) -> Self::Script { - RedisScript { - connections: Arc::clone(&self.connections), - namespace: self.namespace.clone(), - source, - } - } -} diff --git a/litellm-rust/crates/cache-redis/src/claim.rs b/litellm-rust/crates/cache-redis/src/claim.rs new file mode 100644 index 00000000000..e4cbe8c8d5c --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/claim.rs @@ -0,0 +1,105 @@ +use litellm_cache::{CacheCodec, ClaimCache, Error, ExactCacheContext}; +use redis::Commands; + +use crate::{cache::RedisCache, connection::ConnectionRef}; + +const CLAIM_SCRIPT: &str = concat!( + "local current = redis.call('GET', KEYS[1]); ", + "if ARGV[1] == '' then if current ~= false and current ~= '' then return 0; end; ", + "elseif current ~= ARGV[1] then return 0; end; ", + "if ARGV[3] ~= '' then redis.call('SET', KEYS[1], ARGV[3], 'EX', ARGV[2]); ", + "elseif ARGV[4] == '1' then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return 1" +); +const CLAIM_ATTEMPTS: usize = 8; + +fn stored_bytes(value: redis::Value) -> Result>, Error> { + match value { + redis::Value::Nil => Ok(None), + redis::Value::BulkString(bytes) => Ok(Some(bytes)), + redis::Value::SimpleString(text) => Ok(Some(text.into_bytes())), + _ => Err(Error::InvalidEntry), + } +} + +/// Eligibility is decided on decoded values, so a pin written by another encoder (Python's +/// `json.dumps` spacing or key order) still matches. The write is a compare-and-set on the +/// bytes that decision was made on, retried when another claimant wins the race. +fn claim( + connection: &mut ConnectionRef<'_>, + codec: &S, + key: &str, + candidate: S::Value, + eligible: &[S::Value], + ttl: u64, +) -> Result +where + S::Value: PartialEq, +{ + let payload = codec.encode(&candidate)?; + if payload.is_empty() { + return Err(Error::InvalidEntry); + } + for _ in 0..CLAIM_ATTEMPTS { + let current = stored_bytes( + connection + .get::<_, redis::Value>(key) + .map_err(|_| Error::Unavailable)?, + )? + .filter(|bytes| !bytes.is_empty()); + let existing = current + .as_deref() + .and_then(|bytes| codec.decode(bytes).ok()) + .filter(|existing| eligible.is_empty() || eligible.contains(existing)); + let refresh = existing + .as_ref() + .is_some_and(|existing| !eligible.is_empty() || *existing == candidate); + let write: &[u8] = if existing.is_some() { b"" } else { &payload }; + let applied = redis::cmd("EVAL") + .arg(CLAIM_SCRIPT) + .arg(1) + .arg(key) + .arg(current.as_deref().unwrap_or_default()) + .arg(ttl) + .arg(write) + .arg(u8::from(refresh)) + .query::(connection) + .map_err(|_| Error::Unavailable)?; + if applied { + return Ok(existing.unwrap_or(candidate)); + } + } + Err(Error::Unavailable) +} + +impl ClaimCache for RedisCache +where + S: CacheCodec + Clone + 'static, + S::Value: PartialEq, + C: redis::ConnectionLike + Send + 'static, +{ + fn claim_cache( + &self, + key: &str, + candidate: S::Value, + eligible: &[S::Value], + context: ExactCacheContext, + ) -> Result { + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(context.ttl); + self.execute(|connection| claim(connection, &self.codec, &key, candidate, eligible, ttl)) + } + + async fn async_claim_cache( + &self, + key: &str, + candidate: S::Value, + eligible: Vec, + context: ExactCacheContext, + ) -> Result { + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(context.ttl); + let codec = self.codec.clone(); + self.run(move |connection| claim(connection, &codec, &key, candidate, &eligible, ttl)) + .await + } +} diff --git a/litellm-rust/crates/cache-redis/src/cache/connection.rs b/litellm-rust/crates/cache-redis/src/connection.rs similarity index 65% rename from litellm-rust/crates/cache-redis/src/cache/connection.rs rename to litellm-rust/crates/cache-redis/src/connection.rs index 013bf055f89..2f58e2a9b80 100644 --- a/litellm-rust/crates/cache-redis/src/cache/connection.rs +++ b/litellm-rust/crates/cache-redis/src/connection.rs @@ -1,29 +1,126 @@ -use std::collections::HashMap; +use std::{ + sync::{Arc, Mutex}, + time::Duration, +}; use litellm_cache::Error; use redis::{ - ConnectionAddr, ConnectionInfo, ConnectionLike, IntoConnectionInfo, - cluster::{ClusterClient, ClusterClientBuilder, ClusterConnection, NodeAddress}, + ConnectionAddr, ConnectionInfo, IntoConnectionInfo, + cluster::{ + ClusterClient, ClusterClientBuilder, ClusterConnection, ClusterPipeline, NodeAddress, + }, cluster_routing::{ - MultipleNodeRoutingInfo, ResponsePolicy, RoutingInfo, SingleNodeRoutingInfo, Slot, + MultipleNodeRoutingInfo, ResponsePolicy, RoutingInfo, SingleNodeRoutingInfo, }, }; -use super::REDIS_TIMEOUT; -use crate::topology::RedisNode; +use crate::topology::{RedisNode, RedisTopology}; -pub struct PooledConnection { - pub(super) connection: C, - pub(super) failed: bool, +pub(crate) const REDIS_TIMEOUT: Duration = Duration::from_secs(5); +const REDIS_POOL_SIZE: u32 = 16; + +#[allow(private_interfaces)] +pub enum Connections { + Pool(r2d2::Pool), + Cluster(r2d2::Pool), + Fixed(Mutex), +} + +impl Connections +where + C: redis::ConnectionLike + Send + 'static, +{ + pub fn execute( + &self, + operation: impl FnOnce(&mut ConnectionRef<'_>) -> Result, + ) -> Result { + match self { + Self::Pool(pool) => { + let mut pooled = pool.get().map_err(|_| Error::Unavailable)?; + let result = operation(&mut ConnectionRef::Node(&mut pooled.connection)); + pooled.failed = matches!(result, Err(Error::Unavailable)); + result + } + Self::Cluster(pool) => { + let mut pooled = pool.get().map_err(|_| Error::Unavailable)?; + let result = operation(&mut ConnectionRef::Cluster(&mut pooled.connection)); + pooled.failed = matches!(result, Err(Error::Unavailable)); + result + } + Self::Fixed(connection) => { + let mut connection = connection.lock().map_err(|_| Error::Unavailable)?; + operation(&mut ConnectionRef::Node(&mut *connection)) + } + } + } + + pub async fn run_blocking(connections: Arc, operation: F) -> Result + where + T: Send + 'static, + F: FnOnce(&mut ConnectionRef<'_>) -> Result + Send + 'static, + { + tokio::task::spawn_blocking(move || connections.execute(operation)) + .await + .map_err(|_| Error::Unavailable)? + } + + pub fn fixed(connection: C) -> Self { + Self::Fixed(Mutex::new(connection)) + } + + pub fn open(url: &str, topology: &RedisTopology) -> Result { + match topology { + RedisTopology::Standalone => Ok(Self::Pool(pool(ConnectionManager::open(url)?)?)), + RedisTopology::Cluster { startup_nodes } => Ok(Self::Cluster(pool( + ClusterConnectionManager::open(url, startup_nodes)?, + )?)), + } + } + + /// Closes every idle pooled connection; the next operation opens a fresh one. Connections + /// checked out right now return to the pool, and a caller-owned connection stays open. + pub fn disconnect(&self) { + match self { + Self::Pool(pool) => close_idle(pool), + Self::Cluster(pool) => close_idle(pool), + Self::Fixed(_) => {} + } + } +} + +fn pool(manager: M) -> Result, Error> { + r2d2::Pool::builder() + .max_size(REDIS_POOL_SIZE) + .min_idle(Some(0)) + .connection_timeout(REDIS_TIMEOUT) + .test_on_check_out(false) + .build(manager) + .map_err(|_| Error::Unavailable) +} + +fn close_idle(pool: &r2d2::Pool) +where + M: r2d2::ManageConnection>, +{ + let mut idle = Vec::new(); + while let Some(mut connection) = pool.try_get() { + connection.failed = true; + idle.push(connection); + } +} + +pub(crate) struct PooledConnection { + connection: C, + failed: bool, } /// Pools connections without a checkout PING, which would double every operation's round trips. /// A timed-out command leaves its reply on the socket while redis still reports the connection /// open, so any connection whose operation failed is discarded instead of being reused. -pub struct ConnectionManager(redis::Client); +pub(crate) struct ConnectionManager(redis::Client); impl ConnectionManager { - pub(super) fn open(url: &str) -> Result { + fn open(url: &str) -> Result { redis::Client::open(url) .map(Self) .map_err(|_| Error::Unavailable) @@ -54,10 +151,10 @@ impl r2d2::ManageConnection for ConnectionManager { } } -pub struct ClusterConnectionManager(ClusterClient); +pub(crate) struct ClusterConnectionManager(ClusterClient); impl ClusterConnectionManager { - pub(super) fn open(url: &str, startup_nodes: &[RedisNode]) -> Result { + fn open(url: &str, startup_nodes: &[RedisNode]) -> Result { if startup_nodes.is_empty() { return Err(Error::Unavailable); } @@ -172,43 +269,36 @@ impl redis::ConnectionLike for ConnectionRef<'_> { } impl ConnectionRef<'_> { - pub(crate) fn pipeline( + /// Runs `pipeline` and decodes its non-ignored replies as `T`. A cluster connection refuses + /// `Pipeline::query`, so there a transaction goes to its keys' slot as one MULTI/EXEC and + /// anything else is split per node by `ClusterPipeline`; either way the raw replies are + /// handed back to `pipeline` to decode. + pub(crate) fn query_pipeline( &mut self, - commands: Vec, - ) -> Result, Error> { + pipeline: &redis::Pipeline, + ) -> Result { match self { - Self::Node(connection) => { - let mut pipeline = redis::pipe(); - for command in &commands { - pipeline.add_command(command.clone()); - } - pipeline - .query::>(*connection) - .map_err(|_| Error::Unavailable) + Self::Node(connection) => pipeline.query(*connection), + Self::Cluster(connection) if pipeline.is_transaction() => { + redis::ConnectionLike::req_packed_commands( + *connection, + &pipeline.get_packed_pipeline(), + pipeline.len() + 1, + 1, + ) + .and_then(|replies| pipeline.query(&mut Replies(Some(replies)))) } Self::Cluster(connection) => { - let mut replies: Vec> = vec![None; commands.len()]; - for indices in slot_groups(&commands).into_values() { - let mut pipeline = redis::pipe(); - for index in &indices { - pipeline.add_command(commands[*index].clone()); - } - let values = connection - .req_packed_commands(&pipeline.get_packed_pipeline(), 0, indices.len()) - .map_err(|_| Error::Unavailable)?; - if values.len() != indices.len() { - return Err(Error::Unavailable); - } - for (index, value) in indices.into_iter().zip(values) { - replies[index] = Some(value); - } + let mut cluster = ClusterPipeline::with_capacity(pipeline.len()); + for command in pipeline.cmd_iter() { + cluster.add_command(command.clone()); } - replies - .into_iter() - .collect::>>() - .ok_or(Error::Unavailable) + cluster + .query(connection) + .and_then(|replies| pipeline.query(&mut Replies(Some(replies)))) } } + .map_err(|_| Error::Unavailable) } pub(crate) fn scan( @@ -379,14 +469,35 @@ fn scan_command(cursor: u64, pattern: &str, count: usize) -> redis::Cmd { command } -fn slot_groups(commands: &[redis::Cmd]) -> HashMap> { - let mut groups: HashMap> = HashMap::new(); - for (index, command) in commands.iter().enumerate() { - let key = match command.args_iter().nth(1) { - Some(redis::Arg::Simple(key)) => key, - _ => b"", - }; - groups.entry(Slot::for_key(key)).or_default().push(index); +/// Hands already received pipeline replies to `Pipeline::query`, so it applies its own +/// ignore and error handling to replies a cluster pipeline gathered from several nodes. +struct Replies(Option>); + +impl redis::ConnectionLike for Replies { + fn req_packed_command(&mut self, _: &[u8]) -> redis::RedisResult { + Err((redis::ErrorKind::Client, "replies hold a pipeline only").into()) + } + + fn req_packed_commands( + &mut self, + _: &[u8], + _: usize, + _: usize, + ) -> redis::RedisResult> { + self.0 + .take() + .ok_or_else(|| (redis::ErrorKind::Client, "replies were already read").into()) + } + + fn get_db(&self) -> i64 { + 0 + } + + fn check_connection(&mut self) -> bool { + true + } + + fn is_open(&self) -> bool { + true } - groups } diff --git a/litellm-rust/crates/cache-redis/src/counter.rs b/litellm-rust/crates/cache-redis/src/counter.rs new file mode 100644 index 00000000000..adcd597b2f4 --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/counter.rs @@ -0,0 +1,205 @@ +use std::time::Duration; + +use litellm_cache::{ + BoundedCounterCache, CacheCodec, CountReadCache, CounterCache, Error, ExactCacheContext, + IncrementOperation, +}; + +use crate::{ + cache::{RedisCache, ttl_seconds}, + connection::ConnectionRef, + store::mget, +}; + +const INCREMENT_SCRIPT: &str = concat!( + "local value = redis.call('INCRBYFLOAT', KEYS[1], ARGV[1]); ", + "if redis.call('TTL', KEYS[1]) == -1 then ", + "redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return value" +); +const INCREMENT_WITH_FLOOR_SCRIPT: &str = concat!( + "local count = redis.call('INCRBY', KEYS[1], ARGV[1]); ", + "if count < 0 then count = redis.call('INCRBY', KEYS[1], -count); end; ", + "if redis.call('TTL', KEYS[1]) < 0 then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; ", + "return count" +); +const SET_MAX_SCRIPT: &str = concat!( + "local current = redis.call('GET', KEYS[1]); ", + "if current == false or tonumber(current) < tonumber(ARGV[1]) then ", + "redis.call('SET', KEYS[1], ARGV[1]); ", + "if tonumber(ARGV[2]) > 0 then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; ", + "return ARGV[1]; end; return current" +); + +impl CounterCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn increment_cache( + &self, + key: &str, + amount: f64, + context: ExactCacheContext, + ) -> Result { + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(context.ttl); + self.execute(|connection| increment(connection, key, amount, ttl, false)) + } + + /// Python `_incrbyfloat_with_ttl`: without `refresh_ttl` the TTL is set only on a key that + /// has none, in one atomic script; with it, every increment re-arms the TTL. + async fn async_increment( + &self, + key: &str, + amount: f64, + context: ExactCacheContext, + refresh_ttl: bool, + ) -> Result { + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(context.ttl); + self.run(move |connection| increment(connection, key, amount, ttl, refresh_ttl)) + .await + } + + async fn async_increment_pipeline( + &self, + operations: Vec, + ) -> Result, Error> { + if operations.is_empty() { + return Ok(Vec::new()); + } + let mut pipeline = redis::pipe(); + for operation in operations { + let key = self.namespaced_key(&operation.key); + pipeline.cmd("INCRBYFLOAT").arg(&key).arg(operation.amount); + if let Some(ttl) = operation.ttl { + pipeline + .cmd("EXPIRE") + .arg(key) + .arg(ttl_seconds(ttl)) + .ignore(); + } + } + self.run(move |connection| connection.query_pipeline(&pipeline)) + .await + } +} + +fn increment( + connection: &mut ConnectionRef<'_>, + key: String, + amount: f64, + ttl: u64, + refresh_ttl: bool, +) -> Result { + if !refresh_ttl { + return redis::cmd("EVAL") + .arg(INCREMENT_SCRIPT) + .arg(1) + .arg(key) + .arg(amount) + .arg(ttl) + .query(connection) + .map_err(|_| Error::Unavailable); + } + connection + .query_pipeline( + redis::pipe() + .cmd("INCRBYFLOAT") + .arg(&key) + .arg(amount) + .cmd("EXPIRE") + .arg(&key) + .arg(ttl) + .ignore(), + ) + .map(|(value,)| value) +} + +impl CountReadCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn batch_get_counts(&self, keys: &[String]) -> Result>, Error> { + let keys = self.namespaced_keys(keys); + self.execute(|connection| mget(connection, keys))? + .into_iter() + .map(count) + .collect() + } + + async fn async_batch_get_counts(&self, keys: Vec) -> Result>, Error> { + let keys = self.namespaced_keys(&keys); + self.run(move |connection| mget(connection, keys)) + .await? + .into_iter() + .map(count) + .collect() + } +} + +fn count(value: redis::Value) -> Result, Error> { + redis::from_redis_value(value).map_err(|_| Error::InvalidEntry) +} + +impl BoundedCounterCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn increment_with_floor(&self, key: &str, amount: i64, ttl: Duration) -> Result { + let key = self.namespaced_key(key); + let ttl = ttl_seconds(ttl); + self.execute(|connection| increment_with_floor(connection, key, amount, ttl)) + } + + async fn async_increment_with_floor( + &self, + key: &str, + amount: i64, + ttl: Duration, + ) -> Result { + let key = self.namespaced_key(key); + let ttl = ttl_seconds(ttl); + self.run(move |connection| increment_with_floor(connection, key, amount, ttl)) + .await + } + + async fn async_set_max( + &self, + key: &str, + value: f64, + ttl: Option, + ) -> Result { + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(ttl); + self.run(move |connection| { + redis::cmd("EVAL") + .arg(SET_MAX_SCRIPT) + .arg(1) + .arg(key) + .arg(value) + .arg(ttl) + .query(connection) + .map_err(|_| Error::Unavailable) + }) + .await + } +} + +fn increment_with_floor( + connection: &mut ConnectionRef<'_>, + key: String, + amount: i64, + ttl: u64, +) -> Result { + redis::cmd("EVAL") + .arg(INCREMENT_WITH_FLOOR_SCRIPT) + .arg(1) + .arg(key) + .arg(amount) + .arg(ttl) + .query(connection) + .map_err(|_| Error::Unavailable) +} diff --git a/litellm-rust/crates/cache-redis/src/keys.rs b/litellm-rust/crates/cache-redis/src/keys.rs new file mode 100644 index 00000000000..b9d7bb20ff3 --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/keys.rs @@ -0,0 +1,63 @@ +use std::time::Duration; + +use litellm_cache::{CacheCodec, Error, RefreshTtlCache, ScanCache, TtlCache}; + +use crate::cache::RedisCache; + +impl TtlCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + async fn async_get_ttl(&self, key: &str) -> Result, Error> { + let key = self.namespaced_key(key); + let ttl = self + .run(move |connection| { + redis::cmd("TTL") + .arg(key) + .query::(connection) + .map_err(|_| Error::Unavailable) + }) + .await?; + Ok(u64::try_from(ttl).ok().map(Duration::from_secs)) + } +} + +impl RefreshTtlCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + async fn async_refresh_ttl(&self, key: &str, ttl: Option) -> Result { + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(ttl); + self.run(move |connection| { + redis::cmd("EXPIRE") + .arg(key) + .arg(ttl) + .query(connection) + .map_err(|_| Error::Unavailable) + }) + .await + } +} + +impl ScanCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + async fn async_scan_iter(&self, pattern: &str, count: usize) -> Result, Error> { + let pattern = format!("{}*", self.namespaced_key(pattern)); + self.run(move |connection| { + let mut matches = Vec::new(); + connection.scan(&pattern, count, |_, keys| { + matches.extend(keys); + Ok(matches.len() < count) + })?; + matches.truncate(count); + Ok(matches) + }) + .await + } +} diff --git a/litellm-rust/crates/cache-redis/src/lib.rs b/litellm-rust/crates/cache-redis/src/lib.rs index efb0db931ac..037e39e5d40 100644 --- a/litellm-rust/crates/cache-redis/src/lib.rs +++ b/litellm-rust/crates/cache-redis/src/lib.rs @@ -1,11 +1,15 @@ mod cache; +mod claim; +pub mod connection; +mod counter; +mod keys; +mod lifecycle; +mod queue; +mod script; +mod store; mod topology; -pub mod connection { - pub use crate::cache::{ConnectionRef, Connections}; -} - -pub use cache::{ - RedisArg, RedisCache, RedisLpopOperation, RedisLpopResult, RedisRpushOperation, RedisScript, -}; +pub use cache::RedisCache; +pub use queue::{RedisLpopOperation, RedisLpopResult, RedisRpushOperation}; +pub use script::{RedisArg, RedisScript}; pub use topology::{RedisNode, RedisTopology}; diff --git a/litellm-rust/crates/cache-redis/src/lifecycle.rs b/litellm-rust/crates/cache-redis/src/lifecycle.rs new file mode 100644 index 00000000000..6ab8c31509e --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/lifecycle.rs @@ -0,0 +1,85 @@ +use litellm_cache::{ + CacheCodec, CacheConnectionResult, CacheConnectionStatus, ClientInfoCache, ConnectionCache, + DisconnectCache, Error, PingCache, +}; + +use crate::{cache::RedisCache, topology::RedisTopology}; + +impl PingCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn sync_ping(&self) -> Result { + self.execute(|connection| connection.ping().map_err(|_| Error::Unavailable)) + } + + async fn ping(&self) -> Result { + self.run(|connection| connection.ping().map_err(|_| Error::Unavailable)) + .await + } +} + +impl ConnectionCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + /// Python `RedisCache.test_connection`, or `RedisClusterCache.test_connection` for a + /// cluster topology, which differs only in its messages. + async fn test_connection(&self) -> Result { + let label = match self.topology { + RedisTopology::Standalone => "Redis", + RedisTopology::Cluster { .. } => "Redis Cluster", + }; + let ping = self + .run(|connection| Ok(connection.ping().map_err(|error| error.to_string()))) + .await + .unwrap_or_else(|error| Err(error.to_string())); + Ok(match ping { + Ok(true) => CacheConnectionResult { + status: CacheConnectionStatus::Success, + message: format!("{label} connection test successful"), + error: None, + }, + Ok(false) => CacheConnectionResult { + status: CacheConnectionStatus::Failed, + message: format!("{label} ping returned False"), + error: None, + }, + Err(error) => CacheConnectionResult { + status: CacheConnectionStatus::Failed, + message: format!("{label} connection failed: {error}"), + error: Some(error), + }, + }) + } +} + +impl DisconnectCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + async fn disconnect(&self) -> Result<(), Error> { + self.connections.disconnect(); + Ok(()) + } +} + +impl ClientInfoCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + type ClientList = String; + type Info = String; + + fn client_list(&self) -> Result { + self.execute(|connection| connection.node_text(redis::cmd("CLIENT").arg("LIST"))) + } + + fn info(&self) -> Result { + self.execute(|connection| connection.node_text(&redis::cmd("INFO"))) + } +} diff --git a/litellm-rust/crates/cache-redis/src/queue.rs b/litellm-rust/crates/cache-redis/src/queue.rs new file mode 100644 index 00000000000..623bce23640 --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/queue.rs @@ -0,0 +1,226 @@ +use std::time::Duration; + +use litellm_cache::{CacheCodec, Error, PopOperation, PushOperation, QueueCache, SetCache}; + +use crate::{cache::RedisCache, script::RedisArg}; + +pub type RedisRpushOperation = PushOperation; +pub type RedisLpopOperation = PopOperation; + +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum RedisLpopResult { + Missing, + Value(Vec), + Values(Vec>), +} + +impl SetCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + type SetValue = RedisArg; + type SetResult = usize; + + async fn async_set_cache_sadd( + &self, + key: &str, + values: Vec, + ttl: Option, + ) -> Result { + if values.is_empty() { + return Err(Error::InvalidEntry); + } + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(ttl); + let mut pipeline = redis::pipe(); + pipeline + .cmd("SADD") + .arg(&key) + .arg(values) + .cmd("EXPIRE") + .arg(&key) + .arg(ttl) + .ignore(); + self.run(move |connection| connection.query_pipeline(&pipeline)) + .await + .map(|(added,)| added) + } +} + +impl QueueCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + type QueueValue = RedisArg; + type PopResult = RedisLpopResult; + + async fn async_rpush(&self, key: &str, values: Vec) -> Result { + if values.is_empty() { + return Err(Error::InvalidEntry); + } + let key = self.namespaced_key(key); + self.run(move |connection| { + redis::cmd("RPUSH") + .arg(key) + .arg(values) + .query(connection) + .map_err(|_| Error::Unavailable) + }) + .await + } + + async fn async_rpush_and_trim( + &self, + key: &str, + values: Vec, + max_len: usize, + ) -> Result { + if values.is_empty() { + return Err(Error::InvalidEntry); + } + let key = self.namespaced_key(key); + let start = i64::try_from(max_len).map_or(i64::MIN, |max_len| -max_len); + let mut pipeline = redis::pipe(); + pipeline + .atomic() + .cmd("RPUSH") + .arg(&key) + .arg(values) + .cmd("LTRIM") + .arg(&key) + .arg(start) + .arg(-1) + .ignore(); + self.run(move |connection| connection.query_pipeline(&pipeline)) + .await + .map(|(length,)| length) + } + + async fn async_rpush_pipeline( + &self, + operations: Vec, + ) -> Result, Error> { + if operations.is_empty() { + return Ok(Vec::new()); + } + let mut pipeline = redis::pipe(); + for operation in operations { + if operation.values.is_empty() { + return Err(Error::InvalidEntry); + } + pipeline + .cmd("RPUSH") + .arg(self.namespaced_key(&operation.key)) + .arg(operation.values); + } + self.run(move |connection| connection.query_pipeline(&pipeline)) + .await + } + + async fn async_lpop(&self, key: &str, count: Option) -> Result { + if let Some(count) = count + && self.major_version().await < 7 + { + return self.lpop_one_at_a_time(key, count).await; + } + let command = lpop(self.namespaced_key(key), count); + let value = self + .run(move |connection| { + command + .query::(connection) + .map_err(|_| Error::Unavailable) + }) + .await?; + lpop_result(value, count.is_some()) + } + + async fn async_lpop_pipeline( + &self, + operations: Vec, + ) -> Result, Error> { + if operations.is_empty() { + return Ok(Vec::new()); + } + if operations.iter().any(|operation| operation.count.is_some()) + && self.major_version().await < 7 + { + let mut results = Vec::with_capacity(operations.len()); + for operation in &operations { + results.push(self.async_lpop(&operation.key, operation.count).await?); + } + return Ok(results); + } + let multiple = operations + .iter() + .map(|operation| operation.count.is_some()) + .collect::>(); + let mut pipeline = redis::pipe(); + for operation in operations { + pipeline.add_command(lpop(self.namespaced_key(&operation.key), operation.count)); + } + self.run(move |connection| connection.query_pipeline::>(&pipeline)) + .await? + .into_iter() + .zip(multiple) + .map(|(value, multiple)| lpop_result(value, multiple)) + .collect() + } +} + +fn lpop(key: String, count: Option) -> redis::Cmd { + let mut command = redis::cmd("LPOP"); + command.arg(key); + if let Some(count) = count { + command.arg(count); + } + command +} + +fn redis_bytes(value: redis::Value) -> Result, Error> { + match value { + redis::Value::BulkString(bytes) => Ok(bytes), + redis::Value::SimpleString(text) => Ok(text.into_bytes()), + _ => Err(Error::InvalidEntry), + } +} + +impl RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + /// `handle_lpop_count_for_older_redis_versions`: `count` single-`LPOP` pipelines, keeping + /// only the values actually popped. + async fn lpop_one_at_a_time(&self, key: &str, count: usize) -> Result { + let key = self.namespaced_key(key); + let mut values = Vec::new(); + for _ in 0..count { + let mut pipeline = redis::pipe(); + pipeline.add_command(lpop(key.clone(), None)); + let replies = self + .run(move |connection| connection.query_pipeline::>(&pipeline)) + .await?; + for reply in replies { + if reply != redis::Value::Nil { + values.push(redis_bytes(reply)?); + } + } + } + Ok(RedisLpopResult::Values(values)) + } +} + +fn lpop_result(value: redis::Value, multiple: bool) -> Result { + match value { + redis::Value::Nil => Ok(RedisLpopResult::Missing), + redis::Value::Array(values) if multiple => values + .into_iter() + .map(redis_bytes) + .collect::, _>>() + .map(RedisLpopResult::Values), + value if !multiple => redis_bytes(value).map(RedisLpopResult::Value), + _ => Err(Error::InvalidEntry), + } +} diff --git a/litellm-rust/crates/cache-redis/src/script.rs b/litellm-rust/crates/cache-redis/src/script.rs new file mode 100644 index 00000000000..e8a16bcc2b5 --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/script.rs @@ -0,0 +1,136 @@ +use std::sync::Arc; + +use litellm_cache::{CacheCodec, CacheScript, Error, ScriptCache}; + +use crate::{ + cache::{RedisCache, namespaced_key}, + connection::Connections, +}; + +#[derive(Clone, Debug, PartialEq)] +pub enum RedisArg { + Bytes(Vec), + Integer(i64), + Float(f64), +} + +impl From<&str> for RedisArg { + fn from(value: &str) -> Self { + Self::Bytes(value.as_bytes().to_vec()) + } +} + +impl From for RedisArg { + fn from(value: String) -> Self { + Self::Bytes(value.into_bytes()) + } +} + +impl From> for RedisArg { + fn from(value: Vec) -> Self { + Self::Bytes(value) + } +} + +impl From for RedisArg { + fn from(value: i64) -> Self { + Self::Integer(value) + } +} + +impl From for RedisArg { + fn from(value: f64) -> Self { + Self::Float(value) + } +} + +impl redis::ToRedisArgs for RedisArg { + fn write_redis_args(&self, out: &mut W) + where + W: ?Sized + redis::RedisWrite, + { + match self { + Self::Bytes(value) => value.write_redis_args(out), + Self::Integer(value) => value.write_redis_args(out), + Self::Float(value) => value.write_redis_args(out), + } + } +} + +pub struct RedisScript { + connections: Arc>, + namespace: Option, + source: String, +} + +impl CacheScript for RedisScript +where + C: redis::ConnectionLike + Send + 'static, +{ + type Argument = RedisArg; + type Output = redis::Value; + + async fn invoke( + &self, + keys: Vec, + arguments: Vec, + ) -> Result { + let keys = keys + .into_iter() + .map(|key| namespaced_key(self.namespace.as_deref(), &key)) + .collect::>(); + let source = self.source.clone(); + Connections::run_blocking(Arc::clone(&self.connections), move |connection| { + eval(connection, &source, keys, arguments) + }) + .await + } +} + +impl RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + pub async fn async_eval( + &self, + script: String, + keys: Vec, + arguments: Vec, + ) -> Result { + let keys = self.namespaced_keys(&keys); + self.run(move |connection| eval(connection, &script, keys, arguments)) + .await + } +} + +fn eval( + connection: &mut impl redis::ConnectionLike, + script: &str, + keys: Vec, + arguments: Vec, +) -> Result { + redis::cmd("EVAL") + .arg(script) + .arg(keys.len()) + .arg(keys) + .arg(arguments) + .query(connection) + .map_err(|_| Error::Unavailable) +} + +impl ScriptCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + type Script = RedisScript; + + fn async_register_script(&self, source: String) -> Self::Script { + RedisScript { + connections: Arc::clone(&self.connections), + namespace: self.namespace.clone(), + source, + } + } +} diff --git a/litellm-rust/crates/cache-redis/src/store.rs b/litellm-rust/crates/cache-redis/src/store.rs new file mode 100644 index 00000000000..111d481ad02 --- /dev/null +++ b/litellm-rust/crates/cache-redis/src/store.rs @@ -0,0 +1,232 @@ +use std::time::Duration; + +use litellm_cache::{ + BaseCache, BatchCache, BatchEntry, BulkDeleteCache, CacheCodec, DeleteCache, Error, + ExactCacheContext, FlushAllCache, FlushCache, TtlPipelineCache, +}; +use redis::Commands; + +use crate::{cache::RedisCache, connection::ConnectionRef}; + +impl BaseCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + type Value = S::Value; + type Context = ExactCacheContext; + + fn get_ttl(&self, context: &Self::Context) -> Option { + context.ttl.or(Some(self.default_ttl)) + } + + fn set_cache( + &self, + key: &str, + value: Self::Value, + context: &ExactCacheContext, + ) -> Result<(), Error> { + let payload = self.codec.encode(&value)?; + let ttl = self.ttl_or_default(context.ttl); + let key = self.namespaced_key(key); + self.execute(|connection| { + connection + .set_ex::<_, _, ()>(key, payload, ttl) + .map_err(|_| Error::Unavailable) + }) + } + + fn get_cache(&self, key: &str, _: &ExactCacheContext) -> Result, Error> { + let key = self.namespaced_key(key); + let value = self.execute(|connection| { + connection + .get::<_, redis::Value>(key) + .map_err(|_| Error::Unavailable) + })?; + self.decode_response(value) + } + + async fn async_set_cache( + &self, + key: &str, + value: Self::Value, + context: ExactCacheContext, + ) -> Result<(), Error> { + let payload = self.codec.encode(&value)?; + let key = self.namespaced_key(key); + let ttl = self.ttl_or_default(context.ttl); + self.run(move |connection| { + connection + .set_ex::<_, _, ()>(key, payload, ttl) + .map_err(|_| Error::Unavailable) + }) + .await + } + + async fn async_get_cache( + &self, + key: &str, + _: &ExactCacheContext, + ) -> Result, Error> { + let key = self.namespaced_key(key); + let value = self + .run(move |connection| { + connection + .get::<_, redis::Value>(key) + .map_err(|_| Error::Unavailable) + }) + .await?; + self.decode_response(value) + } + + async fn async_set_cache_pipeline( + &self, + cache_list: Vec<(String, Self::Value)>, + context: ExactCacheContext, + ) -> Result<(), Error> { + self.async_set_cache_pipeline_with_ttls( + cache_list + .into_iter() + .map(|(key, value)| (key, value, context.ttl)) + .collect(), + ) + .await + } +} + +impl TtlPipelineCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + async fn async_set_cache_pipeline_with_ttls( + &self, + entries: Vec<(String, Self::Value, Option)>, + ) -> Result<(), Error> { + if entries.is_empty() { + return Ok(()); + } + let mut pipeline = redis::pipe(); + for (key, value, ttl) in entries { + pipeline + .cmd("SETEX") + .arg(self.namespaced_key(&key)) + .arg(self.ttl_or_default(ttl)) + .arg(self.codec.encode(&value)?) + .ignore(); + } + self.run(move |connection| connection.query_pipeline(&pipeline)) + .await + } +} + +impl BatchCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn batch_get_cache( + &self, + keys: &[String], + _: &ExactCacheContext, + ) -> Result>, Error> { + let keys = self.namespaced_keys(keys); + self.execute(|connection| mget(connection, keys))? + .into_iter() + .map(|value| self.decode_batch_response(value)) + .collect() + } + + async fn async_batch_get_cache( + &self, + keys: Vec, + _: ExactCacheContext, + ) -> Result>, Error> { + let keys = self.namespaced_keys(&keys); + self.run(move |connection| mget(connection, keys)) + .await? + .into_iter() + .map(|value| self.decode_batch_response(value)) + .collect() + } +} + +pub(crate) fn mget( + connection: &mut ConnectionRef<'_>, + keys: Vec, +) -> Result, Error> { + redis::cmd("MGET") + .arg(keys) + .query(connection) + .map_err(|_| Error::Unavailable) +} + +impl DeleteCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn delete_cache(&self, key: &str) -> Result<(), Error> { + let key = self.namespaced_key(key); + self.execute(|connection| connection.del::<_, ()>(key).map_err(|_| Error::Unavailable)) + } + + async fn async_delete_cache(&self, key: &str) -> Result<(), Error> { + let key = self.namespaced_key(key); + self.run(move |connection| connection.del::<_, ()>(key).map_err(|_| Error::Unavailable)) + .await + } +} + +impl BulkDeleteCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + async fn delete_cache_keys(&self, keys: Vec) -> Result { + if keys.is_empty() { + return Ok(0); + } + let keys = self.namespaced_keys(&keys); + self.run(move |connection| connection.del(keys).map_err(|_| Error::Unavailable)) + .await + } +} + +impl FlushCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn flush_cache(&self) -> Result<(), Error> { + let pattern = self.namespaced_pattern()?; + self.execute(|connection| flush_matching(connection, &pattern)) + } + + async fn async_flush_cache(&self) -> Result<(), Error> { + let pattern = self.namespaced_pattern()?; + self.run(move |connection| flush_matching(connection, &pattern)) + .await + } +} + +impl FlushAllCache for RedisCache +where + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn flushall(&self) -> Result<(), Error> { + self.execute(|connection| connection.flushall()) + } +} + +fn flush_matching(connection: &mut ConnectionRef<'_>, pattern: &str) -> Result<(), Error> { + connection.scan(pattern, 1000, |connection, keys| { + if !keys.is_empty() { + connection + .del::<_, usize>(keys) + .map_err(|_| Error::Unavailable)?; + } + Ok(true) + }) +} diff --git a/litellm-rust/crates/cache-redis/tests/cache.rs b/litellm-rust/crates/cache-redis/tests/cache.rs index 337f27984f8..70baeffd572 100644 --- a/litellm-rust/crates/cache-redis/tests/cache.rs +++ b/litellm-rust/crates/cache-redis/tests/cache.rs @@ -1,43 +1,84 @@ +mod support; + use std::time::Duration; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheCodec, CacheConnectionStatus, CacheScript, ClaimCache, - CounterCache, DeleteCache, Error, ExactCacheContext, FlushCache, IncrementOperation, JsonCodec, - ScriptCache, get_cache, set_cache, + BaseCache, BatchCache, BatchEntry, BoundedCounterCache, BulkDeleteCache, CacheCodec, + CacheConnectionStatus, CacheScript, ClaimCache, ClientInfoCache, ConnectionCache, + CountReadCache, CounterCache, DeleteCache, DisconnectCache, Error, ExactCacheContext, + FlushAllCache, FlushCache, IncrementOperation, JsonCodec, PingCache, QueueCache, + RefreshTtlCache, ScanCache, ScriptCache, SetCache, TtlCache, TtlPipelineCache, get_cache, + set_cache, }; use litellm_cache_redis::{ RedisArg, RedisCache, RedisLpopOperation, RedisLpopResult, RedisRpushOperation, }; use redis_test::{MockCmd, MockRedisConnection}; +use rstest::{fixture, rstest}; +use serde_json::json; +use support::TaggedByteCodec; -struct TaggedByteCodec(u8); +type Mocked = RedisCache; -impl CacheCodec for TaggedByteCodec { - type Value = u8; - - fn encode(&self, value: &u8) -> Result, Error> { - if *value > 127 { - return Err(Error::InvalidEntry); - } - Ok(vec![self.0, *value]) - } - - fn decode(&self, bytes: &[u8]) -> Result { - match bytes { - [tag, value] if *tag == self.0 => Ok(*value), - _ => Err(Error::InvalidEntry), - } - } +fn mock(commands: Vec) -> MockRedisConnection { + MockRedisConnection::new(commands).assert_all_commands_consumed() } -#[test] +fn tagged(commands: Vec) -> Mocked { + RedisCache::with_connection(mock(commands), None, TaggedByteCodec(42)) +} + +fn json_cache(commands: Vec) -> Mocked> { + RedisCache::with_connection(mock(commands), None, JsonCodec::new()) +} + +fn team(commands: Vec) -> Mocked> { + json_cache(commands).with_namespace(Some("team".into())) +} + +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext::default() +} + +fn scan(pattern: &str, cursor: u64, count: usize, reply: redis::Value) -> MockCmd { + MockCmd::new( + redis::cmd("SCAN") + .cursor_arg(cursor) + .arg("MATCH") + .arg(pattern) + .arg("COUNT") + .arg(count), + Ok(reply), + ) +} + +#[rstest] fn constructor_rejects_invalid_urls() { assert!(RedisCache::new("not a redis url", None, JsonCodec::::new()).is_err()); } -#[test] +#[rstest] +#[case::zero_rounds_up_to_one(Some(Duration::ZERO), 1)] +#[case::fractions_round_up(Some(Duration::from_millis(1500)), 2)] +#[case::whole_seconds_are_kept(Some(Duration::from_secs(15)), 15)] +#[case::missing_ttl_uses_default(None, 600)] +fn writes_round_ttls_up_to_positive_seconds(#[case] ttl: Option, #[case] seconds: u64) { + let cache = tagged(vec![MockCmd::new( + redis::cmd("SETEX") + .arg("key") + .arg(seconds) + .arg([42u8, 7].as_slice()), + Ok("OK"), + )]); + cache + .set_cache("key", 7, &ExactCacheContext { ttl }) + .unwrap(); +} + +#[rstest] fn generic_helpers_use_the_injected_codec_and_ttl() { - let connection = MockRedisConnection::new([ + let cache = tagged(vec![ MockCmd::new( redis::cmd("SETEX") .arg("counter") @@ -46,9 +87,7 @@ fn generic_helpers_use_the_injected_codec_and_ttl() { Ok("OK"), ), MockCmd::new(redis::cmd("GET").arg("counter"), Ok(vec![42u8, 7])), - ]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, TaggedByteCodec(42)); + ]); let context = ExactCacheContext { ttl: Some(Duration::from_millis(1500)), }; @@ -56,34 +95,56 @@ fn generic_helpers_use_the_injected_codec_and_ttl() { assert_eq!(get_cache(&cache, "counter", &context).unwrap(), Some(7)); } -#[tokio::test] -async fn async_operations_preserve_codec_ttl_and_missing_values() { - let connection = MockRedisConnection::new([ +#[rstest] +fn commands_round_trip_entries_and_delete_only_namespaced_keys(context: ExactCacheContext) { + let value = json!({"deployment": "model-a", "cooldown_seconds": 30}); + let payload = JsonCodec::::new() + .encode(&value) + .unwrap(); + let cache = json_cache(vec![ MockCmd::new( redis::cmd("SETEX") - .arg("counter") - .arg(9) - .arg([42u8, 7].as_slice()), + .arg("litellm-cache:key") + .arg(600) + .arg(payload.clone()), Ok("OK"), ), - MockCmd::new(redis::cmd("GET").arg("counter"), Ok(vec![42u8, 7])), - MockCmd::new( - redis::cmd("SETEX") - .arg("batch") - .arg(2) - .arg([42u8, 8].as_slice()), - Ok("OK"), - ), - MockCmd::new(redis::cmd("DEL").arg("counter"), Ok(1u32)), - MockCmd::new(redis::cmd("GET").arg("counter"), Ok(redis::Value::Nil)), + MockCmd::new(redis::cmd("GET").arg("litellm-cache:key"), Ok(payload)), + MockCmd::new(redis::cmd("DEL").arg("litellm-cache:key"), Ok(1u32)), ]) - .assert_all_commands_consumed(); + .with_namespace(Some("litellm-cache".into())); + + cache.set_cache("key", value.clone(), &context).unwrap(); + assert_eq!(cache.get_cache("key", &context).unwrap(), Some(value)); + cache.delete_cache("key").unwrap(); +} + +#[rstest] +#[tokio::test] +async fn async_operations_preserve_codec_ttl_and_missing_values(context: ExactCacheContext) { let cache = RedisCache::with_connection( - connection, + mock(vec![ + MockCmd::new( + redis::cmd("SETEX") + .arg("counter") + .arg(9) + .arg([42u8, 7].as_slice()), + Ok("OK"), + ), + MockCmd::new(redis::cmd("GET").arg("counter"), Ok(vec![42u8, 7])), + MockCmd::new( + redis::cmd("SETEX") + .arg("batch") + .arg(2) + .arg([42u8, 8].as_slice()), + Ok("OK"), + ), + MockCmd::new(redis::cmd("DEL").arg("counter"), Ok(1u32)), + MockCmd::new(redis::cmd("GET").arg("counter"), Ok(redis::Value::Nil)), + ]), Some(Duration::from_secs(9)), TaggedByteCodec(42), ); - let context = ExactCacheContext::default(); cache .batch_cache_write("counter", 7, context.clone()) .await @@ -108,15 +169,13 @@ async fn async_operations_preserve_codec_ttl_and_missing_values() { ); } +#[rstest] #[tokio::test] -async fn codec_errors_propagate_without_writing_partial_batches() { - let connection = MockRedisConnection::new([ +async fn codec_errors_propagate_without_writing_partial_batches(context: ExactCacheContext) { + let cache = tagged(vec![ MockCmd::new(redis::cmd("GET").arg("invalid"), Ok(vec![99u8, 7])), MockCmd::new(redis::cmd("GET").arg("invalid"), Ok(vec![99u8, 7])), - ]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, TaggedByteCodec(42)); - let context = ExactCacheContext::default(); + ]); assert_eq!( cache.set_cache("invalid", 255, &context), Err(Error::InvalidEntry) @@ -134,6 +193,15 @@ async fn codec_errors_propagate_without_writing_partial_batches() { .await, Err(Error::InvalidEntry) ); + assert_eq!( + cache + .async_set_cache_pipeline_with_ttls(vec![ + ("valid".into(), 7, None), + ("invalid".into(), 255, None), + ]) + .await, + Err(Error::InvalidEntry) + ); assert_eq!( cache.get_cache("invalid", &context), Err(Error::InvalidEntry) @@ -144,221 +212,269 @@ async fn codec_errors_propagate_without_writing_partial_batches() { ); } -#[test] -fn namespaces_are_optional_and_existing_prefixes_are_not_duplicated() { - let connection = MockRedisConnection::new([ - MockCmd::new(redis::cmd("GET").arg("team:key"), Ok(redis::Value::Nil)), - MockCmd::new(redis::cmd("GET").arg("team:key"), Ok(redis::Value::Nil)), - ]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team".into())); - assert_eq!( - cache - .get_cache("key", &ExactCacheContext::default()) - .unwrap(), - None - ); - assert_eq!( - cache - .get_cache("team:key", &ExactCacheContext::default()) - .unwrap(), - None - ); +#[rstest] +#[case::bare_key("key")] +#[case::already_prefixed("team:key")] +fn namespaces_are_added_once(#[case] key: &str, context: ExactCacheContext) { + let cache = team(vec![MockCmd::new( + redis::cmd("GET").arg("team:key"), + Ok(redis::Value::Nil), + )]); + assert_eq!(cache.get_cache(key, &context).unwrap(), None); } -#[test] -fn flush_requires_a_namespace_and_escapes_glob_metacharacters() { - let unscoped = RedisCache::with_connection( - MockRedisConnection::new([]).assert_all_commands_consumed(), - None, - JsonCodec::::new(), - ); +#[rstest] +#[case::empty(Some(String::new()))] +#[case::missing(None)] +fn empty_namespaces_leave_keys_unprefixed( + #[case] namespace: Option, + context: ExactCacheContext, +) { + let cache = json_cache(vec![MockCmd::new( + redis::cmd("GET").arg("key"), + Ok(redis::Value::Nil), + )]) + .with_namespace(namespace); + assert_eq!(cache.namespace(), None); + assert_eq!(cache.get_cache("key", &context).unwrap(), None); +} + +#[rstest] +#[tokio::test] +async fn flush_requires_a_namespace() { + let unscoped = json_cache(Vec::new()); assert_eq!(unscoped.flush_cache(), Err(Error::UnscopedFlush)); - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("SCAN") - .cursor_arg(0) - .arg("MATCH") - .arg("team\\*:*") - .arg("COUNT") - .arg(1000), - Ok(redis_test::redis_value!(["0", ["team*:key"]])), - ), - MockCmd::new(redis::cmd("DEL").arg("team*:key"), Ok(1u32)), + assert_eq!( + unscoped.async_flush_cache().await, + Err(Error::UnscopedFlush) + ); +} + +#[rstest] +#[case::plain_namespace("litellm-cache", "litellm-cache:*", "litellm-cache:key")] +#[case::glob_metacharacters_are_escaped("team*", "team\\*:*", "team*:key")] +fn flush_scans_and_deletes_only_namespaced_keys( + #[case] namespace: &str, + #[case] pattern: &str, + #[case] key: &str, +) { + let cache = json_cache(vec![ + scan(pattern, 0, 1000, redis_test::redis_value!(["0", [key]])), + MockCmd::new(redis::cmd("DEL").arg(key), Ok(1u32)), ]) - .assert_all_commands_consumed(); - let scoped = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team*".into())); - scoped.flush_cache().unwrap(); + .with_namespace(Some(namespace.into())); + cache.flush_cache().unwrap(); } +#[rstest] #[tokio::test] -async fn connection_failures_use_the_python_result_contract() { - let error = redis::RedisError::from((redis::ErrorKind::Io, "connection refused")); - let connection = - MockRedisConnection::new([MockCmd::new(redis::cmd("PING"), Err::(error))]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, JsonCodec::::new()); - - let result = cache.test_connection().await.unwrap(); - assert_eq!(result.status, CacheConnectionStatus::Failed); - assert!(result.message.starts_with("Redis connection failed:")); - assert!(result.error.is_some()); +async fn async_flush_deletes_each_scan_page_separately() { + let cache = team(vec![ + scan( + "team:*", + 0, + 1000, + redis_test::redis_value!(["7", ["team:a", "team:b"]]), + ), + MockCmd::new(redis::cmd("DEL").arg("team:a").arg("team:b"), Ok(2u32)), + scan( + "team:*", + 7, + 1000, + redis_test::redis_value!(["0", ["team:c"]]), + ), + MockCmd::new(redis::cmd("DEL").arg("team:c"), Ok(1u32)), + ]); + cache.async_flush_cache().await.unwrap(); } +#[rstest] +fn flushall_ignores_the_namespace() { + team(vec![MockCmd::new(redis::cmd("FLUSHALL"), Ok("OK"))]) + .flushall() + .unwrap(); +} + +#[rstest] #[tokio::test] -async fn batch_reads_keep_order_and_treat_invalid_values_as_invalid_entries() { - let connection = MockRedisConnection::new([MockCmd::new( +async fn batch_reads_keep_order_and_treat_invalid_values_as_invalid_entries( + context: ExactCacheContext, +) { + let cache = tagged(vec![MockCmd::new( redis::cmd("MGET").arg("hit").arg("miss").arg("invalid"), Ok(vec![ redis::Value::BulkString(vec![42, 7]), redis::Value::Nil, redis::Value::BulkString(vec![99, 7]), ]), - )]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, TaggedByteCodec(42)); + )]); assert_eq!( cache - .async_batch_get_cache( - vec!["hit".into(), "miss".into(), "invalid".into()], - ExactCacheContext::default(), - ) + .async_batch_get_cache(vec!["hit".into(), "miss".into(), "invalid".into()], context) .await .unwrap(), vec![BatchEntry::Hit(7), BatchEntry::Miss, BatchEntry::Invalid] ); } +#[rstest] #[tokio::test] -async fn async_flush_deletes_each_scan_page_separately() { - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("SCAN") - .cursor_arg(0) - .arg("MATCH") - .arg("team:*") - .arg("COUNT") - .arg(1000), - Ok(redis_test::redis_value!(["7", ["team:a", "team:b"]])), - ), - MockCmd::new(redis::cmd("DEL").arg("team:a").arg("team:b"), Ok(2u32)), - MockCmd::new( - redis::cmd("SCAN") - .cursor_arg(7) - .arg("MATCH") - .arg("team:*") - .arg("COUNT") - .arg(1000), - Ok(redis_test::redis_value!(["0", ["team:c"]])), - ), - MockCmd::new(redis::cmd("DEL").arg("team:c"), Ok(1u32)), - ]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team".into())); +async fn ttl_pipeline_keeps_each_entry_ttl_and_defaults_missing_ones() { + let mut pipeline = redis::pipe(); + pipeline + .cmd("SETEX") + .arg("ns:team_id:t1") + .arg(60u64) + .arg(r#"{"team_id":"t1"}"#) + .cmd("SETEX") + .arg("ns:u1") + .arg(7u64) + .arg(r#"{"user_id":"u1"}"#) + .cmd("SETEX") + .arg("ns:org_id:o1") + .arg(300u64) + .arg(r#"{"a":1}"#); + let cache = RedisCache::with_connection( + mock(vec![MockCmd::with_values( + pipeline, + Ok(vec!["OK", "OK", "OK"]), + )]), + Some(Duration::from_secs(300)), + JsonCodec::::new(), + ) + .with_namespace(Some("ns".into())); - cache.async_flush_cache().await.unwrap(); + cache + .async_set_cache_pipeline_with_ttls(vec![ + ( + "team_id:t1".into(), + json!({"team_id": "t1"}), + Some(Duration::from_secs(60)), + ), + ( + "u1".into(), + json!({"user_id": "u1"}), + Some(Duration::from_secs(7)), + ), + ("org_id:o1".into(), json!({"a": 1}), None), + ]) + .await + .unwrap(); } +#[rstest] #[tokio::test] -async fn direct_redis_operations_preserve_namespace_values_and_missing_ttls() { - let mut sadd_pipeline = redis::pipe(); - sadd_pipeline - .cmd("SADD") - .arg("team:members") - .arg("a") - .arg("b") - .cmd("EXPIRE") - .arg("team:members") - .arg(600u64) - .ignore(); - let connection = MockRedisConnection::new([ +async fn empty_pipelines_skip_the_round_trip(context: ExactCacheContext) { + let cache = json_cache(Vec::new()); + cache + .async_set_cache_pipeline(Vec::new(), context) + .await + .unwrap(); + cache + .async_set_cache_pipeline_with_ttls(Vec::new()) + .await + .unwrap(); + assert_eq!(cache.delete_cache_keys(Vec::new()).await.unwrap(), 0); + assert_eq!( + cache.async_rpush_pipeline(Vec::new()).await.unwrap(), + Vec::::new() + ); + assert_eq!( + cache.async_lpop_pipeline(Vec::new()).await.unwrap(), + Vec::::new() + ); + assert_eq!( + cache.async_increment_pipeline(Vec::new()).await.unwrap(), + Vec::::new() + ); +} + +#[rstest] +#[tokio::test] +async fn count_reads_parse_integers_and_keep_missing_counters() { + let mget = || { MockCmd::new( redis::cmd("MGET").arg("team:count").arg("team:missing"), Ok(redis_test::redis_value!(["7", nil])), - ), - MockCmd::new( - redis::cmd("MGET").arg("team:count").arg("team:missing"), - Ok(redis_test::redis_value!(["7", nil])), - ), + ) + }; + let cache = team(vec![mget(), mget()]); + let keys = vec!["count".to_string(), "missing".to_string()]; + + assert_eq!(cache.batch_get_counts(&keys).unwrap(), [Some(7), None]); + assert_eq!( + cache.async_batch_get_counts(keys).await.unwrap(), + [Some(7), None] + ); +} + +#[rstest] +#[tokio::test] +async fn pings_run_on_both_paths() { + let cache = team(vec![ MockCmd::new(redis::cmd("PING"), Ok("PONG")), MockCmd::new(redis::cmd("PING"), Ok("PONG")), - MockCmd::new(redis::cmd("TTL").arg("team:missing"), Ok(-2i64)), - MockCmd::new( - redis::cmd("SCAN") - .cursor_arg(0) - .arg("MATCH") - .arg("team:job-*") - .arg("COUNT") - .arg(25), - Ok(redis_test::redis_value!(["4", ["team:job-a"]])), + ]); + assert!(cache.sync_ping().unwrap()); + assert!(cache.ping().await.unwrap()); +} + +#[rstest] +#[case::remaining(12, Some(Duration::from_secs(12)))] +#[case::no_expiry(-1, None)] +#[case::missing(-2, None)] +#[tokio::test] +async fn ttl_reads_hide_negative_replies(#[case] reply: i64, #[case] ttl: Option) { + let cache = team(vec![MockCmd::new( + redis::cmd("TTL").arg("team:key"), + Ok(reply), + )]); + assert_eq!(cache.async_get_ttl("key").await.unwrap(), ttl); +} + +#[rstest] +#[case::explicit_ttl(Some(Duration::from_secs(30)), 30, 1, true)] +#[case::default_ttl(None, 600, 1, true)] +#[case::missing_key(Some(Duration::from_secs(30)), 30, 0, false)] +#[tokio::test] +async fn refresh_ttl_expires_existing_keys_only( + #[case] ttl: Option, + #[case] seconds: u64, + #[case] reply: i64, + #[case] refreshed: bool, +) { + let cache = team(vec![MockCmd::new( + redis::cmd("EXPIRE").arg("team:key").arg(seconds), + Ok(reply), + )]); + assert_eq!( + cache.async_refresh_ttl("key", ttl).await.unwrap(), + refreshed + ); +} + +#[rstest] +#[tokio::test] +async fn scan_stops_at_count_and_bulk_delete_reports_existing_keys() { + let cache = team(vec![ + scan( + "team:job-*", + 0, + 25, + redis_test::redis_value!(["4", ["team:job-a"]]), ), - MockCmd::new( - redis::cmd("SCAN") - .cursor_arg(4) - .arg("MATCH") - .arg("team:job-*") - .arg("COUNT") - .arg(25), - Ok(redis_test::redis_value!(["0", ["team:job-b"]])), + scan( + "team:job-*", + 4, + 25, + redis_test::redis_value!(["0", ["team:job-b"]]), ), MockCmd::new( redis::cmd("DEL").arg("team:job-a").arg("team:job-b"), Ok(2u32), ), - MockCmd::with_values( - sadd_pipeline, - Ok(vec![redis::Value::Int(2), redis::Value::Int(1)]), - ), - MockCmd::new( - redis::cmd("RPUSH").arg("team:queue").arg("a").arg("b"), - Ok(2u32), - ), - MockCmd::new( - redis::cmd("LPOP").arg("team:queue").arg(2usize), - Ok(redis_test::redis_value!(["a", "b"])), - ), - MockCmd::new( - redis::cmd("EVAL") - .arg("return KEYS[1]") - .arg(1usize) - .arg("team:key"), - Ok("team:key"), - ), - MockCmd::new( - redis::cmd("EVAL") - .arg("return KEYS[1]") - .arg(1usize) - .arg("team:key"), - Ok("team:key"), - ), - MockCmd::new(redis::cmd("CLIENT").arg("LIST"), Ok("id=1")), - MockCmd::new(redis::cmd("INFO"), Ok("redis_version:7")), - MockCmd::new(redis::cmd("FLUSHALL"), Ok("OK")), - ]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team".into())); - - assert_eq!( - cache - .batch_get_counts(&["count".into(), "missing".into()]) - .unwrap(), - [Some(7), None] - ); - assert_eq!( - cache - .async_batch_get_counts(vec!["count".into(), "missing".into()]) - .await - .unwrap(), - [Some(7), None] - ); - assert!(cache.sync_ping().unwrap()); - assert!(cache.ping().await.unwrap()); - assert_eq!(cache.async_get_ttl("missing").await.unwrap(), None); + ]); assert_eq!( cache.async_scan_iter("job-", 25).await.unwrap(), ["team:job-a", "team:job-b"] @@ -370,6 +486,25 @@ async fn direct_redis_operations_preserve_namespace_values_and_missing_ttls() { .unwrap(), 2 ); +} + +#[rstest] +#[tokio::test] +async fn sets_add_members_and_arm_the_default_ttl() { + let mut pipeline = redis::pipe(); + pipeline + .cmd("SADD") + .arg("team:members") + .arg("a") + .arg("b") + .cmd("EXPIRE") + .arg("team:members") + .arg(600u64) + .ignore(); + let cache = team(vec![MockCmd::with_values( + pipeline, + Ok(vec![redis::Value::Int(2), redis::Value::Int(1)]), + )]); assert_eq!( cache .async_set_cache_sadd("members", vec!["a".into(), "b".into()], None) @@ -377,6 +512,32 @@ async fn direct_redis_operations_preserve_namespace_values_and_missing_ttls() { .unwrap(), 2 ); + assert_eq!( + cache + .async_set_cache_sadd("members", Vec::new(), None) + .await, + Err(Error::InvalidEntry) + ); +} + +#[rstest] +#[tokio::test] +async fn queues_push_and_pop_namespaced_lists() { + let cache = team(vec![ + MockCmd::new( + redis::cmd("RPUSH").arg("team:queue").arg("a").arg("b"), + Ok(2u32), + ), + MockCmd::new( + redis::cmd("INFO"), + Ok("# Server\r\nredis_version:7.2.4\r\n"), + ), + MockCmd::new( + redis::cmd("LPOP").arg("team:queue").arg(2usize), + Ok(redis_test::redis_value!(["a", "b"])), + ), + MockCmd::new(redis::cmd("LPOP").arg("team:queue"), Ok("c")), + ]); assert_eq!( cache .async_rpush("queue", vec!["a".into(), "b".into()]) @@ -384,10 +545,159 @@ async fn direct_redis_operations_preserve_namespace_values_and_missing_ttls() { .unwrap(), 2 ); + assert_eq!( + cache.async_rpush("queue", Vec::new()).await, + Err(Error::InvalidEntry) + ); assert_eq!( cache.async_lpop("queue", Some(2)).await.unwrap(), RedisLpopResult::Values(vec![b"a".to_vec(), b"b".to_vec()]) ); + assert_eq!( + cache.async_lpop("queue", None).await.unwrap(), + RedisLpopResult::Value(b"c".to_vec()) + ); +} + +/// Python `RedisCache.async_lpop` checks `redis_version` from `INFO` and, below major version 7, +/// pops a counted batch as `count` single-command `LPOP` pipelines, dropping `None` replies. +#[rstest] +#[tokio::test] +async fn counted_lpop_falls_back_to_single_pops_below_redis_7() { + let single_pop = || { + let mut pipeline = redis::pipe(); + pipeline.cmd("LPOP").arg("team:queue"); + pipeline + }; + let cache = team(vec![ + MockCmd::new( + redis::cmd("INFO"), + Ok("# Server\r\nredis_version:6.2.14\r\n"), + ), + MockCmd::with_values(single_pop(), Ok(vec![redis_test::redis_value!("a")])), + MockCmd::with_values(single_pop(), Ok(vec![redis_test::redis_value!("b")])), + MockCmd::with_values(single_pop(), Ok(vec![redis::Value::Nil])), + ]); + + assert_eq!( + cache.async_lpop("queue", Some(3)).await.unwrap(), + RedisLpopResult::Values(vec![b"a".to_vec(), b"b".to_vec()]) + ); +} + +/// Python keeps `redis_version = "Unknown"` when `INFO` fails and then assumes +/// `DEFAULT_REDIS_MAJOR_VERSION` (7), so a counted pop is one `LPOP key count`. The version is read +/// once: the second pop sends no second `INFO`. +#[rstest] +#[tokio::test] +async fn counted_lpop_assumes_redis_7_when_info_fails() { + let cache = team(vec![ + MockCmd::new( + redis::cmd("INFO"), + Err::(redis::RedisError::from((redis::ErrorKind::Io, "down"))), + ), + MockCmd::new( + redis::cmd("LPOP").arg("team:queue").arg(2usize), + Ok(redis_test::redis_value!(["a", "b"])), + ), + MockCmd::new( + redis::cmd("LPOP").arg("team:queue").arg(1usize), + Ok(redis_test::redis_value!(["c"])), + ), + ]); + + assert_eq!( + cache.async_lpop("queue", Some(2)).await.unwrap(), + RedisLpopResult::Values(vec![b"a".to_vec(), b"b".to_vec()]) + ); + assert_eq!( + cache.async_lpop("queue", Some(1)).await.unwrap(), + RedisLpopResult::Values(vec![b"c".to_vec()]) + ); +} + +fn push_and_trim(start: i64) -> redis::Pipeline { + let mut pipeline = redis::pipe(); + pipeline + .atomic() + .cmd("RPUSH") + .arg("ns:buf") + .arg("c") + .arg("d") + .cmd("LTRIM") + .arg("ns:buf") + .arg(start) + .arg(-1); + pipeline +} + +#[rstest] +#[case::keeps_newest_entries(3, -3)] +#[case::zero_keeps_everything(0, 0)] +#[tokio::test] +async fn rpush_and_trim_runs_push_and_trim_in_one_transaction( + #[case] max_len: usize, + #[case] start: i64, +) { + let cache = json_cache(vec![MockCmd::with_values( + push_and_trim(start), + Ok(vec![redis::Value::Array(vec![ + redis::Value::Int(4), + redis::Value::Okay, + ])]), + )]) + .with_namespace(Some("ns".into())); + + assert_eq!( + cache + .async_rpush_and_trim("buf", vec!["c".into(), "d".into()], max_len) + .await + .unwrap(), + 4 + ); +} + +#[rstest] +#[tokio::test] +async fn rpush_and_trim_raises_when_a_queued_command_fails() { + let wrong_type = redis::parse_redis_value( + b"-WRONGTYPE Operation against a key holding the wrong kind of value\r\n", + ) + .unwrap(); + let cache = json_cache(vec![MockCmd::with_values( + push_and_trim(-3), + Ok(vec![redis::Value::Array(vec![ + wrong_type, + redis::Value::Okay, + ])]), + )]) + .with_namespace(Some("ns".into())); + + assert_eq!( + cache + .async_rpush_and_trim("buf", vec!["c".into(), "d".into()], 3) + .await, + Err(Error::Unavailable) + ); + assert_eq!( + cache.async_rpush_and_trim("buf", Vec::new(), 3).await, + Err(Error::InvalidEntry) + ); +} + +#[rstest] +#[tokio::test] +async fn scripts_and_eval_namespace_their_keys() { + let eval = || { + MockCmd::new( + redis::cmd("EVAL") + .arg("return KEYS[1]") + .arg(1usize) + .arg("team:key"), + Ok("team:key"), + ) + }; + let cache = team(vec![eval(), eval()]); assert_eq!( cache .async_eval("return KEYS[1]".into(), vec!["key".into()], Vec::new()) @@ -403,13 +713,21 @@ async fn direct_redis_operations_preserve_namespace_values_and_missing_ttls() { .unwrap(), redis::Value::BulkString(b"team:key".to_vec()) ); - assert_eq!(cache.client_list().unwrap(), "id=1"); - assert_eq!(cache.info().unwrap(), "redis_version:7"); - cache.flushall().unwrap(); } +#[rstest] +fn client_list_and_info_return_server_text() { + let cache = team(vec![ + MockCmd::new(redis::cmd("CLIENT").arg("LIST"), Ok("id=1")), + MockCmd::new(redis::cmd("INFO"), Ok("redis_version:7")), + ]); + assert_eq!(cache.client_list().unwrap(), "id=1"); + assert_eq!(cache.info().unwrap(), "redis_version:7"); +} + +#[rstest] #[tokio::test] -async fn direct_redis_pipelines_preserve_operation_order() { +async fn pipelines_preserve_operation_order() { let mut rpush_pipeline = redis::pipe(); rpush_pipeline .cmd("RPUSH") @@ -425,19 +743,20 @@ async fn direct_redis_pipelines_preserve_operation_order() { .arg(2usize) .cmd("LPOP") .arg("team:b"); - let connection = MockRedisConnection::new([ + let queue = team(vec![ MockCmd::with_values( rpush_pipeline, Ok(vec![redis::Value::Int(1), redis::Value::Int(2)]), ), + MockCmd::new( + redis::cmd("INFO"), + Ok("# Server\r\nredis_version:7.2.4\r\n"), + ), MockCmd::with_values( lpop_pipeline, Ok(vec![redis_test::redis_value!(["one"]), redis::Value::Nil]), ), - ]) - .assert_all_commands_consumed(); - let queue = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team".into())); + ]); assert_eq!( queue @@ -474,7 +793,59 @@ async fn direct_redis_pipelines_preserve_operation_order() { RedisLpopResult::Missing, ] ); +} +/// Below major version 7 a counted `LPOP` is unsupported, so a pipeline that mixes counted and +/// plain pops runs each operation through `async_lpop`: `count` single-`LPOP` pipelines for the +/// counted ones, a bare `LPOP` for the rest. No `LPOP key count` reaches the connection. +#[rstest] +#[tokio::test] +async fn lpop_pipeline_pops_one_at_a_time_below_redis_7() { + let single_pop = |key: &str| { + let mut pipeline = redis::pipe(); + pipeline.cmd("LPOP").arg(key); + pipeline + }; + let cache = team(vec![ + MockCmd::new( + redis::cmd("INFO"), + Ok("# Server\r\nredis_version:6.2.14\r\n"), + ), + MockCmd::with_values( + single_pop("team:a"), + Ok(vec![redis_test::redis_value!("one")]), + ), + MockCmd::with_values( + single_pop("team:a"), + Ok(vec![redis_test::redis_value!("two")]), + ), + MockCmd::new(redis::cmd("LPOP").arg("team:b"), Ok(redis::Value::Nil)), + ]); + + assert_eq!( + cache + .async_lpop_pipeline(vec![ + RedisLpopOperation { + key: "a".into(), + count: Some(2), + }, + RedisLpopOperation { + key: "b".into(), + count: None, + }, + ]) + .await + .unwrap(), + [ + RedisLpopResult::Values(vec![b"one".to_vec(), b"two".to_vec()]), + RedisLpopResult::Missing, + ] + ); +} + +#[rstest] +#[tokio::test] +async fn increment_pipeline_expires_only_operations_with_a_ttl() { let mut increment_pipeline = redis::pipe(); increment_pipeline .cmd("INCRBYFLOAT") @@ -487,17 +858,14 @@ async fn direct_redis_pipelines_preserve_operation_order() { .cmd("INCRBYFLOAT") .arg("team:counter") .arg(2.0f64); - let connection = MockRedisConnection::new([MockCmd::with_values( + let counters = team(vec![MockCmd::with_values( increment_pipeline, Ok(vec![ redis::Value::BulkString(b"1.5".to_vec()), redis::Value::Int(1), redis::Value::BulkString(b"3.5".to_vec()), ]), - )]) - .assert_all_commands_consumed(); - let counters = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team".into())); + )]); assert_eq!( counters .async_increment_pipeline(vec![ @@ -518,6 +886,11 @@ async fn direct_redis_pipelines_preserve_operation_order() { ); } +const INCREMENT_SCRIPT: &str = concat!( + "local value = redis.call('INCRBYFLOAT', KEYS[1], ARGV[1]); ", + "if redis.call('TTL', KEYS[1]) == -1 then ", + "redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return value" +); const INCREMENT_WITH_FLOOR_SCRIPT: &str = concat!( "local count = redis.call('INCRBY', KEYS[1], ARGV[1]); ", "if count < 0 then count = redis.call('INCRBY', KEYS[1], -count); end; ", @@ -532,20 +905,93 @@ const SET_MAX_SCRIPT: &str = concat!( "return ARGV[1]; end; return current" ); +fn increment_script(amount: f64) -> MockCmd { + MockCmd::new( + redis::cmd("EVAL") + .arg(INCREMENT_SCRIPT) + .arg(1) + .arg("counter") + .arg(amount) + .arg(600), + Ok("4.5"), + ) +} + +#[rstest] +#[tokio::test] +async fn increments_keep_an_existing_ttl_in_one_atomic_script(context: ExactCacheContext) { + let cache = RedisCache::with_connection( + mock(vec![increment_script(2.5), increment_script(2.5)]), + None, + JsonCodec::::new(), + ); + + assert_eq!( + cache + .increment_cache("counter", 2.5, context.clone()) + .unwrap(), + 4.5 + ); + assert_eq!( + cache + .async_increment("counter", 2.5, context, false) + .await + .unwrap(), + 4.5 + ); +} + +#[rstest] +#[case::explicit_ttl(Some(Duration::from_secs(60)), 60u64)] +#[case::default_ttl(None, 600u64)] +#[tokio::test] +async fn refresh_ttl_increments_rearm_the_ttl_in_the_same_round_trip( + #[case] ttl: Option, + #[case] seconds: u64, +) { + let mut pipeline = redis::pipe(); + pipeline + .cmd("INCRBYFLOAT") + .arg("ns:spend:key:k") + .arg(1.5f64) + .cmd("EXPIRE") + .arg("ns:spend:key:k") + .arg(seconds); + let cache = json_cache(vec![MockCmd::with_values( + pipeline, + Ok(vec![ + redis::Value::BulkString(b"1.5".to_vec()), + redis::Value::Int(1), + ]), + )]) + .with_namespace(Some("ns".into())); + + assert_eq!( + cache + .async_increment("spend:key:k", 1.5, ExactCacheContext { ttl }, true) + .await + .unwrap(), + 1.5 + ); +} + +#[rstest] #[tokio::test] async fn counter_repairs_are_atomic_and_use_default_ttl() { let floor = || { - redis::cmd("EVAL") - .arg(INCREMENT_WITH_FLOOR_SCRIPT) - .arg(1) - .arg("team:counter") - .arg(-2i64) - .arg(30u64) - .clone() + MockCmd::new( + redis::cmd("EVAL") + .arg(INCREMENT_WITH_FLOOR_SCRIPT) + .arg(1) + .arg("team:counter") + .arg(-2i64) + .arg(30u64), + Ok(0i64), + ) }; - let connection = MockRedisConnection::new([ - MockCmd::new(floor(), Ok(0i64)), - MockCmd::new(floor(), Ok(0i64)), + let cache = team(vec![ + floor(), + floor(), MockCmd::new( redis::cmd("EVAL") .arg(SET_MAX_SCRIPT) @@ -555,10 +1001,7 @@ async fn counter_repairs_are_atomic_and_use_default_ttl() { .arg(600u64), Ok("4.5"), ), - ]) - .assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, JsonCodec::::new()) - .with_namespace(Some("team".into())); + ]); assert_eq!( cache @@ -587,38 +1030,37 @@ const CLAIM_SCRIPT: &str = concat!( "elseif ARGV[4] == '1' then redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return 1" ); -fn claim_eval(expected: &str, write: &str, refresh: bool) -> redis::Cmd { - let mut cmd = redis::cmd("EVAL"); - cmd.arg(CLAIM_SCRIPT) - .arg(1) - .arg("pin") - .arg(expected) - .arg(600) - .arg(write) - .arg(u8::from(refresh)); - cmd +fn claim_eval(expected: &str, write: &str, refresh: bool, applied: i64) -> MockCmd { + MockCmd::new( + redis::cmd("EVAL") + .arg(CLAIM_SCRIPT) + .arg(1) + .arg("pin") + .arg(expected) + .arg(600) + .arg(write) + .arg(u8::from(refresh)), + Ok(applied), + ) } +#[rstest] #[tokio::test] -async fn claims_match_eligible_values_written_by_another_encoder() { +async fn claims_match_eligible_values_written_by_another_encoder(context: ExactCacheContext) { let python_payload = r#"{"model_id": "a", "deployment": "east"}"#; - let stored = serde_json::json!({"deployment": "east", "model_id": "a"}); - let candidate = serde_json::json!({"model_id": "b"}); - let connection = MockRedisConnection::new([ + let stored = json!({"deployment": "east", "model_id": "a"}); + let cache = json_cache(vec![ MockCmd::new(redis::cmd("GET").arg("pin"), Ok(python_payload)), - MockCmd::new(claim_eval(python_payload, "", true), Ok(1)), - ]) - .assert_all_commands_consumed(); - let cache = - RedisCache::with_connection(connection, None, JsonCodec::::new()); + claim_eval(python_payload, "", true, 1), + ]); assert_eq!( cache .async_claim_cache( "pin", - candidate, + json!({"model_id": "b"}), vec![stored.clone()], - ExactCacheContext::default() + context ) .await .unwrap(), @@ -626,78 +1068,91 @@ async fn claims_match_eligible_values_written_by_another_encoder() { ); } -#[test] -fn claims_retry_when_the_key_changes_and_replace_ineligible_winners() { - let candidate = serde_json::json!({"model_id": "b"}); +#[rstest] +fn claims_retry_when_the_key_changes_and_replace_ineligible_winners(context: ExactCacheContext) { + let candidate = json!({"model_id": "b"}); let payload = r#"{"model_id":"b"}"#; - let connection = MockRedisConnection::new([ + let cache = json_cache(vec![ MockCmd::new(redis::cmd("GET").arg("pin"), Ok(redis::Value::Nil)), - MockCmd::new(claim_eval("", payload, false), Ok(0)), + claim_eval("", payload, false, 0), MockCmd::new(redis::cmd("GET").arg("pin"), Ok(r#"{"model_id":"gone"}"#)), - MockCmd::new(claim_eval(r#"{"model_id":"gone"}"#, payload, false), Ok(1)), - ]) - .assert_all_commands_consumed(); - let cache = - RedisCache::with_connection(connection, None, JsonCodec::::new()); + claim_eval(r#"{"model_id":"gone"}"#, payload, false, 1), + ]); assert_eq!( cache .claim_cache( "pin", candidate.clone(), - &[serde_json::json!({"model_id": "a"})], - ExactCacheContext::default() + &[json!({"model_id": "a"})], + context ) .unwrap(), candidate ); } -#[test] -fn claims_without_eligible_values_keep_the_winner_without_refreshing_its_ttl() { +#[rstest] +fn claims_without_eligible_values_keep_the_winner_without_refreshing_its_ttl( + context: ExactCacheContext, +) { let stored = r#"{"model_id": "a"}"#; - let connection = MockRedisConnection::new([ + let cache = json_cache(vec![ MockCmd::new(redis::cmd("GET").arg("pin"), Ok(stored)), - MockCmd::new(claim_eval(stored, "", false), Ok(1)), - ]) - .assert_all_commands_consumed(); - let cache = - RedisCache::with_connection(connection, None, JsonCodec::::new()); + claim_eval(stored, "", false, 1), + ]); assert_eq!( cache - .claim_cache( - "pin", - serde_json::json!({"model_id": "b"}), - &[], - ExactCacheContext::default() - ) + .claim_cache("pin", json!({"model_id": "b"}), &[], context) .unwrap(), - serde_json::json!({"model_id": "a"}) + json!({"model_id": "a"}) ); } +#[rstest] #[tokio::test] -async fn async_increment_runs_the_atomic_script() { - let mut eval = redis::cmd("EVAL"); - eval.arg(concat!( - "local value = redis.call('INCRBYFLOAT', KEYS[1], ARGV[1]); ", - "if redis.call('TTL', KEYS[1]) == -1 then ", - "redis.call('EXPIRE', KEYS[1], ARGV[2]); end; return value" - )) - .arg(1) - .arg("counter") - .arg(2.5f64) - .arg(600); - let connection = - MockRedisConnection::new([MockCmd::new(eval, Ok("4.5"))]).assert_all_commands_consumed(); - let cache = RedisCache::with_connection(connection, None, JsonCodec::::new()); +async fn test_connection_reports_success_with_the_python_message() { + let cache = team(vec![MockCmd::new(redis::cmd("PING"), Ok("PONG"))]); - assert_eq!( - cache - .async_increment("counter", 2.5, ExactCacheContext::default()) - .await - .unwrap(), - 4.5 - ); + let result = cache.test_connection().await.unwrap(); + assert_eq!(result.status, CacheConnectionStatus::Success); + assert_eq!(result.message, "Redis connection test successful"); + assert_eq!(result.error, None); +} + +#[rstest] +#[case::unexpected_reply(Ok("NOPE"), "Redis ping returned False", false)] +#[case::connection_refused( + Err(redis::RedisError::from((redis::ErrorKind::Io, "connection refused"))), + "Redis connection failed:", + true +)] +#[tokio::test] +async fn test_connection_failures_use_the_python_result_contract( + #[case] reply: redis::RedisResult<&'static str>, + #[case] message: &str, + #[case] has_error: bool, +) { + let cache = json_cache(vec![MockCmd::new(redis::cmd("PING"), reply)]); + + let result = cache.test_connection().await.unwrap(); + assert_eq!(result.status, CacheConnectionStatus::Failed); + assert!(result.message.starts_with(message), "{}", result.message); + assert_eq!(result.error.is_some(), has_error); +} + +#[rstest] +#[tokio::test] +async fn disconnect_keeps_a_caller_owned_connection_usable() { + let cache = team(vec![MockCmd::new(redis::cmd("PING"), Ok("PONG"))]); + cache.disconnect().await.unwrap(); + assert!(cache.ping().await.unwrap()); +} + +#[rstest] +#[tokio::test] +async fn disconnect_drains_an_idle_pool_without_connecting() { + let cache = RedisCache::new("redis://127.0.0.1:1", None, JsonCodec::::new()).unwrap(); + cache.disconnect().await.unwrap(); } diff --git a/litellm-rust/crates/cache-redis/tests/cluster.rs b/litellm-rust/crates/cache-redis/tests/cluster.rs index 2c3fc818b66..c1a9a70a5d2 100644 --- a/litellm-rust/crates/cache-redis/tests/cluster.rs +++ b/litellm-rust/crates/cache-redis/tests/cluster.rs @@ -1,100 +1,67 @@ -//! Contract tests against a real Redis Cluster. Set `LITELLM_TEST_REDIS_CLUSTER_NODES` to a -//! comma separated `host:port` list (for example `127.0.0.1:7000,127.0.0.1:7001`) to run them. +//! Tests against a real Redis Cluster. Set `LITELLM_TEST_REDIS_CLUSTER_NODES` to a comma +//! separated `host:port` list (for example `127.0.0.1:7000,127.0.0.1:7001`) to run them. -use std::time::{Duration, SystemTime, UNIX_EPOCH}; +mod support; + +use std::{collections::HashSet, time::Duration}; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheConnectionStatus, CacheScript, ClaimCache, - CounterCache, DeleteCache, Error, ExactCacheContext, FlushCache, IncrementOperation, JsonCodec, - ScriptCache, + BaseCache, BatchCache, BatchEntry, BoundedCounterCache, BulkDeleteCache, CacheConnectionStatus, + CacheScript, ClaimCache, ClientInfoCache, ConnectionCache, CounterCache, DeleteCache, + DisconnectCache, Error, ExactCacheContext, FlushCache, IncrementOperation, JsonCodec, + PingCache, QueueCache, RefreshTtlCache, ScanCache, ScriptCache, SetCache, TtlCache, + TtlPipelineCache, }; use litellm_cache_redis::{ RedisArg, RedisCache, RedisLpopOperation, RedisLpopResult, RedisNode, RedisRpushOperation, RedisTopology, }; use redis::cluster_routing::Slot; +use rstest::{fixture, rstest}; +use serde_json::json; +use support::{JsonCache, cluster_cache, cluster_url}; -type Cache = RedisCache>; +type Counter = RedisCache>; -fn topology() -> Option { - let nodes = std::env::var("LITELLM_TEST_REDIS_CLUSTER_NODES").ok()?; - let startup_nodes = nodes - .split(',') - .map(|node| { - let (host, port) = node.trim().rsplit_once(':').expect("host:port"); - RedisNode { - host: host.to_string(), - port: port.parse().expect("port"), - } - }) - .collect(); - Some(RedisTopology::Cluster { startup_nodes }) +#[fixture] +fn cache(#[default("cache")] label: &str) -> Option { + cluster_cache(label, Duration::from_secs(120), JsonCodec::new()) } -fn namespace(label: &str) -> String { - let nanos = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_nanos(); - format!("cluster-test:{label}:{nanos}") +#[fixture] +fn counter(#[default("counter")] label: &str) -> Option { + cluster_cache(label, Duration::from_secs(60), JsonCodec::new()) } -fn cluster_url() -> String { - std::env::var("LITELLM_TEST_REDIS_CLUSTER_URL") - .unwrap_or_else(|_| "redis://127.0.0.1:7000".into()) -} - -fn cluster_cache(label: &str) -> Option { - let topology = topology()?; - Some( - Cache::connect( - &cluster_url(), - &topology, - Some(Duration::from_secs(120)), - JsonCodec::new(), - ) - .expect("cluster connection") - .with_namespace(Some(namespace(label))), - ) -} - -fn counter_cache(label: &str) -> Option>> { - let topology = topology()?; - Some( - RedisCache::connect( - &cluster_url(), - &topology, - Some(Duration::from_secs(60)), - JsonCodec::new(), - ) - .expect("cluster connection") - .with_namespace(Some(namespace(label))), - ) +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext::default() } fn multi_slot_keys(count: usize) -> Vec { let keys: Vec = (0..count).map(|index| format!("key-{index}")).collect(); - let slots: std::collections::HashSet = keys.iter().map(Slot::for_key).collect(); + let slots: HashSet = keys.iter().map(Slot::for_key).collect(); assert!(slots.len() > 1, "keys must span multiple slots"); keys } -macro_rules! cluster_or_skip { - ($label:expr) => { - match cluster_cache($label) { - Some(cache) => cache, - None => return, - } - }; +fn seconds(seconds: u64) -> Option { + Some(Duration::from_secs(seconds)) } -#[test] -fn constructor_rejects_clusters_without_startup_nodes() { - let error = Cache::connect( - "redis://127.0.0.1:7000", - &RedisTopology::Cluster { - startup_nodes: Vec::new(), - }, +#[rstest] +#[case::no_startup_nodes("redis://127.0.0.1:7000", Vec::new())] +#[case::unix_socket_url( + "redis+unix:///tmp/redis.sock", + vec![RedisNode { host: "127.0.0.1".into(), port: 7000 }] +)] +fn constructor_rejects_unusable_cluster_configs( + #[case] url: &str, + #[case] startup_nodes: Vec, +) { + let error = JsonCache::connect( + url, + &RedisTopology::Cluster { startup_nodes }, None, JsonCodec::new(), ) @@ -102,60 +69,56 @@ fn constructor_rejects_clusters_without_startup_nodes() { assert!(matches!(error, Some(Error::Unavailable))); } -#[test] -fn constructor_rejects_unix_socket_urls_for_clusters() { - let error = Cache::connect( - "redis+unix:///tmp/redis.sock", - &RedisTopology::Cluster { - startup_nodes: vec![RedisNode { - host: "127.0.0.1".into(), - port: 7000, - }], - }, - None, - JsonCodec::new(), - ) - .err(); - assert!(matches!(error, Some(Error::Unavailable))); -} - -#[test] -fn single_key_operations_round_trip_with_ttl_rounding() { - let cache = cluster_or_skip!("single"); +#[rstest] +#[tokio::test] +async fn single_key_operations_round_trip_with_ttl_rounding( + #[with("single")] cache: Option, +) { + let Some(cache) = cache else { return }; let context = ExactCacheContext { ttl: Some(Duration::from_millis(1500)), }; let keys = multi_slot_keys(12); for (index, key) in keys.iter().enumerate() { cache - .set_cache(key, serde_json::json!({ "index": index }), &context) + .set_cache(key, json!({ "index": index }), &context) .unwrap(); } for (index, key) in keys.iter().enumerate() { assert_eq!( cache.get_cache(key, &context).unwrap(), - Some(serde_json::json!({ "index": index })) + Some(json!({ "index": index })) ); } - let runtime = tokio::runtime::Runtime::new().unwrap(); - let ttl = runtime.block_on(cache.async_get_ttl(&keys[0])).unwrap(); - assert_eq!(ttl, Some(2)); + assert_eq!(cache.async_get_ttl(&keys[0]).await.unwrap(), seconds(2)); + assert!( + cache + .async_refresh_ttl(&keys[0], seconds(40)) + .await + .unwrap() + ); + assert_eq!(cache.async_get_ttl(&keys[0]).await.unwrap(), seconds(40)); cache.delete_cache(&keys[0]).unwrap(); assert_eq!(cache.get_cache(&keys[0], &context).unwrap(), None); + assert!(!cache.async_refresh_ttl(&keys[0], None).await.unwrap()); assert!(cache.sync_ping().unwrap()); + cache.async_flush_cache().await.unwrap(); } +#[rstest] #[tokio::test] -async fn batch_reads_span_slots_and_preserve_order_with_malformed_entries() { - let cache = cluster_or_skip!("batch"); - let context = ExactCacheContext::default(); +async fn batch_reads_span_slots_and_preserve_order_with_malformed_entries( + #[with("batch")] cache: Option, + context: ExactCacheContext, +) { + let Some(cache) = cache else { return }; let keys = multi_slot_keys(40); for (index, key) in keys.iter().enumerate() { if index % 5 == 0 { continue; } cache - .async_set_cache(key, serde_json::json!(index), context.clone()) + .async_set_cache(key, json!(index), context.clone()) .await .unwrap(); } @@ -181,41 +144,65 @@ async fn batch_reads_span_slots_and_preserve_order_with_malformed_entries() { } else if index % 5 == 0 { BatchEntry::Miss } else { - BatchEntry::Hit(serde_json::json!(index)) + BatchEntry::Hit(json!(index)) }; assert_eq!(*entry, expected, "entry {index}"); } - let sync_entries = cache.batch_get_cache(&keys, &context).unwrap(); - assert_eq!(sync_entries, entries); + assert_eq!(cache.batch_get_cache(&keys, &context).unwrap(), entries); cache.delete_cache_keys(keys.clone()).await.unwrap(); let entries = cache.async_batch_get_cache(keys, context).await.unwrap(); assert!(entries.iter().all(|entry| *entry == BatchEntry::Miss)); } +#[rstest] #[tokio::test] -async fn pipelines_group_by_slot_and_return_results_in_submission_order() { - let cache = cluster_or_skip!("pipeline"); +async fn pipelines_group_by_slot_and_return_results_in_submission_order( + #[with("pipeline")] cache: Option, + counter: Option, + context: ExactCacheContext, +) { + let (Some(cache), Some(counter)) = (cache, counter) else { + return; + }; let keys = multi_slot_keys(30); - let entries = keys - .iter() - .enumerate() - .map(|(index, key)| (key.clone(), serde_json::json!(index))) - .collect(); cache - .async_set_cache_pipeline(entries, ExactCacheContext::default()) + .async_set_cache_pipeline( + keys.iter() + .enumerate() + .map(|(index, key)| (key.clone(), json!(index))) + .collect(), + context.clone(), + ) .await .unwrap(); let hits = cache - .async_batch_get_cache(keys.clone(), ExactCacheContext::default()) + .async_batch_get_cache(keys.clone(), context.clone()) .await .unwrap(); assert!( hits.iter() .enumerate() - .all(|(index, entry)| *entry == BatchEntry::Hit(serde_json::json!(index))) + .all(|(index, entry)| *entry == BatchEntry::Hit(json!(index))) ); + cache + .async_set_cache_pipeline_with_ttls( + keys.iter() + .enumerate() + .map(|(index, key)| (key.clone(), json!(index), seconds(index as u64 + 10))) + .collect(), + ) + .await + .unwrap(); + for (index, key) in keys.iter().enumerate() { + assert_eq!( + cache.async_get_ttl(key).await.unwrap(), + seconds(index as u64 + 10), + "{key}" + ); + } + let queues: Vec = keys.iter().map(|key| format!("queue:{key}")).collect(); let pushed = cache .async_rpush_pipeline( @@ -265,9 +252,6 @@ async fn pipelines_group_by_slot_and_return_results_in_submission_order() { } let counters: Vec = keys.iter().map(|key| format!("counter:{key}")).collect(); - let Some(counter) = counter_cache("counter") else { - return; - }; let totals = counter .async_increment_pipeline( counters @@ -284,25 +268,63 @@ async fn pipelines_group_by_slot_and_return_results_in_submission_order() { .unwrap(); let expected: Vec = (0..keys.len()).map(|index| index as f64 + 0.5).collect(); assert_eq!(totals, expected); - assert_eq!(counter.async_get_ttl(&counters[0]).await.unwrap(), Some(30)); + assert_eq!( + counter.async_get_ttl(&counters[0]).await.unwrap(), + seconds(30) + ); assert_eq!(counter.async_get_ttl(&counters[1]).await.unwrap(), None); counter.async_flush_cache().await.unwrap(); cache.async_flush_cache().await.unwrap(); } +#[rstest] #[tokio::test] -async fn scan_and_scoped_flush_cover_every_primary() { - let cache = cluster_or_skip!("flush"); - let other = cluster_or_skip!("other"); - let context = ExactCacheContext::default(); +async fn rpush_and_trim_is_one_transaction_on_the_key_slot( + #[with("trim")] cache: Option, +) { + let Some(cache) = cache else { return }; + let values = |values: &[&str]| values.iter().map(|value| RedisArg::from(*value)).collect(); + assert_eq!( + cache + .async_rpush_and_trim("buf", values(&["a", "b"]), 3) + .await + .unwrap(), + 2 + ); + assert_eq!( + cache + .async_rpush_and_trim("buf", values(&["c", "d"]), 3) + .await + .unwrap(), + 4 + ); + assert_eq!( + cache.async_lpop("buf", Some(10)).await.unwrap(), + RedisLpopResult::Values(vec![b"b".to_vec(), b"c".to_vec(), b"d".to_vec()]) + ); + cache.async_flush_cache().await.unwrap(); +} + +#[rstest] +#[tokio::test] +async fn scan_and_scoped_flush_cover_every_primary( + #[with("flush")] cache: Option, + #[from(cache)] + #[with("other")] + other: Option, + context: ExactCacheContext, +) { + let (Some(cache), Some(other)) = (cache, other) else { + return; + }; let keys = multi_slot_keys(60); for key in &keys { cache - .async_set_cache(key, serde_json::json!(true), context.clone()) + .async_set_cache(key, json!(true), context.clone()) .await .unwrap(); other - .async_set_cache(key, serde_json::json!(true), context.clone()) + .async_set_cache(key, json!(true), context.clone()) .await .unwrap(); } @@ -325,7 +347,7 @@ async fn scan_and_scoped_flush_cover_every_primary() { let kept = other.async_batch_get_cache(keys, context).await.unwrap(); assert!( kept.iter() - .all(|entry| *entry == BatchEntry::Hit(serde_json::json!(true))) + .all(|entry| *entry == BatchEntry::Hit(json!(true))) ); other.async_flush_cache().await.unwrap(); } @@ -361,9 +383,10 @@ fn ping_calls_per_node(startup: &redis::Client) -> Vec<(String, u64)> { counts } +#[rstest] #[tokio::test] -async fn ping_reaches_every_node() { - let cache = cluster_or_skip!("ping"); +async fn ping_reaches_every_node(#[with("ping")] cache: Option) { + let Some(cache) = cache else { return }; let startup = redis::Client::open(cluster_url()).unwrap(); let before = ping_calls_per_node(&startup); assert!(before.len() >= 2, "{before:?}"); @@ -375,14 +398,63 @@ async fn ping_reaches_every_node() { assert!(cache.sync_ping().unwrap()); let result = cache.test_connection().await.unwrap(); assert_eq!(result.status, CacheConnectionStatus::Success); + assert_eq!(result.message, "Redis Cluster connection test successful"); } +#[rstest] #[tokio::test] -async fn counters_claims_scripts_and_sets_work_on_the_cluster() { - let Some(counter) = counter_cache("counter") else { +async fn disconnect_closes_idle_connections_and_reconnects_on_demand( + #[with("disconnect")] cache: Option, +) { + let Some(cache) = cache else { return }; + assert!(cache.ping().await.unwrap()); + cache.disconnect().await.unwrap(); + assert!(cache.ping().await.unwrap()); +} + +#[rstest] +#[case::keep_existing_ttl(false)] +#[case::refresh_ttl(true)] +#[tokio::test] +async fn increments_refresh_the_ttl_only_when_asked( + counter: Option, + #[case] refresh_ttl: bool, +) { + let Some(counter) = counter else { return }; + let context = ExactCacheContext { ttl: seconds(60) }; + counter + .async_set_cache("spend", 0.0, ExactCacheContext { ttl: seconds(600) }) + .await + .unwrap(); + assert_eq!( + counter + .async_increment("spend", 1.5, context.clone(), refresh_ttl) + .await + .unwrap(), + 1.5 + ); + assert_eq!( + counter + .async_increment("spend", 2.0, context, refresh_ttl) + .await + .unwrap(), + 3.5 + ); + let ttl = counter.async_get_ttl("spend").await.unwrap().unwrap(); + assert_eq!(ttl <= Duration::from_secs(60), refresh_ttl, "{ttl:?}"); + counter.async_flush_cache().await.unwrap(); +} + +#[rstest] +#[tokio::test] +async fn counters_claims_scripts_and_sets_work_on_the_cluster( + counter: Option, + #[with("claim")] cache: Option, + context: ExactCacheContext, +) { + let (Some(counter), Some(cache)) = (counter, cache) else { return; }; - let context = ExactCacheContext::default(); assert_eq!( counter .increment_cache("spend", 1.5, context.clone()) @@ -391,7 +463,7 @@ async fn counters_claims_scripts_and_sets_work_on_the_cluster() { ); assert_eq!( counter - .async_increment("spend", 2.0, context.clone()) + .async_increment("spend", 2.0, context.clone(), false) .await .unwrap(), 3.5 @@ -413,9 +485,8 @@ async fn counters_claims_scripts_and_sets_work_on_the_cluster() { assert_eq!(counter.async_set_max("peak", 2.0, None).await.unwrap(), 4.0); counter.flush_cache().unwrap(); - let cache = cluster_or_skip!("claim"); - let owner = serde_json::json!("owner-a"); - let rival = serde_json::json!("owner-b"); + let owner = json!("owner-a"); + let rival = json!("owner-b"); assert_eq!( cache .claim_cache("lock", owner.clone(), &[], context.clone()) @@ -453,8 +524,8 @@ async fn counters_claims_scripts_and_sets_work_on_the_cluster() { .await .unwrap(); assert_eq!(reply, redis::Value::Okay); - assert_eq!(cache.async_get_ttl("scripted").await.unwrap(), Some(5)); - let evaluated: redis::Value = cache + assert_eq!(cache.async_get_ttl("scripted").await.unwrap(), seconds(5)); + let evaluated = cache .async_eval( "return redis.call('GET', KEYS[1])".into(), vec!["scripted".into()], @@ -472,13 +543,13 @@ async fn counters_claims_scripts_and_sets_work_on_the_cluster() { RedisArg::Bytes(b"a".to_vec()), RedisArg::Bytes(b"b".to_vec()) ], - Some(Duration::from_secs(9)), + seconds(9), ) .await .unwrap(), 2 ); - assert_eq!(cache.async_get_ttl("members").await.unwrap(), Some(9)); + assert_eq!(cache.async_get_ttl("members").await.unwrap(), seconds(9)); let result = cache.test_connection().await.unwrap(); assert_eq!(result.status, CacheConnectionStatus::Success); diff --git a/litellm-rust/crates/cache-redis/tests/contract.rs b/litellm-rust/crates/cache-redis/tests/contract.rs new file mode 100644 index 00000000000..85d043b90b2 --- /dev/null +++ b/litellm-rust/crates/cache-redis/tests/contract.rs @@ -0,0 +1,95 @@ +//! The shared cache contracts, run against the in-process fake connection and, when +//! `LITELLM_TEST_REDIS_CLUSTER_NODES` is set, against a live Redis Cluster. + +mod support; + +use std::time::Duration; + +use litellm_cache::{ExactCacheContext, JsonCodec}; +use litellm_cache_testing as contract; +use rstest::rstest; +use serde_json::json; +use support::{JsonCache, cluster_cache, fake_cache}; + +const PREFIX: &str = "contract:"; + +#[derive(Clone, Copy, Debug)] +enum Contract { + HitAndMiss, + SyncAsyncEquivalence, + OverwriteReplaces, + PipelineWritesEveryEntry, + BatchPreservesOrder, + DeleteRemovesKey, + FlushClears, + CounterAccumulates, +} + +#[derive(Clone, Copy, Debug)] +enum Server { + Fake, + Cluster, +} + +async fn check(contract: Contract, cache: &JsonCache) +where + C: redis::ConnectionLike + Send + 'static, +{ + let context = ExactCacheContext::default(); + match contract { + Contract::HitAndMiss => { + contract::hit_and_miss(cache, context, PREFIX, json!({"answer": 42})).await + } + Contract::SyncAsyncEquivalence => { + contract::sync_async_equivalence(cache, context, PREFIX, json!("first"), json!([2])) + .await + } + Contract::OverwriteReplaces => { + contract::overwrite_replaces(cache, context, PREFIX, json!(1), json!({"b": 2})).await + } + Contract::PipelineWritesEveryEntry => { + contract::pipeline_writes_every_entry( + cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await + } + Contract::BatchPreservesOrder => { + contract::batch_preserves_order(cache, context, PREFIX, json!("first"), json!(2)).await + } + Contract::DeleteRemovesKey => { + contract::delete_removes_key(cache, context, PREFIX, json!("value")).await + } + Contract::FlushClears => { + contract::flush_clears(cache, context, PREFIX, json!("value")).await + } + Contract::CounterAccumulates => contract::counter_accumulates(cache, context, PREFIX).await, + } +} + +#[rstest] +#[case::hit_and_miss(Contract::HitAndMiss)] +#[case::sync_async_equivalence(Contract::SyncAsyncEquivalence)] +#[case::overwrite_replaces(Contract::OverwriteReplaces)] +#[case::pipeline_writes_every_entry(Contract::PipelineWritesEveryEntry)] +#[case::batch_preserves_order(Contract::BatchPreservesOrder)] +#[case::delete_removes_key(Contract::DeleteRemovesKey)] +#[case::flush_clears(Contract::FlushClears)] +#[case::counter_accumulates(Contract::CounterAccumulates)] +#[tokio::test] +async fn redis_satisfies_the_cache_contract( + #[case] contract: Contract, + #[values(Server::Fake, Server::Cluster)] server: Server, +) { + match server { + Server::Fake => check(contract, &fake_cache("contract")).await, + Server::Cluster => { + let label = format!("{contract:?}"); + if let Some(cache) = cluster_cache(&label, Duration::from_secs(120), JsonCodec::new()) { + check(contract, &cache).await; + } + } + } +} diff --git a/litellm-rust/crates/cache-redis/tests/support/mod.rs b/litellm-rust/crates/cache-redis/tests/support/mod.rs new file mode 100644 index 00000000000..bff1e618582 --- /dev/null +++ b/litellm-rust/crates/cache-redis/tests/support/mod.rs @@ -0,0 +1,231 @@ +#![allow(dead_code)] + +use std::{ + collections::BTreeMap, + time::{Duration, SystemTime, UNIX_EPOCH}, +}; + +use litellm_cache::{CacheCodec, Error, JsonCodec}; +use litellm_cache_redis::{RedisCache, RedisNode, RedisTopology}; + +/// Encodes a byte behind a tag, so a value written with another tag decodes as invalid. +pub struct TaggedByteCodec(pub u8); + +impl CacheCodec for TaggedByteCodec { + type Value = u8; + + fn encode(&self, value: &u8) -> Result, Error> { + if *value > 127 { + return Err(Error::InvalidEntry); + } + Ok(vec![self.0, *value]) + } + + fn decode(&self, bytes: &[u8]) -> Result { + match bytes { + [tag, value] if *tag == self.0 => Ok(*value), + _ => Err(Error::InvalidEntry), + } + } +} + +/// A stateful in-process stand-in for a Redis server that understands the string commands the +/// shared contracts exercise, so they run without a live server. TTLs are accepted and ignored. +#[derive(Default)] +pub struct FakeRedis { + strings: BTreeMap, Vec>, +} + +impl FakeRedis { + fn run(&mut self, command: Vec>) -> redis::RedisResult { + let name = String::from_utf8_lossy(&command[0]).to_ascii_uppercase(); + let args = &command[1..]; + Ok(match name.as_str() { + "PING" => redis::Value::SimpleString("PONG".into()), + "SET" | "SETEX" => { + let value = if name == "SET" { &args[1] } else { &args[2] }; + self.strings.insert(args[0].clone(), value.clone()); + redis::Value::Okay + } + "GET" => self.get(&args[0]), + "MGET" => redis::Value::Array(args.iter().map(|key| self.get(key)).collect()), + "DEL" => { + let removed = args + .iter() + .filter(|key| self.strings.remove(*key).is_some()) + .count(); + redis::Value::Int(removed as i64) + } + "SCAN" => { + let pattern = &args[2]; + let keys = self + .strings + .keys() + .filter(|key| glob(pattern, key)) + .map(|key| redis::Value::BulkString(key.clone())) + .collect(); + redis::Value::Array(vec![ + redis::Value::BulkString(b"0".to_vec()), + redis::Value::Array(keys), + ]) + } + "EVAL" if args[0].windows(11).any(|window| window == b"INCRBYFLOAT") => { + self.increment_by_float(&args[2], &args[3]) + } + "INCRBYFLOAT" => self.increment_by_float(&args[0], &args[1]), + _ => { + return Err(redis::RedisError::from(( + redis::ErrorKind::Client, + "unsupported command", + name, + ))); + } + }) + } + + fn get(&self, key: &[u8]) -> redis::Value { + self.strings.get(key).map_or(redis::Value::Nil, |value| { + redis::Value::BulkString(value.clone()) + }) + } + + fn increment_by_float(&mut self, key: &[u8], amount: &[u8]) -> redis::Value { + let current = self + .strings + .get(key) + .map_or(0.0, |value| parse_float(value)); + let total = format!("{}", current + parse_float(amount)); + self.strings + .insert(key.to_vec(), total.clone().into_bytes()); + redis::Value::BulkString(total.into_bytes()) + } +} + +fn parse_float(bytes: &[u8]) -> f64 { + std::str::from_utf8(bytes).unwrap().parse().unwrap() +} + +/// Redis `MATCH` globbing for `*`, `?` and backslash escapes. +fn glob(pattern: &[u8], key: &[u8]) -> bool { + match pattern.split_first() { + None => key.is_empty(), + Some((b'*', rest)) => (0..=key.len()).any(|skip| glob(rest, &key[skip..])), + Some((b'?', rest)) => !key.is_empty() && glob(rest, &key[1..]), + Some((b'\\', [escaped, rest @ ..])) => { + key.first() == Some(escaped) && glob(rest, &key[1..]) + } + Some((literal, rest)) => key.first() == Some(literal) && glob(rest, &key[1..]), + } +} + +/// Splits RESP request bytes into the commands they carry. +fn commands(mut bytes: &[u8]) -> Vec>> { + fn line<'a>(bytes: &mut &'a [u8]) -> &'a [u8] { + let end = bytes + .windows(2) + .position(|window| window == b"\r\n") + .unwrap(); + let (line, rest) = bytes.split_at(end); + *bytes = &rest[2..]; + line + } + fn length(line: &[u8]) -> usize { + std::str::from_utf8(&line[1..]).unwrap().parse().unwrap() + } + let mut commands = Vec::new(); + while !bytes.is_empty() { + let count = length(line(&mut bytes)); + let command = (0..count) + .map(|_| { + let size = length(line(&mut bytes)); + let (argument, rest) = bytes.split_at(size); + bytes = &rest[2..]; + argument.to_vec() + }) + .collect(); + commands.push(command); + } + commands +} + +impl redis::ConnectionLike for FakeRedis { + fn req_packed_command(&mut self, cmd: &[u8]) -> redis::RedisResult { + let command = commands(cmd).into_iter().next().unwrap(); + self.run(command) + } + + fn req_packed_commands( + &mut self, + cmd: &[u8], + offset: usize, + count: usize, + ) -> redis::RedisResult> { + let replies = commands(cmd) + .into_iter() + .map(|command| self.run(command)) + .collect::>>()?; + Ok(replies.into_iter().skip(offset).take(count).collect()) + } + + fn get_db(&self) -> i64 { + 0 + } + + fn check_connection(&mut self) -> bool { + true + } + + fn is_open(&self) -> bool { + true + } +} + +pub type JsonCache = RedisCache, C>; + +pub fn fake_cache(namespace: &str) -> JsonCache { + RedisCache::with_connection(FakeRedis::default(), None, JsonCodec::new()) + .with_namespace(Some(namespace.into())) +} + +/// Startup nodes from `LITELLM_TEST_REDIS_CLUSTER_NODES` (`host:port,host:port`); tests that +/// need a live cluster skip when it is unset. +pub fn cluster_topology() -> Option { + let nodes = std::env::var("LITELLM_TEST_REDIS_CLUSTER_NODES").ok()?; + let startup_nodes = nodes + .split(',') + .map(|node| { + let (host, port) = node.trim().rsplit_once(':').expect("host:port"); + RedisNode { + host: host.to_string(), + port: port.parse().expect("port"), + } + }) + .collect(); + Some(RedisTopology::Cluster { startup_nodes }) +} + +pub fn cluster_url() -> String { + std::env::var("LITELLM_TEST_REDIS_CLUSTER_URL") + .unwrap_or_else(|_| "redis://127.0.0.1:7000".into()) +} + +pub fn unique_namespace(label: &str) -> String { + let nanos = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_nanos(); + format!("cluster-test:{label}:{nanos}") +} + +pub fn cluster_cache( + label: &str, + default_ttl: Duration, + codec: S, +) -> Option> { + let topology = cluster_topology()?; + Some( + RedisCache::connect(&cluster_url(), &topology, Some(default_ttl), codec) + .expect("cluster connection") + .with_namespace(Some(unique_namespace(label))), + ) +} diff --git a/litellm-rust/crates/cache-response/Cargo.toml b/litellm-rust/crates/cache-response/Cargo.toml index 04affb9872d..42a1afb2ba0 100644 --- a/litellm-rust/crates/cache-response/Cargo.toml +++ b/litellm-rust/crates/cache-response/Cargo.toml @@ -17,4 +17,5 @@ litellm-cache-memory.workspace = true litellm-cache-redis.workspace = true redis = "1.7.0" redis-test = "1.0.4" +rstest.workspace = true tokio.workspace = true diff --git a/litellm-rust/crates/cache-response/README.md b/litellm-rust/crates/cache-response/README.md index d048afb69f8..dbad474c9e7 100644 --- a/litellm-rust/crates/cache-response/README.md +++ b/litellm-rust/crates/cache-response/README.md @@ -1,14 +1,16 @@ -# Response cache foundation +# Response cache `ResponseCache` adds request keys, independent read/write controls, response envelopes, and freshness checks to any `B: BaseCache` ## Ownership -`litellm-cache` defines typed storage and codec traits. Memory and Redis implement those traits without depending on response policy. Other consumers can store their own value types using the same backend implementations +`litellm-cache` defines typed storage, codec, and capability traits. `BaseCache` is only get, set, TTL, and pipeline writes. Everything else is an optional capability a backend implements only where its Python class defines the method: `DisconnectCache`, `ConnectionCache` (`test_connection`), `PingCache`, `BatchCache`, `DeleteCache`, `FlushCache`, counters, queues, TTL, scan, and scripts. Memory, Redis, disk, S3, GCS, and Azure Blob implement those traits without depending on response policy, so other consumers can store their own value types in the same backends + +Semantic backends (Redis, Valkey, Qdrant) are generic over their embedder and codec, and share one prompt and embedding contract from `litellm_cache::semantic`. They take a `SemanticCacheContext`, so `ResponseCache` drives them the same way it drives exact backends `litellm-cache-response` owns response keys, controls, entries, the Python-compatible response codec, and `WriteBuffer`, the backend-neutral deferred-write policy. It has no runtime dependency on a specific cache backend or Python -The Python bridge constructs backends and selects them through its private `NativeResponseCache` enum, which only dispatches. Generic Rust callers inject their backend directly. A native gateway can construct the same generic response service in its own host +`ExactResponseCache` is the object-safe view of a `ResponseCache` over an exact backend. `ConnectionProbe` is the object-safe `test_connection`, implemented only when the backend implements `ConnectionCache`, so a host holds one next to its `ExactResponseCache` and reports the operation as unsupported otherwise, as Python's `BaseCache` does. Lookup, store, batch, and flush never require it ## Native Rust use @@ -28,36 +30,22 @@ cache.store(&request, json!({"answer": 7}), now)?; assert_eq!(cache.async_lookup(&request, now).await?, Some(json!({"answer": 7}))); ``` -For Redis, inject `RedisCache::new(url, ttl, ResponseCacheCodec)` instead. Namespaces are optional and existing namespace prefixes are preserved. Sync operations check out independent connections from a bounded pool, while async callers, including counters and claims, move that blocking work off the executor. The pool skips the checkout PING and instead discards any connection whose command failed +For Redis, inject `RedisCache::new(url, ttl, ResponseCacheCodec)` instead. Namespaces are optional and existing namespace prefixes are preserved Callers supply Unix time for response freshness. Backend TTL uses its own clock. A read can reject an entry through `max_age` even while the backend still retains it -## Python integration boundary +## Python integration -The extension keeps a private test harness for memory and Redis single and batch response lookup and storage. Batch lookup returns ordered values plus missing indices for embedding partial-hit wiring. No bridge-only cache type is part of the public API +The bridge activates backends through the Rust catalog in `litellm/rust_bridge/catalog.py`. Every cache rule ships as `PYTHON_ONLY`, so SDK, Router, and proxy calls stay on Python and construct no native cache resources until a rule is changed -The bridge also exposes a production-shaped response cache runtime selected through the Rust catalog. Its shipped rule set is empty, so current SDK, Router, and proxy calls stay on Python and do not construct native cache resources. Tests can inject a rule and build the native memory runtime from an ordinary Python `Cache` configuration without changing the legacy cache classes +When a rule selects a backend, the Python `Cache` facade builds the native runtime from its own configuration and routes its storage calls (sync and async lookup and store, and pipelined batch store) to it. Stream replay, embedding partial-hit merging, response reconstruction, and callbacks stay in Python on top of that native store. The Python backend object remains for its direct API Object responses are written as they are, and every other response shape is written as a serialized string, which is the pair of shapes Python reads. A string on the wire is therefore always a serialized response, so string-valued responses round trip. Typed backends such as memory never pass through the codec -The resolver reads the namespace's `cache` attribute each time it resolves. A captured binding retains the selected service for its operation, including background writes. `None` disables caching. Custom Python cache objects keep their original methods, arguments, returned awaitables, exceptions, and caller-task execution - -Python callbacks use the built-in `Cache` API, so a `Cache` subclass works unchanged. A batch lookup takes one original kwargs mapping per request and returns the list of `get_cache` or gathered `async_get_cache` results, while native bindings return `{values, missing_indices}`. A batch store hands the caller's original result to `async_add_cache_pipeline`. `ping` calls `ping`, and a flush goes to the facade's backend - -The private facade test harness checks object identity, method overrides, effective TTL, Redis namespace, memory capacity, and later configuration changes before selecting native execution. Its snapshot includes Redis connection settings, so a later `redis_kwargs` change, including an SSL option, selects Python callback execution. Buffered async writes honor `redis_flush_size`. Public activation must construct the shared native service from the initial Python Redis settings, including `litellm.default_redis_ttl` and SSL options. A buffered entry keeps the time it was produced, and a failed flush drops its batch instead of growing the buffer during an outage. The harness does not migrate entries or replace Python methods. Until activation configures one shared service, the Python facade and native test service can hold separate data. Existing public cache constructors remain on Python - -Native cache handles must be recreated after fork. The bridge releases the GIL around native operations, and Redis runs blocking connection operations off the async executor. Native errors propagate to the host, which owns the existing fail-open and logging policy - -The Redis backend also provides the primitives needed to preserve its direct Python surface later: TLS URLs, ping, bulk delete, counter batches, TTL, scan, set membership, raw queue push and pop, queue and counter pipelines, counter floor and maximum operations, script evaluation, client information, namespaced flush, and full flush. These are backend operations only and are not exported to Python by this PR. Memory provides TTL, oldest-key, and counter-pipeline operations +Native cache handles must be recreated after fork. Native errors propagate to the host, which owns the existing fail-open and logging policy ## Adding another backend -Implement `BaseCache` for the backend with its associated value type, and accept a `CacheCodec` when wire serialization is needed. `ResponseCache` then works without another response implementation. Add a concrete bridge enum variant and constructor only when exposing that backend to Python +Implement `BaseCache` for the backend with its associated value type and the capability traits its Python class supports, and accept a `CacheCodec` when wire serialization is needed. `ResponseCache` then works without another response implementation -Verify typed values, TTL precedence, missing entries, serialization failures, namespaces, batch ordering, and sync/async behavior. Run response fixtures with `ResponseCacheCodec`, including both Python envelope encodings, before enabling a public facade - -## Follow-up scope - -Public SDK, Router, and proxy activation still need constructor parity, stream replay, embedding partial-batch integration, response reconstruction, callback scheduling, and failure-policy integration. This foundation does not switch those request paths - -Redis cluster, disk, and cloud stores remain follow-ups. Semantic backends plug in through `SemanticCacheContext`, which carries the prompt inputs and metadata alongside the cache TTL. The generic dual cache takes read, write, and remote-failure policies, runs its async operations through the async L2 methods, and provides L2-first counters and atomic affinity claims. Errors propagate by default, and `RemoteFailurePolicy::UseLocal` opts key-value operations and claims into the local tier when L2 is unavailable. Claims compare decoded values, so a pin written by Python still matches. Public Router integration remains follow-up work. Reservations and pubsub still need explicit capabilities owned by their consuming features. Adding a cache backend does not establish those guarantees +Run the `litellm-cache-testing` contract checks the backend's capabilities allow, and run response fixtures with `ResponseCacheCodec`, including both Python envelope encodings, before adding a catalog rule diff --git a/litellm-rust/crates/cache-response/src/exact.rs b/litellm-rust/crates/cache-response/src/exact.rs index f5e86b2598c..16b79e4b11b 100644 --- a/litellm-rust/crates/cache-response/src/exact.rs +++ b/litellm-rust/crates/cache-response/src/exact.rs @@ -1,7 +1,8 @@ use std::{future::Future, pin::Pin, time::Duration}; use litellm_cache::{ - BaseCache, BatchCache, CacheConnectionResult, Error, ExactCacheContext, FlushCache, + BaseCache, BatchCache, CacheConnectionResult, ConnectionCache, Error, ExactCacheContext, + FlushCache, }; use serde_json::Value; @@ -61,10 +62,25 @@ pub trait ExactResponseCache: Send + Sync { ) -> BoxFuture<'a, Result<(), Error>>; fn async_flush<'a>(&'a self) -> BoxFuture<'a, Result<(), Error>>; +} +/// Object-safe `test_connection` for the exact backends whose Python class defines it. Hosts hold +/// one next to their `ExactResponseCache` when the backend has it, and report the operation as +/// unsupported otherwise, as Python's `BaseCache.test_connection` does. +pub trait ConnectionProbe: Send + Sync { fn test_connection<'a>(&'a self) -> BoxFuture<'a, Result>; } +impl ConnectionProbe for ResponseCache +where + B: ConnectionCache, + B::Context: Default + PartialEq, +{ + fn test_connection<'a>(&'a self) -> BoxFuture<'a, Result> { + Box::pin(ResponseCache::test_connection(self)) + } +} + impl ExactResponseCache for ResponseCache where B: BaseCache + BatchCache + FlushCache, @@ -141,8 +157,4 @@ where fn async_flush<'a>(&'a self) -> BoxFuture<'a, Result<(), Error>> { Box::pin(ResponseCache::async_flush(self)) } - - fn test_connection<'a>(&'a self) -> BoxFuture<'a, Result> { - Box::pin(ResponseCache::test_connection(self)) - } } diff --git a/litellm-rust/crates/cache-response/src/lib.rs b/litellm-rust/crates/cache-response/src/lib.rs index ab9867ac8db..a6a4bb3eb64 100644 --- a/litellm-rust/crates/cache-response/src/lib.rs +++ b/litellm-rust/crates/cache-response/src/lib.rs @@ -12,5 +12,5 @@ pub use caching::{ }; pub use codec::ResponseCacheCodec; pub use embedding::PartialHits; -pub use exact::ExactResponseCache; +pub use exact::{ConnectionProbe, ExactResponseCache}; pub use response::{ResponseCache, ResponseCacheRequest}; diff --git a/litellm-rust/crates/cache-response/src/response.rs b/litellm-rust/crates/cache-response/src/response.rs index 5088402f125..e761c7157db 100644 --- a/litellm-rust/crates/cache-response/src/response.rs +++ b/litellm-rust/crates/cache-response/src/response.rs @@ -1,7 +1,9 @@ use std::{sync::Arc, time::Duration}; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, CacheConnectionResult, CacheContext, Error, FlushCache, + BaseCache, BatchCache, BatchEntry, CacheConnectionResult, CacheContext, ConnectionCache, Error, + FlushCache, + semantic::{SemanticCache, SemanticLookup}, }; use serde_json::Value; @@ -78,7 +80,10 @@ where self.backend.async_flush_cache().await } - pub async fn test_connection(&self) -> Result { + pub async fn test_connection(&self) -> Result + where + B: ConnectionCache, + { self.backend.test_connection().await } @@ -121,6 +126,43 @@ where Ok(Self::fresh_or_miss(entry, now, request.max_age)) } + /// `lookup` plus the similarity the semantic backend reports. Freshness applies to the + /// value only: Python stamps the similarity before its max-age check. + pub fn lookup_semantic( + &self, + request: &ResponseCacheRequest, + now: Duration, + ) -> Result, Error> + where + B: SemanticCache, + { + if !request.controls.reads() { + return Ok(SemanticLookup::miss(None)); + } + let lookup = self + .backend + .get_cache_with_similarity(&cache_key(&request.key), &request.context); + Self::fresh_semantic(lookup, now, request.max_age) + } + + pub async fn async_lookup_semantic( + &self, + request: &ResponseCacheRequest, + now: Duration, + ) -> Result, Error> + where + B: SemanticCache, + { + if !request.controls.reads() { + return Ok(SemanticLookup::miss(None)); + } + let lookup = self + .backend + .async_get_cache_with_similarity(&cache_key(&request.key), &request.context) + .await; + Self::fresh_semantic(lookup, now, request.max_age) + } + pub fn lookup_batch( &self, requests: &[ResponseCacheRequest], @@ -290,6 +332,21 @@ where Ok(PartialHits::new(values)) } + fn fresh_semantic( + lookup: Result, Error>, + now: Duration, + max_age: Option, + ) -> Result, Error> { + match lookup { + Ok(lookup) => Ok(SemanticLookup { + value: Self::fresh_or_miss(lookup.value, now, max_age), + similarity: lookup.similarity, + }), + Err(Error::InvalidEntry) => Ok(SemanticLookup::miss(None)), + Err(error) => Err(error), + } + } + fn fresh_or_miss( entry: Option, now: Duration, diff --git a/litellm-rust/crates/cache-response/tests/caching.rs b/litellm-rust/crates/cache-response/tests/caching.rs index 0e8ce9b3b1d..93c2eb3d16d 100644 --- a/litellm-rust/crates/cache-response/tests/caching.rs +++ b/litellm-rust/crates/cache-response/tests/caching.rs @@ -1,90 +1,174 @@ use litellm_cache_response::{ CacheControls, CacheKeyContext, CacheKeyField, CacheKeyInput, cache_key, get_cache_key, + should_use_cache, }; +use rstest::rstest; use sha2::{Digest, Sha256}; -#[test] -fn keys_match_python_order_groups_files_presets_and_namespaces() { - let mut input = CacheKeyInput { - fields: vec![ - CacheKeyField { - name: "model".into(), - value: Some("deployment".into()), - api_parameter: true, - internal_parameter: false, - }, - CacheKeyField { - name: "file".into(), - value: None, - api_parameter: true, - internal_parameter: false, - }, - ], - namespace: Some("team".into()), - ..Default::default() - }; +fn field(name: &str, value: Option<&str>) -> CacheKeyField { + CacheKeyField { + name: name.into(), + value: value.map(str::to_owned), + api_parameter: true, + internal_parameter: false, + } +} + +fn hash(preimage: &[u8]) -> String { + format!("{:x}", Sha256::digest(preimage)) +} + +#[rstest] +#[case::caching_group_and_checksum( CacheKeyContext { model_group: Some("group".into()), caching_groups: vec![(vec!["group".into()], "['group']".into())], file_checksum: Some("checksum".into()), ..Default::default() - } - .apply(&mut input); - assert_eq!( - cache_key(&input), - format!( - "team:{:x}", - Sha256::digest(b"model: ['group']file: checksum") - ) - ); - input.preset = Some("preset".into()); + }, + Some("team"), + "team:", + b"model: ['group']file: checksum".as_slice(), +)] +#[case::model_group_outside_caching_groups( + CacheKeyContext { + model_group: Some("group".into()), + caching_groups: vec![(vec!["other".into()], "['other']".into())], + file_object_name: Some("object".into()), + ..Default::default() + }, + None, + "", + b"model: groupfile: object".as_slice(), +)] +#[case::metadata_file_name_before_parameters( + CacheKeyContext { + metadata_file_name: Some("metadata".into()), + parameters_file_name: Some("parameters".into()), + ..Default::default() + }, + Some(""), + "", + b"model: deploymentfile: metadata".as_slice(), +)] +#[case::parameters_file_name_last( + CacheKeyContext { + parameters_file_name: Some("parameters".into()), + ..Default::default() + }, + None, + "", + b"model: deploymentfile: parameters".as_slice(), +)] +#[case::no_context_keeps_the_request_model( + CacheKeyContext::default(), + Some("team"), + "team:", + b"model: deployment".as_slice(), +)] +fn keys_match_python_order_groups_files_and_namespaces( + #[case] context: CacheKeyContext, + #[case] namespace: Option<&str>, + #[case] prefix: &str, + #[case] preimage: &[u8], +) { + let mut input = CacheKeyInput { + fields: vec![field("model", Some("deployment")), field("file", None)], + namespace: namespace.map(str::to_owned), + ..Default::default() + }; + context.apply(&mut input); + let expected = format!("{prefix}{}", hash(preimage)); + assert_eq!(cache_key(&input), expected); + assert_eq!(get_cache_key(&input), expected); +} + +#[rstest] +#[case::api_parameter(true, false, false, true)] +#[case::provider_parameter_when_included(false, false, true, true)] +#[case::provider_parameter_when_excluded(false, false, false, false)] +#[case::internal_parameter_never(false, true, true, false)] +fn keys_hash_api_and_opted_in_provider_parameters( + #[case] api_parameter: bool, + #[case] internal_parameter: bool, + #[case] include_provider_parameters: bool, + #[case] hashed: bool, +) { + let input = CacheKeyInput { + fields: vec![ + field("model", Some("a")), + CacheKeyField { + name: "extra".into(), + value: Some("x".into()), + api_parameter, + internal_parameter, + }, + ], + include_provider_parameters, + ..Default::default() + }; + let preimage: &[u8] = if hashed { + b"model: aextra: x" + } else { + b"model: a" + }; + assert_eq!(cache_key(&input), hash(preimage)); +} + +#[rstest] +#[case::without_namespace(None)] +#[case::with_namespace(Some("team"))] +fn preset_keys_are_used_verbatim(#[case] namespace: Option<&str>) { + let input = CacheKeyInput { + fields: vec![field("model", Some("a"))], + preset: Some("preset".into()), + namespace: namespace.map(str::to_owned), + ..Default::default() + }; + assert_eq!(cache_key(&input), "preset"); assert_eq!(get_cache_key(&input), "preset"); } -#[test] -fn cache_controls_honor_default_modes_and_directives() { - let enabled = CacheControls { - supported_call_type: true, - configured: true, - default_on: true, - ..Default::default() - }; - assert!(enabled.reads()); - assert!(enabled.writes()); - assert!( - !CacheControls { - default_on: false, - ..enabled - } - .reads() - ); - assert!( - CacheControls { - default_on: false, - use_cache: true, - ..enabled - } - .reads() - ); - assert!( - !CacheControls { - no_cache: true, - ..enabled - } - .reads() - ); - assert!( - !CacheControls { - no_store: true, - ..enabled - } - .writes() - ); - assert!( - !CacheControls { - caching: Some(false), - ..enabled - } - .writes() - ); +const ENABLED: CacheControls = CacheControls { + supported_call_type: true, + configured: true, + native_backend: false, + default_on: true, + caching: None, + no_cache: false, + no_store: false, + use_cache: false, +}; + +#[rstest] +#[case::enabled(ENABLED, true, true)] +#[case::default_off(CacheControls { default_on: false, ..ENABLED }, false, false)] +#[case::default_off_with_use_cache( + CacheControls { default_on: false, use_cache: true, ..ENABLED }, + true, + true +)] +#[case::no_cache(CacheControls { no_cache: true, ..ENABLED }, false, true)] +#[case::no_store(CacheControls { no_store: true, ..ENABLED }, true, false)] +#[case::no_cache_and_no_store( + CacheControls { no_cache: true, no_store: true, ..ENABLED }, + false, + false +)] +#[case::caching_disabled(CacheControls { caching: Some(false), ..ENABLED }, false, false)] +#[case::caching_enabled(CacheControls { caching: Some(true), ..ENABLED }, true, true)] +#[case::unsupported_call_type( + CacheControls { supported_call_type: false, ..ENABLED }, + false, + false +)] +#[case::unconfigured(CacheControls { configured: false, ..ENABLED }, false, false)] +fn cache_controls_honor_default_modes_and_directives( + #[case] controls: CacheControls, + #[case] reads: bool, + #[case] writes: bool, +) { + assert_eq!(controls.reads(), reads); + assert_eq!(controls.writes(), writes); + assert_eq!(should_use_cache(controls), reads || writes); } diff --git a/litellm-rust/crates/cache-response/tests/codec.rs b/litellm-rust/crates/cache-response/tests/codec.rs new file mode 100644 index 00000000000..4fb5a5094cb --- /dev/null +++ b/litellm-rust/crates/cache-response/tests/codec.rs @@ -0,0 +1,110 @@ +use litellm_cache::{CacheCodec, Error}; +use litellm_cache_response::{CacheEntry, ResponseCacheCodec}; +use rstest::rstest; +use serde_json::{Value, json}; + +fn entry(response: Value) -> CacheEntry { + CacheEntry { + timestamp: Some(100.0), + response, + } +} + +#[rstest] +#[case::python_literal_object( + br#"{'timestamp': 100.0, 'response': {'text': 'hello \\ world', 'flag': True, 'empty': None, 'list': [1, 2.5]}}"#.as_slice(), + json!({"text": "hello \\ world", "flag": true, "empty": null, "list": [1, 2.5]}), +)] +#[case::python_sync_string_response( + br#"{'timestamp': 100.0, 'response': '{"ok": true, "text": "cached"}'}"#.as_slice(), + json!({"ok": true, "text": "cached"}), +)] +#[case::python_literal_string_response( + br#"{'timestamp': 100.0, 'response': "{'ok': True, 'items': (1, 2)}"}"#.as_slice(), + json!({"ok": true, "items": [1, 2]}), +)] +#[case::json_object_response( + br#"{"timestamp":100.0,"response":{"ok":true,"text":"cached"}}"#.as_slice(), + json!({"ok": true, "text": "cached"}), +)] +#[case::json_string_response( + br#"{"timestamp": 100.0, "response": "[1,2]"}"#.as_slice(), + json!([1, 2]), +)] +fn decode_reads_every_python_envelope(#[case] bytes: &[u8], #[case] response: Value) { + assert_eq!(ResponseCacheCodec.decode(bytes).unwrap(), entry(response)); +} + +#[rstest] +#[case::code_is_not_executed(b"__import__('os').system('false')".to_vec())] +#[case::non_numeric_timestamp(b"{'timestamp': 'invalid', 'response': {}}".to_vec())] +#[case::infinite_timestamp(b"{'timestamp': 1e9999, 'response': {}}".to_vec())] +#[case::missing_response(br#"{"timestamp": 100.0}"#.to_vec())] +#[case::unserialized_string_response(br#"{"timestamp": 100.0, "response": "not serialized"}"#.to_vec())] +#[case::non_utf8(vec![0xff, 0xfe])] +#[case::deep_nesting(format!("{}None{}", "[".repeat(1000), "]".repeat(1000)).into_bytes())] +fn decode_rejects_invalid_entries(#[case] bytes: Vec) { + assert_eq!( + ResponseCacheCodec.decode(&bytes).unwrap_err(), + Error::InvalidEntry + ); +} + +#[rstest] +#[case::nan(f64::NAN)] +#[case::infinity(f64::INFINITY)] +fn encode_rejects_non_finite_timestamps(#[case] timestamp: f64) { + assert_eq!( + ResponseCacheCodec + .encode(&CacheEntry { + timestamp: Some(timestamp), + response: json!({}), + }) + .unwrap_err(), + Error::InvalidEntry + ); +} + +#[rstest] +#[case::object(json!({"choices": [{"text": "cached"}]}), json!({"choices": [{"text": "cached"}]}))] +#[case::array(json!([1, 2]), json!("[1,2]"))] +#[case::number(json!(7), json!("7"))] +#[case::null(json!(null), json!("null"))] +#[case::string(json!("hello world"), json!("\"hello world\""))] +#[case::numeric_string(json!("123"), json!("\"123\""))] +#[case::null_string(json!("null"), json!("\"null\""))] +fn encode_writes_python_readable_envelopes_that_round_trip( + #[case] response: Value, + #[case] wire_response: Value, +) { + let wire = ResponseCacheCodec.encode(&entry(response.clone())).unwrap(); + assert_eq!( + serde_json::from_slice::(&wire).unwrap(), + json!({"timestamp": 100.0, "response": wire_response}) + ); + assert_eq!(ResponseCacheCodec.decode(&wire).unwrap(), entry(response)); +} + +#[rstest] +fn object_entries_preserve_the_existing_json_representation() { + let entry = CacheEntry { + timestamp: Some(123.0), + response: json!({"choices": [{"text": "cached"}]}), + }; + let bytes = ResponseCacheCodec.encode(&entry).unwrap(); + assert_eq!(bytes, serde_json::to_vec(&entry).unwrap()); + assert_eq!(ResponseCacheCodec.decode(&bytes).unwrap(), entry); +} + +#[rstest] +#[case::json(br#"{"choices": [{"text": "legacy"}]}"#.as_slice())] +#[case::python_literal(br#"{'choices': [{'text': 'legacy'}]}"#.as_slice())] +fn values_without_timestamps_decode_as_bare_responses(#[case] bytes: &[u8]) { + assert_eq!( + ResponseCacheCodec.decode(bytes).unwrap(), + CacheEntry { + timestamp: None, + response: json!({"choices": [{"text": "legacy"}]}), + } + ); +} diff --git a/litellm-rust/crates/cache-response/tests/connection.rs b/litellm-rust/crates/cache-response/tests/connection.rs new file mode 100644 index 00000000000..bc24cf56846 --- /dev/null +++ b/litellm-rust/crates/cache-response/tests/connection.rs @@ -0,0 +1,123 @@ +mod support; + +use std::{sync::Arc, time::Duration}; + +use litellm_cache::CacheConnectionStatus; +use litellm_cache_memory::InMemoryCache; +use litellm_cache_response::{ + CacheEntry, ConnectionProbe, ExactResponseCache, ResponseCache, ResponseCacheRequest, +}; +use redis_test::MockCmd; +use rstest::rstest; +use serde_json::json; +use support::{keyed, memory, redis, request}; + +#[rstest] +#[case::reachable( + Ok("PONG"), + CacheConnectionStatus::Success, + "Redis connection test successful", + false +)] +#[case::unexpected_reply( + Ok("NOPE"), + CacheConnectionStatus::Failed, + "Redis ping returned False", + false +)] +#[case::connection_refused( + Err(redis::RedisError::from((redis::ErrorKind::Io, "connection refused"))), + CacheConnectionStatus::Failed, + "Redis connection failed:", + true +)] +#[tokio::test] +async fn connection_backends_are_reachable_as_a_probe( + #[case] reply: redis::RedisResult<&'static str>, + #[case] status: CacheConnectionStatus, + #[case] message: &str, + #[case] has_error: bool, +) { + let probe: Arc = + Arc::new(redis(vec![MockCmd::new(redis::cmd("PING"), reply)], None)); + + let result = probe.test_connection().await.unwrap(); + assert_eq!(result.status, status); + assert!(result.message.starts_with(message), "{}", result.message); + assert_eq!(result.error.is_some(), has_error); +} + +#[rstest] +#[tokio::test] +async fn one_service_serves_both_the_exact_cache_and_its_probe(request: ResponseCacheRequest) { + let service = Arc::new(redis( + vec![ + MockCmd::new(redis::cmd("PING"), Ok("PONG")), + MockCmd::new( + redis::cmd("GET").arg("tenant:key"), + Ok(br#"{"timestamp":100.0,"response":{"ok":true}}"#.to_vec()), + ), + ], + Some("tenant"), + )); + let probe: Arc = service.clone(); + let exact: Arc = service; + + assert_eq!( + probe.test_connection().await.unwrap().status, + CacheConnectionStatus::Success + ); + assert_eq!( + exact + .async_lookup(&request, Duration::from_secs(100)) + .await + .unwrap(), + Some(json!({"ok": true})) + ); +} + +/// The in-memory backend has no `test_connection`, as in Python, and still serves every response +/// operation. +#[rstest] +#[tokio::test] +async fn backends_without_a_connection_test_serve_every_response_operation( + #[from(memory)] service: Arc>>, + request: ResponseCacheRequest, +) { + let cache: Arc = service; + let now = Duration::from_secs(100); + let other = keyed("tenant:other"); + let missing = keyed("tenant:missing"); + + assert_eq!(cache.default_ttl(), Some(Duration::from_secs(600))); + cache.store(&request, json!({"v": 1}), now).unwrap(); + assert_eq!(cache.lookup(&request, now).unwrap(), Some(json!({"v": 1}))); + cache + .async_store(&other, json!({"v": 2}), now) + .await + .unwrap(); + assert_eq!( + cache.async_lookup(&other, now).await.unwrap(), + Some(json!({"v": 2})) + ); + + let requests = [request.clone(), missing.clone(), other.clone()]; + let partial = cache.lookup_batch(&requests, now).unwrap(); + assert_eq!( + partial.values, + vec![Some(json!({"v": 1})), None, Some(json!({"v": 2}))] + ); + assert_eq!(partial.missing_indices, vec![1]); + + cache + .async_store_batch(vec![(missing.clone(), json!({"v": 3}))], now) + .await + .unwrap(); + let partial = cache.async_lookup_batch(&requests, now).await.unwrap(); + assert!(partial.missing_indices.is_empty()); + assert_eq!(partial.values[1], Some(json!({"v": 3}))); + + cache.async_flush().await.unwrap(); + let partial = cache.async_lookup_batch(&requests, now).await.unwrap(); + assert_eq!(partial.missing_indices, vec![0, 1, 2]); +} diff --git a/litellm-rust/crates/cache-response/tests/response.rs b/litellm-rust/crates/cache-response/tests/response.rs index dcfc0301148..ec5e16f1367 100644 --- a/litellm-rust/crates/cache-response/tests/response.rs +++ b/litellm-rust/crates/cache-response/tests/response.rs @@ -1,3 +1,5 @@ +mod support; + use std::{ sync::{ Arc, Mutex, @@ -7,32 +9,22 @@ use std::{ }; use litellm_cache::{ - BaseCache, CacheCodec, CacheConnectionResult, CacheConnectionStatus, Error, - SemanticCacheContext, + BaseCache, Error, SemanticCacheContext, + semantic::{SemanticCache, SemanticLookup}, }; use litellm_cache_memory::InMemoryCache; -use litellm_cache_redis::RedisCache; use litellm_cache_response::{ - CacheEntry, CacheKeyField, CacheKeyInput, ResponseCache, ResponseCacheCodec, - ResponseCacheRequest, WriteBuffer, + CacheControls, CacheEntry, CacheKeyField, CacheKeyInput, ResponseCache, ResponseCacheRequest, + WriteBuffer, cache_key, }; -use redis_test::{MockCmd, MockRedisConnection}; -use serde_json::json; +use redis_test::MockCmd; +use rstest::rstest; +use serde_json::{Value, json}; +use support::{keyed, memory, redis, request}; -fn memory() -> Arc>> { - Arc::new(ResponseCache::new(Arc::new(InMemoryCache::new( - Some(8), - Some(Duration::from_secs(600)), - )))) -} - -fn request() -> ResponseCacheRequest { - ResponseCacheRequest::new(CacheKeyInput { - preset: Some("tenant:key".into()), - ..Default::default() - }) -} +type Memory = Arc>>; +#[derive(Default)] struct SemanticBackend { entries: Mutex>, contexts: Mutex>, @@ -67,50 +59,133 @@ impl BaseCache for SemanticBackend { .find(|(entry_key, _)| entry_key == key) .map(|(_, entry)| entry.clone())) } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - Ok(CacheConnectionResult { - status: CacheConnectionStatus::Success, - message: "ok".into(), - error: None, - }) - } } -#[test] -fn semantic_context_reaches_backend_for_store_and_lookup() { - let backend = Arc::new(SemanticBackend { - entries: Mutex::new(Vec::new()), - contexts: Mutex::new(Vec::new()), - }); +#[rstest] +#[tokio::test] +async fn semantic_context_reaches_backend_for_store_and_lookup( + request: ResponseCacheRequest, + #[values(false, true)] asynchronous: bool, +) { + let backend = Arc::new(SemanticBackend::default()); let cache = ResponseCache::new(backend.clone()); let context = SemanticCacheContext { messages: Some(json!([{"role": "user", "content": "hello"}])), ..Default::default() }; - let request = request().with_context(context.clone()); + let request = request.with_context(context.clone()); let response = json!({"answer": 42}); + let now = Duration::from_secs(100); - cache - .store(&request, response.clone(), Duration::from_secs(100)) - .unwrap(); + let hit = if asynchronous { + cache + .async_store(&request, response.clone(), now) + .await + .unwrap(); + cache.async_lookup(&request, now).await.unwrap() + } else { + cache.store(&request, response.clone(), now).unwrap(); + cache.lookup(&request, now).unwrap() + }; - assert_eq!( - cache.lookup(&request, Duration::from_secs(100)).unwrap(), - Some(response) - ); + assert_eq!(hit, Some(response)); assert_eq!( backend.contexts.lock().unwrap().as_slice(), &[context.clone(), context] ); } +/// A semantic backend that answers every read with one fixed lookup. +struct ScoredBackend(Result, Error>); + +impl BaseCache for ScoredBackend { + type Value = CacheEntry; + type Context = SemanticCacheContext; + + fn get_ttl(&self, _: &Self::Context) -> Option { + None + } + + fn set_cache(&self, _: &str, _: Self::Value, _: &Self::Context) -> Result<(), Error> { + Ok(()) + } + + fn get_cache(&self, key: &str, context: &Self::Context) -> Result, Error> { + self.get_cache_with_similarity(key, context) + .map(|lookup| lookup.value) + } +} + +impl SemanticCache for ScoredBackend { + fn get_cache_with_similarity( + &self, + _: &str, + _: &Self::Context, + ) -> Result, Error> { + self.0.clone() + } + + async fn async_get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + self.get_cache_with_similarity(key, context) + } +} + +fn scored(timestamp: f64, similarity: f64) -> Result, Error> { + Ok(SemanticLookup { + value: Some(CacheEntry { + timestamp: Some(timestamp), + response: json!({"answer": 42}), + }), + similarity: Some(similarity), + }) +} + +#[rstest] +#[case::fresh_hit(scored(95.0, 0.95), true, Ok(SemanticLookup { value: Some(json!({"answer": 42})), similarity: Some(0.95) }))] +#[case::stale_hit_keeps_the_similarity( + scored(50.0, 0.95), + true, + Ok(SemanticLookup::miss(Some(0.95))) +)] +#[case::miss_keeps_the_similarity( + Ok(SemanticLookup::miss(Some(0.4))), + true, + Ok(SemanticLookup::miss(Some(0.4))) +)] +#[case::no_search(Ok(SemanticLookup::miss(None)), true, Ok(SemanticLookup::miss(None)))] +#[case::disabled_reads_skip_the_backend(scored(95.0, 0.95), false, Ok(SemanticLookup::miss(None)))] +#[case::invalid_entry_is_a_miss(Err(Error::InvalidEntry), true, Ok(SemanticLookup::miss(None)))] +#[case::backend_errors_propagate(Err(Error::Unavailable), true, Err(Error::Unavailable))] #[tokio::test] -async fn sync_and_async_consumers_share_keys_ttls_and_freshness() { +async fn semantic_lookup_applies_freshness_to_the_value_only( + #[case] backend: Result, Error>, + #[case] reads: bool, + #[case] expected: Result, Error>, + #[values(false, true)] asynchronous: bool, + request: ResponseCacheRequest, +) { + let cache = ResponseCache::new(Arc::new(ScoredBackend(backend))); + let mut request = request.with_context(SemanticCacheContext::default()); + request.max_age = Some(Duration::from_secs(10)); + request.controls.no_cache = !reads; + let now = Duration::from_secs(100); + + let lookup = if asynchronous { + cache.async_lookup_semantic(&request, now).await + } else { + cache.lookup_semantic(&request, now) + }; + + assert_eq!(lookup, expected); +} + +#[rstest] +#[tokio::test] +async fn sync_and_async_consumers_share_keys_ttls_and_freshness(mut request: ResponseCacheRequest) { let clock = Arc::new(AtomicU64::new(100)); let backend = Arc::new(InMemoryCache::with_clock( Some(8), @@ -121,7 +196,6 @@ async fn sync_and_async_consumers_share_keys_ttls_and_freshness() { }, )); let cache = ResponseCache::new(backend.clone()); - let mut request = request(); request.context.ttl = Some(Duration::from_secs(10)); request.max_age = Some(Duration::from_secs(5)); cache @@ -172,80 +246,164 @@ async fn sync_and_async_consumers_share_keys_ttls_and_freshness() { ); } +#[derive(Clone, Copy, Debug)] +enum Directive { + Plain, + NoCache, + NoStore, + DefaultOff, + UseCache, + CachingOff, + Unsupported, +} + +impl Directive { + fn apply(self, controls: &mut CacheControls) { + match self { + Self::Plain => {} + Self::NoCache => controls.no_cache = true, + Self::NoStore => controls.no_store = true, + Self::DefaultOff => controls.default_on = false, + Self::UseCache => { + controls.default_on = false; + controls.use_cache = true; + } + Self::CachingOff => controls.caching = Some(false), + Self::Unsupported => controls.supported_call_type = false, + } + } +} + +#[rstest] +#[case::plain(Directive::Plain, Directive::Plain, true)] +#[case::no_store_skips_the_write(Directive::NoStore, Directive::Plain, false)] +#[case::no_store_keeps_reads(Directive::Plain, Directive::NoStore, true)] +#[case::no_cache_keeps_writes(Directive::NoCache, Directive::Plain, true)] +#[case::no_cache_skips_the_read(Directive::Plain, Directive::NoCache, false)] +#[case::default_off_skips_the_write(Directive::DefaultOff, Directive::Plain, false)] +#[case::default_off_skips_the_read(Directive::Plain, Directive::DefaultOff, false)] +#[case::use_cache_opts_in_under_default_off(Directive::UseCache, Directive::UseCache, true)] +#[case::caching_off_skips_the_write(Directive::CachingOff, Directive::Plain, false)] +#[case::caching_off_skips_the_read(Directive::Plain, Directive::CachingOff, false)] +#[case::unsupported_call_type_skips_the_write(Directive::Unsupported, Directive::Plain, false)] +#[case::unsupported_call_type_skips_the_read(Directive::Plain, Directive::Unsupported, false)] #[tokio::test] -async fn directives_skip_io_and_keep_reads_and_writes_independent() { - let cache = memory(); - let mut request = request(); +async fn directives_skip_io_and_keep_reads_and_writes_independent( + memory: Memory, + request: ResponseCacheRequest, + #[case] write: Directive, + #[case] read: Directive, + #[case] hit: bool, + #[values(false, true)] asynchronous: bool, +) { let now = Duration::from_secs(100); - request.controls.no_store = true; - cache - .async_store(&request, json!({"v": 1}), now) - .await - .unwrap(); - assert_eq!(cache.lookup(&request, now).unwrap(), None); - request.controls.no_store = false; - request.controls.no_cache = true; - cache.store(&request, json!({"v": 2}), now).unwrap(); - assert_eq!(cache.async_lookup(&request, now).await.unwrap(), None); - request.controls.no_cache = false; - assert_eq!(cache.lookup(&request, now).unwrap(), Some(json!({"v": 2}))); - request.controls.default_on = false; - cache.store(&request, json!({"v": 3}), now).unwrap(); - assert_eq!(cache.lookup(&request, now).unwrap(), None); - request.controls.use_cache = true; - assert_eq!(cache.lookup(&request, now).unwrap(), Some(json!({"v": 2}))); - request.controls.supported_call_type = false; - assert_eq!(cache.lookup(&request, now).unwrap(), None); -} + let mut writer = request.clone(); + write.apply(&mut writer.controls); + let mut reader = request; + read.apply(&mut reader.controls); -#[tokio::test] -async fn redis_consumer_reads_python_sync_and_async_envelopes_and_writes_compatible_json() { - let connection = MockRedisConnection::new([ - MockCmd::new( - redis::cmd("GET").arg("tenant:key"), - Ok(br#"{'timestamp': 100.0, 'response': '{"ok": true, "text": "cached"}'}"#.to_vec()), - ), - MockCmd::new( - redis::cmd("GET").arg("tenant:key"), - Ok(br#"{"timestamp":100.0,"response":{"ok":true,"text":"cached"}}"#.to_vec()), - ), - MockCmd::new( - redis::cmd("SETEX") - .arg("tenant:key") - .arg(600) - .arg(br#"{"timestamp":100.0,"response":{"ok":true,"text":"cached"}}"#.as_slice()), - Ok("OK"), - ), - ]) - .assert_all_commands_consumed(); - let backend = RedisCache::with_connection(connection, None, ResponseCacheCodec) - .with_namespace(Some("tenant".into())); - let cache = ResponseCache::new(Arc::new(backend)); - let request = request(); - let expected = json!({"ok": true, "text": "cached"}); - assert_eq!( - cache.lookup(&request, Duration::from_secs(101)).unwrap(), - Some(expected.clone()) - ); - assert_eq!( - cache - .async_lookup(&request, Duration::from_secs(101)) + if asynchronous { + memory + .async_store(&writer, json!({"v": 1}), now) .await - .unwrap(), - Some(expected.clone()) + .unwrap(); + } else { + memory.store(&writer, json!({"v": 1}), now).unwrap(); + } + let found = if asynchronous { + memory.async_lookup(&reader, now).await.unwrap() + } else { + memory.lookup(&reader, now).unwrap() + }; + + assert_eq!( + found, + hit.then(|| json!({"v": 1})), + "{write:?} then {read:?}" + ); +} + +#[rstest] +#[case::python_sync_literal( + br#"{'timestamp': 100.0, 'response': '{"ok": true, "text": "cached"}'}"#.as_slice() +)] +#[case::python_async_json(br#"{"timestamp":100.0,"response":{"ok":true,"text":"cached"}}"#.as_slice())] +#[tokio::test] +async fn redis_consumer_reads_python_sync_and_async_envelopes( + request: ResponseCacheRequest, + #[case] stored: &[u8], + #[values(false, true)] asynchronous: bool, +) { + let cache = redis( + vec![MockCmd::new( + redis::cmd("GET").arg("tenant:key"), + Ok(stored.to_vec()), + )], + Some("tenant"), + ); + let now = Duration::from_secs(101); + let found = if asynchronous { + cache.async_lookup(&request, now).await.unwrap() + } else { + cache.lookup(&request, now).unwrap() + }; + assert_eq!(found, Some(json!({"ok": true, "text": "cached"}))); +} + +#[rstest] +#[case::object( + json!({"ok": true, "text": "cached"}), + br#"{"timestamp":100.0,"response":{"ok":true,"text":"cached"}}"#.as_slice() +)] +#[case::array(json!([1, 2]), br#"{"timestamp":100.0,"response":"[1,2]"}"#.as_slice())] +#[tokio::test] +async fn redis_consumer_writes_python_compatible_json( + request: ResponseCacheRequest, + #[case] response: Value, + #[case] wire: &[u8], +) { + let cache = redis( + vec![MockCmd::new( + redis::cmd("SETEX").arg("tenant:key").arg(600).arg(wire), + Ok("OK"), + )], + Some("tenant"), ); cache - .async_store(&request, expected, Duration::from_secs(100)) + .async_store(&request, response, Duration::from_secs(100)) .await .unwrap(); } +#[rstest] #[tokio::test] -async fn captured_service_keeps_the_selected_backend_for_background_writes() { - let original = memory(); +async fn invalid_entries_are_misses_and_disabled_reads_do_not_touch_redis( + mut request: ResponseCacheRequest, +) { + let cache = redis( + vec![MockCmd::new( + redis::cmd("GET").arg("tenant:key"), + Ok(b"invalid".to_vec()), + )], + None, + ); + request.controls.no_cache = true; + assert_eq!(cache.lookup(&request, Duration::ZERO).unwrap(), None); + request.controls.no_cache = false; + assert_eq!( + cache.async_lookup(&request, Duration::ZERO).await.unwrap(), + None + ); +} + +#[rstest] +#[tokio::test] +async fn captured_service_keeps_the_selected_backend_for_background_writes( + #[from(memory)] original: Memory, + #[from(memory)] replacement: Memory, + request: ResponseCacheRequest, +) { let captured = original.clone(); - let replacement = memory(); - let request = request(); let writer = tokio::spawn({ let request = request.clone(); async move { @@ -271,9 +429,13 @@ async fn captured_service_keeps_the_selected_backend_for_background_writes() { ); } -#[test] -fn generated_keys_preserve_namespace_and_explicit_keys() { - let cache = memory(); +#[rstest] +#[case::with_namespace(Some("tenant"))] +#[case::without_namespace(None)] +fn generated_keys_preserve_namespace_and_explicit_keys( + memory: Memory, + #[case] namespace: Option<&str>, +) { let key = CacheKeyInput { fields: vec![CacheKeyField { name: "model".into(), @@ -281,201 +443,125 @@ fn generated_keys_preserve_namespace_and_explicit_keys() { api_parameter: true, internal_parameter: false, }], - namespace: Some("tenant".into()), + namespace: namespace.map(str::to_owned), ..Default::default() }; let generated = ResponseCacheRequest::new(key.clone()); - let explicit = ResponseCacheRequest::new(CacheKeyInput { - preset: Some(litellm_cache_response::cache_key(&key)), - ..Default::default() - }); - cache + let explicit = keyed(&cache_key(&key)); + memory .store(&generated, json!({"value": 7}), Duration::from_secs(100)) .unwrap(); assert_eq!( - cache.lookup(&explicit, Duration::from_secs(100)).unwrap(), + memory.lookup(&explicit, Duration::from_secs(100)).unwrap(), Some(json!({"value":7})) ); } -#[test] -fn response_codec_accepts_python_literals_without_executing_code() { - let bytes = br#"{'timestamp': 100.0, 'response': {'text': 'hello \\ world', 'flag': True, 'empty': None, 'list': [1, 2.5]}}"#; - let entry = ResponseCacheCodec.decode(bytes).unwrap(); - assert_eq!( - entry.response, - json!({"text": "hello \\ world", "flag": true, "empty": null, "list": [1, 2.5]}) - ); - for bytes in [ - b"__import__('os').system('false')".as_slice(), - b"{'timestamp': 'invalid', 'response': {}}", - b"{'timestamp': 1e9999, 'response': {}}", - ] { - assert_eq!( - ResponseCacheCodec.decode(bytes).unwrap_err(), - Error::InvalidEntry - ); - } - let deep = format!("{}None{}", "[".repeat(1000), "]".repeat(1000)); - assert_eq!( - ResponseCacheCodec.decode(deep.as_bytes()).unwrap_err(), - Error::InvalidEntry - ); - assert_eq!( - ResponseCacheCodec - .encode(&CacheEntry { - timestamp: Some(f64::NAN), - response: json!({}) - }) - .unwrap_err(), - Error::InvalidEntry - ); -} - -#[tokio::test] -async fn invalid_entries_are_misses_and_disabled_reads_do_not_touch_redis() { - let connection = MockRedisConnection::new([MockCmd::new( - redis::cmd("GET").arg("tenant:key"), - Ok(b"invalid".to_vec()), - )]) - .assert_all_commands_consumed(); - let backend = RedisCache::with_connection(connection, None, ResponseCacheCodec); - let cache = ResponseCache::new(Arc::new(backend)); - let mut request = request(); - request.controls.no_cache = true; - assert_eq!(cache.lookup(&request, Duration::ZERO).unwrap(), None); - request.controls.no_cache = false; - assert_eq!( - cache.async_lookup(&request, Duration::ZERO).await.unwrap(), - None - ); -} - -#[test] -fn string_responses_round_trip_through_typed_and_wire_backends() { - let cache = ResponseCache::new(Arc::new(InMemoryCache::default())); +#[rstest] +#[case::text(json!("hello world"))] +#[case::numeric_text(json!("123"))] +#[case::null_text(json!("null"))] +#[case::array(json!([1, 2]))] +fn non_object_responses_round_trip_through_a_typed_backend( + memory: Memory, + request: ResponseCacheRequest, + #[case] response: Value, +) { let now = Duration::from_secs(100); - for response in [json!("hello world"), json!("123"), json!("null")] { - cache.store(&request(), response.clone(), now).unwrap(); - assert_eq!( - cache.lookup(&request(), now).unwrap(), - Some(response.clone()) - ); - - let wire = ResponseCacheCodec - .encode(&CacheEntry { - timestamp: Some(100.0), - response: response.clone(), - }) - .unwrap(); - assert_eq!(ResponseCacheCodec.decode(&wire).unwrap().response, response); - } + memory.store(&request, response.clone(), now).unwrap(); + assert_eq!(memory.lookup(&request, now).unwrap(), Some(response)); } -#[test] -fn non_object_responses_are_written_as_python_readable_serialized_strings() { - let wire = ResponseCacheCodec - .encode(&CacheEntry { - timestamp: Some(100.0), - response: json!([1, 2]), - }) - .unwrap(); - assert_eq!( - serde_json::from_slice::(&wire).unwrap(), - json!({"timestamp": 100.0, "response": "[1,2]"}) - ); - assert_eq!( - ResponseCacheCodec.decode(&wire).unwrap().response, - json!([1, 2]) - ); - assert_eq!( - ResponseCacheCodec.decode(br#"{"timestamp": 100.0, "response": "not serialized"}"#), - Err(Error::InvalidEntry) - ); -} - -#[test] -fn response_entries_preserve_the_existing_json_representation() { - let codec = ResponseCacheCodec; - let entry = CacheEntry { - timestamp: Some(123.0), - response: json!({"choices": [{"text": "cached"}]}), - }; - let bytes = codec.encode(&entry).unwrap(); - assert_eq!(bytes, serde_json::to_vec(&entry).unwrap()); - assert_eq!(codec.decode(&bytes).unwrap(), entry); -} - -#[test] -fn response_codec_preserves_values_without_timestamps() { - let codec = ResponseCacheCodec; - let raw = json!({"choices": [{"text": "legacy"}]}); - let entry = codec.decode(&serde_json::to_vec(&raw).unwrap()).unwrap(); - assert_eq!(entry.timestamp, None); - assert_eq!(entry.response, raw); - +#[rstest] +fn entries_without_timestamps_are_always_fresh(request: ResponseCacheRequest) { let backend = Arc::new(InMemoryCache::default()); - BaseCache::set_cache(backend.as_ref(), "tenant:key", entry, &Default::default()).unwrap(); + BaseCache::set_cache( + backend.as_ref(), + "tenant:key", + CacheEntry { + timestamp: None, + response: json!({"choices": [{"text": "legacy"}]}), + }, + &Default::default(), + ) + .unwrap(); let cache = ResponseCache::new(backend); + let mut request = request; + request.max_age = Some(Duration::from_secs(1)); assert_eq!( - cache.lookup(&request(), Duration::from_secs(100)).unwrap(), + cache.lookup(&request, Duration::from_secs(100)).unwrap(), Some(json!({"choices": [{"text": "legacy"}]})) ); } +#[rstest] #[tokio::test] -async fn batch_lookup_reports_partial_hits_and_batch_store_populates_misses() { - let cache = memory(); - let requests = ["hit", "miss", "disabled"].map(|key| { - ResponseCacheRequest::new(CacheKeyInput { - preset: Some(key.into()), - ..Default::default() - }) - }); - cache - .store(&requests[0], json!({"value": 1}), Duration::from_secs(100)) +async fn batch_lookup_reports_partial_hits_and_batch_store_populates_misses( + memory: Memory, + #[values(false, true)] asynchronous: bool, +) { + let now = Duration::from_secs(100); + let mut requests = ["hit", "miss", "disabled"].map(keyed).to_vec(); + memory + .store(&requests[0], json!({"value": 1}), now) .unwrap(); - let mut requests = requests.to_vec(); requests[2].controls.caching = Some(false); - let partial = cache - .async_lookup_batch(&requests, Duration::from_secs(100)) - .await - .unwrap(); + let partial = if asynchronous { + memory.async_lookup_batch(&requests, now).await.unwrap() + } else { + memory.lookup_batch(&requests, now).unwrap() + }; assert_eq!(partial.values, vec![Some(json!({"value": 1})), None, None]); assert_eq!(partial.missing_indices, vec![1, 2]); - cache + memory .async_store_batch( vec![ (requests[1].clone(), json!({"value": 2})), (requests[2].clone(), json!({"value": 3})), ], - Duration::from_secs(100), + now, ) .await .unwrap(); assert_eq!( - cache - .lookup(&requests[1], Duration::from_secs(100)) - .unwrap(), + memory.lookup(&requests[1], now).unwrap(), Some(json!({"value": 2})) ); requests[2].controls.caching = None; - assert_eq!( - cache - .lookup(&requests[2], Duration::from_secs(100)) - .unwrap(), - None - ); + assert_eq!(memory.lookup(&requests[2], now).unwrap(), None); } +#[rstest] #[tokio::test] -async fn deferred_entries_keep_the_time_they_were_produced() { - let cache = ResponseCache::new(Arc::new(InMemoryCache::default())); - let mut request = request(); +async fn batch_lookup_with_no_readable_request_skips_the_backend( + #[values(false, true)] asynchronous: bool, +) { + let cache = redis(Vec::new(), None); + let mut request = keyed("key"); + request.controls.no_cache = true; + let requests = [request.clone(), request]; + let partial = if asynchronous { + cache + .async_lookup_batch(&requests, Duration::ZERO) + .await + .unwrap() + } else { + cache.lookup_batch(&requests, Duration::ZERO).unwrap() + }; + assert_eq!(partial.values, vec![None, None]); + assert_eq!(partial.missing_indices, vec![0, 1]); +} + +#[rstest] +#[tokio::test] +async fn deferred_entries_keep_the_time_they_were_produced( + memory: Memory, + mut request: ResponseCacheRequest, +) { request.max_age = Some(Duration::from_secs(10)); - cache + memory .async_store_entries(vec![( request.clone(), json!({"answer": 7}), @@ -485,27 +571,29 @@ async fn deferred_entries_keep_the_time_they_were_produced() { .unwrap(); assert_eq!( - cache.lookup(&request, Duration::from_secs(110)).unwrap(), + memory.lookup(&request, Duration::from_secs(110)).unwrap(), Some(json!({"answer": 7})) ); assert_eq!( - cache.lookup(&request, Duration::from_secs(111)).unwrap(), + memory.lookup(&request, Duration::from_secs(111)).unwrap(), None ); } +#[rstest] #[tokio::test] -async fn write_buffer_flushes_at_its_size_and_keeps_each_produced_time() { - let cache = ResponseCache::new(Arc::new(InMemoryCache::default())); +async fn write_buffer_flushes_at_its_size_and_keeps_each_produced_time( + memory: Memory, + request: ResponseCacheRequest, +) { let buffer = WriteBuffer::new(2); - let mut first = request(); + let mut first = request; first.max_age = Some(Duration::from_secs(10)); - let mut second = request(); - second.key.preset = Some("tenant:other".into()); + let second = keyed("tenant:other"); buffer .async_store( - &cache, + memory.as_ref(), &first, json!({"answer": 7}), Duration::from_secs(100), @@ -513,13 +601,13 @@ async fn write_buffer_flushes_at_its_size_and_keeps_each_produced_time() { .await .unwrap(); assert_eq!( - cache.lookup(&first, Duration::from_secs(100)).unwrap(), + memory.lookup(&first, Duration::from_secs(100)).unwrap(), None ); buffer .async_store( - &cache, + memory.as_ref(), &second, json!({"answer": 8}), Duration::from_secs(200), @@ -527,37 +615,36 @@ async fn write_buffer_flushes_at_its_size_and_keeps_each_produced_time() { .await .unwrap(); assert_eq!( - cache.lookup(&first, Duration::from_secs(110)).unwrap(), + memory.lookup(&first, Duration::from_secs(110)).unwrap(), Some(json!({"answer": 7})) ); assert_eq!( - cache.lookup(&first, Duration::from_secs(111)).unwrap(), + memory.lookup(&first, Duration::from_secs(111)).unwrap(), None ); assert_eq!( - cache.lookup(&second, Duration::from_secs(200)).unwrap(), + memory.lookup(&second, Duration::from_secs(200)).unwrap(), Some(json!({"answer": 8})) ); } +#[rstest] #[tokio::test] -async fn write_buffer_clear_drops_pending_entries() { - let cache = ResponseCache::new(Arc::new(InMemoryCache::default())); +async fn write_buffer_clear_drops_pending_entries(memory: Memory, request: ResponseCacheRequest) { let buffer = WriteBuffer::new(2); - let mut other = request(); - other.key.preset = Some("tenant:other".into()); + let other = keyed("tenant:other"); let now = Duration::from_secs(100); buffer - .async_store(&cache, &request(), json!({"answer": 7}), now) + .async_store(memory.as_ref(), &request, json!({"answer": 7}), now) .await .unwrap(); buffer.clear().unwrap(); buffer - .async_store(&cache, &other, json!({"answer": 8}), now) + .async_store(memory.as_ref(), &other, json!({"answer": 8}), now) .await .unwrap(); - assert_eq!(cache.lookup(&request(), now).unwrap(), None); - assert_eq!(cache.lookup(&other, now).unwrap(), None); + assert_eq!(memory.lookup(&request, now).unwrap(), None); + assert_eq!(memory.lookup(&other, now).unwrap(), None); } diff --git a/litellm-rust/crates/cache-response/tests/support/mod.rs b/litellm-rust/crates/cache-response/tests/support/mod.rs new file mode 100644 index 00000000000..b992a937b70 --- /dev/null +++ b/litellm-rust/crates/cache-response/tests/support/mod.rs @@ -0,0 +1,40 @@ +use std::{sync::Arc, time::Duration}; + +use litellm_cache_memory::InMemoryCache; +use litellm_cache_redis::RedisCache; +use litellm_cache_response::{ + CacheEntry, CacheKeyInput, ResponseCache, ResponseCacheCodec, ResponseCacheRequest, +}; +use redis_test::{MockCmd, MockRedisConnection}; +use rstest::fixture; + +pub type MockedRedis = RedisCache; + +#[fixture] +pub fn memory() -> Arc>> { + Arc::new(ResponseCache::new(Arc::new(InMemoryCache::new( + Some(8), + Some(Duration::from_secs(600)), + )))) +} + +#[fixture] +pub fn request() -> ResponseCacheRequest { + keyed("tenant:key") +} + +pub fn keyed(key: &str) -> ResponseCacheRequest { + ResponseCacheRequest::new(CacheKeyInput { + preset: Some(key.into()), + ..Default::default() + }) +} + +/// A Redis response cache that must receive exactly `commands`, in order. +pub fn redis(commands: Vec, namespace: Option<&str>) -> ResponseCache { + let connection = MockRedisConnection::new(commands).assert_all_commands_consumed(); + ResponseCache::new(Arc::new( + RedisCache::with_connection(connection, None, ResponseCacheCodec) + .with_namespace(namespace.map(str::to_owned)), + )) +} diff --git a/litellm-rust/crates/cache-s3/Cargo.toml b/litellm-rust/crates/cache-s3/Cargo.toml index cdc17e732cb..c8150180e7c 100644 --- a/litellm-rust/crates/cache-s3/Cargo.toml +++ b/litellm-rust/crates/cache-s3/Cargo.toml @@ -10,11 +10,17 @@ litellm-cache.workspace = true litellm-auth-aws.workspace = true aws-sdk-s3 = { version = "1.146.1", default-features = false, features = ["rustls", "rt-tokio"] } aws-credential-types = "1.3.0" -aws-smithy-types = "1.6.0" +aws-smithy-runtime-api = { version = "1.16.2", features = ["client", "http-1x"] } +aws-smithy-types = { version = "1.6.0", features = ["http-body-1-x"] } aws-types = "1.6.0" +futures-util.workspace = true +http.workspace = true +reqwest.workspace = true tokio.workspace = true [dev-dependencies] +litellm-cache-testing.workspace = true +rstest.workspace = true wiremock = "0.6.5" serde_json.workspace = true tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } diff --git a/litellm-rust/crates/cache-s3/src/auth.rs b/litellm-rust/crates/cache-s3/src/auth.rs index b7ca722cea3..fdf71fc011b 100644 --- a/litellm-rust/crates/cache-s3/src/auth.rs +++ b/litellm-rust/crates/cache-s3/src/auth.rs @@ -5,22 +5,22 @@ use aws_credential_types::{ use litellm_auth_aws::{AwsAuthConfig, resolve_credentials}; #[derive(Clone)] -pub(crate) struct Credentials { +pub struct S3Credentials { config: AwsAuthConfig, env: fn(&str) -> Option, } -impl Credentials { - pub(crate) fn new(config: AwsAuthConfig) -> Self { +impl S3Credentials { + pub fn new(config: AwsAuthConfig) -> Self { Self::with_env(config, |name| std::env::var(name).ok()) } - pub(crate) fn with_env(config: AwsAuthConfig, env: fn(&str) -> Option) -> Self { + pub fn with_env(config: AwsAuthConfig, env: fn(&str) -> Option) -> Self { Self { config, env } } } -impl ProvideCredentials for Credentials { +impl ProvideCredentials for S3Credentials { fn provide_credentials<'a>(&'a self) -> future::ProvideCredentials<'a> where Self: 'a, @@ -45,57 +45,8 @@ impl ProvideCredentials for Credentials { } } -impl std::fmt::Debug for Credentials { +impl std::fmt::Debug for S3Credentials { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("Credentials").finish_non_exhaustive() - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[tokio::test] - async fn explicit_keys_ignore_an_ambient_session_token() { - let provider = Credentials::with_env( - AwsAuthConfig { - access_key_id: Some("key".to_string()), - secret_access_key: Some("secret".to_string()), - region_name: Some("us-east-1".to_string()), - ..Default::default() - }, - |name| (name == "AWS_SESSION_TOKEN").then(|| "ambient".to_string()), - ); - let credentials = provider.provide_credentials().await.unwrap(); - assert_eq!(credentials.access_key_id(), "key"); - assert_eq!(credentials.secret_access_key(), "secret"); - assert_eq!(credentials.session_token(), None); - } - - #[tokio::test] - async fn explicit_keys_keep_their_session_token() { - let provider = Credentials::new(AwsAuthConfig { - access_key_id: Some("key".to_string()), - secret_access_key: Some("secret".to_string()), - session_token: Some("t".to_string()), - region_name: Some("us-east-1".to_string()), - ..Default::default() - }); - let credentials = provider.provide_credentials().await.unwrap(); - assert_eq!(credentials.session_token(), Some("t")); - } - - #[tokio::test] - async fn environment_keys_resolve_with_their_session_token() { - let provider = Credentials::with_env(AwsAuthConfig::default(), |name| match name { - "AWS_ACCESS_KEY_ID" => Some("env-key".to_string()), - "AWS_SECRET_ACCESS_KEY" => Some("env-secret".to_string()), - "AWS_SESSION_TOKEN" => Some("env-token".to_string()), - _ => None, - }); - let credentials = provider.provide_credentials().await.unwrap(); - assert_eq!(credentials.access_key_id(), "env-key"); - assert_eq!(credentials.secret_access_key(), "env-secret"); - assert_eq!(credentials.session_token(), Some("env-token")); + f.debug_struct("S3Credentials").finish_non_exhaustive() } } diff --git a/litellm-rust/crates/cache-s3/src/cache.rs b/litellm-rust/crates/cache-s3/src/cache.rs index 9c791f42c3b..91cd5e8ef54 100644 --- a/litellm-rust/crates/cache-s3/src/cache.rs +++ b/litellm-rust/crates/cache-s3/src/cache.rs @@ -10,13 +10,14 @@ use aws_sdk_s3::{ primitives::ByteStream, }; use aws_smithy_types::{DateTime, date_time::Format}; +use futures_util::future::try_join_all; use litellm_auth_aws::AwsAuthConfig; use litellm_cache::{ - BaseCache, BatchCache, CacheCodec, CacheConnectionResult, Error, ExactCacheContext, FlushCache, + BaseCache, BatchCache, CacheCodec, DisconnectCache, Error, ExactCacheContext, FlushCache, }; use tokio::runtime::Handle; -use crate::auth::Credentials; +use crate::{auth::S3Credentials, transport::ReqwestHttpClient}; pub struct S3Endpoint { pub url: String, @@ -41,12 +42,13 @@ pub struct S3Cache { } impl S3Cache { - pub fn new(config: S3CacheConfig, codec: C, runtime: Handle) -> Self { + pub fn new(config: S3CacheConfig, http: reqwest::Client, codec: C, runtime: Handle) -> Self { let endpoint_url: Option = config.endpoint.map(|endpoint| endpoint.url); let base = aws_sdk_s3::Config::builder() .behavior_version(BehaviorVersion::latest()) .region(Region::new(config.region.clone())) - .credentials_provider(Credentials::new(config.auth)) + .http_client(ReqwestHttpClient(http)) + .credentials_provider(S3Credentials::new(config.auth)) .request_checksum_calculation(RequestChecksumCalculation::WhenRequired) .response_checksum_validation(ResponseChecksumValidation::WhenRequired); let builder = match &endpoint_url { @@ -202,13 +204,26 @@ impl BaseCache for S3Cache { self.get(key).await } + async fn async_set_cache_pipeline( + &self, + entries: Vec<(String, Self::Value)>, + context: Self::Context, + ) -> Result<(), Error> { + let context = &context; + try_join_all( + entries + .into_iter() + .map(|(key, value)| async move { self.put(&key, value, context).await }), + ) + .await + .map(drop) + } +} + +impl DisconnectCache for S3Cache { async fn disconnect(&self) -> Result<(), Error> { Ok(()) } - - async fn test_connection(&self) -> Result { - Err(Error::UnsupportedOperation) - } } impl BatchCache for S3Cache {} diff --git a/litellm-rust/crates/cache-s3/src/lib.rs b/litellm-rust/crates/cache-s3/src/lib.rs index f6126dfa908..9be0210aad3 100644 --- a/litellm-rust/crates/cache-s3/src/lib.rs +++ b/litellm-rust/crates/cache-s3/src/lib.rs @@ -1,4 +1,6 @@ mod auth; mod cache; +mod transport; +pub use auth::S3Credentials; pub use cache::{S3Cache, S3CacheConfig, S3Endpoint}; diff --git a/litellm-rust/crates/cache-s3/src/transport.rs b/litellm-rust/crates/cache-s3/src/transport.rs new file mode 100644 index 00000000000..3e5ce578c31 --- /dev/null +++ b/litellm-rust/crates/cache-s3/src/transport.rs @@ -0,0 +1,49 @@ +use aws_smithy_runtime_api::client::{ + http::{ + HttpClient, HttpConnector, HttpConnectorFuture, HttpConnectorSettings, SharedHttpConnector, + }, + orchestrator::HttpRequest, + result::ConnectorError, + runtime_components::RuntimeComponents, +}; +use aws_smithy_types::body::SdkBody; + +#[derive(Clone, Debug)] +pub(crate) struct ReqwestHttpClient(pub(crate) reqwest::Client); + +impl HttpClient for ReqwestHttpClient { + fn http_connector( + &self, + _: &HttpConnectorSettings, + _: &RuntimeComponents, + ) -> SharedHttpConnector { + SharedHttpConnector::new(self.clone()) + } +} + +impl HttpConnector for ReqwestHttpClient { + fn call(&self, request: HttpRequest) -> HttpConnectorFuture { + let client = self.0.clone(); + HttpConnectorFuture::new(async move { + let request = request + .try_into_http1x() + .map_err(|error| ConnectorError::other(error.into(), None))? + .map(reqwest::Body::wrap); + let request = reqwest::Request::try_from(request) + .map_err(|error| ConnectorError::other(error.into(), None))?; + let response = client.execute(request).await.map_err(|error| { + if error.is_timeout() { + ConnectorError::timeout(error.into()) + } else { + ConnectorError::io(error.into()) + } + })?; + let response = http::Response::from(response).map(SdkBody::from_body_1_x); + response + .try_into() + .map_err(|error: aws_smithy_runtime_api::http::HttpError| { + ConnectorError::other(error.into(), None) + }) + }) + } +} diff --git a/litellm-rust/crates/cache-s3/tests/auth.rs b/litellm-rust/crates/cache-s3/tests/auth.rs new file mode 100644 index 00000000000..59c5aa2e091 --- /dev/null +++ b/litellm-rust/crates/cache-s3/tests/auth.rs @@ -0,0 +1,57 @@ +use aws_credential_types::provider::ProvideCredentials; +use litellm_auth_aws::AwsAuthConfig; +use litellm_cache_s3::S3Credentials; +use rstest::rstest; + +fn explicit(session_token: Option<&str>) -> AwsAuthConfig { + AwsAuthConfig { + access_key_id: Some("key".to_string()), + secret_access_key: Some("secret".to_string()), + session_token: session_token.map(str::to_string), + region_name: Some("us-east-1".to_string()), + ..Default::default() + } +} + +fn ambient_token(name: &str) -> Option { + (name == "AWS_SESSION_TOKEN").then(|| "ambient".to_string()) +} + +fn environment_keys(name: &str) -> Option { + match name { + "AWS_ACCESS_KEY_ID" => Some("env-key".to_string()), + "AWS_SECRET_ACCESS_KEY" => Some("env-secret".to_string()), + "AWS_SESSION_TOKEN" => Some("env-token".to_string()), + _ => None, + } +} + +#[rstest] +#[case::explicit_keys_ignore_an_ambient_session_token( + explicit(None), ambient_token, ("key", "secret", None) +)] +#[case::explicit_keys_keep_their_session_token( + explicit(Some("t")), ambient_token, ("key", "secret", Some("t")) +)] +#[case::environment_keys_resolve_with_their_session_token( + AwsAuthConfig::default(), environment_keys, ("env-key", "env-secret", Some("env-token")) +)] +#[tokio::test] +async fn credentials_resolve( + #[case] config: AwsAuthConfig, + #[case] env: fn(&str) -> Option, + #[case] expected: (&str, &str, Option<&str>), +) { + let credentials = S3Credentials::with_env(config, env) + .provide_credentials() + .await + .unwrap(); + assert_eq!( + ( + credentials.access_key_id(), + credentials.secret_access_key(), + credentials.session_token(), + ), + expected + ); +} diff --git a/litellm-rust/crates/cache-s3/tests/cache.rs b/litellm-rust/crates/cache-s3/tests/cache.rs index 9a71656286b..53a51f8a289 100644 --- a/litellm-rust/crates/cache-s3/tests/cache.rs +++ b/litellm-rust/crates/cache-s3/tests/cache.rs @@ -1,41 +1,23 @@ +mod support; + use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use litellm_auth_aws::AwsAuthConfig; +use aws_smithy_types::{DateTime, date_time::Format}; use litellm_cache::{ - BaseCache, BatchCache, BatchEntry, Error, ExactCacheContext, FlushCache, JsonCodec, + BaseCache, BatchCache, BatchEntry, DisconnectCache, Error, ExactCacheContext, FlushCache, }; -use litellm_cache_s3::{S3Cache, S3CacheConfig, S3Endpoint}; +use litellm_cache_s3::S3CacheConfig; +use rstest::{fixture, rstest}; use serde_json::{Value, json}; -use tokio::runtime::Handle; +use support::FakeBucket; use wiremock::{ Mock, MockServer, ResponseTemplate, + http::HeaderMap, matchers::{method, path}, }; -fn config(endpoint: String) -> S3CacheConfig { - S3CacheConfig { - bucket: "cache-bucket".to_string(), - key_prefix: "team/".to_string(), - region: "us-east-1".to_string(), - endpoint: Some(S3Endpoint { url: endpoint }), - auth: AwsAuthConfig { - access_key_id: Some("key".to_string()), - secret_access_key: Some("secret".to_string()), - region_name: Some("us-east-1".to_string()), - ..Default::default() - }, - } -} - -fn cache(endpoint: &str) -> S3Cache> { - S3Cache::new( - config(endpoint.to_string()), - JsonCodec::::new(), - Handle::current(), - ) -} - -async fn mock_server() -> MockServer { +#[fixture] +async fn server() -> MockServer { let server = MockServer::start().await; Mock::given(method("PUT")) .respond_with(ResponseTemplate::new(200).insert_header("etag", "\"etag\"")) @@ -44,23 +26,25 @@ async fn mock_server() -> MockServer { server } -fn http_date_from(headers: &wiremock::http::HeaderMap, name: &str) -> Option { - use aws_smithy_types::{DateTime, date_time::Format}; +fn http_date_from(headers: &HeaderMap, name: &str) -> Option { headers .get(name) .and_then(|value| DateTime::from_str(value.to_str().ok()?, Format::HttpDate).ok()) .map(|date| UNIX_EPOCH + Duration::new(date.secs() as u64, date.subsec_nanos())) } +fn ttl(seconds: u64) -> ExactCacheContext { + ExactCacheContext { + ttl: Some(Duration::from_secs(seconds)), + } +} + +#[rstest] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn set_writes_python_metadata_with_and_without_ttl() { - let server = mock_server().await; - let cache = cache(&server.uri()); - let context = ExactCacheContext { - ttl: Some(Duration::from_secs(90)), - }; +async fn set_writes_python_metadata_with_and_without_ttl(#[future(awt)] server: MockServer) { + let cache = support::cache(&server.uri()); cache - .set_cache("alpha:beta", json!({"answer": 1}), &context) + .set_cache("alpha:beta", json!({"answer": 1}), &ttl(90)) .unwrap(); cache .set_cache("plain", json!({"answer": 2}), &ExactCacheContext::default()) @@ -110,61 +94,84 @@ async fn set_writes_python_metadata_with_and_without_ttl() { ); } +#[rstest] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn get_hit_miss_expired_and_invalid_entries() { - let server = mock_server().await; - Mock::given(method("GET")) - .and(path("/cache-bucket/team/hit")) - .respond_with(ResponseTemplate::new(200).set_body_json(json!({"answer": 3}))) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/cache-bucket/team/missing")) - .respond_with( - ResponseTemplate::new(404).set_body_string("NoSuchKey"), - ) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/cache-bucket/team/denied")) - .respond_with( - ResponseTemplate::new(403).set_body_string("AccessDenied"), - ) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/cache-bucket/team/expired")) - .respond_with( - ResponseTemplate::new(200) - .insert_header("expires", "Thu, 01 Jan 1970 00:00:00 GMT") - .set_body_json(json!({"answer": 4})), - ) - .mount(&server) - .await; - Mock::given(method("GET")) - .and(path("/cache-bucket/team/malformed")) - .respond_with(ResponseTemplate::new(200).set_body_string("not a cache entry")) - .mount(&server) - .await; - let cache = cache(&server.uri()); - let context = ExactCacheContext::default(); +async fn async_set_signs_with_the_configured_keys(#[future(awt)] server: MockServer) { + support::cache(&server.uri()) + .async_set_cache("key", json!({"answer": 1}), ttl(3600)) + .await + .unwrap(); - assert_eq!( - cache.get_cache("hit", &context).unwrap(), - Some(json!({"answer": 3})) + let requests = server.received_requests().await.unwrap(); + let request = &requests[0]; + assert_eq!(request.url.path(), "/cache-bucket/team/key"); + assert!( + request.headers["authorization"] + .to_str() + .unwrap() + .contains("Credential=key/") ); - assert_eq!(cache.get_cache("missing", &context).unwrap(), None); - assert_eq!(cache.get_cache("denied", &context).unwrap(), None); - assert_eq!(cache.get_cache("expired", &context).unwrap(), None); + assert!(request.headers.get("x-amz-security-token").is_none()); assert_eq!( - cache.get_cache("malformed", &context), - Err(Error::InvalidEntry) + request.headers["cache-control"].to_str().unwrap(), + "immutable, max-age=3600, s-maxage=3600" ); } +#[rstest] +#[case::hit("hit", ResponseTemplate::new(200).set_body_json(json!({"answer": 3})), Ok(Some(json!({"answer": 3}))))] +#[case::no_such_key( + "missing", + ResponseTemplate::new(404).set_body_string("NoSuchKey"), + Ok(None) +)] +#[case::access_denied( + "denied", + ResponseTemplate::new(403).set_body_string("AccessDenied"), + Ok(None) +)] +#[case::expired( + "expired", + ResponseTemplate::new(200) + .insert_header("expires", "Thu, 01 Jan 1970 00:00:00 GMT") + .set_body_json(json!({"answer": 4})), + Ok(None) +)] +#[case::not_yet_expired( + "fresh", + ResponseTemplate::new(200) + .insert_header("expires", "Fri, 01 Jan 2100 00:00:00 GMT") + .set_body_json(json!({"answer": 5})), + Ok(Some(json!({"answer": 5}))) +)] +#[case::malformed( + "malformed", + ResponseTemplate::new(200).set_body_string("not a cache entry"), + Err(Error::InvalidEntry) +)] +#[case::server_error("broken", ResponseTemplate::new(500), Err(Error::Unavailable))] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn batch_get_preserves_order_with_hits_misses_and_invalid() { - let server = mock_server().await; +async fn get_maps_s3_responses( + #[future(awt)] server: MockServer, + #[case] key: &str, + #[case] response: ResponseTemplate, + #[case] expected: Result, Error>, +) { + Mock::given(method("GET")) + .and(path(format!("/cache-bucket/team/{key}"))) + .respond_with(response) + .mount(&server) + .await; + let cache = support::cache(&server.uri()); + let context = ExactCacheContext::default(); + + assert_eq!(cache.get_cache(key, &context), expected); + assert_eq!(cache.async_get_cache(key, &context).await, expected); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn batch_get_preserves_order_with_hits_misses_and_invalid(#[future(awt)] server: MockServer) { for (key, status, body) in [ ("first", 200, "{\"answer\": 1}"), ("invalid", 200, "garbage"), @@ -180,91 +187,117 @@ async fn batch_get_preserves_order_with_hits_misses_and_invalid() { .respond_with(ResponseTemplate::new(404)) .mount(&server) .await; - let cache = cache(&server.uri()); + let cache = support::cache(&server.uri()); let context = ExactCacheContext::default(); let keys = vec![ "first".to_string(), "miss".to_string(), "invalid".to_string(), ]; + let expected = vec![ + BatchEntry::Hit(json!({"answer": 1})), + BatchEntry::Miss, + BatchEntry::Invalid, + ]; - let entries = cache.batch_get_cache(&keys, &context).unwrap(); - + assert_eq!(cache.batch_get_cache(&keys, &context).unwrap(), expected); assert_eq!( - entries, - vec![ - BatchEntry::Hit(json!({"answer": 1})), - BatchEntry::Miss, - BatchEntry::Invalid, - ] + cache.async_batch_get_cache(keys, context).await.unwrap(), + expected ); } +#[rstest] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn unsupported_and_noop_capabilities_match_python() { - let server = mock_server().await; - let cache = cache(&server.uri()); +async fn pipeline_writes_every_entry_with_the_shared_ttl() { + let server = FakeBucket::serve().await; + let cache = support::cache(&server.uri()); + cache + .async_set_cache_pipeline( + vec![ + ("one".into(), json!({"n": 1})), + ("two".into(), json!({"n": 2})), + ], + ttl(30), + ) + .await + .unwrap(); + let requests = server.received_requests().await.unwrap(); + assert_eq!(requests.len(), 2); + assert!(requests.iter().all(|request| { + request.headers["cache-control"].to_str().unwrap() == "immutable, max-age=30, s-maxage=30" + })); assert_eq!( - cache.test_connection().await, - Err(Error::UnsupportedOperation) + cache + .get_cache("two", &ExactCacheContext::default()) + .unwrap(), + Some(json!({"n": 2})) ); +} + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn flush_and_disconnect_are_noops_like_python(#[future(awt)] server: MockServer) { + let cache = support::cache(&server.uri()); + cache.flush_cache().unwrap(); + cache.async_flush_cache().await.unwrap(); cache.disconnect().await.unwrap(); - assert_eq!(cache.get_ttl(&ExactCacheContext::default()), None); - assert_eq!( - cache.get_ttl(&ExactCacheContext { - ttl: Some(Duration::from_secs(45)), - }), - Some(Duration::from_secs(45)) - ); assert!(server.received_requests().await.unwrap().is_empty()); } -#[test] -fn key_conversion_prefixes_and_splits_colons() { +#[rstest] +#[case::without_ttl(ExactCacheContext::default(), None)] +#[case::with_ttl(ttl(45), Some(Duration::from_secs(45)))] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn get_ttl_reports_the_request_ttl( + #[case] context: ExactCacheContext, + #[case] expected: Option, +) { + assert_eq!( + support::cache("http://localhost").get_ttl(&context), + expected + ); +} + +#[rstest] +#[case::prefixed("team/", "a:b:c", "team/a/b/c")] +#[case::prefixed_plain("team/", "plain", "team/plain")] +#[case::unprefixed("", "a:b", "a/b")] +fn key_conversion_prefixes_and_splits_colons( + #[case] key_prefix: &str, + #[case] key: &str, + #[case] expected: &str, +) { let runtime = tokio::runtime::Builder::new_multi_thread() .worker_threads(1) .enable_all() .build() .unwrap(); - let _guard = runtime.enter(); - let cache = S3Cache::new( + let cache = support::cache_with( S3CacheConfig { - key_prefix: "team/".to_string(), - ..config("http://localhost".to_string()) + key_prefix: key_prefix.to_string(), + ..support::config("http://localhost") }, - JsonCodec::::new(), runtime.handle().clone(), ); assert_eq!(cache.bucket(), "cache-bucket"); - assert_eq!(cache.key_prefix(), "team/"); - assert_eq!(cache.to_s3_key("a:b:c"), "team/a/b/c"); - assert_eq!(cache.to_s3_key("plain"), "team/plain"); - - let unprefixed = S3Cache::new( - S3CacheConfig { - key_prefix: String::new(), - ..config("http://localhost".to_string()) - }, - JsonCodec::::new(), - runtime.handle().clone(), - ); - assert_eq!(unprefixed.to_s3_key("a:b"), "a/b"); + assert_eq!(cache.key_prefix(), key_prefix); + assert_eq!(cache.region(), "us-east-1"); + assert_eq!(cache.endpoint(), Some("http://localhost")); + assert_eq!(cache.to_s3_key(key), expected); } +#[rstest] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn sync_methods_block_inside_and_outside_the_runtime() { - let server = mock_server().await; - Mock::given(method("GET")) - .and(path("/cache-bucket/team/key")) - .respond_with(ResponseTemplate::new(200).set_body_json(json!({"answer": 9}))) - .mount(&server) - .await; +async fn sync_methods_block_outside_the_runtime() { + let server = FakeBucket::serve().await; let uri = server.uri(); - let cache = tokio::task::spawn_blocking(move || { - let cache = cache(&uri); + let handle = tokio::runtime::Handle::current(); + let cached = tokio::task::spawn_blocking(move || { + let cache = support::cache_with(support::config(&uri), handle); let context = ExactCacheContext::default(); cache .set_cache("key", json!({"answer": 9}), &context) @@ -274,5 +307,5 @@ async fn sync_methods_block_inside_and_outside_the_runtime() { .await .unwrap(); - assert_eq!(cache, Some(json!({"answer": 9}))); + assert_eq!(cached, Some(json!({"answer": 9}))); } diff --git a/litellm-rust/crates/cache-s3/tests/contract.rs b/litellm-rust/crates/cache-s3/tests/contract.rs new file mode 100644 index 00000000000..9855e2868ff --- /dev/null +++ b/litellm-rust/crates/cache-s3/tests/contract.rs @@ -0,0 +1,65 @@ +mod support; + +use litellm_cache::ExactCacheContext; +use litellm_cache_testing as contract; +use rstest::{fixture, rstest}; +use serde_json::json; +use support::{FakeBucket, JsonS3Cache}; +use wiremock::MockServer; + +struct S3 { + cache: JsonS3Cache, + _server: MockServer, +} + +#[fixture] +async fn s3() -> S3 { + let server = FakeBucket::serve().await; + S3 { + cache: support::cache(&server.uri()), + _server: server, + } +} + +#[fixture] +fn context() -> ExactCacheContext { + ExactCacheContext::default() +} + +const PREFIX: &str = "contract:"; + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn hit_and_miss(#[future(awt)] s3: S3, context: ExactCacheContext) { + contract::hit_and_miss(&s3.cache, context, PREFIX, json!({"answer": 42})).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn sync_async_equivalence(#[future(awt)] s3: S3, context: ExactCacheContext) { + contract::sync_async_equivalence(&s3.cache, context, PREFIX, json!("first"), json!([2])).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn overwrite_replaces(#[future(awt)] s3: S3, context: ExactCacheContext) { + contract::overwrite_replaces(&s3.cache, context, PREFIX, json!(1), json!({"b": 2})).await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn pipeline_writes_every_entry(#[future(awt)] s3: S3, context: ExactCacheContext) { + contract::pipeline_writes_every_entry( + &s3.cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; +} + +#[rstest] +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn batch_preserves_order(#[future(awt)] s3: S3, context: ExactCacheContext) { + contract::batch_preserves_order(&s3.cache, context, PREFIX, json!("first"), json!(2)).await; +} diff --git a/litellm-rust/crates/cache-s3/tests/support/mod.rs b/litellm-rust/crates/cache-s3/tests/support/mod.rs new file mode 100644 index 00000000000..046b042c66a --- /dev/null +++ b/litellm-rust/crates/cache-s3/tests/support/mod.rs @@ -0,0 +1,77 @@ +#![allow(dead_code)] + +use std::{ + collections::HashMap, + sync::{Arc, Mutex}, +}; + +use litellm_auth_aws::AwsAuthConfig; +use litellm_cache::JsonCodec; +use litellm_cache_s3::{S3Cache, S3CacheConfig, S3Endpoint}; +use serde_json::Value; +use tokio::runtime::Handle; +use wiremock::{Mock, MockServer, Request, Respond, ResponseTemplate, http::Method, matchers::any}; + +pub type JsonS3Cache = S3Cache>; + +pub fn config(endpoint: &str) -> S3CacheConfig { + S3CacheConfig { + bucket: "cache-bucket".to_string(), + key_prefix: "team/".to_string(), + region: "us-east-1".to_string(), + endpoint: Some(S3Endpoint { + url: endpoint.to_string(), + }), + auth: AwsAuthConfig { + access_key_id: Some("key".to_string()), + secret_access_key: Some("secret".to_string()), + region_name: Some("us-east-1".to_string()), + ..Default::default() + }, + } +} + +pub fn cache_with(config: S3CacheConfig, runtime: Handle) -> JsonS3Cache { + S3Cache::new(config, reqwest::Client::new(), JsonCodec::new(), runtime) +} + +pub fn cache(endpoint: &str) -> JsonS3Cache { + cache_with(config(endpoint), Handle::current()) +} + +/// An in-memory bucket: PUT stores the body under the request path, GET serves it or answers +/// `NoSuchKey`. +#[derive(Clone, Default)] +pub struct FakeBucket { + objects: Arc>>>, +} + +impl FakeBucket { + pub async fn serve() -> MockServer { + let server = MockServer::start().await; + Mock::given(any()) + .respond_with(Self::default()) + .mount(&server) + .await; + server + } +} + +impl Respond for FakeBucket { + fn respond(&self, request: &Request) -> ResponseTemplate { + let path = request.url.path().to_string(); + let mut objects = self.objects.lock().unwrap(); + match request.method { + Method::PUT => { + objects.insert(path, request.body.clone()); + ResponseTemplate::new(200).insert_header("etag", "\"etag\"") + } + Method::GET => match objects.get(&path) { + Some(body) => ResponseTemplate::new(200).set_body_bytes(body.clone()), + None => ResponseTemplate::new(404) + .set_body_string("NoSuchKey"), + }, + _ => ResponseTemplate::new(405), + } + } +} diff --git a/litellm-rust/crates/cache-testing/Cargo.toml b/litellm-rust/crates/cache-testing/Cargo.toml new file mode 100644 index 00000000000..674472df50d --- /dev/null +++ b/litellm-rust/crates/cache-testing/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "litellm-cache-testing" +version = "0.1.0" +edition.workspace = true +license.workspace = true +repository.workspace = true +publish = false + +[dependencies] +litellm-cache.workspace = true diff --git a/litellm-rust/crates/cache-testing/src/lib.rs b/litellm-rust/crates/cache-testing/src/lib.rs new file mode 100644 index 00000000000..c227c1e12dd --- /dev/null +++ b/litellm-rust/crates/cache-testing/src/lib.rs @@ -0,0 +1,211 @@ +//! Backend-neutral contract checks every cache backend runs from its own `rstest` suite. +//! +//! Each check takes the cache under test, the context to call it with, a key `prefix` that +//! keeps runs apart on shared servers, and distinct sample values. A check panics with the +//! violated invariant, so a backend test is one `#[rstest]` case per contract. + +use std::fmt::Debug; + +use litellm_cache::{BaseCache, BatchCache, BatchEntry, CounterCache, DeleteCache, FlushCache}; + +fn key(prefix: &str, name: &str) -> String { + format!("{prefix}{name}") +} + +/// A missing key reads as `None`, and a written key reads back through sync and async gets. +pub async fn hit_and_miss(cache: &B, context: B::Context, prefix: &str, value: B::Value) +where + B: BaseCache, + B::Value: Debug + PartialEq, +{ + let key = key(prefix, "hit-and-miss"); + assert_eq!( + cache.get_cache(&key, &context).unwrap(), + None, + "unwritten key must miss" + ); + assert_eq!( + cache.async_get_cache(&key, &context).await.unwrap(), + None, + "unwritten key must miss asynchronously" + ); + cache.set_cache(&key, value.clone(), &context).unwrap(); + assert_eq!( + cache.get_cache(&key, &context).unwrap(), + Some(value.clone()) + ); + assert_eq!( + cache.async_get_cache(&key, &context).await.unwrap(), + Some(value) + ); +} + +/// Sync and async writes land in the same store: each is visible to the other read path. +pub async fn sync_async_equivalence( + cache: &B, + context: B::Context, + prefix: &str, + first: B::Value, + second: B::Value, +) where + B: BaseCache, + B::Value: Debug + PartialEq, +{ + let async_written = key(prefix, "async-written"); + let sync_written = key(prefix, "sync-written"); + cache + .async_set_cache(&async_written, first.clone(), context.clone()) + .await + .unwrap(); + assert_eq!( + cache.get_cache(&async_written, &context).unwrap(), + Some(first) + ); + cache + .set_cache(&sync_written, second.clone(), &context) + .unwrap(); + assert_eq!( + cache + .async_get_cache(&sync_written, &context) + .await + .unwrap(), + Some(second) + ); +} + +/// A second write to a key replaces the first. +pub async fn overwrite_replaces( + cache: &B, + context: B::Context, + prefix: &str, + first: B::Value, + second: B::Value, +) where + B: BaseCache, + B::Value: Debug + PartialEq, +{ + let key = key(prefix, "overwrite"); + cache.set_cache(&key, first, &context).unwrap(); + cache.set_cache(&key, second.clone(), &context).unwrap(); + assert_eq!(cache.get_cache(&key, &context).unwrap(), Some(second)); +} + +/// `async_set_cache_pipeline` writes every entry, and an empty pipeline succeeds. +pub async fn pipeline_writes_every_entry( + cache: &B, + context: B::Context, + prefix: &str, + values: Vec, +) where + B: BaseCache, + B::Value: Debug + PartialEq, +{ + cache + .async_set_cache_pipeline(Vec::new(), context.clone()) + .await + .unwrap(); + let entries = values + .iter() + .enumerate() + .map(|(index, value)| (key(prefix, &format!("pipeline-{index}")), value.clone())) + .collect::>(); + cache + .async_set_cache_pipeline(entries.clone(), context.clone()) + .await + .unwrap(); + for (key, value) in entries { + assert_eq!( + cache.get_cache(&key, &context).unwrap(), + Some(value), + "{key}" + ); + } +} + +/// Batch reads answer in request order, with a `Miss` in place of each absent key. +pub async fn batch_preserves_order( + cache: &B, + context: B::Context, + prefix: &str, + first: B::Value, + second: B::Value, +) where + B: BatchCache, + B::Value: Debug + PartialEq, +{ + let keys = vec![ + key(prefix, "batch-first"), + key(prefix, "batch-missing"), + key(prefix, "batch-second"), + ]; + cache.set_cache(&keys[0], first.clone(), &context).unwrap(); + cache.set_cache(&keys[2], second.clone(), &context).unwrap(); + let expected = vec![ + BatchEntry::Hit(first), + BatchEntry::Miss, + BatchEntry::Hit(second), + ]; + assert_eq!(cache.batch_get_cache(&keys, &context).unwrap(), expected); + assert_eq!( + cache.async_batch_get_cache(keys, context).await.unwrap(), + expected + ); +} + +/// Sync and async deletes remove only the named key, and deleting a missing key succeeds. +pub async fn delete_removes_key(cache: &B, context: B::Context, prefix: &str, value: B::Value) +where + B: DeleteCache, + B::Value: Debug + PartialEq, +{ + let sync_deleted = key(prefix, "delete-sync"); + let async_deleted = key(prefix, "delete-async"); + let kept = key(prefix, "delete-kept"); + for key in [&sync_deleted, &async_deleted, &kept] { + cache.set_cache(key, value.clone(), &context).unwrap(); + } + cache.delete_cache(&sync_deleted).unwrap(); + cache.async_delete_cache(&async_deleted).await.unwrap(); + cache + .delete_cache(&key(prefix, "delete-never-written")) + .unwrap(); + assert_eq!(cache.get_cache(&sync_deleted, &context).unwrap(), None); + assert_eq!(cache.get_cache(&async_deleted, &context).unwrap(), None); + assert_eq!(cache.get_cache(&kept, &context).unwrap(), Some(value)); +} + +/// `flush_cache` and `async_flush_cache` each leave the cache empty. +pub async fn flush_clears(cache: &B, context: B::Context, prefix: &str, value: B::Value) +where + B: FlushCache, + B::Value: Debug + PartialEq, +{ + let key = key(prefix, "flush"); + cache.set_cache(&key, value.clone(), &context).unwrap(); + cache.flush_cache().unwrap(); + assert_eq!(cache.get_cache(&key, &context).unwrap(), None); + cache.set_cache(&key, value, &context).unwrap(); + cache.async_flush_cache().await.unwrap(); + assert_eq!(cache.get_cache(&key, &context).unwrap(), None); +} + +/// Sync and async increments accumulate on one counter, starting from zero. Whole-number +/// steps, since Python's disk cache restarts any counter whose stored value is not an `int`. +pub async fn counter_accumulates(cache: &B, context: B::Context, prefix: &str) +where + B: CounterCache, +{ + let key = key(prefix, "counter"); + assert_eq!( + cache.increment_cache(&key, 1.0, context.clone()).unwrap(), + 1.0 + ); + assert_eq!( + cache + .async_increment(&key, 2.0, context.clone(), false) + .await + .unwrap(), + 3.0 + ); + assert_eq!(cache.increment_cache(&key, -1.0, context).unwrap(), 2.0); +} diff --git a/litellm-rust/crates/cache-valkey-semantic/Cargo.toml b/litellm-rust/crates/cache-valkey-semantic/Cargo.toml index f98bb5a5fa8..da9bb60c853 100644 --- a/litellm-rust/crates/cache-valkey-semantic/Cargo.toml +++ b/litellm-rust/crates/cache-valkey-semantic/Cargo.toml @@ -8,13 +8,13 @@ repository.workspace = true [dependencies] litellm-cache.workspace = true litellm-cache-redis.workspace = true -litellm-cache-response.workspace = true redis = { version = "1.7.0", features = ["tls-rustls"] } -serde_json.workspace = true sha2.workspace = true -tokio.workspace = true uuid = { version = "1", features = ["v4"] } [dev-dependencies] +litellm-cache-testing.workspace = true redis-test = "1.0.4" rstest.workspace = true +serde_json.workspace = true +tokio.workspace = true diff --git a/litellm-rust/crates/cache-valkey-semantic/src/cache.rs b/litellm-rust/crates/cache-valkey-semantic/src/cache.rs new file mode 100644 index 00000000000..947c0edc479 --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/src/cache.rs @@ -0,0 +1,245 @@ +use std::{ + sync::{Arc, Mutex}, + time::Duration, +}; + +use litellm_cache::{ + BaseCache, CacheCodec, Error, SemanticCacheContext, + semantic::{Embedder, SemanticCache, SemanticLookup, prompt_from_context}, +}; +use litellm_cache_redis::{RedisTopology, connection::Connections}; + +use crate::{ + ValkeySemanticConfig, + index::IndexState, + search::{embedding_bytes, scope_tag, search_document, write_document}, +}; + +/// `ValkeySemanticCache`: a semantic cache on valkey-search's TAG + VECTOR index. Values go +/// through the injected codec, so the response layer decides what a cached entry is. +pub struct ValkeySemanticCache { + connections: Arc>, + embedder: E, + codec: S, + config: ValkeySemanticConfig, + index_dimension: Arc>>, +} + +impl ValkeySemanticCache { + pub fn new( + url: &str, + embedder: E, + codec: S, + config: ValkeySemanticConfig, + ) -> Result { + Ok(Self { + connections: Arc::new(Connections::open(url, &RedisTopology::Standalone)?), + embedder, + codec, + config, + index_dimension: Arc::new(Mutex::new(None)), + }) + } +} + +impl ValkeySemanticCache +where + E: Embedder, + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + pub fn with_connection( + connection: C, + embedder: E, + codec: S, + config: ValkeySemanticConfig, + ) -> Self { + Self { + connections: Arc::new(Connections::fixed(connection)), + embedder, + codec, + config, + index_dimension: Arc::new(Mutex::new(None)), + } + } + + pub fn similarity_threshold(&self) -> f64 { + self.config.similarity_threshold + } + + pub fn index_name(&self) -> &str { + &self.config.index_name + } + + fn index_state(&self) -> IndexState { + IndexState { + name: self.config.index_name.clone(), + prefix: format!("{}:", self.config.index_name), + dimension: Arc::clone(&self.index_dimension), + similarity_threshold: self.config.similarity_threshold, + } + } + + fn decode(&self, lookup: SemanticLookup>) -> Result, Error> { + Ok(SemanticLookup { + value: lookup + .value + .map(|bytes| self.codec.decode(&bytes)) + .transpose()?, + similarity: lookup.similarity, + }) + } +} + +impl ValkeySemanticCache +where + E: Embedder, + S: CacheCodec + Clone, + C: redis::ConnectionLike + Send + 'static, +{ + /// The same index and connections behind a different embedder. + pub fn with_embedder(&self, embedder: E2) -> ValkeySemanticCache { + ValkeySemanticCache { + connections: Arc::clone(&self.connections), + embedder, + codec: self.codec.clone(), + config: self.config.clone(), + index_dimension: Arc::clone(&self.index_dimension), + } + } +} + +impl BaseCache for ValkeySemanticCache +where + E: Embedder, + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + type Value = S::Value; + type Context = SemanticCacheContext; + + fn get_ttl(&self, context: &Self::Context) -> Option { + context.ttl + } + + fn set_cache( + &self, + key: &str, + value: Self::Value, + context: &Self::Context, + ) -> Result<(), Error> { + let Some(prompt) = prompt_from_context(context) else { + return Ok(()); + }; + let embedding = self.embedder.embed(&prompt, context.metadata.as_ref())?; + let response = self.codec.encode(&value)?; + let index = self.index_state(); + self.connections.execute(|connection| { + write_document( + connection, + &index, + &scope_tag(key), + &prompt, + response, + embedding_bytes(&embedding), + self.get_ttl(context), + ) + }) + } + + fn get_cache(&self, key: &str, context: &Self::Context) -> Result, Error> { + self.get_cache_with_similarity(key, context) + .map(|lookup| lookup.value) + } + + async fn async_set_cache( + &self, + key: &str, + value: Self::Value, + context: Self::Context, + ) -> Result<(), Error> { + let Some(prompt) = prompt_from_context(&context) else { + return Ok(()); + }; + let embedding = self + .embedder + .async_embed(&prompt, context.metadata.as_ref()) + .await?; + let response = self.codec.encode(&value)?; + let index = self.index_state(); + let scope = scope_tag(key); + Connections::run_blocking(Arc::clone(&self.connections), move |connection| { + write_document( + connection, + &index, + &scope, + &prompt, + response, + embedding_bytes(&embedding), + context.ttl, + ) + }) + .await + } + + async fn async_get_cache( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + self.async_get_cache_with_similarity(key, context) + .await + .map(|lookup| lookup.value) + } +} + +/// Python stamps a similarity of `0.0` when there is no prompt or no document in the key's +/// scope, and the closest document's similarity even when it misses the threshold. +impl SemanticCache for ValkeySemanticCache +where + E: Embedder, + S: CacheCodec, + C: redis::ConnectionLike + Send + 'static, +{ + fn get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + let Some(prompt) = prompt_from_context(context) else { + return Ok(SemanticLookup::miss(Some(0.0))); + }; + let embedding = self.embedder.embed(&prompt, context.metadata.as_ref())?; + let index = self.index_state(); + let lookup = self.connections.execute(|connection| { + search_document( + connection, + &index, + &scope_tag(key), + embedding_bytes(&embedding), + ) + })?; + self.decode(lookup) + } + + async fn async_get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error> { + let Some(prompt) = prompt_from_context(context) else { + return Ok(SemanticLookup::miss(Some(0.0))); + }; + let embedding = self + .embedder + .async_embed(&prompt, context.metadata.as_ref()) + .await?; + let index = self.index_state(); + let scope = scope_tag(key); + let lookup = Connections::run_blocking(Arc::clone(&self.connections), move |connection| { + search_document(connection, &index, &scope, embedding_bytes(&embedding)) + }) + .await?; + self.decode(lookup) + } +} diff --git a/litellm-rust/crates/cache-valkey-semantic/src/config.rs b/litellm-rust/crates/cache-valkey-semantic/src/config.rs new file mode 100644 index 00000000000..c417652c27b --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/src/config.rs @@ -0,0 +1,8 @@ +/// `ValkeySemanticCache.DEFAULT_VALKEY_INDEX_NAME`. +pub const DEFAULT_INDEX_NAME: &str = "litellm_semantic_cache_index"; + +#[derive(Clone, Debug, PartialEq)] +pub struct ValkeySemanticConfig { + pub similarity_threshold: f64, + pub index_name: String, +} diff --git a/litellm-rust/crates/cache-valkey-semantic/src/index.rs b/litellm-rust/crates/cache-valkey-semantic/src/index.rs new file mode 100644 index 00000000000..a0b7be4ca7b --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/src/index.rs @@ -0,0 +1,100 @@ +use std::sync::{Arc, Mutex}; + +use litellm_cache::Error; +use litellm_cache_redis::connection::ConnectionRef; + +use crate::search::value_text; + +/// The valkey-search index one cache writes to, with the dimension it was last ensured for. +#[derive(Clone)] +pub(crate) struct IndexState { + pub(crate) name: String, + pub(crate) prefix: String, + pub(crate) dimension: Arc>>, + pub(crate) similarity_threshold: f64, +} + +/// `_ensure_index_sync` / `_ensure_index_async`: create the TAG + HNSW index once per dimension, +/// and accept an existing index unless it reports a different dimension. +pub(crate) fn ensure_index( + connection: &mut ConnectionRef<'_>, + index: &IndexState, + dimension: usize, +) -> Result<(), Error> { + if index + .dimension + .lock() + .map_err(|_| Error::Unavailable)? + .is_some_and(|existing| existing == dimension) + { + return Ok(()); + } + let create = redis::cmd("FT.CREATE") + .arg(&index.name) + .arg("ON") + .arg("HASH") + .arg("PREFIX") + .arg(1) + .arg(&index.prefix) + .arg("SCHEMA") + .arg("litellm_cache_key") + .arg("TAG") + .arg("embedding") + .arg("VECTOR") + .arg("HNSW") + .arg(6) + .arg("TYPE") + .arg("FLOAT32") + .arg("DIM") + .arg(dimension) + .arg("DISTANCE_METRIC") + .arg("COSINE") + .query::(connection) + .map(|_| ()) + .map_err(|error| error.to_string()); + if let Err(message) = create { + if !message.to_ascii_lowercase().contains("already exists") { + return Err(Error::Unavailable); + } + let info = redis::cmd("FT.INFO") + .arg(&index.name) + .query::(connection) + .map_err(|_| Error::Unavailable)?; + if index_dimension_from_info(&info).is_some_and(|existing| existing != dimension) { + return Err(Error::Unavailable); + } + } + *index.dimension.lock().map_err(|_| Error::Unavailable)? = Some(dimension); + Ok(()) +} + +/// `_extract_index_dim`: flatten each attribute one level and read the value after +/// `dimensions`. +fn index_dimension_from_info(value: &redis::Value) -> Option { + let redis::Value::Array(values) = value else { + return None; + }; + let attributes = values.windows(2).find_map(|pair| { + (value_text(&pair[0]).as_deref() == Some("attributes")).then_some(&pair[1]) + })?; + let redis::Value::Array(fields) = attributes else { + return None; + }; + fields.iter().find_map(|field| { + let redis::Value::Array(values) = field else { + return None; + }; + let values = values + .iter() + .flat_map(|value| match value { + redis::Value::Array(values) => values.as_slice(), + _ => std::slice::from_ref(value), + }) + .collect::>(); + values.windows(2).find_map(|pair| { + (value_text(pair[0]).as_deref() == Some("dimensions")) + .then(|| value_text(pair[1]).and_then(|value| value.parse().ok())) + .flatten() + }) + }) +} diff --git a/litellm-rust/crates/cache-valkey-semantic/src/lib.rs b/litellm-rust/crates/cache-valkey-semantic/src/lib.rs index 6062ccc842c..f2f62bc95bd 100644 --- a/litellm-rust/crates/cache-valkey-semantic/src/lib.rs +++ b/litellm-rust/crates/cache-valkey-semantic/src/lib.rs @@ -1,1153 +1,7 @@ -use std::{ - future::Future, - sync::{Arc, Mutex}, - time::Duration, -}; +mod cache; +mod config; +mod index; +mod search; -use litellm_cache::{BaseCache, CacheCodec, CacheConnectionResult, Error, SemanticCacheContext}; -use litellm_cache_redis::{ - RedisTopology, - connection::{ConnectionRef, Connections}, -}; -use litellm_cache_response::CacheEntry; -use serde_json::Value; -use sha2::{Digest, Sha256}; -use uuid::Uuid; - -pub trait Embedder: Send + Sync + 'static { - fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error>; - - fn async_embed( - &self, - prompt: &str, - metadata: Option<&Value>, - ) -> impl Future, Error>> + Send; -} - -pub struct PreparedEmbedding(pub Vec); - -impl Embedder for PreparedEmbedding { - fn embed(&self, _prompt: &str, _metadata: Option<&Value>) -> Result, Error> { - Ok(self.0.clone()) - } - - async fn async_embed( - &self, - _prompt: &str, - _metadata: Option<&Value>, - ) -> Result, Error> { - Ok(self.0.clone()) - } -} - -#[derive(Clone, Debug, PartialEq)] -pub struct ValkeySemanticConfig { - pub similarity_threshold: f64, - pub index_name: String, -} - -pub const DEFAULT_INDEX_NAME: &str = "litellm_semantic_cache_index"; - -#[derive(Clone)] -struct IndexState { - name: String, - prefix: String, - dimension: Arc>>, - similarity_threshold: f64, -} - -pub struct ValkeySemanticCache< - E: Embedder, - S: CacheCodec, - C = redis::Connection, -> { - connections: Arc>, - embedder: E, - codec: S, - config: ValkeySemanticConfig, - index_dimension: Arc>>, -} - -impl ValkeySemanticCache -where - E: Embedder, - S: CacheCodec, -{ - pub fn new( - url: &str, - embedder: E, - codec: S, - config: ValkeySemanticConfig, - ) -> Result { - Ok(Self { - connections: Arc::new(Connections::open(url, &RedisTopology::Standalone)?), - embedder, - codec, - config, - index_dimension: Arc::new(Mutex::new(None)), - }) - } -} - -impl ValkeySemanticCache -where - E: Embedder, - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - pub fn with_connection( - connection: C, - embedder: E, - codec: S, - config: ValkeySemanticConfig, - ) -> Self { - Self { - connections: Arc::new(Connections::fixed(connection)), - embedder, - codec, - config, - index_dimension: Arc::new(Mutex::new(None)), - } - } - - pub fn similarity_threshold(&self) -> f64 { - self.config.similarity_threshold - } - - pub fn index_name(&self) -> &str { - &self.config.index_name - } - - fn index_state(&self) -> IndexState { - IndexState { - name: self.config.index_name.clone(), - prefix: format!("{}:", self.config.index_name), - dimension: Arc::clone(&self.index_dimension), - similarity_threshold: self.config.similarity_threshold, - } - } -} - -impl ValkeySemanticCache -where - E: Embedder, - S: CacheCodec + Clone, - C: redis::ConnectionLike + Send + 'static, -{ - pub fn with_embedder(&self, embedder: E2) -> ValkeySemanticCache { - ValkeySemanticCache { - connections: Arc::clone(&self.connections), - embedder, - codec: self.codec.clone(), - config: self.config.clone(), - index_dimension: Arc::clone(&self.index_dimension), - } - } -} - -impl BaseCache for ValkeySemanticCache -where - E: Embedder, - S: CacheCodec, - C: redis::ConnectionLike + Send + 'static, -{ - type Value = CacheEntry; - type Context = SemanticCacheContext; - - fn get_ttl(&self, context: &Self::Context) -> Option { - context.ttl - } - - fn set_cache( - &self, - key: &str, - value: Self::Value, - context: &Self::Context, - ) -> Result<(), Error> { - let Some(prompt) = prompt_from_context(context) else { - return Ok(()); - }; - let embedding = self.embedder.embed(&prompt, context.metadata.as_ref())?; - let scope = scope_tag(key); - let response = self.codec.encode(&value)?; - let vector = embedding_bytes(&embedding); - let index = self.index_state(); - self.connections.execute(|connection| { - write_document( - connection, - &index, - &scope, - &prompt, - response, - vector, - self.get_ttl(context), - ) - }) - } - - fn get_cache(&self, key: &str, context: &Self::Context) -> Result, Error> { - let Some(prompt) = prompt_from_context(context) else { - return Ok(None); - }; - let embedding = self.embedder.embed(&prompt, context.metadata.as_ref())?; - let scope = scope_tag(key); - let vector = embedding_bytes(&embedding); - let index = self.index_state(); - let response = self.connections.execute(|connection| { - search_document(connection, &index, &scope, vector, embedding.len()) - })?; - let Some(response) = response else { - return Ok(None); - }; - self.codec.decode(&response).map(Some) - } - - fn async_set_cache( - &self, - key: &str, - value: Self::Value, - context: Self::Context, - ) -> impl Future> + Send { - let key = key.to_owned(); - let prompt = prompt_from_context(&context); - let metadata = context.metadata.clone(); - async move { - let Some(prompt) = prompt else { - return Ok(()); - }; - let embedding = self - .embedder - .async_embed(&prompt, metadata.as_ref()) - .await?; - let connections = Arc::clone(&self.connections); - let index = self.index_state(); - let response = self.codec.encode(&value)?; - let vector = embedding_bytes(&embedding); - let scope = scope_tag(&key); - let ttl = context.ttl; - Connections::run_blocking(connections, move |connection| { - write_document(connection, &index, &scope, &prompt, response, vector, ttl) - }) - .await - } - } - - fn async_get_cache( - &self, - key: &str, - context: &Self::Context, - ) -> impl Future, Error>> + Send { - let key = key.to_owned(); - let prompt = prompt_from_context(context); - let metadata = context.metadata.clone(); - async move { - let Some(prompt) = prompt else { - return Ok(None); - }; - let embedding = self - .embedder - .async_embed(&prompt, metadata.as_ref()) - .await?; - let connections = Arc::clone(&self.connections); - let index = self.index_state(); - Connections::run_blocking(connections, move |connection| { - let scope = scope_tag(&key); - let vector = embedding_bytes(&embedding); - search_document(connection, &index, &scope, vector, embedding.len()) - }) - .await - .and_then(|response| response.map(|bytes| self.codec.decode(&bytes)).transpose()) - } - } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - Err(Error::UnsupportedOperation) - } -} - -pub fn prompt_from_context(context: &SemanticCacheContext) -> Option { - if let Some(Value::Array(messages)) = context.messages.as_ref() - && !messages.is_empty() - { - return messages - .iter() - .filter_map(Value::as_object) - .map(message_text) - .collect(); - } - let input = context.input.as_ref()?; - let mut parts = Vec::new(); - collect_input_text(input, &mut parts); - let prompt = parts.join("\n").trim().to_owned(); - (!prompt.is_empty()).then_some(prompt) -} - -fn message_text(message: &serde_json::Map) -> Option { - let content = match message.get("content") { - Some(Value::String(value)) => value.clone(), - Some(Value::Array(parts)) => { - let mut content = String::new(); - for part in parts { - let part = part.as_object()?; - if let Some(text) = part.get("text").and_then(Value::as_str) { - content.push_str(text); - } - } - content - } - _ => String::new(), - }; - Some(format!( - "{content}{}", - search_results_text(message.get("search_results")) - )) -} - -fn search_results_text(value: Option<&Value>) -> String { - let Some(Value::Array(results)) = value else { - return String::new(); - }; - results - .iter() - .filter_map(Value::as_object) - .map(|result| { - let source = result.get("source").and_then(Value::as_str).unwrap_or(""); - let title = result.get("title").and_then(Value::as_str).unwrap_or(""); - let content = result - .get("content") - .and_then(Value::as_array) - .map(|blocks| { - blocks - .iter() - .filter_map(Value::as_object) - .filter_map(|block| block.get("text").and_then(Value::as_str)) - .collect::() - }) - .unwrap_or_default(); - let citations = result - .get("citations") - .filter(|value| !value.is_null()) - .and_then(|value| serde_json::to_string(value).ok()) - .unwrap_or_default(); - format!("{source}{title}{content}{citations}") - }) - .collect() -} - -fn collect_input_text(value: &Value, parts: &mut Vec) { - match value { - Value::String(value) => { - let value = value.trim(); - if !value.is_empty() { - parts.push(value.to_owned()); - } - } - Value::Array(values) => values - .iter() - .for_each(|value| collect_input_text(value, parts)), - Value::Object(object) => { - if let Some(content) = object.get("content").filter(|value| !value.is_null()) { - collect_input_text(content, parts); - return; - } - for key in ["text", "output", "input_text", "output_text"] { - if let Some(Value::String(value)) = object.get(key) { - let value = value.trim(); - if !value.is_empty() { - parts.push(value.to_owned()); - return; - } - } - } - } - _ => {} - } -} - -fn scope_tag(key: &str) -> String { - let digest = Sha256::digest(key.as_bytes()); - digest.iter().map(|byte| format!("{byte:02x}")).collect() -} - -fn embedding_bytes(embedding: &[f32]) -> Vec { - embedding - .iter() - .flat_map(|value| value.to_le_bytes()) - .collect() -} - -fn write_document( - connection: &mut ConnectionRef<'_>, - index: &IndexState, - scope: &str, - prompt: &str, - response: Vec, - vector: Vec, - ttl: Option, -) -> Result<(), Error> { - let dimension = vector.len() / std::mem::size_of::(); - ensure_index( - connection, - &index.name, - &index.prefix, - &index.dimension, - dimension, - )?; - let document = format!("{}{scope}:{}", index.prefix, Uuid::new_v4()); - let mut pipeline = redis::pipe(); - pipeline - .cmd("HSET") - .arg(&document) - .arg("litellm_cache_key") - .arg(scope) - .arg("prompt") - .arg(prompt) - .arg("response") - .arg(response) - .arg("embedding") - .arg(vector) - .ignore(); - if let Some(ttl) = ttl { - pipeline - .cmd("EXPIRE") - .arg(&document) - .arg(ttl.as_secs()) - .ignore(); - } - pipeline - .query::<()>(connection) - .map_err(|_| Error::Unavailable) -} - -fn search_document( - connection: &mut ConnectionRef<'_>, - index: &IndexState, - scope: &str, - vector: Vec, - dimension: usize, -) -> Result>, Error> { - ensure_index( - connection, - &index.name, - &index.prefix, - &index.dimension, - dimension, - )?; - let query = - format!("(@litellm_cache_key:{{{scope}}})=>[KNN 1 @embedding $vec AS vector_distance]"); - let response = redis::cmd("FT.SEARCH") - .arg(&index.name) - .arg(query) - .arg("PARAMS") - .arg(2) - .arg("vec") - .arg(vector) - .arg("RETURN") - .arg(2) - .arg("response") - .arg("vector_distance") - .arg("DIALECT") - .arg(2) - .query::(connection) - .map_err(|_| Error::Unavailable)?; - let Some(fields) = search_fields(response)? else { - return Ok(None); - }; - let response = fields - .iter() - .find_map(|(name, value)| (name == "response").then(|| value.clone())) - .ok_or(Error::InvalidEntry)?; - let distance = fields - .iter() - .find_map(|(name, value)| (name == "vector_distance").then(|| value.clone())) - .ok_or(Error::InvalidEntry)?; - let distance = parse_f64(&distance)?; - if 1.0 - distance < index.similarity_threshold { - return Ok(None); - } - Ok(Some(response)) -} - -fn ensure_index( - connection: &mut ConnectionRef<'_>, - index_name: &str, - prefix: &str, - index_dimension: &Mutex>, - dimension: usize, -) -> Result<(), Error> { - if index_dimension - .lock() - .map_err(|_| Error::Unavailable)? - .is_some_and(|existing| existing == dimension) - { - return Ok(()); - } - let create = redis::cmd("FT.CREATE") - .arg(index_name) - .arg("ON") - .arg("HASH") - .arg("PREFIX") - .arg(1) - .arg(prefix) - .arg("SCHEMA") - .arg("litellm_cache_key") - .arg("TAG") - .arg("embedding") - .arg("VECTOR") - .arg("HNSW") - .arg(6) - .arg("TYPE") - .arg("FLOAT32") - .arg("DIM") - .arg(dimension) - .arg("DISTANCE_METRIC") - .arg("COSINE") - .query::(connection) - .map(|_| ()) - .map_err(|error| error.to_string()); - if let Err(message) = create { - if !message.to_ascii_lowercase().contains("already exists") { - return Err(Error::Unavailable); - } - let info = redis::cmd("FT.INFO") - .arg(index_name) - .query::(connection) - .map_err(|_| Error::Unavailable)?; - let existing = index_dimension_from_info(&info).ok_or(Error::Unavailable)?; - if existing != dimension { - return Err(Error::Unavailable); - } - } - *index_dimension.lock().map_err(|_| Error::Unavailable)? = Some(dimension); - Ok(()) -} - -fn index_dimension_from_info(value: &redis::Value) -> Option { - let redis::Value::Array(values) = value else { - return None; - }; - let attributes = values.windows(2).find_map(|pair| { - (value_text(&pair[0]).as_deref() == Some("attributes")).then_some(&pair[1]) - })?; - let redis::Value::Array(fields) = attributes else { - return None; - }; - fields.iter().find_map(|field| { - let redis::Value::Array(values) = field else { - return None; - }; - let flattened = values.iter().flat_map(|value| match value { - redis::Value::Array(values) => values.as_slice(), - _ => std::slice::from_ref(value), - }); - let values = flattened.collect::>(); - values.windows(2).find_map(|pair| { - if value_text(pair[0]).as_deref() == Some("dimensions") { - return value_text(pair[1]).and_then(|value| value.parse().ok()); - } - None - }) - }) -} - -type SearchFields = Vec<(String, Vec)>; - -fn search_fields(value: redis::Value) -> Result, Error> { - let redis::Value::Array(values) = value else { - return Err(Error::InvalidEntry); - }; - let total = parse_i64(values.first().ok_or(Error::InvalidEntry)?)?; - if total <= 0 || values.len() < 3 { - return Ok(None); - } - let redis::Value::Array(fields) = &values[2] else { - return Err(Error::InvalidEntry); - }; - let (pairs, remainder) = fields.as_chunks::<2>(); - if !remainder.is_empty() { - return Err(Error::InvalidEntry); - } - let pairs = pairs - .iter() - .map(|pair| { - Ok(( - value_text(&pair[0]).ok_or(Error::InvalidEntry)?, - value_bytes(&pair[1])?, - )) - }) - .collect::, Error>>()?; - Ok(Some(pairs)) -} - -fn parse_i64(value: &redis::Value) -> Result { - value_text(value) - .ok_or(Error::InvalidEntry)? - .parse() - .map_err(|_| Error::InvalidEntry) -} - -fn parse_f64(value: &[u8]) -> Result { - std::str::from_utf8(value) - .map_err(|_| Error::InvalidEntry)? - .parse() - .map_err(|_| Error::InvalidEntry) -} - -fn value_text(value: &redis::Value) -> Option { - match value { - redis::Value::BulkString(bytes) => String::from_utf8(bytes.clone()).ok(), - redis::Value::SimpleString(value) => Some(value.clone()), - redis::Value::Int(value) => Some(value.to_string()), - _ => None, - } -} - -fn value_bytes(value: &redis::Value) -> Result, Error> { - match value { - redis::Value::BulkString(bytes) => Ok(bytes.clone()), - redis::Value::SimpleString(value) => Ok(value.as_bytes().to_vec()), - redis::Value::Int(value) => Ok(value.to_string().into_bytes()), - _ => Err(Error::InvalidEntry), - } -} - -#[cfg(test)] -mod tests { - use std::{ - collections::VecDeque, - sync::{Arc, Mutex}, - time::Duration, - }; - - use litellm_cache::{BaseCache, CacheCodec}; - use litellm_cache_response::{ - CacheEntry, CacheKeyInput, ResponseCache, ResponseCacheCodec, ResponseCacheRequest, - }; - use redis_test::MockRedisConnection; - use rstest::rstest; - use serde_json::{Value, json}; - - use super::{ - Embedder, PreparedEmbedding, ValkeySemanticCache, ValkeySemanticConfig, - index_dimension_from_info, prompt_from_context, scope_tag, - }; - - #[derive(Clone)] - struct FixedEmbedder { - vector: Vec, - calls: EmbedderCalls, - } - - type EmbedderCalls = Arc)>>>; - type RecordingCache = - ValkeySemanticCache; - type RecordingSetup = (RecordingCache, Arc>>>, EmbedderCalls); - - impl Embedder for FixedEmbedder { - fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, super::Error> { - self.calls - .lock() - .unwrap() - .push((prompt.into(), metadata.cloned())); - Ok(self.vector.clone()) - } - - async fn async_embed( - &self, - prompt: &str, - metadata: Option<&Value>, - ) -> Result, super::Error> { - self.embed(prompt, metadata) - } - } - - struct RecordingConnection { - requests: Arc>>>, - replies: Mutex>>, - } - - impl RecordingConnection { - fn new(replies: impl IntoIterator>) -> Self { - Self { - requests: Arc::default(), - replies: Mutex::new(replies.into_iter().collect()), - } - } - - fn requests(&self) -> Arc>>> { - Arc::clone(&self.requests) - } - - fn reply(&self) -> redis::RedisResult { - self.replies - .lock() - .unwrap() - .pop_front() - .unwrap_or_else(|| Ok(redis::Value::SimpleString("OK".into()))) - } - } - - impl redis::ConnectionLike for RecordingConnection { - fn req_packed_command(&mut self, command: &[u8]) -> redis::RedisResult { - self.requests.lock().unwrap().push(command.to_vec()); - self.reply() - } - - fn req_packed_commands( - &mut self, - command: &[u8], - _offset: usize, - count: usize, - ) -> redis::RedisResult> { - self.requests.lock().unwrap().push(command.to_vec()); - (0..count).map(|_| self.reply()).collect() - } - - fn get_db(&self) -> i64 { - 0 - } - - fn check_connection(&mut self) -> bool { - true - } - - fn is_open(&self) -> bool { - true - } - } - - fn context( - messages: Option, - input: Option, - ) -> litellm_cache::SemanticCacheContext { - litellm_cache::SemanticCacheContext { - messages, - input, - ..Default::default() - } - } - - #[rstest] - #[case(json!([{"content": "hello"}]), None, Some("hello"))] - #[case(json!([{"content": [{"text": "hello"}, {"text": " world"}]}]), None, Some("hello world"))] - #[case(json!([{"content": ["raw", {"text": "hello"}]}]), None, None)] - #[case(json!([{"search_results": [{"source": "s", "title": "t", "content": [{"text": "c"}], "citations": ["x"]}]}]), None, Some(r#"stc["x"]"#))] - #[case(Value::Array(vec![]), Some(json!(" hello ")), Some("hello"))] - #[case(Value::Array(vec![]), Some(json!([{"content": "first"}, {"text": "second"}])), Some("first\nsecond"))] - #[case(Value::Array(vec![]), Some(json!(" ")), None)] - fn prompt_shapes( - #[case] messages: Value, - #[case] input: Option, - #[case] expected: Option<&str>, - ) { - assert_eq!( - prompt_from_context(&context(Some(messages), input)), - expected.map(str::to_owned) - ); - } - - #[test] - fn scope_tags_are_lowercase_sha256() { - assert_eq!( - scope_tag("key"), - "2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683" - ); - } - - #[test] - fn existing_index_dimension_is_read_from_attributes() { - let info = redis::Value::Array(vec![ - redis::Value::SimpleString("attributes".into()), - redis::Value::Array(vec![redis::Value::Array(vec![ - redis::Value::SimpleString("identifier".into()), - redis::Value::SimpleString("embedding".into()), - redis::Value::Array(vec![ - redis::Value::SimpleString("dimensions".into()), - redis::Value::SimpleString("2".into()), - ]), - ])]), - ]); - assert_eq!(index_dimension_from_info(&info), Some(2)); - } - - #[tokio::test] - async fn unsupported_connection_test_is_reported() { - let cache = ValkeySemanticCache::with_connection( - MockRedisConnection::new([]).assert_all_commands_consumed(), - FixedEmbedder { - vector: vec![1.0, 0.0], - calls: Arc::default(), - }, - ResponseCacheCodec, - ValkeySemanticConfig { - similarity_threshold: 0.8, - index_name: "test".into(), - }, - ); - assert_eq!( - cache.test_connection().await, - Err(super::Error::UnsupportedOperation) - ); - } - - #[tokio::test] - async fn prepared_embedding_returns_its_vector_for_any_prompt() { - let embedding = PreparedEmbedding(vec![1.0, 2.0]); - assert_eq!( - embedding - .async_embed("different prompt", None) - .await - .unwrap(), - vec![1.0, 2.0] - ); - } - - #[test] - fn with_embedder_shares_index_state_and_connections() { - let entry = CacheEntry { - timestamp: Some(1.0), - response: json!({"answer": "ok"}), - }; - let encoded = ResponseCacheCodec.encode(&entry).unwrap(); - let cache = ValkeySemanticCache::with_connection( - RecordingConnection::new([ok(), ok(), Ok(search_hit(encoded, "0.1"))]), - FixedEmbedder { - vector: vec![1.0, 0.0], - calls: Arc::default(), - }, - ResponseCacheCodec, - ValkeySemanticConfig { - similarity_threshold: 0.8, - index_name: "test".into(), - }, - ); - cache - .set_cache("key", entry.clone(), &semantic_context(None)) - .unwrap(); - let prepared = cache.with_embedder(PreparedEmbedding(vec![1.0, 0.0])); - assert_eq!( - prepared.get_cache("key", &semantic_context(None)).unwrap(), - Some(entry) - ); - } - - #[test] - fn missing_prompt_does_not_touch_redis() { - let cache = ValkeySemanticCache::with_connection( - MockRedisConnection::new([]).assert_all_commands_consumed(), - FixedEmbedder { - vector: vec![1.0, 0.0], - calls: Arc::default(), - }, - ResponseCacheCodec, - ValkeySemanticConfig { - similarity_threshold: 0.8, - index_name: "test".into(), - }, - ); - assert_eq!(cache.get_cache("key", &context(None, None)).unwrap(), None); - assert_eq!(cache.get_ttl(&context(None, None)), None); - } - - fn semantic_context(ttl: Option) -> litellm_cache::SemanticCacheContext { - litellm_cache::SemanticCacheContext { - messages: Some(json!([{"role": "user", "content": "hello"}])), - metadata: Some(json!({"source": "test"})), - ttl, - ..Default::default() - } - } - - fn cache_with_recording( - replies: impl IntoIterator>, - vector: Vec, - threshold: f64, - ) -> RecordingSetup { - let connection = RecordingConnection::new(replies); - let requests = connection.requests(); - let calls: EmbedderCalls = Arc::default(); - let cache = ValkeySemanticCache::with_connection( - connection, - FixedEmbedder { - vector, - calls: Arc::clone(&calls), - }, - ResponseCacheCodec, - ValkeySemanticConfig { - similarity_threshold: threshold, - index_name: "test".into(), - }, - ); - (cache, requests, calls) - } - - fn ok() -> redis::RedisResult { - Ok(redis::Value::SimpleString("OK".into())) - } - - fn already_exists() -> redis::RedisResult { - Err(redis::RedisError::from(( - redis::ErrorKind::Io, - "already exists", - ))) - } - - fn info_dimension(dimension: usize) -> redis::Value { - redis::Value::Array(vec![ - redis::Value::SimpleString("attributes".into()), - redis::Value::Array(vec![redis::Value::Array(vec![ - redis::Value::SimpleString("embedding".into()), - redis::Value::Array(vec![ - redis::Value::SimpleString("dimensions".into()), - redis::Value::Int(dimension as i64), - ]), - ])]), - ]) - } - - fn search_hit(response: Vec, distance: &str) -> redis::Value { - redis::Value::Array(vec![ - redis::Value::Int(1), - redis::Value::BulkString(b"test:document".to_vec()), - redis::Value::Array(vec![ - redis::Value::BulkString(b"response".to_vec()), - redis::Value::BulkString(response), - redis::Value::BulkString(b"vector_distance".to_vec()), - redis::Value::BulkString(distance.as_bytes().to_vec()), - ]), - ]) - } - - fn requests_text(requests: &Arc>>>) -> String { - requests - .lock() - .unwrap() - .iter() - .map(|request| String::from_utf8_lossy(request)) - .collect::>() - .join("\n") - } - - #[test] - fn set_without_ttl_writes_hset_without_expire() { - let (cache, requests, calls) = cache_with_recording([ok()], vec![1.0, 0.0], 0.8); - cache - .set_cache( - "key", - CacheEntry { - timestamp: None, - response: json!({"answer": "ok"}), - }, - &semantic_context(None), - ) - .unwrap(); - let text = requests_text(&requests); - assert!(text.contains("FT.CREATE")); - assert!(text.contains("HSET")); - assert!( - text.contains("test:2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683:") - ); - assert!(!text.contains("EXPIRE")); - assert_eq!( - *calls.lock().unwrap(), - vec![("hello".into(), Some(json!({"source": "test"})))] - ); - } - - #[test] - fn set_with_ttl_truncates_expire_seconds() { - let (cache, requests, _) = cache_with_recording([ok()], vec![1.0, 0.0], 0.8); - cache - .set_cache( - "key", - CacheEntry { - timestamp: None, - response: json!({"answer": "ok"}), - }, - &semantic_context(Some(Duration::from_millis(1900))), - ) - .unwrap(); - let text = requests_text(&requests); - assert!(text.contains("EXPIRE")); - assert!(text.contains("\r\n$1\r\n1\r\n")); - } - - #[test] - fn second_set_skips_create_after_dimension_is_cached() { - let (cache, requests, _) = cache_with_recording([ok()], vec![1.0, 0.0], 0.8); - let context = semantic_context(None); - let entry = CacheEntry { - timestamp: None, - response: json!({"answer": "ok"}), - }; - cache.set_cache("key", entry.clone(), &context).unwrap(); - cache.set_cache("key", entry, &context).unwrap(); - let text = requests_text(&requests); - assert_eq!(text.matches("FT.CREATE").count(), 1); - assert_eq!(text.matches("HSET").count(), 2); - } - - #[test] - fn existing_index_dimension_must_match_embedding() { - let (cache, _, _) = cache_with_recording( - [already_exists(), Ok(info_dimension(2))], - vec![1.0, 0.0], - 0.8, - ); - cache - .set_cache( - "key", - CacheEntry { - timestamp: None, - response: json!({"answer": "ok"}), - }, - &semantic_context(None), - ) - .unwrap(); - - let (cache, _, _) = cache_with_recording( - [already_exists(), Ok(info_dimension(3))], - vec![1.0, 0.0], - 0.8, - ); - assert_eq!( - cache.set_cache( - "key", - CacheEntry { - timestamp: None, - response: json!({"answer": "ok"}), - }, - &semantic_context(None), - ), - Err(super::Error::Unavailable) - ); - } - - #[test] - fn get_applies_threshold_and_decodes_entry() { - let entry = CacheEntry { - timestamp: Some(1.0), - response: json!({"answer": "ok"}), - }; - let encoded = ResponseCacheCodec.encode(&entry).unwrap(); - let (cache, _, _) = cache_with_recording( - [ok(), Ok(search_hit(encoded.clone(), "0.1"))], - vec![1.0, 0.0], - 0.8, - ); - assert_eq!( - cache.get_cache("key", &semantic_context(None)).unwrap(), - Some(entry) - ); - - let (cache, _, _) = - cache_with_recording([ok(), Ok(search_hit(encoded, "0.5"))], vec![1.0, 0.0], 0.8); - assert_eq!( - cache.get_cache("key", &semantic_context(None)).unwrap(), - None - ); - } - - #[test] - fn get_zero_docs_is_a_miss() { - let (cache, _, _) = cache_with_recording( - [ok(), Ok(redis::Value::Array(vec![redis::Value::Int(0)]))], - vec![1.0, 0.0], - 0.8, - ); - assert_eq!( - cache.get_cache("key", &semantic_context(None)).unwrap(), - None - ); - } - - #[rstest] - #[case(redis::Value::Array(vec![ - redis::Value::Int(1), - redis::Value::BulkString(b"document".to_vec()), - redis::Value::Array(vec![ - redis::Value::BulkString(b"vector_distance".to_vec()), - redis::Value::BulkString(b"0.1".to_vec()), - ]), - ]))] - #[case(redis::Value::Array(vec![ - redis::Value::Int(1), - redis::Value::BulkString(b"document".to_vec()), - redis::Value::Array(vec![ - redis::Value::BulkString(b"response".to_vec()), - redis::Value::BulkString(b"not-json".to_vec()), - redis::Value::BulkString(b"vector_distance".to_vec()), - redis::Value::BulkString(b"abc".to_vec()), - ]), - ]))] - fn malformed_entries_are_invalid(#[case] search: redis::Value) { - let (cache, _, _) = cache_with_recording([ok(), Ok(search)], vec![1.0, 0.0], 0.8); - assert_eq!( - cache.get_cache("key", &semantic_context(None)), - Err(super::Error::InvalidEntry) - ); - } - - #[test] - fn response_cache_turns_invalid_entries_into_misses() { - let (cache, _, _) = cache_with_recording( - [ - ok(), - Ok(redis::Value::Array(vec![ - redis::Value::Int(1), - redis::Value::BulkString(b"document".to_vec()), - redis::Value::Array(vec![ - redis::Value::BulkString(b"response".to_vec()), - redis::Value::BulkString(b"not-json".to_vec()), - redis::Value::BulkString(b"vector_distance".to_vec()), - redis::Value::BulkString(b"0.1".to_vec()), - ]), - ])), - ], - vec![1.0, 0.0], - 0.8, - ); - let service = ResponseCache::new(Arc::new(cache)); - let request = ResponseCacheRequest { - key: CacheKeyInput { - preset: Some("key".into()), - ..Default::default() - }, - context: semantic_context(None), - ..ResponseCacheRequest::new(CacheKeyInput::default()) - }; - assert_eq!(service.lookup(&request, Duration::ZERO).unwrap(), None); - } - - #[tokio::test] - async fn async_set_and_get_use_shared_document_helpers() { - let entry = CacheEntry { - timestamp: Some(1.0), - response: json!({"answer": "ok"}), - }; - let encoded = ResponseCacheCodec.encode(&entry).unwrap(); - let (cache, requests, calls) = cache_with_recording( - [ok(), ok(), ok(), Ok(search_hit(encoded, "0.1"))], - vec![1.0, 0.0], - 0.8, - ); - let context = semantic_context(Some(Duration::from_millis(1900))); - cache - .async_set_cache("key", entry.clone(), context.clone()) - .await - .unwrap(); - assert_eq!( - cache.async_get_cache("key", &context).await.unwrap(), - Some(entry) - ); - let text = requests_text(&requests); - assert!(text.contains("FT.CREATE")); - assert!(text.contains("HSET")); - assert!(text.contains("EXPIRE")); - assert_eq!(calls.lock().unwrap().len(), 2); - } -} +pub use cache::ValkeySemanticCache; +pub use config::{DEFAULT_INDEX_NAME, ValkeySemanticConfig}; diff --git a/litellm-rust/crates/cache-valkey-semantic/src/search.rs b/litellm-rust/crates/cache-valkey-semantic/src/search.rs new file mode 100644 index 00000000000..3b4fae84317 --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/src/search.rs @@ -0,0 +1,163 @@ +use std::time::Duration; + +use litellm_cache::{Error, semantic::SemanticLookup}; +use litellm_cache_redis::connection::ConnectionRef; +use sha2::{Digest, Sha256}; +use uuid::Uuid; + +use crate::index::{IndexState, ensure_index}; + +/// `_scope_tag`: valkey-search TAG fields cannot match arbitrary keys verbatim, so scopes are +/// the key's lowercase SHA-256. +pub(crate) fn scope_tag(key: &str) -> String { + let digest = Sha256::digest(key.as_bytes()); + digest.iter().map(|byte| format!("{byte:02x}")).collect() +} + +pub(crate) fn embedding_bytes(embedding: &[f32]) -> Vec { + embedding + .iter() + .flat_map(|value| value.to_le_bytes()) + .collect() +} + +/// `HSET` a fresh `:` document, then `EXPIRE` it when a TTL is set. +pub(crate) fn write_document( + connection: &mut ConnectionRef<'_>, + index: &IndexState, + scope: &str, + prompt: &str, + response: Vec, + vector: Vec, + ttl: Option, +) -> Result<(), Error> { + ensure_index(connection, index, vector.len() / size_of::())?; + let document = format!("{}{scope}:{}", index.prefix, Uuid::new_v4()); + let mut pipeline = redis::pipe(); + pipeline + .cmd("HSET") + .arg(&document) + .arg("litellm_cache_key") + .arg(scope) + .arg("prompt") + .arg(prompt) + .arg("response") + .arg(response) + .arg("embedding") + .arg(vector) + .ignore(); + if let Some(ttl) = ttl { + pipeline + .cmd("EXPIRE") + .arg(&document) + .arg(ttl.as_secs()) + .ignore(); + } + pipeline + .query::<()>(connection) + .map_err(|_| Error::Unavailable) +} + +/// The KNN-1 search within `scope`: the closest document's similarity, and its stored response +/// when that similarity reaches the threshold. No document reads as a similarity of `0.0`. +pub(crate) fn search_document( + connection: &mut ConnectionRef<'_>, + index: &IndexState, + scope: &str, + vector: Vec, +) -> Result>, Error> { + ensure_index(connection, index, vector.len() / size_of::())?; + let query = + format!("(@litellm_cache_key:{{{scope}}})=>[KNN 1 @embedding $vec AS vector_distance]"); + let response = redis::cmd("FT.SEARCH") + .arg(&index.name) + .arg(query) + .arg("PARAMS") + .arg(2) + .arg("vec") + .arg(vector) + .arg("RETURN") + .arg(2) + .arg("response") + .arg("vector_distance") + .arg("DIALECT") + .arg(2) + .query::(connection) + .map_err(|_| Error::Unavailable)?; + let Some(fields) = search_fields(response)? else { + return Ok(SemanticLookup::miss(Some(0.0))); + }; + let field = |name: &str| { + fields + .iter() + .find_map(|(field, value)| (field == name).then(|| value.clone())) + .ok_or(Error::InvalidEntry) + }; + let response = field("response")?; + let similarity = 1.0 - parse_f64(&field("vector_distance")?)?; + Ok(SemanticLookup { + value: (similarity >= index.similarity_threshold).then_some(response), + similarity: Some(similarity), + }) +} + +type SearchFields = Vec<(String, Vec)>; + +fn search_fields(value: redis::Value) -> Result, Error> { + let redis::Value::Array(values) = value else { + return Err(Error::InvalidEntry); + }; + let total = parse_i64(values.first().ok_or(Error::InvalidEntry)?)?; + if total <= 0 || values.len() < 3 { + return Ok(None); + } + let redis::Value::Array(fields) = &values[2] else { + return Err(Error::InvalidEntry); + }; + let (pairs, remainder) = fields.as_chunks::<2>(); + if !remainder.is_empty() { + return Err(Error::InvalidEntry); + } + pairs + .iter() + .map(|pair| { + Ok(( + value_text(&pair[0]).ok_or(Error::InvalidEntry)?, + value_bytes(&pair[1])?, + )) + }) + .collect::, Error>>() + .map(Some) +} + +fn parse_i64(value: &redis::Value) -> Result { + value_text(value) + .ok_or(Error::InvalidEntry)? + .parse() + .map_err(|_| Error::InvalidEntry) +} + +fn parse_f64(value: &[u8]) -> Result { + std::str::from_utf8(value) + .map_err(|_| Error::InvalidEntry)? + .parse() + .map_err(|_| Error::InvalidEntry) +} + +pub(crate) fn value_text(value: &redis::Value) -> Option { + match value { + redis::Value::BulkString(bytes) => String::from_utf8(bytes.clone()).ok(), + redis::Value::SimpleString(value) => Some(value.clone()), + redis::Value::Int(value) => Some(value.to_string()), + _ => None, + } +} + +fn value_bytes(value: &redis::Value) -> Result, Error> { + match value { + redis::Value::BulkString(bytes) => Ok(bytes.clone()), + redis::Value::SimpleString(value) => Ok(value.as_bytes().to_vec()), + redis::Value::Int(value) => Ok(value.to_string().into_bytes()), + _ => Err(Error::InvalidEntry), + } +} diff --git a/litellm-rust/crates/cache-valkey-semantic/tests/cache.rs b/litellm-rust/crates/cache-valkey-semantic/tests/cache.rs new file mode 100644 index 00000000000..1c693d0875d --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/tests/cache.rs @@ -0,0 +1,417 @@ +mod support; + +use std::{ + sync::{Arc, Mutex}, + time::Duration, +}; + +use litellm_cache::{ + BaseCache, Error, JsonCodec, SemanticCacheContext, + semantic::{PreparedEmbedding, SemanticCache, SemanticLookup}, +}; +use litellm_cache_valkey_semantic::{ + DEFAULT_INDEX_NAME, ValkeySemanticCache, ValkeySemanticConfig, +}; +use redis_test::MockRedisConnection; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use support::{EmbedCalls, FakeEmbedder, RecordingConnection}; + +type Requests = Arc>>>; +type RecordingCache = ValkeySemanticCache, RecordingConnection>; + +const KEY_SCOPE: &str = "2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683"; + +struct Recording { + cache: RecordingCache, + requests: Requests, + calls: EmbedCalls, +} + +impl Recording { + fn text(&self) -> String { + self.requests + .lock() + .unwrap() + .iter() + .map(|request| String::from_utf8_lossy(request).into_owned()) + .collect::>() + .join("\n") + } +} + +fn config() -> ValkeySemanticConfig { + ValkeySemanticConfig { + similarity_threshold: 0.8, + index_name: "test".into(), + } +} + +fn recording(replies: impl IntoIterator>) -> Recording { + let connection = RecordingConnection::new(replies); + let requests = connection.requests(); + let embedder = FakeEmbedder::new(&[]); + let calls = Arc::clone(&embedder.calls); + Recording { + cache: ValkeySemanticCache::with_connection( + connection, + embedder, + JsonCodec::new(), + config(), + ), + requests, + calls, + } +} + +#[fixture] +fn entry() -> Value { + json!({"timestamp": 1.0, "response": {"answer": "ok"}}) +} + +#[fixture] +fn context() -> SemanticCacheContext { + SemanticCacheContext { + messages: Some(json!([{"role": "user", "content": "hello"}])), + metadata: Some(json!({"source": "test"})), + ..Default::default() + } +} + +fn ok() -> redis::RedisResult { + Ok(redis::Value::SimpleString("OK".into())) +} + +fn already_exists() -> redis::RedisResult { + Err(redis::RedisError::from(( + redis::ErrorKind::Io, + "already exists", + ))) +} + +fn bulk(value: &[u8]) -> redis::Value { + redis::Value::BulkString(value.to_vec()) +} + +fn search_hit(response: &[u8], distance: &str) -> redis::Value { + redis::Value::Array(vec![ + redis::Value::Int(1), + bulk(b"test:document"), + redis::Value::Array(vec![ + bulk(b"response"), + bulk(response), + bulk(b"vector_distance"), + bulk(distance.as_bytes()), + ]), + ]) +} + +fn encoded(value: &Value) -> Vec { + serde_json::to_vec(value).unwrap() +} + +/// `FT.INFO` with the vector field's dimension nested one level down, as valkey-search reports. +fn nested_dimension_info(dimension: i64) -> redis::Value { + redis::Value::Array(vec![ + redis::Value::SimpleString("attributes".into()), + redis::Value::Array(vec![redis::Value::Array(vec![ + redis::Value::SimpleString("embedding".into()), + redis::Value::Array(vec![ + redis::Value::SimpleString("dimensions".into()), + redis::Value::Int(dimension), + ]), + ])]), + ]) +} + +/// `FT.INFO` with `dimensions` as a sibling string of the identifier. +fn flat_dimension_info(dimension: &str) -> redis::Value { + redis::Value::Array(vec![ + redis::Value::SimpleString("attributes".into()), + redis::Value::Array(vec![redis::Value::Array(vec![ + redis::Value::SimpleString("identifier".into()), + redis::Value::SimpleString("embedding".into()), + redis::Value::Array(vec![ + redis::Value::SimpleString("dimensions".into()), + redis::Value::SimpleString(dimension.into()), + ]), + ])]), + ]) +} + +#[rstest] +#[case::string_content(json!([{"content": "hello"}]), None, Some("hello"))] +#[case::text_parts(json!([{"content": [{"text": "hello"}, {"text": " world"}]}]), None, Some("hello world"))] +#[case::non_object_parts_are_skipped(json!([{"content": ["raw", {"text": "hello"}]}]), None, Some("hello"))] +#[case::search_results(json!([{"search_results": [{"source": "s", "title": "t", "content": [{"text": "c"}], "citations": ["x"]}]}]), None, Some(r#"stc["x"]"#))] +#[case::responses_string_input(json!([]), Some(json!(" hello ")), Some("hello"))] +#[case::responses_item_input(json!([]), Some(json!([{"content": "first"}, {"text": "second"}])), Some("first\nsecond"))] +#[case::blank_input(json!([]), Some(json!(" ")), None)] +fn prompt_shapes_follow_redis_semantic_extraction( + #[case] messages: Value, + #[case] input: Option, + #[case] expected: Option<&str>, +) { + let recording = recording([ok(), Ok(redis::Value::Array(vec![redis::Value::Int(0)]))]); + let context = SemanticCacheContext { + messages: Some(messages), + input, + ..Default::default() + }; + + assert_eq!(recording.cache.get_cache("key", &context).unwrap(), None); + + let prompts = recording + .calls + .lock() + .unwrap() + .iter() + .map(|(prompt, _)| prompt.clone()) + .collect::>(); + assert_eq!( + prompts, + expected.into_iter().map(str::to_owned).collect::>() + ); + assert_eq!( + recording.requests.lock().unwrap().is_empty(), + expected.is_none() + ); +} + +#[rstest] +#[case::key("key", KEY_SCOPE)] +#[case::empty_key("", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")] +fn documents_are_scoped_by_the_keys_sha256( + #[case] key: &str, + #[case] scope: &str, + entry: Value, + context: SemanticCacheContext, +) { + let recording = recording([ok()]); + + recording.cache.set_cache(key, entry, &context).unwrap(); + + let text = recording.text(); + assert!(text.contains(&format!("test:{scope}:"))); + assert!(text.contains(&format!("litellm_cache_key\r\n$64\r\n{scope}\r\n"))); +} + +#[rstest] +#[case::no_ttl(None, None)] +#[case::whole_seconds(Some(Duration::from_secs(5)), Some("5"))] +#[case::fractional_seconds_truncate(Some(Duration::from_millis(1900)), Some("1"))] +fn set_writes_hset_and_expires_only_with_a_ttl( + #[case] ttl: Option, + #[case] expire: Option<&str>, + entry: Value, + context: SemanticCacheContext, +) { + let recording = recording([ok()]); + + recording + .cache + .set_cache( + "key", + entry, + &SemanticCacheContext { + ttl, + ..context.clone() + }, + ) + .unwrap(); + + let text = recording.text(); + assert!(text.contains("FT.CREATE")); + assert!(text.contains("HSET")); + let expire_seconds = text + .split_once("EXPIRE\r\n") + .and_then(|(_, rest)| rest.split("\r\n").nth(3)); + assert_eq!(expire_seconds, expire); + assert_eq!( + *recording.calls.lock().unwrap(), + vec![("hello".to_owned(), context.metadata)] + ); +} + +#[rstest] +fn second_set_skips_create_after_dimension_is_cached(entry: Value, context: SemanticCacheContext) { + let recording = recording([ok()]); + + recording + .cache + .set_cache("key", entry.clone(), &context) + .unwrap(); + recording.cache.set_cache("key", entry, &context).unwrap(); + + let text = recording.text(); + assert_eq!(text.matches("FT.CREATE").count(), 1); + assert_eq!(text.matches("HSET").count(), 2); +} + +#[rstest] +#[case::nested_matching(nested_dimension_info(3), Ok(()))] +#[case::nested_mismatch(nested_dimension_info(2), Err(Error::Unavailable))] +#[case::flat_matching(flat_dimension_info("3"), Ok(()))] +#[case::flat_mismatch(flat_dimension_info("2"), Err(Error::Unavailable))] +#[case::unreported_dimension_is_accepted(redis::Value::Array(vec![]), Ok(()))] +fn existing_index_dimension_must_match_embedding( + #[case] info: redis::Value, + #[case] expected: Result<(), Error>, + entry: Value, + context: SemanticCacheContext, +) { + let recording = recording([already_exists(), Ok(info)]); + + assert_eq!(recording.cache.set_cache("key", entry, &context), expected); +} + +#[rstest] +#[case::create_failure(Err(redis::RedisError::from((redis::ErrorKind::Io, "boom"))))] +fn index_creation_failures_are_unavailable( + #[case] reply: redis::RedisResult, + entry: Value, + context: SemanticCacheContext, +) { + let recording = recording([reply]); + + assert_eq!( + recording.cache.set_cache("key", entry, &context), + Err(Error::Unavailable) + ); +} + +#[rstest] +#[case::within_threshold(search_hit(&encoded(&entry()), "0.1"), Ok(Some(entry())))] +#[case::at_threshold(search_hit(&encoded(&entry()), "0.2"), Ok(Some(entry())))] +#[case::beyond_threshold(search_hit(&encoded(&entry()), "0.5"), Ok(None))] +#[case::zero_documents(redis::Value::Array(vec![redis::Value::Int(0)]), Ok(None))] +#[case::missing_response( + redis::Value::Array(vec![ + redis::Value::Int(1), + bulk(b"document"), + redis::Value::Array(vec![bulk(b"vector_distance"), bulk(b"0.1")]), + ]), + Err(Error::InvalidEntry) +)] +#[case::unparsable_distance(search_hit(b"not-json", "abc"), Err(Error::InvalidEntry))] +#[case::undecodable_response(search_hit(b"not-json", "0.1"), Err(Error::InvalidEntry))] +fn get_applies_threshold_and_decodes_entry( + #[case] reply: redis::Value, + #[case] expected: Result, Error>, + context: SemanticCacheContext, +) { + let recording = recording([ok(), Ok(reply)]); + + assert_eq!(recording.cache.get_cache("key", &context), expected); +} + +#[rstest] +#[case::hit(context(), Some(search_hit(&encoded(&entry()), "0.1")), Some(entry()), Some(1.0 - 0.1))] +#[case::below_threshold(context(), Some(search_hit(&encoded(&entry()), "0.5")), None, Some(1.0 - 0.5))] +#[case::no_results(context(), Some(redis::Value::Array(vec![redis::Value::Int(0)])), None, Some(0.0))] +#[case::no_prompt(SemanticCacheContext::default(), None, None, Some(0.0))] +#[tokio::test] +async fn lookup_reports_python_semantic_similarity( + #[case] context: SemanticCacheContext, + #[case] reply: Option, + #[case] value: Option, + #[case] similarity: Option, + #[values(false, true)] use_async: bool, +) { + let searched = reply.is_some(); + let recording = recording(reply.map_or_else(Vec::new, |reply| vec![ok(), Ok(reply)])); + + let lookup = if use_async { + recording + .cache + .async_get_cache_with_similarity("key", &context) + .await + } else { + recording.cache.get_cache_with_similarity("key", &context) + }; + + assert_eq!(lookup, Ok(SemanticLookup { value, similarity })); + assert_eq!(recording.text().contains("FT.SEARCH"), searched); +} + +#[rstest] +#[tokio::test] +async fn missing_prompt_does_not_touch_valkey(entry: Value) { + let cache = ValkeySemanticCache::with_connection( + MockRedisConnection::new([]).assert_all_commands_consumed(), + FakeEmbedder::new(&[]), + JsonCodec::new(), + config(), + ); + let context = SemanticCacheContext::default(); + + cache.set_cache("key", entry.clone(), &context).unwrap(); + assert_eq!(cache.get_cache("key", &context).unwrap(), None); + cache + .async_set_cache("key", entry, context.clone()) + .await + .unwrap(); + assert_eq!(cache.async_get_cache("key", &context).await.unwrap(), None); + assert_eq!(cache.get_ttl(&context), None); +} + +#[rstest] +fn with_embedder_shares_index_state_and_connections(entry: Value, context: SemanticCacheContext) { + let recording = recording([ok(), ok(), Ok(search_hit(&encoded(&entry), "0.1"))]); + recording + .cache + .set_cache("key", entry.clone(), &context) + .unwrap(); + + let prepared = recording + .cache + .with_embedder(PreparedEmbedding(vec![0.1, 0.2, 0.3])); + + assert_eq!(prepared.get_cache("key", &context).unwrap(), Some(entry)); + assert_eq!(recording.text().matches("FT.CREATE").count(), 1); +} + +#[rstest] +fn accessors_report_the_config() { + let recording = recording([]); + + assert_eq!(recording.cache.index_name(), "test"); + assert_eq!(recording.cache.similarity_threshold(), 0.8); + assert_eq!(DEFAULT_INDEX_NAME, "litellm_semantic_cache_index"); +} + +#[rstest] +#[tokio::test] +async fn async_set_and_get_use_shared_document_helpers( + entry: Value, + context: SemanticCacheContext, +) { + let recording = recording([ok(), ok(), ok(), Ok(search_hit(&encoded(&entry), "0.1"))]); + let context = SemanticCacheContext { + ttl: Some(Duration::from_millis(1900)), + ..context + }; + + recording + .cache + .async_set_cache("key", entry.clone(), context.clone()) + .await + .unwrap(); + assert_eq!( + recording + .cache + .async_get_cache("key", &context) + .await + .unwrap(), + Some(entry) + ); + + let text = recording.text(); + assert!(text.contains("FT.CREATE")); + assert!(text.contains("HSET")); + assert!(text.contains("EXPIRE")); + assert_eq!( + *recording.calls.lock().unwrap(), + vec![("hello".to_owned(), context.metadata.clone()); 2] + ); +} diff --git a/litellm-rust/crates/cache-valkey-semantic/tests/contract.rs b/litellm-rust/crates/cache-valkey-semantic/tests/contract.rs new file mode 100644 index 00000000000..71081fca92b --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/tests/contract.rs @@ -0,0 +1,62 @@ +//! `overwrite_replaces` does not apply: like Python, every write is a new `:` +//! document, so a second write with the same prompt adds a tie instead of replacing the first. + +mod support; + +use litellm_cache::{JsonCodec, SemanticCacheContext, semantic::PreparedEmbedding}; +use litellm_cache_testing as contract; +use litellm_cache_valkey_semantic::{ + DEFAULT_INDEX_NAME, ValkeySemanticCache, ValkeySemanticConfig, +}; +use rstest::{fixture, rstest}; +use serde_json::{Value, json}; +use support::FakeSearch; + +type Cache = ValkeySemanticCache, FakeSearch>; + +const PREFIX: &str = "contract:"; + +#[fixture] +fn cache() -> Cache { + ValkeySemanticCache::with_connection( + FakeSearch::default(), + PreparedEmbedding(vec![0.6, 0.8]), + JsonCodec::new(), + ValkeySemanticConfig { + similarity_threshold: 0.9, + index_name: DEFAULT_INDEX_NAME.into(), + }, + ) +} + +#[fixture] +fn context() -> SemanticCacheContext { + SemanticCacheContext { + messages: Some(json!([{"role": "user", "content": "contract prompt"}])), + ..Default::default() + } +} + +#[rstest] +#[tokio::test] +async fn hit_and_miss(cache: Cache, context: SemanticCacheContext) { + contract::hit_and_miss(&cache, context, PREFIX, json!({"answer": 42})).await; +} + +#[rstest] +#[tokio::test] +async fn sync_async_equivalence(cache: Cache, context: SemanticCacheContext) { + contract::sync_async_equivalence(&cache, context, PREFIX, json!("first"), json!([2])).await; +} + +#[rstest] +#[tokio::test] +async fn pipeline_writes_every_entry(cache: Cache, context: SemanticCacheContext) { + contract::pipeline_writes_every_entry( + &cache, + context, + PREFIX, + vec![json!("a"), json!(2), json!({"c": true})], + ) + .await; +} diff --git a/litellm-rust/crates/cache-valkey-semantic/tests/support/mod.rs b/litellm-rust/crates/cache-valkey-semantic/tests/support/mod.rs new file mode 100644 index 00000000000..2c6ff06b134 --- /dev/null +++ b/litellm-rust/crates/cache-valkey-semantic/tests/support/mod.rs @@ -0,0 +1,349 @@ +#![allow(dead_code)] + +use std::{ + collections::{BTreeMap, HashMap, VecDeque}, + sync::{Arc, Mutex}, +}; + +use litellm_cache::{Error, semantic::Embedder}; +use serde_json::Value; + +pub type EmbedCalls = Arc)>>>; + +/// Embeds known prompts to fixed vectors, anything else to `[0.1, 0.2, 0.3]`, and records every +/// prompt with its metadata. +pub struct FakeEmbedder { + vectors: HashMap>, + pub calls: EmbedCalls, +} + +impl FakeEmbedder { + pub fn new(vectors: &[(&str, &[f32])]) -> Self { + Self { + vectors: vectors + .iter() + .map(|(prompt, vector)| ((*prompt).to_owned(), vector.to_vec())) + .collect(), + calls: EmbedCalls::default(), + } + } +} + +impl Embedder for FakeEmbedder { + fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { + self.calls + .lock() + .unwrap() + .push((prompt.to_owned(), metadata.cloned())); + Ok(self + .vectors + .get(prompt) + .cloned() + .unwrap_or_else(|| vec![0.1, 0.2, 0.3])) + } + + async fn async_embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { + self.embed(prompt, metadata) + } +} + +struct FakeIndex { + prefix: Vec, + dims: usize, + vector_field: String, +} + +#[derive(Default)] +struct SearchState { + indexes: HashMap, + hashes: BTreeMap, BTreeMap>>, +} + +/// An in-memory valkey-search speaking the `FT.*`, `HSET` and `EXPIRE` subset the semantic cache +/// sends, with exact cosine KNN over the hashes under an index prefix. +#[derive(Clone, Default)] +pub struct FakeSearch { + state: Arc>, +} + +impl FakeSearch { + fn run(&self, args: Vec>) -> redis::RedisResult { + let mut state = self.state.lock().unwrap(); + let text = |index: usize| String::from_utf8_lossy(&args[index]).into_owned(); + match text(0).to_uppercase().as_str() { + "FT.CREATE" => { + let name = text(1); + if state.indexes.contains_key(&name) { + return Err(error("Index already exists")); + } + let position = |token: &str| args.iter().position(|arg| arg == token.as_bytes()); + let prefix = args[position("PREFIX").unwrap() + 2].clone(); + let dims = text(position("DIM").unwrap() + 1).parse().unwrap(); + let vector_field = text(position("VECTOR").unwrap() - 1); + state.indexes.insert( + name, + FakeIndex { + prefix, + dims, + vector_field, + }, + ); + Ok(redis::Value::Okay) + } + "FT.INFO" => { + let index = state + .indexes + .get(&text(1)) + .ok_or_else(|| error("Unknown index name"))?; + Ok(index_info(index)) + } + "FT.DROPINDEX" => { + state.indexes.remove(&text(1)); + Ok(redis::Value::Okay) + } + "HSET" => { + let hash = state.hashes.entry(args[1].clone()).or_default(); + for pair in args[2..].chunks(2) { + hash.insert( + String::from_utf8_lossy(&pair[0]).into_owned(), + pair[1].clone(), + ); + } + Ok(redis::Value::Int(((args.len() - 2) / 2) as i64)) + } + "EXPIRE" => Ok(redis::Value::Int(i64::from( + state.hashes.contains_key(&args[1]), + ))), + "FT.SEARCH" => { + let index = state + .indexes + .get(&text(1)) + .ok_or_else(|| error("no such index"))?; + let query = text(2); + let tag = query_tag(&query); + let params = args.iter().position(|arg| arg == b"PARAMS").unwrap(); + let vector = floats(&args[params + 3]); + let best = state + .hashes + .iter() + .filter(|(key, _)| key.starts_with(&index.prefix)) + .filter(|(_, fields)| { + fields.get("litellm_cache_key").map(Vec::as_slice) == Some(tag.as_bytes()) + }) + .filter_map(|(key, fields)| { + let stored = floats(fields.get(&index.vector_field)?); + (stored.len() == index.dims) + .then(|| (key, fields, 1.0 - cosine(&vector, &stored))) + }) + .min_by(|left, right| left.2.total_cmp(&right.2)); + let Some((key, fields, distance)) = best else { + return Ok(redis::Value::Array(vec![redis::Value::Int(0)])); + }; + let mut reply = fields + .iter() + .filter(|(name, _)| **name != index.vector_field) + .flat_map(|(name, value)| [bulk(name.as_bytes()), bulk(value)]) + .collect::>(); + reply.extend([ + bulk(b"vector_distance"), + bulk(distance.to_string().as_bytes()), + ]); + Ok(redis::Value::Array(vec![ + redis::Value::Int(1), + bulk(key), + redis::Value::Array(reply), + ])) + } + "PING" => Ok(redis::Value::SimpleString("PONG".into())), + _ => Err(error("unsupported command")), + } + } +} + +impl redis::ConnectionLike for FakeSearch { + fn req_packed_command(&mut self, command: &[u8]) -> redis::RedisResult { + let mut commands = parse_commands(command); + self.run(commands.remove(0)) + } + + fn req_packed_commands( + &mut self, + commands: &[u8], + offset: usize, + count: usize, + ) -> redis::RedisResult> { + let replies = parse_commands(commands) + .into_iter() + .map(|args| self.run(args)) + .collect::>>()?; + Ok(replies.into_iter().skip(offset).take(count).collect()) + } + + fn get_db(&self) -> i64 { + 0 + } + + fn check_connection(&mut self) -> bool { + true + } + + fn is_open(&self) -> bool { + true + } +} + +fn error(message: &'static str) -> redis::RedisError { + redis::RedisError::from((redis::ErrorKind::Extension, message)) +} + +fn bulk(bytes: &[u8]) -> redis::Value { + redis::Value::BulkString(bytes.to_vec()) +} + +fn index_info(index: &FakeIndex) -> redis::Value { + redis::Value::Array(vec![ + bulk(b"index_name"), + bulk(b"fake"), + bulk(b"attributes"), + redis::Value::Array(vec![ + redis::Value::Array(vec![ + bulk(b"identifier"), + bulk(b"litellm_cache_key"), + bulk(b"type"), + bulk(b"TAG"), + ]), + redis::Value::Array(vec![ + bulk(b"identifier"), + bulk(index.vector_field.as_bytes()), + bulk(b"type"), + bulk(b"VECTOR"), + bulk(b"index"), + redis::Value::Array(vec![ + bulk(b"dimensions"), + redis::Value::Int(index.dims as i64), + ]), + ]), + ]), + ]) +} + +/// The tag inside `@litellm_cache_key:{...}`, with query escapes removed. +fn query_tag(query: &str) -> String { + let start = query.find("@litellm_cache_key:{").unwrap() + "@litellm_cache_key:{".len(); + let mut tag = String::new(); + let mut characters = query[start..].chars(); + while let Some(character) = characters.next() { + match character { + '\\' => tag.extend(characters.next()), + '}' => break, + character => tag.push(character), + } + } + tag +} + +fn floats(bytes: &[u8]) -> Vec { + bytes + .as_chunks::<4>() + .0 + .iter() + .map(|chunk| f32::from_le_bytes(*chunk)) + .collect() +} + +fn cosine(left: &[f32], right: &[f32]) -> f64 { + let dot = left + .iter() + .zip(right) + .map(|(left, right)| f64::from(*left) * f64::from(*right)) + .sum::(); + let norm = |vector: &[f32]| { + vector + .iter() + .map(|value| f64::from(*value).powi(2)) + .sum::() + .sqrt() + }; + dot / (norm(left) * norm(right)) +} + +/// Splits a packed RESP request into each command's arguments. +fn parse_commands(mut bytes: &[u8]) -> Vec>> { + let line = |bytes: &mut &[u8]| { + let end = bytes + .windows(2) + .position(|window| window == b"\r\n") + .unwrap(); + let text = String::from_utf8(bytes[1..end].to_vec()).unwrap(); + *bytes = &bytes[end + 2..]; + text.parse::().unwrap() + }; + let mut commands = Vec::new(); + while !bytes.is_empty() { + let count = line(&mut bytes); + let mut args = Vec::with_capacity(count); + for _ in 0..count { + let length = line(&mut bytes); + args.push(bytes[..length].to_vec()); + bytes = &bytes[length + 2..]; + } + commands.push(args); + } + commands +} + +/// Records every packed request and answers from a script, `OK` once the script runs out. +pub struct RecordingConnection { + requests: Arc>>>, + replies: Mutex>>, +} + +impl RecordingConnection { + pub fn new(replies: impl IntoIterator>) -> Self { + Self { + requests: Arc::default(), + replies: Mutex::new(replies.into_iter().collect()), + } + } + + pub fn requests(&self) -> Arc>>> { + Arc::clone(&self.requests) + } + + fn reply(&self) -> redis::RedisResult { + self.replies + .lock() + .unwrap() + .pop_front() + .unwrap_or_else(|| Ok(redis::Value::SimpleString("OK".into()))) + } +} + +impl redis::ConnectionLike for RecordingConnection { + fn req_packed_command(&mut self, command: &[u8]) -> redis::RedisResult { + self.requests.lock().unwrap().push(command.to_vec()); + self.reply() + } + + fn req_packed_commands( + &mut self, + command: &[u8], + _offset: usize, + count: usize, + ) -> redis::RedisResult> { + self.requests.lock().unwrap().push(command.to_vec()); + (0..count).map(|_| self.reply()).collect() + } + + fn get_db(&self) -> i64 { + 0 + } + + fn check_connection(&mut self) -> bool { + true + } + + fn is_open(&self) -> bool { + true + } +} diff --git a/litellm-rust/crates/cache/Cargo.toml b/litellm-rust/crates/cache/Cargo.toml index 0c504ab727a..f18dbd9cb26 100644 --- a/litellm-rust/crates/cache/Cargo.toml +++ b/litellm-rust/crates/cache/Cargo.toml @@ -7,7 +7,7 @@ repository.workspace = true [dependencies] serde.workspace = true -serde_json.workspace = true +serde_json = { workspace = true, features = ["preserve_order"] } thiserror.workspace = true [dev-dependencies] diff --git a/litellm-rust/crates/cache/src/base_cache.rs b/litellm-rust/crates/cache/src/base_cache.rs index 5c10e7fd5c3..506d944b0e8 100644 --- a/litellm-rust/crates/cache/src/base_cache.rs +++ b/litellm-rust/crates/cache/src/base_cache.rs @@ -122,36 +122,4 @@ pub trait BaseCache: Send + Sync { ) -> impl Future> + Send { self.async_set_cache(key, value, context) } - - fn disconnect(&self) -> impl Future> + Send; - - fn test_connection(&self) -> impl Future> + Send; -} - -#[cfg(test)] -mod tests { - use std::time::Duration; - - use serde_json::json; - - use super::{CacheContext, SemanticCacheContext}; - - #[test] - fn semantic_context_with_ttl_only_replaces_ttl() { - let context = SemanticCacheContext { - input: Some(json!({"input": "hello"})), - messages: Some(json!([{"role": "user", "content": "hello"}])), - metadata: Some(json!({"tenant": "team"})), - scope: Some("scope".into()), - ttl: Some(Duration::from_secs(10)), - }; - - let updated = context.with_ttl(Some(Duration::from_secs(20))); - - assert_eq!(updated.ttl, Some(Duration::from_secs(20))); - assert_eq!(updated.input, context.input); - assert_eq!(updated.messages, context.messages); - assert_eq!(updated.metadata, context.metadata); - assert_eq!(updated.scope, context.scope); - } } diff --git a/litellm-rust/crates/cache/src/cache_type.rs b/litellm-rust/crates/cache/src/cache_type.rs index f0a97c04fd5..22d8c8c7cb5 100644 --- a/litellm-rust/crates/cache/src/cache_type.rs +++ b/litellm-rust/crates/cache/src/cache_type.rs @@ -55,31 +55,3 @@ impl CacheType { .find(|cache_type| cache_type.as_python_name() == value) } } - -#[cfg(test)] -mod tests { - use super::CacheType; - - #[test] - fn every_python_cache_type_has_one_round_trip_identity() { - let names = CacheType::ALL.map(CacheType::as_python_name); - assert_eq!( - names, - [ - "local", - "redis", - "redis-semantic", - "valkey-semantic", - "s3", - "disk", - "qdrant-semantic", - "azure-blob", - "gcs", - ] - ); - assert_eq!( - names.map(CacheType::from_python_name), - CacheType::ALL.map(Some) - ); - } -} diff --git a/litellm-rust/crates/cache/src/capabilities.rs b/litellm-rust/crates/cache/src/capabilities.rs index f7307e5c7bd..ac9d8fc8764 100644 --- a/litellm-rust/crates/cache/src/capabilities.rs +++ b/litellm-rust/crates/cache/src/capabilities.rs @@ -1,6 +1,6 @@ use std::{future::Future, time::Duration}; -use crate::{BaseCache, BatchEntry, Error}; +use crate::{BaseCache, BatchEntry, CacheConnectionResult, CacheContext, Error}; #[derive(Clone, Debug, PartialEq)] pub struct IncrementOperation { @@ -9,6 +9,35 @@ pub struct IncrementOperation { pub ttl: Option, } +#[derive(Clone, Debug, PartialEq)] +pub struct PushOperation { + pub key: String, + pub values: Vec, +} + +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct PopOperation { + pub key: String, + pub count: Option, +} + +/// `disconnect`, for backends whose Python class releases connections or clients. +pub trait DisconnectCache: BaseCache { + fn disconnect(&self) -> impl Future> + Send; +} + +/// `test_connection`, for backends whose Python class overrides the base `NotImplementedError`. +pub trait ConnectionCache: BaseCache { + fn test_connection(&self) -> impl Future> + Send; +} + +/// `sync_ping` and `ping`. +pub trait PingCache: BaseCache { + fn sync_ping(&self) -> Result; + + fn ping(&self) -> impl Future> + Send; +} + pub trait BatchCache: BaseCache { fn batch_get_cache( &self, @@ -45,6 +74,14 @@ pub trait BatchCache: BaseCache { } } +/// `async_set_cache_pipeline_with_ttls`: one pipeline where every entry carries its own TTL. +pub trait TtlPipelineCache: BaseCache { + fn async_set_cache_pipeline_with_ttls( + &self, + entries: Vec<(String, Self::Value, Option)>, + ) -> impl Future> + Send; +} + pub trait DeleteCache: BaseCache { fn delete_cache(&self, key: &str) -> Result<(), Error>; @@ -53,6 +90,14 @@ pub trait DeleteCache: BaseCache { } } +/// `delete_cache_keys`: one round trip that reports how many keys existed. +pub trait BulkDeleteCache: DeleteCache { + fn delete_cache_keys( + &self, + keys: Vec, + ) -> impl Future> + Send; +} + pub trait FlushCache: BaseCache { fn flush_cache(&self) -> Result<(), Error>; @@ -61,18 +106,79 @@ pub trait FlushCache: BaseCache { } } -pub trait CounterCache: BaseCache { +/// `flushall`: drops every key on the server, ignoring any namespace. +pub trait FlushAllCache: FlushCache { + fn flushall(&self) -> Result<(), Error>; +} + +/// Numeric counters. Counters are independent of `Value`, so a response-valued backend can +/// expose them, the way one Python `RedisCache` serves both. +pub trait CounterCache: BaseCache { fn increment_cache(&self, key: &str, amount: f64, context: Self::Context) -> Result; + /// `refresh_ttl` re-arms the TTL on every write instead of only when the key is new; + /// backends without expiring counters ignore it, as Python's `**kwargs` does. fn async_increment( &self, key: &str, amount: f64, context: Self::Context, + _refresh_ttl: bool, ) -> impl Future> + Send { async move { self.increment_cache(key, amount, context) } } + + /// `async_increment_pipeline`, one result per operation in order. The default increments + /// one key at a time, as the in-memory cache does. + fn async_increment_pipeline( + &self, + operations: Vec, + ) -> impl Future, Error>> + Send + where + Self::Context: Default, + { + async move { + let mut results = Vec::with_capacity(operations.len()); + for operation in operations { + let context = Self::Context::default().with_ttl(operation.ttl); + results.push( + self.async_increment(&operation.key, operation.amount, context, false) + .await?, + ); + } + Ok(results) + } + } +} + +/// `batch_get_counts` and `async_batch_get_counts`: counter values read in one round trip. +pub trait CountReadCache: CounterCache { + fn batch_get_counts(&self, keys: &[String]) -> Result>, Error>; + + fn async_batch_get_counts( + &self, + keys: Vec, + ) -> impl Future>, Error>> + Send; +} + +/// `increment_with_floor`, `async_increment_with_floor`, and `async_set_max`. +pub trait BoundedCounterCache: CounterCache { + fn increment_with_floor(&self, key: &str, amount: i64, ttl: Duration) -> Result; + + fn async_increment_with_floor( + &self, + key: &str, + amount: i64, + ttl: Duration, + ) -> impl Future> + Send; + + fn async_set_max( + &self, + key: &str, + value: f64, + ttl: Option, + ) -> impl Future> + Send; } pub trait ClaimCache: BaseCache @@ -105,6 +211,17 @@ pub trait TtlCache: BaseCache { ) -> impl Future, Error>> + Send; } +pub trait RefreshTtlCache: TtlCache { + /// `async_refresh_ttl`: re-arms an existing key without touching its value. `ttl` falls + /// back to the backend default, and the result is `false` when the key is absent or + /// neither TTL is set. + fn async_refresh_ttl( + &self, + key: &str, + ttl: Option, + ) -> impl Future> + Send; +} + pub trait SetCache: BaseCache { type SetValue: Clone + Send + Sync + 'static; type SetResult: Send + Sync + 'static; @@ -127,11 +244,30 @@ pub trait QueueCache: BaseCache { values: Vec, ) -> impl Future> + Send; + /// `async_rpush_and_trim`: pushes, then keeps only the newest `max_len` entries, atomically. + /// Returns the list length right after the push, before the trim. + fn async_rpush_and_trim( + &self, + key: &str, + values: Vec, + max_len: usize, + ) -> impl Future> + Send; + + fn async_rpush_pipeline( + &self, + operations: Vec>, + ) -> impl Future, Error>> + Send; + fn async_lpop( &self, key: &str, count: Option, ) -> impl Future> + Send; + + fn async_lpop_pipeline( + &self, + operations: Vec, + ) -> impl Future, Error>> + Send; } pub trait ScanCache: BaseCache { diff --git a/litellm-rust/crates/cache/src/dual.rs b/litellm-rust/crates/cache/src/dual.rs index d68d4b2b69f..c4bc953239d 100644 --- a/litellm-rust/crates/cache/src/dual.rs +++ b/litellm-rust/crates/cache/src/dual.rs @@ -1,8 +1,8 @@ use std::{sync::Arc, time::Duration}; use crate::{ - BaseCache, BatchCache, BatchEntry, CacheConnectionResult, CacheContext, ClaimCache, - CounterCache, DeleteCache, Error, FlushCache, + BaseCache, BatchCache, BatchEntry, BulkDeleteCache, CacheContext, ClaimCache, CounterCache, + DeleteCache, Error, FlushCache, IncrementOperation, SetCache, TtlCache, }; #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] @@ -33,8 +33,12 @@ pub struct DualCache { write_policy: WritePolicy, remote_failure_policy: RemoteFailurePolicy, promotion_ttl: Option, + delete_batch_size: usize, } +/// `DEFAULT_MAX_REDIS_BATCH_CACHE_SIZE`. +pub const DEFAULT_DELETE_BATCH_SIZE: usize = 1000; + impl DualCache { pub fn new(l1: Arc, l2: Arc) -> Self { Self { @@ -44,6 +48,14 @@ impl DualCache { write_policy: WritePolicy::default(), remote_failure_policy: RemoteFailurePolicy::default(), promotion_ttl: None, + delete_batch_size: DEFAULT_DELETE_BATCH_SIZE, + } + } + + pub fn with_delete_batch_size(self, delete_batch_size: usize) -> Self { + Self { + delete_batch_size, + ..self } } @@ -217,15 +229,6 @@ where } self.l1.async_set_cache_pipeline(entries, context).await } - - async fn disconnect(&self) -> Result<(), Error> { - self.l2.disconnect().await?; - self.l1.disconnect().await - } - - async fn test_connection(&self) -> Result { - self.l2.test_connection().await - } } impl BatchCache for DualCache @@ -320,26 +323,146 @@ where } } +impl DualCache +where + C: CacheContext, + L1: BaseCache, +{ + /// Python's `local_only=True` increment: the local tier alone, read then written back. + fn increment_local(&self, key: &str, amount: f64, context: &C) -> Result { + let value = self.l1.get_cache(key, context)?.unwrap_or(0.0) + amount; + self.l1.set_cache(key, value, context)?; + Ok(value) + } +} + impl CounterCache for DualCache where C: CacheContext, L1: BaseCache, - L2: CounterCache, + L2: CounterCache, { fn increment_cache(&self, key: &str, amount: f64, context: C) -> Result { + if !self.writes_remote() { + return self.increment_local(key, amount, &context); + } let value = self.l2.increment_cache(key, amount, context.clone())?; self.l1.set_cache(key, value, &context)?; Ok(value) } - async fn async_increment(&self, key: &str, amount: f64, context: C) -> Result { + async fn async_increment( + &self, + key: &str, + amount: f64, + context: C, + refresh_ttl: bool, + ) -> Result { + if !self.writes_remote() { + return self.increment_local(key, amount, &context); + } let value = self .l2 - .async_increment(key, amount, context.clone()) + .async_increment(key, amount, context.clone(), refresh_ttl) .await?; self.l1.async_set_cache(key, value, context).await?; Ok(value) } + + /// `async_increment_cache_pipeline`, L2-first like single increments: the local tier takes + /// each remote result. + async fn async_increment_pipeline( + &self, + operations: Vec, + ) -> Result, Error> + where + C: Default, + { + if !self.writes_remote() { + return operations + .iter() + .map(|operation| { + let context = C::default().with_ttl(operation.ttl); + self.increment_local(&operation.key, operation.amount, &context) + }) + .collect(); + } + let values = self.l2.async_increment_pipeline(operations.clone()).await?; + if values.len() != operations.len() { + return Err(Error::Unavailable); + } + for (operation, value) in operations.iter().zip(&values) { + self.l1 + .async_set_cache(&operation.key, *value, C::default().with_ttl(operation.ttl)) + .await?; + } + Ok(values) + } +} + +/// `async_set_cache_sadd`: local set first, then the remote one unless writes stay local. +impl SetCache for DualCache +where + V: Clone + Send + Sync + 'static, + C: CacheContext, + S: Clone + Send + Sync + 'static, + L1: SetCache, + L2: SetCache, +{ + type SetValue = S; + type SetResult = (); + + async fn async_set_cache_sadd( + &self, + key: &str, + values: Vec, + ttl: Option, + ) -> Result<(), Error> { + self.l1 + .async_set_cache_sadd(key, values.clone(), ttl) + .await?; + if self.writes_remote() { + self.l2.async_set_cache_sadd(key, values, ttl).await?; + } + Ok(()) + } +} + +/// `async_delete_cache_keys`: every key leaves the local tier, then the remote tier in chunks +/// of `DEFAULT_MAX_REDIS_BATCH_CACHE_SIZE`, since Redis takes a chunk as one command. +impl BulkDeleteCache for DualCache +where + V: Clone + Send + Sync + 'static, + C: CacheContext, + L1: DeleteCache, + L2: BulkDeleteCache, +{ + async fn delete_cache_keys(&self, keys: Vec) -> Result { + for key in &keys { + self.l1.delete_cache(key)?; + } + let mut deleted = 0; + for chunk in keys.chunks(self.delete_batch_size.max(1)) { + deleted += self.l2.delete_cache_keys(chunk.to_vec()).await?; + } + Ok(deleted) + } +} + +/// `async_get_ttl`: the local TTL, or the remote one when the local tier has none. +impl TtlCache for DualCache +where + V: Clone + Send + Sync + 'static, + C: CacheContext, + L1: TtlCache, + L2: TtlCache, +{ + async fn async_get_ttl(&self, key: &str) -> Result, Error> { + match self.l1.async_get_ttl(key).await? { + Some(ttl) => Ok(Some(ttl)), + None => self.l2.async_get_ttl(key).await, + } + } } impl ClaimCache for DualCache diff --git a/litellm-rust/crates/cache/src/lib.rs b/litellm-rust/crates/cache/src/lib.rs index 8364c635e3a..55d8a5fa28b 100644 --- a/litellm-rust/crates/cache/src/lib.rs +++ b/litellm-rust/crates/cache/src/lib.rs @@ -5,6 +5,7 @@ mod capabilities; mod codec; mod dual; mod error; +pub mod semantic; pub use base_cache::{ BaseCache, BatchEntry, CacheConnectionResult, CacheConnectionStatus, CacheContext, @@ -13,9 +14,13 @@ pub use base_cache::{ pub use cache_type::CacheType; pub use caching::{Cache, CacheBackend, get_cache, set_cache}; pub use capabilities::{ - BatchCache, CacheScript, ClaimCache, ClientInfoCache, CounterCache, DeleteCache, FlushCache, - IncrementOperation, QueueCache, ScanCache, ScriptCache, SetCache, TtlCache, + BatchCache, BoundedCounterCache, BulkDeleteCache, CacheScript, ClaimCache, ClientInfoCache, + ConnectionCache, CountReadCache, CounterCache, DeleteCache, DisconnectCache, FlushAllCache, + FlushCache, IncrementOperation, PingCache, PopOperation, PushOperation, QueueCache, + RefreshTtlCache, ScanCache, ScriptCache, SetCache, TtlCache, TtlPipelineCache, }; pub use codec::{CacheCodec, JsonCodec}; -pub use dual::{DualCache, ReadPolicy, RemoteFailurePolicy, WritePolicy}; +pub use dual::{ + DEFAULT_DELETE_BATCH_SIZE, DualCache, ReadPolicy, RemoteFailurePolicy, WritePolicy, +}; pub use error::Error; diff --git a/litellm-rust/crates/cache/src/semantic.rs b/litellm-rust/crates/cache/src/semantic.rs new file mode 100644 index 00000000000..c88706a213b --- /dev/null +++ b/litellm-rust/crates/cache/src/semantic.rs @@ -0,0 +1,274 @@ +//! The embedding and prompt contract every semantic backend shares. +//! +//! Python's semantic caches all read their prompt through `get_str_from_messages`, and +//! `RedisSemanticCache._get_prompt_from_kwargs` (inherited by Valkey) adds Responses API +//! `input`. Qdrant reads messages only. Each backend picks one of the two extractors here. + +use std::{future::Future, io}; + +use serde::Serialize; +use serde_json::{ + Value, + ser::{CharEscape, Formatter, Serializer}, +}; + +use crate::{BaseCache, Error, SemanticCacheContext}; + +/// Turns a prompt into the vector a semantic backend stores and searches with. +/// +/// `metadata` is the request metadata, which a host embedder may route on. Hosts that can only +/// embed asynchronously keep the default `embed`; backends that serve sync calls through a +/// runtime then block on `async_embed` instead. +pub trait Embedder: Send + Sync + 'static { + fn embed(&self, _prompt: &str, _metadata: Option<&Value>) -> Result, Error> { + Err(Error::UnsupportedOperation) + } + + fn async_embed( + &self, + prompt: &str, + metadata: Option<&Value>, + ) -> impl Future, Error>> + Send; +} + +/// One semantic read: the cached value, if any, and the similarity Python's backend writes to +/// `metadata["semantic-similarity"]`. `similarity` is `None` when the backend reports none. +#[derive(Clone, Debug, PartialEq)] +pub struct SemanticLookup { + pub value: Option, + pub similarity: Option, +} + +impl SemanticLookup { + /// A read that found nothing, with the similarity Python records for it. + pub fn miss(similarity: Option) -> Self { + Self { + value: None, + similarity, + } + } +} + +/// A semantic backend's read that also reports the similarity of the closest cached prompt, +/// the value Python stamps onto the request metadata as `semantic-similarity`. +pub trait SemanticCache: BaseCache { + fn get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> Result, Error>; + + fn async_get_cache_with_similarity( + &self, + key: &str, + context: &Self::Context, + ) -> impl Future, Error>> + Send; +} + +/// An embedding computed ahead of time, for callers that already hold the vector. +#[derive(Clone, Debug, PartialEq)] +pub struct PreparedEmbedding(pub Vec); + +impl Embedder for PreparedEmbedding { + fn embed(&self, _prompt: &str, _metadata: Option<&Value>) -> Result, Error> { + Ok(self.0.clone()) + } + + async fn async_embed( + &self, + _prompt: &str, + _metadata: Option<&Value>, + ) -> Result, Error> { + Ok(self.0.clone()) + } +} + +/// `get_str_from_messages`: every message's text content followed by its search results. +pub fn str_from_messages(messages: &[Value]) -> String { + let mut text = String::new(); + for message in messages.iter().filter_map(Value::as_object) { + match message.get("content") { + Some(Value::String(content)) => text.push_str(content), + Some(Value::Array(parts)) => { + for part in parts { + if let Some(part_text) = part.get("text").and_then(Value::as_str) { + text.push_str(part_text); + } + } + } + _ => {} + } + push_search_results_text(&mut text, message.get("search_results")); + } + text +} + +/// The messages prompt Qdrant embeds: `None` when the request carries no messages. +pub fn prompt_from_messages(context: &SemanticCacheContext) -> Option { + let messages = context.messages.as_ref()?.as_array()?; + (!messages.is_empty()).then(|| str_from_messages(messages)) +} + +/// `RedisSemanticCache._get_prompt_from_kwargs`: chat messages first, then the text parts of a +/// Responses API `input`. `None` when neither yields a prompt. +pub fn prompt_from_context(context: &SemanticCacheContext) -> Option { + if let Some(messages) = context.messages.as_ref().and_then(Value::as_array) + && !messages.is_empty() + { + return Some(str_from_messages(messages)); + } + let input = context.input.as_ref()?; + let mut parts = Vec::new(); + collect_input_text(input, &mut parts); + let prompt = python_strip(&parts.join("\n")).to_owned(); + (!prompt.is_empty()).then_some(prompt) +} + +/// `extract_search_results_text`. +fn push_search_results_text(text: &mut String, search_results: Option<&Value>) { + let Some(Value::Array(results)) = search_results else { + return; + }; + for result in results.iter().filter_map(Value::as_object) { + for key in ["source", "title"] { + if let Some(value) = result.get(key).and_then(Value::as_str) { + text.push_str(value); + } + } + if let Some(Value::Array(content)) = result.get("content") { + for block in content.iter().filter_map(Value::as_object) { + if let Some(value) = block.get("text").and_then(Value::as_str) { + text.push_str(value); + } + } + } + if let Some(citations) = result.get("citations").filter(|value| !value.is_null()) { + text.push_str(&compact_json(citations)); + } + } +} + +fn collect_input_text(value: &Value, parts: &mut Vec) { + match value { + Value::String(text) => { + push_trimmed(text, parts); + } + Value::Array(items) => { + for item in items { + collect_input_text(item, parts); + } + } + Value::Object(map) => { + if let Some(content) = map.get("content").filter(|content| !content.is_null()) { + collect_input_text(content, parts); + return; + } + for key in ["text", "output", "input_text", "output_text"] { + if let Some(Value::String(text)) = map.get(key) + && push_trimmed(text, parts) + { + return; + } + } + } + _ => {} + } +} + +/// Pushes `text` stripped as Python's `str.strip` does, reporting whether anything was left. +fn push_trimmed(text: &str, parts: &mut Vec) -> bool { + let trimmed = python_strip(text); + if trimmed.is_empty() { + return false; + } + parts.push(trimmed.to_owned()); + true +} + +/// `str.strip()`: Python's whitespace also covers the ASCII information separators. +fn python_strip(text: &str) -> &str { + text.trim_matches(|character: char| { + character.is_whitespace() || ('\u{1c}'..='\u{1f}').contains(&character) + }) +} + +/// `json.dumps(value, separators=(",", ":"))`: compact, key insertion order, `ensure_ascii`. +fn compact_json(value: &Value) -> String { + let mut output = Vec::new(); + // Serializing a `Value` into memory cannot fail. + let _ = value.serialize(&mut Serializer::with_formatter(&mut output, AsciiFormatter)); + String::from_utf8(output).unwrap_or_default() +} + +struct AsciiFormatter; + +impl Formatter for AsciiFormatter { + fn write_string_fragment(&mut self, writer: &mut W, fragment: &str) -> io::Result<()> + where + W: ?Sized + io::Write, + { + let mut start = 0; + for (index, character) in fragment.char_indices() { + if character.is_ascii() && character != '\u{7f}' { + continue; + } + writer.write_all(&fragment.as_bytes()[start..index])?; + let mut units = [0; 2]; + for unit in character.encode_utf16(&mut units) { + write!(writer, "\\u{unit:04x}")?; + } + start = index + character.len_utf8(); + } + writer.write_all(&fragment.as_bytes()[start..]) + } + + fn write_f64(&mut self, writer: &mut W, value: f64) -> io::Result<()> + where + W: ?Sized + io::Write, + { + writer.write_all(python_float_repr(value).as_bytes()) + } + + fn write_char_escape(&mut self, writer: &mut W, escape: CharEscape) -> io::Result<()> + where + W: ?Sized + io::Write, + { + match escape { + CharEscape::AsciiControl(byte) => write!(writer, "\\u{byte:04x}"), + escape => serde_json::ser::CompactFormatter.write_char_escape(writer, escape), + } + } +} + +/// `repr(float)`: the shortest round-trip digits, positional between `1e-4` and `1e16`, and +/// otherwise scientific with a signed exponent of at least two digits. +fn python_float_repr(value: f64) -> String { + // `{:e}` yields the shortest round-trip digits, e.g. `1.5e-7`. + let scientific = format!("{value:e}"); + let (mantissa, exponent) = scientific.split_once('e').unwrap_or((&scientific, "0")); + let exponent: i32 = exponent.parse().unwrap_or(0); + let (sign, mantissa) = mantissa + .strip_prefix('-') + .map_or(("", mantissa), |rest| ("-", rest)); + let digits = mantissa.replace('.', ""); + if !(-4..16).contains(&exponent) { + let fraction = &digits[1..]; + let mantissa = if fraction.is_empty() { + digits[..1].to_owned() + } else { + format!("{}.{fraction}", &digits[..1]) + }; + let exponent_sign = if exponent < 0 { '-' } else { '+' }; + return format!("{sign}{mantissa}e{exponent_sign}{:02}", exponent.abs()); + } + let point = exponent + 1; + let positional = if point <= 0 { + format!("0.{}{digits}", "0".repeat(point.unsigned_abs() as usize)) + } else if point as usize >= digits.len() { + format!("{digits}{}.0", "0".repeat(point as usize - digits.len())) + } else { + let (whole, fraction) = digits.split_at(point as usize); + format!("{whole}.{fraction}") + }; + format!("{sign}{positional}") +} diff --git a/litellm-rust/crates/cache/tests/cache_type.rs b/litellm-rust/crates/cache/tests/cache_type.rs new file mode 100644 index 00000000000..24aaba8e5fd --- /dev/null +++ b/litellm-rust/crates/cache/tests/cache_type.rs @@ -0,0 +1,56 @@ +use litellm_cache::CacheType; +use rstest::rstest; + +#[rstest] +#[case(CacheType::Local, "local")] +#[case(CacheType::Redis, "redis")] +#[case(CacheType::RedisSemantic, "redis-semantic")] +#[case(CacheType::ValkeySemantic, "valkey-semantic")] +#[case(CacheType::S3, "s3")] +#[case(CacheType::Disk, "disk")] +#[case(CacheType::QdrantSemantic, "qdrant-semantic")] +#[case(CacheType::AzureBlob, "azure-blob")] +#[case(CacheType::Gcs, "gcs")] +fn every_python_cache_type_has_one_round_trip_identity( + #[case] cache_type: CacheType, + #[case] name: &str, +) { + assert_eq!(cache_type.as_python_name(), name); + assert_eq!(CacheType::from_python_name(name), Some(cache_type)); + assert_eq!( + serde_json::to_value(cache_type).unwrap(), + serde_json::Value::from(name) + ); + assert_eq!( + CacheType::ALL + .iter() + .filter(|candidate| candidate.as_python_name() == name) + .count(), + 1 + ); +} + +#[rstest] +fn python_cache_types_are_listed_in_python_order() { + assert_eq!( + CacheType::ALL.map(CacheType::as_python_name), + [ + "local", + "redis", + "redis-semantic", + "valkey-semantic", + "s3", + "disk", + "qdrant-semantic", + "azure-blob", + "gcs", + ] + ); +} + +#[rstest] +#[case::unknown("memcached")] +#[case::case_sensitive("Redis")] +fn unknown_python_names_have_no_cache_type(#[case] name: &str) { + assert_eq!(CacheType::from_python_name(name), None); +} diff --git a/litellm-rust/crates/cache/tests/caching.rs b/litellm-rust/crates/cache/tests/caching.rs index 36307ac9b33..baf968f4659 100644 --- a/litellm-rust/crates/cache/tests/caching.rs +++ b/litellm-rust/crates/cache/tests/caching.rs @@ -1,15 +1,25 @@ use std::{sync::Mutex, time::Duration}; use litellm_cache::{ - BaseCache, CacheConnectionResult, CacheContext, Error, ExactCacheContext, SemanticCacheContext, - get_cache, + BaseCache, CacheContext, CounterCache, Error, ExactCacheContext, IncrementOperation, + SemanticCacheContext, get_cache, }; +use rstest::{fixture, rstest}; +use serde_json::json; struct TestCache { default_ttl: Duration, writes: Mutex>, } +#[fixture] +fn cache() -> TestCache { + TestCache { + default_ttl: Duration::from_secs(60), + writes: Mutex::default(), + } +} + #[derive(Clone)] struct SemanticContext { ttl: Option, @@ -46,14 +56,6 @@ impl BaseCache for SemanticCache { fn get_cache(&self, _: &str, context: &Self::Context) -> Result, Error> { Ok((context.query == "matching prompt").then(|| "semantic hit".into())) } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - unreachable!() - } } impl BaseCache for TestCache { @@ -87,70 +89,124 @@ impl BaseCache for TestCache { fn get_cache(&self, _: &str, _: &ExactCacheContext) -> Result, Error> { Ok(None) } +} - async fn disconnect(&self) -> Result<(), Error> { +/// Records every `async_increment` so the default pipeline's calls are observable. +#[derive(Default)] +struct RecordingCounter { + increments: Mutex>, + total: Mutex, +} + +impl BaseCache for RecordingCounter { + type Value = f64; + type Context = ExactCacheContext; + + fn get_ttl(&self, context: &Self::Context) -> Option { + context.ttl + } + + fn set_cache(&self, _: &str, _: f64, _: &ExactCacheContext) -> Result<(), Error> { Ok(()) } - async fn test_connection(&self) -> Result { - unreachable!() + fn get_cache(&self, _: &str, _: &ExactCacheContext) -> Result, Error> { + Ok(None) } } -#[test] -fn ttl_uses_default_and_allows_per_call_override() { - let cache = TestCache { - default_ttl: Duration::from_secs(60), - writes: Mutex::default(), - }; - assert_eq!( - cache.get_ttl(&ExactCacheContext::default()), - Some(Duration::from_secs(60)) - ); +impl CounterCache for RecordingCounter { + fn increment_cache(&self, key: &str, amount: f64, _: ExactCacheContext) -> Result { + if key == "unavailable" { + return Err(Error::Unavailable); + } + let mut total = self.total.lock().unwrap(); + *total += amount; + Ok(*total) + } + + async fn async_increment( + &self, + key: &str, + amount: f64, + context: ExactCacheContext, + refresh_ttl: bool, + ) -> Result { + self.increments + .lock() + .unwrap() + .push((key.into(), amount, context.clone(), refresh_ttl)); + self.increment_cache(key, amount, context) + } +} + +fn operation(key: &str, amount: f64, ttl: Option) -> IncrementOperation { + IncrementOperation { + key: key.into(), + amount, + ttl: ttl.map(Duration::from_secs), + } +} + +#[rstest] +#[case::default_ttl(None, Some(60))] +#[case::per_call_override(Some(5), Some(5))] +fn ttl_uses_default_and_allows_per_call_override( + cache: TestCache, + #[case] ttl: Option, + #[case] expected: Option, +) { assert_eq!( cache.get_ttl(&ExactCacheContext { - ttl: Some(Duration::from_secs(5)), + ttl: ttl.map(Duration::from_secs), }), - Some(Duration::from_secs(5)) + expected.map(Duration::from_secs) ); } -#[test] -fn associated_context_preserves_backend_specific_lookup_inputs() { +#[rstest] +#[case::matching("matching prompt", Some("semantic hit"))] +#[case::other("other prompt", None)] +fn associated_context_preserves_backend_specific_lookup_inputs( + #[case] query: &str, + #[case] expected: Option<&str>, +) { let context = SemanticContext { ttl: None, - query: "matching prompt".into(), + query: query.into(), }; assert_eq!( get_cache(&SemanticCache, "shared-key", &context).unwrap(), - Some("semantic hit".into()) + expected.map(String::from) ); } -#[test] -fn semantic_context_with_ttl_preserves_lookup_inputs() { +#[rstest] +#[case::set(None, Some(30))] +#[case::replaced(Some(10), Some(20))] +#[case::cleared(Some(10), None)] +fn semantic_context_with_ttl_only_replaces_ttl( + #[case] initial: Option, + #[case] updated: Option, +) { let context = SemanticCacheContext { - input: Some(serde_json::json!("text")), - messages: Some(serde_json::json!([{"role": "user", "content": "hi"}])), - metadata: Some(serde_json::json!({"key": "value"})), + input: Some(json!({"input": "hello"})), + messages: Some(json!([{"role": "user", "content": "hello"}])), + metadata: Some(json!({"tenant": "team"})), scope: Some("scope".into()), - ttl: None, + ttl: initial.map(Duration::from_secs), }; - let updated = context.with_ttl(Some(Duration::from_secs(30))); - assert_eq!(updated.ttl(), Some(Duration::from_secs(30))); - assert_eq!(updated.input, context.input); - assert_eq!(updated.messages, context.messages); - assert_eq!(updated.metadata, context.metadata); - assert_eq!(updated.scope, context.scope); - assert_eq!(context.with_ttl(None).ttl(), None); + let result = context.with_ttl(updated.map(Duration::from_secs)); + assert_eq!(result.ttl(), updated.map(Duration::from_secs)); + assert_eq!(result.input, context.input); + assert_eq!(result.messages, context.messages); + assert_eq!(result.metadata, context.metadata); + assert_eq!(result.scope, context.scope); } +#[rstest] #[tokio::test] -async fn default_batch_operations_use_async_writes_and_stop_on_failure() { - let cache = TestCache { - default_ttl: Duration::from_secs(60), - writes: Mutex::default(), - }; +async fn default_batch_operations_use_async_writes_and_stop_on_failure(cache: TestCache) { let entry = String::from("cached"); let context = ExactCacheContext { ttl: Some(Duration::from_secs(5)), @@ -180,3 +236,101 @@ async fn default_batch_operations_use_async_writes_and_stop_on_failure() { ] ); } + +#[rstest] +#[tokio::test] +async fn default_async_increment_delegates_to_the_sync_increment() { + struct SyncOnly; + + impl BaseCache for SyncOnly { + type Value = f64; + type Context = ExactCacheContext; + + fn get_ttl(&self, context: &Self::Context) -> Option { + context.ttl + } + + fn set_cache(&self, _: &str, _: f64, _: &ExactCacheContext) -> Result<(), Error> { + Ok(()) + } + + fn get_cache(&self, _: &str, _: &ExactCacheContext) -> Result, Error> { + Ok(None) + } + } + + impl CounterCache for SyncOnly { + fn increment_cache( + &self, + _: &str, + amount: f64, + _: ExactCacheContext, + ) -> Result { + Ok(amount * 10.0) + } + } + + for refresh_ttl in [false, true] { + assert_eq!( + SyncOnly + .async_increment("key", 2.0, ExactCacheContext::default(), refresh_ttl) + .await, + Ok(20.0) + ); + } +} + +#[rstest] +#[case::empty(Vec::new(), Vec::new())] +#[case::one(vec![operation("a", 1.0, Some(10))], vec![1.0])] +#[case::in_order( + vec![operation("a", 1.0, Some(10)), operation("b", 2.5, None), operation("a", -0.5, Some(20))], + vec![1.0, 3.5, 3.0], +)] +#[tokio::test] +async fn default_increment_pipeline_increments_each_operation_in_order( + #[case] operations: Vec, + #[case] expected: Vec, +) { + let cache = RecordingCounter::default(); + assert_eq!( + cache.async_increment_pipeline(operations.clone()).await, + Ok(expected) + ); + assert_eq!( + *cache.increments.lock().unwrap(), + operations + .into_iter() + .map(|operation| ( + operation.key, + operation.amount, + ExactCacheContext { ttl: operation.ttl }, + false, + )) + .collect::>() + ); +} + +#[rstest] +#[tokio::test] +async fn default_increment_pipeline_stops_at_the_first_failure() { + let cache = RecordingCounter::default(); + assert_eq!( + cache + .async_increment_pipeline(vec![ + operation("a", 1.0, None), + operation("unavailable", 1.0, None), + operation("skipped", 1.0, None), + ]) + .await, + Err(Error::Unavailable) + ); + let keys = cache + .increments + .lock() + .unwrap() + .iter() + .map(|(key, ..)| key.clone()) + .collect::>(); + assert_eq!(keys, ["a", "unavailable"]); +} diff --git a/litellm-rust/crates/cache/tests/codec.rs b/litellm-rust/crates/cache/tests/codec.rs index e24545caad6..5320545fd49 100644 --- a/litellm-rust/crates/cache/tests/codec.rs +++ b/litellm-rust/crates/cache/tests/codec.rs @@ -1,6 +1,7 @@ use std::collections::BTreeMap; use litellm_cache::{CacheCodec, Error, JsonCodec}; +use rstest::rstest; use serde::{Deserialize, Serialize}; use serde_json::json; @@ -10,7 +11,7 @@ struct RoutingState { cooldown_seconds: u64, } -#[test] +#[rstest] fn json_codec_round_trips_typed_domain_values() { let codec = JsonCodec::::new(); let value = RoutingState { @@ -25,15 +26,15 @@ fn json_codec_round_trips_typed_domain_values() { ); } -#[test] -fn json_codec_rejects_malformed_and_wrongly_typed_entries() { +#[rstest] +#[case::malformed(b"not json")] +#[case::wrongly_typed(br#"{"deployment":12}"#)] +fn json_codec_rejects_malformed_and_wrongly_typed_entries(#[case] bytes: &[u8]) { let codec = JsonCodec::::new(); - for bytes in [b"not json".as_slice(), br#"{"deployment":12}"#.as_slice()] { - assert_eq!(codec.decode(bytes).unwrap_err(), Error::InvalidEntry); - } + assert_eq!(codec.decode(bytes).unwrap_err(), Error::InvalidEntry); } -#[test] +#[rstest] fn json_codec_propagates_encoding_errors() { let codec = JsonCodec::>::new(); let value = BTreeMap::from([((1, 2), "invalid JSON object key".into())]); diff --git a/litellm-rust/crates/cache/tests/dual.rs b/litellm-rust/crates/cache/tests/dual.rs index e7e8927f8d0..87dd76388ef 100644 --- a/litellm-rust/crates/cache/tests/dual.rs +++ b/litellm-rust/crates/cache/tests/dual.rs @@ -1,12 +1,15 @@ use std::{ + collections::HashMap, sync::{Arc, Mutex}, time::Duration, }; use litellm_cache::{ - BaseCache, BatchCache, CacheConnectionResult, ClaimCache, CounterCache, DeleteCache, DualCache, - Error, ExactCacheContext, FlushCache, ReadPolicy, RemoteFailurePolicy, WritePolicy, + BaseCache, BatchCache, BatchEntry, BulkDeleteCache, ClaimCache, CounterCache, DeleteCache, + DualCache, Error, ExactCacheContext, FlushCache, IncrementOperation, ReadPolicy, + RemoteFailurePolicy, SetCache, TtlCache, WritePolicy, }; +use rstest::{fixture, rstest}; struct TestCache { value: Mutex>, @@ -41,14 +44,6 @@ where fn get_cache(&self, _: &str, _: &ExactCacheContext) -> Result, Error> { Ok(self.value.lock().unwrap().clone()) } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - unreachable!() - } } impl BatchCache for TestCache where V: Clone + Send + Sync + 'static {} @@ -111,7 +106,7 @@ where } } -#[test] +#[rstest] fn failed_l2_increment_leaves_l1_unchanged() { let l1 = Arc::new(TestCache::new(Some(10.0), false)); let cache = DualCache::new(l1.clone(), Arc::new(TestCache::new(Some(20.0), true))); @@ -127,7 +122,7 @@ fn failed_l2_increment_leaves_l1_unchanged() { ); } -#[test] +#[rstest] fn claim_uses_l1_fallback_without_overwriting_an_eligible_winner() { let l1 = Arc::new(TestCache::new(Some("first".to_string()), false)); let cache = DualCache::new(l1, Arc::new(TestCache::new(None, true))) @@ -193,14 +188,6 @@ impl BaseCache for SyncPanics { } Ok(()) } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - unreachable!() - } } impl BatchCache for SyncPanics { @@ -208,11 +195,11 @@ impl BatchCache for SyncPanics { &self, keys: Vec, context: ExactCacheContext, - ) -> Result>, Error> { + ) -> Result>, Error> { assert_eq!(keys, ["missing"]); Ok(vec![match self.0.get_cache("missing", &context)? { - Some(value) => litellm_cache::BatchEntry::Hit(value), - None => litellm_cache::BatchEntry::Miss, + Some(value) => BatchEntry::Hit(value), + None => BatchEntry::Miss, }]) } } @@ -233,6 +220,7 @@ impl FlushCache for SyncPanics { } } +#[rstest] #[tokio::test] async fn async_operations_use_the_async_l2_methods() { let l1 = Arc::new(TestCache::new(None, false)); @@ -260,7 +248,7 @@ async fn async_operations_use_the_async_l2_methods() { .async_batch_get_cache(vec!["missing".into()], context.clone()) .await .unwrap(), - [litellm_cache::BatchEntry::Hit("remote".to_string())] + [BatchEntry::Hit("remote".to_string())] ); cache .async_set_cache("missing", "written".into(), context.clone()) @@ -294,14 +282,6 @@ impl BaseCache for Unavailable { fn get_cache(&self, _: &str, _: &ExactCacheContext) -> Result, Error> { Err(Error::Unavailable) } - - async fn disconnect(&self) -> Result<(), Error> { - Ok(()) - } - - async fn test_connection(&self) -> Result { - unreachable!() - } } impl BatchCache for Unavailable {} @@ -330,7 +310,7 @@ impl ClaimCache for Unavailable { } } -#[test] +#[rstest] fn remote_failure_policy_selects_propagation_or_the_local_tier() { let context = ExactCacheContext::default(); let strict = DualCache::new(Arc::new(TestCache::new(None, false)), Arc::new(Unavailable)); @@ -353,7 +333,7 @@ fn remote_failure_policy_selects_propagation_or_the_local_tier() { assert_eq!(l1.get_cache("key", &context), Ok(None)); } -#[test] +#[rstest] fn claim_fallback_does_not_hide_non_availability_errors() { let cache = DualCache::new( Arc::new(TestCache::new(Some("first".to_string()), false)), @@ -371,7 +351,7 @@ fn claim_fallback_does_not_hide_non_availability_errors() { ); } -#[test] +#[rstest] fn local_only_policies_never_touch_l2() { let l2 = Arc::new(TestCache::new(Some("remote".to_string()), false)); let cache = DualCache::new(Arc::new(TestCache::new(None, false)), l2.clone()) @@ -383,3 +363,474 @@ fn local_only_policies_never_touch_l2() { cache.set_cache("key", "local".into(), &context).unwrap(); assert_eq!(l2.get_cache("key", &context), Ok(Some("remote".into()))); } + +type Log = Arc>>; +type StoredSet = (Vec, Option); + +/// A keyed tier that logs every call, so tests can assert which tier ran and in what order. +struct Tier { + name: &'static str, + log: Log, + fail: bool, + counters: Mutex>, + sets: Mutex>, + ttls: HashMap, +} + +impl Tier { + fn new(name: &'static str, log: &Log) -> Self { + Self { + name, + log: log.clone(), + fail: false, + counters: Mutex::default(), + sets: Mutex::default(), + ttls: HashMap::new(), + } + } + + fn failing(self) -> Self { + Self { fail: true, ..self } + } + + fn with_counter(self, key: &str, value: f64) -> Self { + self.counters + .lock() + .unwrap() + .insert(key.into(), (value, ExactCacheContext::default())); + self + } + + fn with_ttl(mut self, key: &str, seconds: u64) -> Self { + self.ttls.insert(key.into(), Duration::from_secs(seconds)); + self + } + + fn record(&self, event: String) { + self.log + .lock() + .unwrap() + .push(format!("{} {event}", self.name)); + } + + fn counter(&self, key: &str) -> Option<(f64, ExactCacheContext)> { + self.counters.lock().unwrap().get(key).cloned() + } + + fn check(&self) -> Result<(), Error> { + if self.fail { + return Err(Error::Unavailable); + } + Ok(()) + } +} + +impl BaseCache for Tier { + type Value = f64; + type Context = ExactCacheContext; + + fn get_ttl(&self, context: &Self::Context) -> Option { + context.ttl + } + + fn set_cache(&self, key: &str, value: f64, context: &ExactCacheContext) -> Result<(), Error> { + self.check()?; + self.record(format!("set {key}={value}")); + self.counters + .lock() + .unwrap() + .insert(key.into(), (value, context.clone())); + Ok(()) + } + + fn get_cache(&self, key: &str, _: &ExactCacheContext) -> Result, Error> { + Ok(self.counter(key).map(|(value, _)| value)) + } +} + +impl CounterCache for Tier { + fn increment_cache( + &self, + key: &str, + amount: f64, + context: ExactCacheContext, + ) -> Result { + self.check()?; + let mut counters = self.counters.lock().unwrap(); + let value = counters.get(key).map_or(0.0, |(value, _)| *value) + amount; + counters.insert(key.into(), (value, context)); + Ok(value) + } + + async fn async_increment( + &self, + key: &str, + amount: f64, + context: ExactCacheContext, + refresh_ttl: bool, + ) -> Result { + self.record(format!( + "increment {key}+{amount} refresh_ttl={refresh_ttl}" + )); + self.increment_cache(key, amount, context) + } + + async fn async_increment_pipeline( + &self, + operations: Vec, + ) -> Result, Error> { + let keys = operations + .iter() + .map(|operation| operation.key.as_str()) + .collect::>(); + self.record(format!("pipeline {}", keys.join(","))); + operations + .into_iter() + .map(|operation| { + self.increment_cache( + &operation.key, + operation.amount, + ExactCacheContext { ttl: operation.ttl }, + ) + }) + .collect() + } +} + +impl DeleteCache for Tier { + fn delete_cache(&self, key: &str) -> Result<(), Error> { + self.check()?; + self.record(format!("delete {key}")); + self.counters.lock().unwrap().remove(key); + Ok(()) + } +} + +impl BulkDeleteCache for Tier { + async fn delete_cache_keys(&self, keys: Vec) -> Result { + self.check()?; + self.record(format!("delete_keys {}", keys.join(","))); + let mut counters = self.counters.lock().unwrap(); + Ok(keys + .iter() + .filter(|key| counters.remove(key.as_str()).is_some()) + .count()) + } +} + +impl SetCache for Tier { + type SetValue = String; + type SetResult = (); + + async fn async_set_cache_sadd( + &self, + key: &str, + values: Vec, + ttl: Option, + ) -> Result<(), Error> { + self.check()?; + self.record(format!("sadd {key} {}", values.join(","))); + self.sets.lock().unwrap().insert(key.into(), (values, ttl)); + Ok(()) + } +} + +impl TtlCache for Tier { + async fn async_get_ttl(&self, key: &str) -> Result, Error> { + self.check()?; + self.record(format!("ttl {key}")); + Ok(self.ttls.get(key).copied()) + } +} + +#[fixture] +fn log() -> Log { + Log::default() +} + +fn events(log: &Log) -> Vec { + log.lock().unwrap().clone() +} + +fn seconds(ttl: u64) -> ExactCacheContext { + ExactCacheContext { + ttl: Some(Duration::from_secs(ttl)), + } +} + +#[rstest] +#[case::window_semantics(false)] +#[case::refresh_on_every_write(true)] +#[tokio::test] +async fn async_increment_passes_refresh_ttl_to_l2_and_stores_its_result_locally( + log: Log, + #[case] refresh_ttl: bool, +) { + let l1 = Arc::new(Tier::new("l1", &log).with_counter("counter", 1.0)); + let l2 = Arc::new(Tier::new("l2", &log).with_counter("counter", 10.0)); + let cache = DualCache::new(l1.clone(), l2.clone()); + + assert_eq!( + cache + .async_increment("counter", 2.0, seconds(30), refresh_ttl) + .await, + Ok(12.0) + ); + assert_eq!( + events(&log), + [ + format!("l2 increment counter+2 refresh_ttl={refresh_ttl}"), + "l1 set counter=12".into(), + ] + ); + assert_eq!(l1.counter("counter"), Some((12.0, seconds(30)))); + assert_eq!(l2.counter("counter"), Some((12.0, seconds(30)))); +} + +#[rstest] +#[tokio::test] +async fn failed_async_l2_increment_leaves_l1_unchanged(log: Log) { + let l1 = Arc::new(Tier::new("l1", &log).with_counter("counter", 1.0)); + let cache = DualCache::new(l1.clone(), Arc::new(Tier::new("l2", &log).failing())) + .with_remote_failure_policy(RemoteFailurePolicy::UseLocal); + + assert_eq!( + cache + .async_increment("counter", 2.0, seconds(30), true) + .await, + Err(Error::Unavailable) + ); + assert_eq!( + l1.counter("counter"), + Some((1.0, ExactCacheContext::default())) + ); +} + +#[rstest] +#[case::empty(Vec::new(), Vec::new())] +#[case::one_key(vec![("a", 1.0, Some(10))], vec![6.0])] +#[case::repeated_and_mixed_ttls( + vec![("a", 1.0, Some(10)), ("b", 2.0, None), ("a", 3.0, Some(20))], + vec![6.0, 2.0, 9.0], +)] +#[tokio::test] +async fn async_increment_pipeline_runs_l2_first_and_l1_takes_each_remote_result( + log: Log, + #[case] operations: Vec<(&str, f64, Option)>, + #[case] expected: Vec, +) { + let operations = operations + .into_iter() + .map(|(key, amount, ttl)| IncrementOperation { + key: key.into(), + amount, + ttl: ttl.map(Duration::from_secs), + }) + .collect::>(); + let l1 = Arc::new(Tier::new("l1", &log).with_counter("a", 100.0)); + let l2 = Arc::new(Tier::new("l2", &log).with_counter("a", 5.0)); + let cache = DualCache::new(l1.clone(), l2); + + assert_eq!( + cache.async_increment_pipeline(operations.clone()).await, + Ok(expected.clone()) + ); + let keys = operations + .iter() + .map(|operation| operation.key.as_str()) + .collect::>(); + let mut expected_events = vec![format!("l2 pipeline {}", keys.join(","))]; + expected_events.extend( + operations + .iter() + .zip(&expected) + .map(|(operation, value)| format!("l1 set {}={value}", operation.key)), + ); + assert_eq!(events(&log), expected_events); + if let Some((operation, value)) = operations.iter().zip(&expected).next_back() { + assert_eq!( + l1.counter(&operation.key), + Some((*value, ExactCacheContext { ttl: operation.ttl })) + ); + } +} + +#[rstest] +#[tokio::test] +async fn failed_l2_increment_pipeline_leaves_l1_unchanged(log: Log) { + let l1 = Arc::new(Tier::new("l1", &log).with_counter("a", 1.0)); + let cache = DualCache::new(l1.clone(), Arc::new(Tier::new("l2", &log).failing())); + + assert_eq!( + cache + .async_increment_pipeline(vec![IncrementOperation { + key: "a".into(), + amount: 1.0, + ttl: None, + }]) + .await, + Err(Error::Unavailable) + ); + assert_eq!(events(&log), ["l2 pipeline a"]); + assert_eq!(l1.counter("a"), Some((1.0, ExactCacheContext::default()))); +} + +#[rstest] +#[case::both_tiers(WritePolicy::Both, &["l1 sadd members a,b", "l2 sadd members a,b"])] +#[case::local_only(WritePolicy::LocalOnly, &["l1 sadd members a,b"])] +#[tokio::test] +async fn set_add_writes_locally_then_remotely_unless_local_only( + log: Log, + #[case] write_policy: WritePolicy, + #[case] expected: &[&str], +) { + let l1 = Arc::new(Tier::new("l1", &log)); + let l2 = Arc::new(Tier::new("l2", &log)); + let cache = DualCache::new(l1.clone(), l2.clone()).with_write_policy(write_policy); + let ttl = Some(Duration::from_secs(45)); + + cache + .async_set_cache_sadd("members", vec!["a".into(), "b".into()], ttl) + .await + .unwrap(); + assert_eq!(events(&log), expected); + let stored = Some((vec!["a".to_string(), "b".to_string()], ttl)); + assert_eq!(l1.sets.lock().unwrap().get("members").cloned(), stored); + assert_eq!( + l2.sets.lock().unwrap().get("members").cloned(), + stored.filter(|_| write_policy == WritePolicy::Both) + ); +} + +#[rstest] +#[tokio::test] +async fn failed_local_set_add_never_reaches_l2(log: Log) { + let cache = DualCache::new( + Arc::new(Tier::new("l1", &log).failing()), + Arc::new(Tier::new("l2", &log)), + ); + assert_eq!( + cache + .async_set_cache_sadd("members", vec!["a".into()], None) + .await, + Err(Error::Unavailable) + ); + assert!(events(&log).is_empty()); +} + +#[rstest] +#[case::empty(None, &[], &[])] +#[case::default_batch_size(None, &["a", "b", "c"], &["a,b,c"])] +#[case::chunked(Some(2), &["a", "b", "c", "d", "e"], &["a,b", "c,d", "e"])] +#[case::exact_chunks(Some(2), &["a", "b", "c", "d"], &["a,b", "c,d"])] +#[case::zero_means_one_per_chunk(Some(0), &["a", "b"], &["a", "b"])] +#[tokio::test] +async fn bulk_delete_removes_every_key_locally_then_remotely_in_chunks( + log: Log, + #[case] batch_size: Option, + #[case] keys: &[&str], + #[case] chunks: &[&str], +) { + let l1 = Tier::new("l1", &log); + let l2 = Tier::new("l2", &log); + for key in keys.iter().step_by(2) { + l2.counters + .lock() + .unwrap() + .insert((*key).into(), (1.0, ExactCacheContext::default())); + } + let l1 = Arc::new(l1); + let mut cache = DualCache::new(l1, Arc::new(l2)); + if let Some(batch_size) = batch_size { + cache = cache.with_delete_batch_size(batch_size); + } + + assert_eq!( + cache + .delete_cache_keys(keys.iter().map(|key| (*key).into()).collect()) + .await, + Ok(keys.len().div_ceil(2)) + ); + let expected = keys + .iter() + .map(|key| format!("l1 delete {key}")) + .chain(chunks.iter().map(|chunk| format!("l2 delete_keys {chunk}"))) + .collect::>(); + assert_eq!(events(&log), expected); +} + +#[rstest] +#[tokio::test] +async fn bulk_delete_stops_before_l2_when_the_local_delete_fails(log: Log) { + let cache = DualCache::new( + Arc::new(Tier::new("l1", &log).failing()), + Arc::new(Tier::new("l2", &log)), + ); + assert_eq!( + cache.delete_cache_keys(vec!["a".into()]).await, + Err(Error::Unavailable) + ); + assert!(events(&log).is_empty()); +} + +#[rstest] +#[case::local_hit("both", Some(10), &["l1 ttl both"])] +#[case::remote_fallback("remote", Some(20), &["l1 ttl remote", "l2 ttl remote"])] +#[case::missing_everywhere("missing", None, &["l1 ttl missing", "l2 ttl missing"])] +#[tokio::test] +async fn ttl_reads_local_then_remote( + log: Log, + #[case] key: &str, + #[case] expected: Option, + #[case] expected_events: &[&str], +) { + let cache = DualCache::new( + Arc::new(Tier::new("l1", &log).with_ttl("both", 10)), + Arc::new( + Tier::new("l2", &log) + .with_ttl("both", 99) + .with_ttl("remote", 20), + ), + ); + assert_eq!( + cache.async_get_ttl(key).await, + Ok(expected.map(Duration::from_secs)) + ); + assert_eq!(events(&log), expected_events); +} + +/// Python `local_only=True`: the increment and the pipeline stay on the local tier. +#[rstest] +#[tokio::test] +async fn local_only_writes_increment_the_local_tier_alone(log: Log) { + let l1 = Arc::new(Tier::new("l1", &log).with_counter("a", 1.0)); + let l2 = Arc::new(Tier::new("l2", &log).with_counter("a", 10.0)); + let cache = DualCache::new(l1.clone(), l2.clone()).with_write_policy(WritePolicy::LocalOnly); + + assert_eq!(cache.increment_cache("a", 2.0, seconds(30)), Ok(3.0)); + assert_eq!( + cache.async_increment("a", 1.0, seconds(30), true).await, + Ok(4.0) + ); + let operations = vec![ + IncrementOperation { + key: "a".into(), + amount: 1.0, + ttl: Some(Duration::from_secs(10)), + }, + IncrementOperation { + key: "b".into(), + amount: 2.0, + ttl: None, + }, + ]; + assert_eq!( + cache.async_increment_pipeline(operations).await, + Ok(vec![5.0, 2.0]) + ); + assert_eq!( + events(&log), + ["l1 set a=3", "l1 set a=4", "l1 set a=5", "l1 set b=2"] + ); + assert_eq!(l2.counter("a"), Some((10.0, ExactCacheContext::default()))); +} diff --git a/litellm-rust/crates/cache/tests/semantic.rs b/litellm-rust/crates/cache/tests/semantic.rs new file mode 100644 index 00000000000..97a552a8010 --- /dev/null +++ b/litellm-rust/crates/cache/tests/semantic.rs @@ -0,0 +1,270 @@ +use litellm_cache::{ + Error, SemanticCacheContext, + semantic::{ + Embedder, PreparedEmbedding, prompt_from_context, prompt_from_messages, str_from_messages, + }, +}; +use rstest::rstest; +use serde_json::{Value, json}; + +fn context(messages: Option, input: Option) -> SemanticCacheContext { + SemanticCacheContext { + messages, + input, + ..SemanticCacheContext::default() + } +} + +#[rstest] +#[case::empty(json!([]), "")] +#[case::string_content(json!([{"role": "user", "content": "hello"}]), "hello")] +#[case::concatenates_messages( + json!([{"role": "system", "content": "be brief. "}, {"role": "user", "content": "hello"}]), + "be brief. hello", +)] +#[case::text_parts( + json!([{"role": "user", "content": [ + {"type": "text", "text": "What is "}, + {"type": "image_url", "image_url": {"url": "https://example.com/a.png"}}, + {"type": "text", "text": "this?"}, + ]}]), + "What is this?", +)] +#[case::missing_null_and_empty_content( + json!([{"role": "assistant"}, {"role": "assistant", "content": null}, {"role": "user", "content": ""}]), + "", +)] +#[case::search_results_hidden_behind_small_content( + json!([{"role": "tool", "content": "small", "search_results": [ + {"source": "s", "title": "t", "content": [{"text": "hidden payload"}]}, + ]}]), + "smallsthidden payload", +)] +#[case::title_only_search_result( + json!([{"role": "tool", "content": "small", "search_results": [ + {"source": "s", "title": "long title", "content": []}, + ]}]), + "smallslong title", +)] +#[case::search_results_without_content( + json!([{"role": "tool", "search_results": [{"source": "s", "title": "t"}]}]), + "st", +)] +#[case::search_result_fields_in_python_order( + json!([{"role": "tool", "content": "c", "search_results": [ + {"citations": {"enabled": true}, "content": [{"text": "body"}], "title": "t", "source": "s"}, + {"source": "s2"}, + ]}]), + r#"cstbody{"enabled":true}s2"#, +)] +#[case::null_citations_skipped( + json!([{"role": "tool", "content": "c", "search_results": [ + {"source": "s", "citations": null}, + ]}]), + "cs", +)] +#[case::non_string_and_non_object_entries_skipped( + json!([{"role": "tool", "content": "c", "search_results": [ + "junk", + {"source": 1, "title": null, "content": ["junk", {"text": 3}, {"text": "kept"}]}, + ]}]), + "ckept", +)] +#[case::non_list_search_results_skipped( + json!([{"role": "tool", "content": "c", "search_results": {"source": "s"}}]), + "c", +)] +#[case::citations_compact_in_insertion_order( + json!([{"role": "tool", "search_results": [ + {"citations": {"z": 1, "a": [1.5, true, null], "m": {"k": "v"}}}, + ]}]), + r#"{"z":1,"a":[1.5,true,null],"m":{"k":"v"}}"#, +)] +#[case::citations_ensure_ascii( + json!([{"role": "tool", "search_results": [{"citations": ["caf\u{e9}", "\u{4e2d}"]}]}]), + r#"["caf\u00e9","\u4e2d"]"#, +)] +#[case::citations_astral_chars_as_surrogate_pairs( + json!([{"role": "tool", "search_results": [{"citations": "\u{1f600}"}]}]), + r#""\ud83d\ude00""#, +)] +#[case::citations_escapes( + json!([{"role": "tool", "search_results": [{"citations": "q\"\\\n\t\u{1}/"}]}]), + r#""q\"\\\n\t\u0001/""#, +)] +#[case::citations_large_float_exponent( + json!([{"role": "tool", "search_results": [{"citations": [1e20, 1.0]}]}]), + "[1e+20,1.0]", +)] +#[case::citations_scalars( + json!([{"role": "tool", "search_results": [{"citations": false}, {"citations": 3}]}]), + "false3", +)] +fn str_from_messages_matches_python(#[case] messages: Value, #[case] expected: &str) { + assert_eq!(str_from_messages(messages.as_array().unwrap()), expected); +} + +#[rstest] +#[case::no_messages(None, None)] +#[case::empty_messages(Some(json!([])), None)] +#[case::messages_not_a_list(Some(json!("hello")), None)] +#[case::messages(Some(json!([{"content": "hello"}])), Some("hello"))] +#[case::messages_without_text(Some(json!([{"content": null}])), Some(""))] +fn prompt_from_messages_reads_messages_only( + #[case] messages: Option, + #[case] expected: Option<&str>, +) { + let context = context(messages, Some(json!("responses prompt"))); + assert_eq!(prompt_from_messages(&context).as_deref(), expected); +} + +#[rstest] +#[case::prefers_messages( + Some(json!([{"content": "message prompt"}])), + Some(json!("responses prompt")), + Some("message prompt"), +)] +#[case::empty_messages_fall_back_to_input( + Some(json!([])), + Some(json!("responses prompt")), + Some("responses prompt"), +)] +#[case::messages_without_text_keep_an_empty_prompt( + Some(json!([{"content": null}])), + Some(json!("x")), + Some(""), +)] +#[case::nothing(None, None, None)] +#[case::null_input(None, Some(Value::Null), None)] +#[case::blank_string(None, Some(json!(" ")), None)] +#[case::trimmed_string( + None, + Some(json!(" What is the capital of France?\n")), + Some("What is the capital of France?"), +)] +#[case::image_only( + None, + Some(json!([{"type": "input_image", "image_url": "https://example.com"}])), + None, +)] +#[case::structured_input( + None, + Some(json!([{"role": "user", "content": [ + {"type": "input_text", "text": "What is the capital of France?"}, + {"type": "input_text", "text": "Answer briefly."}, + {"type": "input_image", "image_url": "https://example.com/paris.png"}, + ]}])), + Some("What is the capital of France?\nAnswer briefly."), +)] +#[case::model_objects_after_dump( + None, + Some(json!([ + {"content": [{"text": "model dump prompt"}]}, + {"content": [{"output_text": "dict prompt"}]}, + {"content": [{"input_text": "inline prompt"}]}, + {"content": [{"type": "input_image", "image_url": "https://example.com"}]}, + ])), + Some("model dump prompt\ndict prompt\ninline prompt"), +)] +#[case::object_content( + None, + Some(json!({"content": [{"text": "object content prompt"}]})), + Some("object content prompt"), +)] +#[case::string_content(None, Some(json!({"content": " inline "})), Some("inline"))] +#[case::null_content_uses_text_keys( + None, + Some(json!({"content": null, "output": "tool output"})), + Some("tool output"), +)] +#[case::content_wins_over_text(None, Some(json!({"content": [], "text": "ignored"})), None)] +#[case::text_key_precedence( + None, + Some(json!({"output_text": "d", "input_text": "c", "output": "b", "text": "a"})), + Some("a"), +)] +#[case::input_text_key(None, Some(json!({"input_text": "only input"})), Some("only input"))] +#[case::output_text_key(None, Some(json!({"output_text": "only output"})), Some("only output"))] +#[case::non_string_text_keys_skipped( + None, + Some(json!({"text": 1, "output": "fallback"})), + Some("fallback"), +)] +#[case::nested_lists(None, Some(json!([["a", [" b "]], "", "c"])), Some("a\nb\nc"))] +#[case::scalars_ignored(None, Some(json!([1, true, null, "kept"])), Some("kept"))] +fn prompt_from_context_matches_python( + #[case] messages: Option, + #[case] input: Option, + #[case] expected: Option<&str>, +) { + assert_eq!( + prompt_from_context(&context(messages, input)).as_deref(), + expected + ); +} + +/// Python `test_redis_semantic_cache_prompt_extraction_skips_blank_dict_text_keys`: a blank +/// text key falls through to the next one. +#[rstest] +#[case::blank_text_falls_through( + json!({"text": " ", "input_text": "fallback prompt"}), + "fallback prompt", +)] +fn prompt_from_context_skips_blank_text_keys(#[case] input: Value, #[case] expected: &str) { + assert_eq!( + prompt_from_context(&context(None, Some(input))).as_deref(), + Some(expected) + ); +} + +/// Where `json.dumps(..., separators=(",", ":"))` and Python `str.strip` differ from +/// `semantic.rs`: ensure_ascii escapes DEL, small floats keep Python's two-digit exponent, and +/// strip also removes the ASCII information separators. +#[rstest] +#[case::del_is_escaped(json!([{"search_results": [{"citations": "\u{7f}"}]}]), None, r#""\u007f""#)] +#[case::small_float_exponent(json!([{"search_results": [{"citations": 1.5e-7}]}]), None, "1.5e-07")] +#[case::float_at_positional_floor(json!([{"search_results": [{"citations": 1e-4}]}]), None, "0.0001")] +#[case::float_at_scientific_ceiling(json!([{"search_results": [{"citations": 1e16}]}]), None, "1e+16")] +#[case::large_float(json!([{"search_results": [{"citations": [1.25e20, -2.5, 3.0]}]}]), None, "[1.25e+20,-2.5,3.0]")] +#[case::strip_information_separators(json!([]), Some(json!("\u{1c}a\u{1f}")), "a")] +fn python_serialization_edge_cases( + #[case] messages: Value, + #[case] input: Option, + #[case] expected: &str, +) { + let actual = match input { + Some(input) => prompt_from_context(&context(None, Some(input))).unwrap_or_default(), + None => str_from_messages(messages.as_array().unwrap()), + }; + assert_eq!(actual, expected); +} + +#[rstest] +#[tokio::test] +async fn prepared_embedding_returns_its_vector_for_any_prompt() { + let embedding = PreparedEmbedding(vec![0.1, 0.2, 0.3]); + let metadata = json!({"tenant": "team"}); + assert_eq!(embedding.embed("a", None), Ok(vec![0.1, 0.2, 0.3])); + assert_eq!( + embedding.async_embed("b", Some(&metadata)).await, + Ok(vec![0.1, 0.2, 0.3]) + ); +} + +#[rstest] +#[tokio::test] +async fn embedders_default_to_async_only() { + struct AsyncOnly; + + impl Embedder for AsyncOnly { + async fn async_embed(&self, prompt: &str, _: Option<&Value>) -> Result, Error> { + Ok(vec![prompt.len() as f32]) + } + } + + assert_eq!( + AsyncOnly.embed("abc", None), + Err(Error::UnsupportedOperation) + ); + assert_eq!(AsyncOnly.async_embed("abc", None).await, Ok(vec![3.0])); +} diff --git a/litellm-rust/crates/core-utils/Cargo.toml b/litellm-rust/crates/core-utils/Cargo.toml index eb353bc060c..baf5dd16707 100644 --- a/litellm-rust/crates/core-utils/Cargo.toml +++ b/litellm-rust/crates/core-utils/Cargo.toml @@ -7,6 +7,7 @@ repository.workspace = true [dependencies] fancy-regex.workspace = true +litellm-tracing.workspace = true litellm-types.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/litellm-rust/crates/core-utils/src/secret_redaction.rs b/litellm-rust/crates/core-utils/src/secret_redaction.rs index e3caee4799a..14a88eae288 100644 --- a/litellm-rust/crates/core-utils/src/secret_redaction.rs +++ b/litellm-rust/crates/core-utils/src/secret_redaction.rs @@ -1,109 +1 @@ -use fancy_regex::Regex; - -pub const REDACTED: &str = "REDACTED"; - -const DEFAULT_MINIMUM_CUSTOM_KEY_LENGTH: usize = 16; - -fn minimum_custom_key_length() -> usize { - std::env::var("MINIMUM_CUSTOM_KEY_LENGTH") - .ok() - .and_then(|value| value.trim().parse().ok()) - .unwrap_or(DEFAULT_MINIMUM_CUSTOM_KEY_LENGTH) -} - -fn secret_patterns(minimum_custom_key_length: usize) -> String { - let sk_suffix_length = minimum_custom_key_length.saturating_sub("sk-".len()); - [ - r"-----BEGIN[A-Z \-]*PRIVATE KEY-----[\s\S]*?-----END[A-Z \-]*PRIVATE KEY-----", - r"\bya29\.[A-Za-z0-9_.~+/-]+", - r#"(?:client_secret|azure_password|azure_username)\s+[^\s,'"})\]{}>]+"#, - r"(?:AKIA|ASIA)[0-9A-Z]{16}", - r"Bearer\s+[A-Za-z0-9\-._~+/]{10,}=*", - r"Basic\s+[A-Za-z0-9+/]{10,}={0,2}", - &format!(r"sk-[A-Za-z0-9\-_]{{{sk_suffix_length},}}"), - r#"(?<=[?&])(?:api[_-]?key|\w*(?:token|password|passwd|client_secret|secret_key|_secret))=[^\s&'"]+"#, - r#"(?:api[_-]?key)['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]{8,}"#, - r#"(?:x-api-key|api-key)['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, - r"x-ak-[A-Za-z0-9\-_]{20,}", - r"AIza[0-9A-Za-z\-_]{35}", - r#"(?<=[?&])key=[^\s&'"]{8,}"#, - r#"(?:^|(?<=\W))\w*(?:password|passwd|client_secret|secret_key|_secret)['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, - r#"(?<=://)[^\s'":]{0,4096}:[^\s'"]{1,4096}(?=@)"#, - r"dapi[0-9a-f]{32}", - r#"litellm\.[A-Za-z0-9_]*_key['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, - r#"private_key['"]?\s*[:=]\s*['"]?(?:-----BEGIN[A-Z \-]*PRIVATE KEY-----[\s\S]*?-----END[A-Z \-]*PRIVATE KEY-----|[^\s,'"})\]{}>]+)"#, - concat!( - r"(?:master_key|xai_key|database_url|db_url|connection_string|", - r"aws_secret_access_key|aws_session_token|aws_access_key_id|", - r"signing_key|encryption_key|", - r"auth_token|access_token|refresh_token|", - r"slack_webhook_url|webhook_url|", - r"database_connection_string|", - r"huggingface_token|jwt_secret)", - r#"['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, - ), - r"\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*", - r"(?<=[?&])sig=[A-Za-z0-9%+/=]+", - r#"\{[^{}]*"type"\s*:\s*"service_account"[^{}]*(?:\{[^{}]*\}[^{}]*)*\}"#, - ] - .join("|") -} - -/// Python's `_ENABLE_SECRET_REDACTION` pattern set, compiled once per configuration. -#[derive(Clone, Debug)] -pub struct SecretRedactor { - pattern: Regex, -} - -impl SecretRedactor { - pub fn new(minimum_custom_key_length: usize) -> Self { - let pattern = Regex::new(&format!( - "(?i){}", - secret_patterns(minimum_custom_key_length) - )) - .expect("secret redaction patterns compile"); - Self { pattern } - } - - /// `None` when `LITELLM_DISABLE_REDACT_SECRETS` turns redaction off. - pub fn from_env() -> Option { - let disabled = std::env::var("LITELLM_DISABLE_REDACT_SECRETS") - .is_ok_and(|value| value.eq_ignore_ascii_case("true")); - (!disabled).then(|| Self::new(minimum_custom_key_length())) - } - - pub fn redact(&self, value: &str) -> String { - self.pattern.replace_all(value, REDACTED).into_owned() - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[rstest::rstest] - #[case::bearer("auth failed: Bearer abcdefghijklmnop", "auth failed: REDACTED")] - #[case::sk_key("key sk-abcdefghijklmnopqrstuvwxyz rejected", "key REDACTED rejected")] - #[case::short_sk_key_is_kept("sk-abc", "sk-abc")] - #[case::query_param("GET /v1?api_key=secret123&x=1", "GET /v1?REDACTED&x=1")] - #[case::dict_repr("{'api_key': 'abcdefghij'}", "{'REDACTED'}")] - #[case::url_credentials("postgres://user:pass@host/db", "postgres://REDACTED@host/db")] - #[case::case_insensitive("BEARER ABCDEFGHIJKLMNOP", "REDACTED")] - #[case::aws_key("AKIAABCDEFGHIJKLMNOP", "REDACTED")] - #[case::sas_signature("https://x.blob/a?sv=1&sig=abc%2B=", "https://x.blob/a?sv=1&REDACTED")] - #[case::password_needs_word_boundary("db_password=hunter2", "REDACTED")] - #[case::plain_text_is_kept(r#"{"message": "rejected"}"#, r#"{"message": "rejected"}"#)] - fn redacts_the_same_spans_as_the_python_patterns(#[case] input: &str, #[case] expected: &str) { - assert_eq!( - SecretRedactor::new(DEFAULT_MINIMUM_CUSTOM_KEY_LENGTH).redact(input), - expected - ); - } - - #[test] - fn sk_threshold_follows_the_minimum_custom_key_length() { - let redactor = SecretRedactor::new(8); - assert_eq!(redactor.redact("sk-abcde"), REDACTED); - assert_eq!(redactor.redact("sk-abcd"), "sk-abcd"); - } -} +pub use litellm_tracing::{REDACTED, SecretRedactor}; diff --git a/litellm-rust/crates/cost/Cargo.toml b/litellm-rust/crates/cost/Cargo.toml new file mode 100644 index 00000000000..b85f8a8f876 --- /dev/null +++ b/litellm-rust/crates/cost/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "litellm-cost" +version = "0.1.0" +edition.workspace = true +license.workspace = true +repository.workspace = true + +[dev-dependencies] +criterion.workspace = true +proptest.workspace = true + +[[bench]] +name = "calculate" +harness = false diff --git a/litellm-rust/crates/cost/README.md b/litellm-rust/crates/cost/README.md new file mode 100644 index 00000000000..ee4722b6438 --- /dev/null +++ b/litellm-rust/crates/cost/README.md @@ -0,0 +1,13 @@ +# litellm-cost + +This crate calculates text token charges from rates and usage supplied by its caller. It is standalone and has no Python bridge or proxy integration + +Call `compile(&pricing)` once for an immutable plan, then `plan.calculate(&request)` for each supported request. `calculate(&pricing, &request)` compiles on each call. A successful result exposes pre-multiplier component costs, selected rates, the multiplier, and derived `input()`, `output()`, and `total()` values + +The caller states whether `prompt_tokens` includes cache tokens. Threshold selection uses total input tokens for either convention and selects one rate for the whole request. Thresholds are sorted when compiled, and duplicate thresholds or tier overrides fail deterministically. `Fast` selects priority rates; unknown tiers use standard rates + +`Rate::Missing`, `Rate::Null`, and `Rate::Value(0.0)` remain distinct. Missing cache rates fall back to the selected input rate, and an absent one-hour write rate falls back to the selected write rate. Missing input or output rates return typed errors, including for zero usage. Python's sparse-entry behavior remains outside this native contract + +The supported off-peak shape is one non-wrapping UTC daily window. The caller supplies the applicable regional multiplier after provider-specific selection. Negative or non-finite rates, ambiguous rules, inconsistent cache counts, incomplete write splits, invalid windows and overflow return errors. Callers must decline unsupported inputs before native execution if their public contract accepts those shapes + +This crate does not select models, read catalogs, fetch provider prices, normalize multimodal usage, process provider-reported costs, or calculate non-token charges. It does not change proxy behavior. The reference fixture was generated by `tests/generate_python_reference.py` against the Python implementation at the commit recorded in `tests/python_reference.tsv`, using synthetic rates and fixed usage diff --git a/litellm-rust/crates/cost/benches/calculate.rs b/litellm-rust/crates/cost/benches/calculate.rs new file mode 100644 index 00000000000..2561b606e6c --- /dev/null +++ b/litellm-rust/crates/cost/benches/calculate.rs @@ -0,0 +1,66 @@ +use criterion::{Criterion, criterion_group, criterion_main}; +use litellm_cost::{ + Pricing, PromptConvention, Rate, Rates, Request, ServiceTier, ThresholdPolicy, ThresholdRates, + Usage, calculate, compile, +}; +use std::hint::black_box; + +fn bench(c: &mut Criterion) { + let pricing = Pricing { + standard: Rates { + input: Rate::Value(0.000002), + output: Rate::Value(0.000008), + cache_read: Rate::Value(0.0000005), + cache_write: Rate::Missing, + cache_write_1h: Rate::Missing, + }, + tiers: &[], + thresholds: &[], + off_peak: None, + }; + let request = Request { + usage: Usage { + prompt_tokens: 1000, + completion_tokens: 200, + cache_read_tokens: 250, + cache_write_tokens: 0, + cache_write_5m_tokens: None, + cache_write_1h_tokens: None, + prompt_convention: PromptConvention::IncludesCache, + }, + service_tier: ServiceTier::Standard, + threshold_policy: ThresholdPolicy::Exclusive, + region_multiplier: None, + billed_at_utc_minute: None, + }; + let plan = compile(&pricing).unwrap(); + c.bench_function("native_compiled_calculation", |b| { + b.iter(|| black_box(plan.calculate(black_box(&request)).unwrap())) + }); + c.bench_function("native_full_wrapper", |b| { + b.iter(|| black_box(calculate(black_box(&pricing), black_box(&request)).unwrap())) + }); + c.bench_function("native_rate_compilation", |b| { + b.iter(|| black_box(compile(black_box(&pricing)).unwrap())) + }); + let threshold = ThresholdRates { + above_prompt_tokens: 1000, + standard: Rates { + input: Rate::Value(0.000004), + output: Rate::Value(0.000016), + ..Rates::EMPTY + }, + tiers: &[], + }; + let threshold_pricing = Pricing { + thresholds: &[threshold], + ..pricing + }; + let threshold_plan = compile(&threshold_pricing).unwrap(); + c.bench_function("native_threshold_boundary", |b| { + b.iter(|| black_box(threshold_plan.calculate(black_box(&request)).unwrap())) + }); +} + +criterion_group!(benches, bench); +criterion_main!(benches); diff --git a/litellm-rust/crates/cost/examples/charge.rs b/litellm-rust/crates/cost/examples/charge.rs new file mode 100644 index 00000000000..a3a83febd74 --- /dev/null +++ b/litellm-rust/crates/cost/examples/charge.rs @@ -0,0 +1,40 @@ +use litellm_cost::{ + Pricing, PromptConvention, Rate, Rates, Request, ServiceTier, ThresholdPolicy, Usage, compile, +}; + +fn main() { + let pricing = Pricing { + standard: Rates { + input: Rate::Value(2.0), + output: Rate::Value(4.0), + cache_read: Rate::Value(0.5), + cache_write: Rate::Value(3.0), + cache_write_1h: Rate::Missing, + }, + tiers: &[], + thresholds: &[], + off_peak: None, + }; + let request = Request { + usage: Usage { + prompt_tokens: 100, + completion_tokens: 20, + cache_read_tokens: 25, + cache_write_tokens: 10, + cache_write_5m_tokens: None, + cache_write_1h_tokens: None, + prompt_convention: PromptConvention::IncludesCache, + }, + service_tier: ServiceTier::Standard, + threshold_policy: ThresholdPolicy::Exclusive, + region_multiplier: None, + billed_at_utc_minute: None, + }; + let cost = compile(&pricing).unwrap().calculate(&request).unwrap(); + println!( + "input={} output={} total={}", + cost.input(), + cost.output(), + cost.total() + ); +} diff --git a/litellm-rust/crates/cost/src/lib.rs b/litellm-rust/crates/cost/src/lib.rs new file mode 100644 index 00000000000..32cc755ce15 --- /dev/null +++ b/litellm-rust/crates/cost/src/lib.rs @@ -0,0 +1,405 @@ +#[derive(Clone, Copy, Debug, PartialEq)] +pub enum Rate { + Missing, + Null, + Value(f64), +} + +impl Rate { + fn value(self) -> Option { + match self { + Self::Value(value) => Some(value), + Self::Missing | Self::Null => None, + } + } + + fn or(self, fallback: Self) -> Self { + if self.value().is_some() { + self + } else { + fallback + } + } +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Rates { + pub input: Rate, + pub output: Rate, + pub cache_read: Rate, + pub cache_write: Rate, + pub cache_write_1h: Rate, +} + +impl Rates { + pub const EMPTY: Self = Self { + input: Rate::Missing, + output: Rate::Missing, + cache_read: Rate::Missing, + cache_write: Rate::Missing, + cache_write_1h: Rate::Missing, + }; + + fn overlay(self, base: Self) -> Self { + Self { + input: self.input.or(base.input), + output: self.output.or(base.output), + cache_read: self.cache_read.or(base.cache_read), + cache_write: self.cache_write.or(base.cache_write), + cache_write_1h: self.cache_write_1h.or(base.cache_write_1h), + } + } +} + +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub enum ServiceTier { + Standard, + Flex, + Priority, + Fast, + Ultrafast, + Unknown, +} + +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub enum ThresholdPolicy { + Exclusive, + Inclusive, +} + +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub enum PromptConvention { + IncludesCache, + ExcludesCache, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Usage { + pub prompt_tokens: u64, + pub completion_tokens: u64, + pub cache_read_tokens: u64, + pub cache_write_tokens: u64, + pub cache_write_5m_tokens: Option, + pub cache_write_1h_tokens: Option, + pub prompt_convention: PromptConvention, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct TierRates { + pub tier: ServiceTier, + pub rates: Rates, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct ThresholdRates<'a> { + pub above_prompt_tokens: u64, + pub standard: Rates, + pub tiers: &'a [TierRates], +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct OffPeakRates { + pub start_utc_minute: u16, + pub end_utc_minute: u16, + pub rates: Rates, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Pricing<'a> { + pub standard: Rates, + pub tiers: &'a [TierRates], + pub thresholds: &'a [ThresholdRates<'a>], + pub off_peak: Option, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Request { + pub usage: Usage, + pub service_tier: ServiceTier, + pub threshold_policy: ThresholdPolicy, + pub region_multiplier: Option, + pub billed_at_utc_minute: Option, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Cost { + pub uncached_input: f64, + pub cache_read: f64, + pub cache_write_5m: f64, + pub cache_write_1h: f64, + pub output: f64, + pub multiplier: f64, + pub rates: EffectiveRates, +} + +impl Cost { + pub fn input(self) -> f64 { + (self.uncached_input + self.cache_read + self.cache_write_5m + self.cache_write_1h) + * self.multiplier + } + + pub fn output(self) -> f64 { + self.output * self.multiplier + } + + pub fn total(self) -> f64 { + self.input() + self.output() + } +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct EffectiveRates { + pub input: f64, + pub output: f64, + pub cache_read: f64, + pub cache_write_5m: f64, + pub cache_write_1h: f64, +} + +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub enum PricingError { + MissingInputRate, + MissingOutputRate, + InvalidRate, + InvalidRegionMultiplier, + InvalidBillingTime, + InvalidOffPeakWindow, + CacheExceedsPrompt, + InvalidCacheWriteDetails, + TokenCountOverflow, + DuplicateTier, + DuplicateThreshold, + DuplicateThresholdTier, +} + +fn selected_tier(tier: ServiceTier) -> ServiceTier { + if tier == ServiceTier::Fast { + ServiceTier::Priority + } else { + tier + } +} + +#[derive(Clone, Debug)] +struct CompiledThreshold { + above_prompt_tokens: u64, + standard: Rates, + tiers: Vec, +} + +#[derive(Clone, Debug)] +pub struct PricingPlan { + standard: Rates, + tiers: Vec, + thresholds: Vec, + off_peak: Option, +} + +fn valid_rates(rates: Rates) -> bool { + [ + rates.input, + rates.output, + rates.cache_read, + rates.cache_write, + rates.cache_write_1h, + ] + .into_iter() + .all(|rate| { + rate.value() + .is_none_or(|value| value.is_finite() && value >= 0.0) + }) +} + +fn validate_tiers(tiers: &[TierRates], duplicate: PricingError) -> Result<(), PricingError> { + if tiers.iter().any(|entry| !valid_rates(entry.rates)) { + return Err(PricingError::InvalidRate); + } + if tiers.iter().enumerate().any(|(index, entry)| { + matches!( + entry.tier, + ServiceTier::Standard | ServiceTier::Unknown | ServiceTier::Fast + ) || tiers[..index] + .iter() + .any(|previous| previous.tier == entry.tier) + }) { + return Err(duplicate); + } + Ok(()) +} + +pub fn compile(pricing: &Pricing<'_>) -> Result { + if !valid_rates(pricing.standard) { + return Err(PricingError::InvalidRate); + } + validate_tiers(pricing.tiers, PricingError::DuplicateTier)?; + if let Some(window) = pricing.off_peak { + if window.start_utc_minute >= 1440 + || window.end_utc_minute > 1440 + || window.start_utc_minute >= window.end_utc_minute + { + return Err(PricingError::InvalidOffPeakWindow); + } + if !valid_rates(window.rates) { + return Err(PricingError::InvalidRate); + } + } + let mut thresholds: Vec<_> = pricing + .thresholds + .iter() + .map(|entry| { + if !valid_rates(entry.standard) { + return Err(PricingError::InvalidRate); + } + validate_tiers(entry.tiers, PricingError::DuplicateThresholdTier)?; + Ok(CompiledThreshold { + above_prompt_tokens: entry.above_prompt_tokens, + standard: entry.standard, + tiers: entry.tiers.to_vec(), + }) + }) + .collect::>()?; + thresholds.sort_unstable_by_key(|entry| entry.above_prompt_tokens); + if thresholds + .windows(2) + .any(|pair| pair[0].above_prompt_tokens == pair[1].above_prompt_tokens) + { + return Err(PricingError::DuplicateThreshold); + } + Ok(PricingPlan { + standard: pricing.standard, + tiers: pricing.tiers.to_vec(), + thresholds, + off_peak: pricing.off_peak, + }) +} + +impl PricingPlan { + fn resolve_rates( + &self, + request: &Request, + threshold_tokens: u64, + ) -> Result { + let tier = selected_tier(request.service_tier); + let base = self + .tiers + .iter() + .find(|entry| tier != ServiceTier::Standard && entry.tier == tier) + .map_or(self.standard, |entry| entry.rates.overlay(self.standard)); + let threshold = self.thresholds.iter().rev().find(|entry| { + threshold_tokens > entry.above_prompt_tokens + || (request.threshold_policy == ThresholdPolicy::Inclusive + && threshold_tokens == entry.above_prompt_tokens) + }); + let selected = threshold.map_or(base, |entry| { + let standard = entry.standard.overlay(base); + entry + .tiers + .iter() + .find(|specific| tier != ServiceTier::Standard && specific.tier == tier) + .map_or(standard, |specific| specific.rates.overlay(standard)) + }); + match self.off_peak { + None => Ok(selected), + Some(window) => { + if window.start_utc_minute >= 1440 + || window.end_utc_minute > 1440 + || window.start_utc_minute >= window.end_utc_minute + { + return Err(PricingError::InvalidOffPeakWindow); + } + let minute = request + .billed_at_utc_minute + .ok_or(PricingError::InvalidBillingTime)?; + if minute >= 1440 { + return Err(PricingError::InvalidBillingTime); + } + if (window.start_utc_minute..window.end_utc_minute).contains(&minute) { + Ok(window.rates.overlay(selected)) + } else { + Ok(selected) + } + } + } + } + + fn checked_rate(rate: Rate, missing: PricingError) -> Result { + let value = rate.value().ok_or(missing)?; + if !value.is_finite() || value < 0.0 { + return Err(PricingError::InvalidRate); + } + Ok(value) + } + + pub fn calculate(&self, request: &Request) -> Result { + let usage = request.usage; + let cached = usage + .cache_read_tokens + .checked_add(usage.cache_write_tokens) + .ok_or(PricingError::TokenCountOverflow)?; + let (regular, threshold_tokens) = match usage.prompt_convention { + PromptConvention::IncludesCache => ( + usage + .prompt_tokens + .checked_sub(cached) + .ok_or(PricingError::CacheExceedsPrompt)?, + usage.prompt_tokens, + ), + PromptConvention::ExcludesCache => ( + usage.prompt_tokens, + usage + .prompt_tokens + .checked_add(cached) + .ok_or(PricingError::TokenCountOverflow)?, + ), + }; + let writes = match (usage.cache_write_5m_tokens, usage.cache_write_1h_tokens) { + (None, None) => (usage.cache_write_tokens, 0), + (Some(five), Some(one)) if five.checked_add(one) == Some(usage.cache_write_tokens) => { + (five, one) + } + _ => return Err(PricingError::InvalidCacheWriteDetails), + }; + let rates = self.resolve_rates(request, threshold_tokens)?; + let input = Self::checked_rate(rates.input, PricingError::MissingInputRate)?; + let output = Self::checked_rate(rates.output, PricingError::MissingOutputRate)?; + let read = Self::checked_rate( + rates.cache_read.or(rates.input), + PricingError::MissingInputRate, + )?; + let write = Self::checked_rate( + rates.cache_write.or(rates.input), + PricingError::MissingInputRate, + )?; + let write_1h = Self::checked_rate( + rates.cache_write_1h.or(rates.cache_write).or(rates.input), + PricingError::MissingInputRate, + )?; + let multiplier = request.region_multiplier.unwrap_or(1.0); + if !multiplier.is_finite() || multiplier <= 0.0 { + return Err(PricingError::InvalidRegionMultiplier); + } + let cost = Cost { + uncached_input: regular as f64 * input, + cache_read: usage.cache_read_tokens as f64 * read, + cache_write_5m: writes.0 as f64 * write, + cache_write_1h: writes.1 as f64 * write_1h, + output: usage.completion_tokens as f64 * output, + multiplier, + rates: EffectiveRates { + input, + output, + cache_read: read, + cache_write_5m: write, + cache_write_1h: write_1h, + }, + }; + if !cost.total().is_finite() { + return Err(PricingError::TokenCountOverflow); + } + Ok(cost) + } +} + +pub fn calculate(pricing: &Pricing<'_>, request: &Request) -> Result { + compile(pricing)?.calculate(request) +} diff --git a/litellm-rust/crates/cost/tests/calculation.rs b/litellm-rust/crates/cost/tests/calculation.rs new file mode 100644 index 00000000000..8cd06e74ec8 --- /dev/null +++ b/litellm-rust/crates/cost/tests/calculation.rs @@ -0,0 +1,458 @@ +use litellm_cost::{ + OffPeakRates, Pricing, PricingError, PromptConvention, Rate, Rates, Request, ServiceTier, + ThresholdPolicy, ThresholdRates, TierRates, Usage, calculate, compile, +}; + +fn rates(input: Rate, output: Rate) -> Rates { + Rates { + input, + output, + ..Rates::EMPTY + } +} + +fn request() -> Request { + Request { + usage: Usage { + prompt_tokens: 100, + completion_tokens: 20, + cache_read_tokens: 25, + cache_write_tokens: 10, + cache_write_5m_tokens: None, + cache_write_1h_tokens: None, + prompt_convention: PromptConvention::IncludesCache, + }, + service_tier: ServiceTier::Standard, + threshold_policy: ThresholdPolicy::Exclusive, + region_multiplier: None, + billed_at_utc_minute: None, + } +} + +fn pricing(standard: Rates) -> Pricing<'static> { + Pricing { + standard, + tiers: &[], + thresholds: &[], + off_peak: None, + } +} + +#[test] +fn breakdown_and_total_agree() { + let standard = Rates { + cache_read: Rate::Value(0.5), + cache_write: Rate::Value(3.0), + ..rates(Rate::Value(2.0), Rate::Value(4.0)) + }; + let result = calculate(&pricing(standard), &request()).unwrap(); + assert_eq!(result.uncached_input, 65.0 * 2.0); + assert_eq!(result.cache_read, 25.0 * 0.5); + assert_eq!(result.cache_write_5m, 10.0 * 3.0); + assert_eq!(result.output(), 20.0 * 4.0); + assert_eq!(result.total(), result.input() + result.output()); + assert_eq!(result.rates.cache_read, 0.5); +} + +#[test] +fn absent_null_and_zero_cache_rates_are_distinct() { + let base = rates(Rate::Value(2.0), Rate::Value(4.0)); + for read in [Rate::Missing, Rate::Null] { + let standard = Rates { + cache_read: read, + ..base + }; + assert_eq!( + calculate(&pricing(standard), &request()).unwrap().input(), + 200.0 + ); + } + let standard = Rates { + cache_read: Rate::Value(0.0), + cache_write: Rate::Value(0.0), + ..base + }; + assert_eq!( + calculate(&pricing(standard), &request()).unwrap().input(), + 130.0 + ); +} + +#[test] +fn equivalent_prompt_conventions_select_the_same_threshold() { + let threshold = ThresholdRates { + above_prompt_tokens: 90, + standard: rates(Rate::Value(5.0), Rate::Value(8.0)), + tiers: &[], + }; + let specification = Pricing { + standard: rates(Rate::Value(2.0), Rate::Value(4.0)), + tiers: &[], + thresholds: &[threshold], + off_peak: None, + }; + let included = request(); + let excluded = Request { + usage: Usage { + prompt_tokens: 65, + prompt_convention: PromptConvention::ExcludesCache, + ..included.usage + }, + ..included + }; + let plan = compile(&specification).unwrap(); + assert_eq!(plan.calculate(&included), plan.calculate(&excluded)); + assert_eq!(plan.calculate(&included).unwrap().rates.input, 5.0); +} + +#[test] +fn split_writes_and_invalid_accounting() { + let standard = Rates { + cache_read: Rate::Value(0.5), + cache_write: Rate::Value(3.0), + cache_write_1h: Rate::Value(5.0), + ..rates(Rate::Value(2.0), Rate::Value(4.0)) + }; + let base = request(); + let split = Request { + usage: Usage { + cache_write_5m_tokens: Some(4), + cache_write_1h_tokens: Some(6), + ..base.usage + }, + ..base + }; + let result = calculate(&pricing(standard), &split).unwrap(); + assert_eq!(result.cache_write_5m, 12.0); + assert_eq!(result.cache_write_1h, 30.0); + let overlapping = Request { + usage: Usage { + prompt_tokens: 30, + ..split.usage + }, + ..split + }; + assert_eq!( + calculate(&pricing(standard), &overlapping), + Err(PricingError::CacheExceedsPrompt) + ); + let incomplete = Request { + usage: Usage { + cache_write_1h_tokens: None, + ..split.usage + }, + ..split + }; + assert_eq!( + calculate(&pricing(standard), &incomplete), + Err(PricingError::InvalidCacheWriteDetails) + ); +} + +#[test] +fn threshold_tiers_and_boundaries() { + let priority = TierRates { + tier: ServiceTier::Priority, + rates: rates(Rate::Value(3.0), Rate::Missing), + }; + let threshold = ThresholdRates { + above_prompt_tokens: 100, + standard: rates(Rate::Value(5.0), Rate::Value(8.0)), + tiers: &[ + TierRates { + tier: ServiceTier::Priority, + rates: rates(Rate::Value(7.0), Rate::Missing), + }, + TierRates { + tier: ServiceTier::Flex, + rates: rates(Rate::Value(6.0), Rate::Missing), + }, + ], + }; + let specification = Pricing { + standard: rates(Rate::Value(2.0), Rate::Value(4.0)), + tiers: &[priority], + thresholds: &[threshold], + off_peak: None, + }; + let base = request(); + let no_cache = Request { + usage: Usage { + cache_read_tokens: 0, + cache_write_tokens: 0, + ..base.usage + }, + ..base + }; + let fast = Request { + service_tier: ServiceTier::Fast, + ..no_cache + }; + let inclusive = Request { + threshold_policy: ThresholdPolicy::Inclusive, + ..fast + }; + let flex = Request { + service_tier: ServiceTier::Flex, + ..inclusive + }; + assert_eq!(calculate(&specification, &no_cache).unwrap().input(), 200.0); + assert_eq!(calculate(&specification, &fast).unwrap().input(), 300.0); + assert_eq!( + calculate(&specification, &inclusive).unwrap().input(), + 700.0 + ); + assert_eq!(calculate(&specification, &flex).unwrap().input(), 600.0); +} + +#[test] +fn compile_rejects_ambiguous_rates() { + let duplicate = ThresholdRates { + above_prompt_tokens: 100, + standard: Rates::EMPTY, + tiers: &[], + }; + let specification = Pricing { + standard: rates(Rate::Value(1.0), Rate::Value(1.0)), + tiers: &[], + thresholds: &[duplicate, duplicate], + off_peak: None, + }; + assert_eq!( + compile(&specification).err(), + Some(PricingError::DuplicateThreshold) + ); + let invalid = pricing(rates(Rate::Value(f64::NAN), Rate::Value(1.0))); + assert_eq!(compile(&invalid).err(), Some(PricingError::InvalidRate)); +} + +#[test] +fn off_peak_is_one_non_wrapping_utc_window() { + let specification = Pricing { + standard: rates(Rate::Value(2.0), Rate::Value(4.0)), + tiers: &[], + thresholds: &[], + off_peak: Some(OffPeakRates { + start_utc_minute: 60, + end_utc_minute: 120, + rates: rates(Rate::Value(1.0), Rate::Value(2.0)), + }), + }; + let base = request(); + let start = Request { + billed_at_utc_minute: Some(60), + ..base + }; + let end = Request { + billed_at_utc_minute: Some(120), + ..base + }; + assert_eq!( + calculate(&specification, &base), + Err(PricingError::InvalidBillingTime) + ); + assert_eq!(calculate(&specification, &start).unwrap().input(), 100.0); + assert_eq!(calculate(&specification, &end).unwrap().input(), 200.0); +} + +#[test] +fn missing_rates_and_free_rates_remain_distinct() { + let base = request(); + let empty = Request { + usage: Usage { + prompt_tokens: 0, + completion_tokens: 0, + cache_read_tokens: 0, + cache_write_tokens: 0, + ..base.usage + }, + ..base + }; + assert_eq!( + calculate(&pricing(Rates::EMPTY), &empty), + Err(PricingError::MissingInputRate) + ); + assert_eq!( + calculate(&pricing(rates(Rate::Value(0.0), Rate::Missing)), &empty), + Err(PricingError::MissingOutputRate) + ); + assert_eq!( + calculate(&pricing(rates(Rate::Value(0.0), Rate::Value(0.0))), &empty) + .unwrap() + .total(), + 0.0 + ); +} + +#[test] +fn matches_executed_python_reference_cases() { + for row in include_str!("python_reference.tsv") + .lines() + .filter(|line| !line.starts_with('#')) + { + let fields: Vec<_> = row.split('\t').collect(); + let count = |index: usize| fields[index].parse::().unwrap(); + let number = |index: usize| fields[index].parse::().unwrap(); + let optional_rate = |index: usize| { + if fields[index].is_empty() { + Rate::Missing + } else { + Rate::Value(number(index)) + } + }; + let threshold = ThresholdRates { + above_prompt_tokens: if fields[9].is_empty() { 0 } else { count(9) }, + standard: rates(optional_rate(10), optional_rate(11)), + tiers: &[], + }; + let thresholds = if fields[9].is_empty() { + &[][..] + } else { + std::slice::from_ref(&threshold) + }; + let specification = Pricing { + standard: Rates { + cache_read: optional_rate(7), + cache_write: optional_rate(8), + ..rates(Rate::Value(number(5)), Rate::Value(number(6))) + }, + tiers: &[], + thresholds, + off_peak: None, + }; + let base = request(); + let input = Request { + usage: Usage { + prompt_tokens: count(1), + completion_tokens: count(2), + cache_read_tokens: count(3), + cache_write_tokens: count(4), + ..base.usage + }, + ..base + }; + let actual = calculate(&specification, &input).unwrap(); + assert_eq!(actual.input(), number(12), "{}", fields[0]); + assert_eq!(actual.output(), number(13), "{}", fields[0]); + } +} + +proptest::proptest! { + #[test] + fn equivalent_usage_conventions_and_breakdown_agree( + regular in 0_u64..1000, + read in 0_u64..1000, + write in 0_u64..1000, + output in 0_u64..1000, + ) { + let threshold = ThresholdRates { + above_prompt_tokens: 1000, + standard: rates(Rate::Value(5.0), Rate::Value(8.0)), + tiers: &[], + }; + let specification = Pricing { + standard: rates(Rate::Value(2.0), Rate::Value(4.0)), + tiers: &[], + thresholds: &[threshold], + off_peak: None, + }; + let base = request(); + let included = Request { + usage: Usage { + prompt_tokens: regular + read + write, + completion_tokens: output, + cache_read_tokens: read, + cache_write_tokens: write, + ..base.usage + }, + ..base + }; + let excluded = Request { + usage: Usage { + prompt_tokens: regular, + prompt_convention: PromptConvention::ExcludesCache, + ..included.usage + }, + ..included + }; + let plan = compile(&specification).unwrap(); + let left = plan.calculate(&included).unwrap(); + let right = plan.calculate(&excluded).unwrap(); + proptest::prop_assert_eq!(left, right); + proptest::prop_assert_eq!(left.total(), left.input() + left.output()); + } +} + +#[test] +fn regional_multiplier_applies_after_input_components_are_summed() { + let standard = Rates { + cache_read: Rate::Value(0.5), + cache_write: Rate::Value(3.0), + ..rates(Rate::Value(2.0), Rate::Value(4.0)) + }; + let base = request(); + let regional = Request { + region_multiplier: Some(1.1), + ..base + }; + let result = calculate(&pricing(standard), ®ional).unwrap(); + assert_eq!(result.input(), (65.0 * 2.0 + 25.0 * 0.5 + 10.0 * 3.0) * 1.1); + assert_eq!(result.output(), 20.0 * 4.0 * 1.1); + let invalid = Request { + region_multiplier: Some(f64::NAN), + ..base + }; + assert_eq!( + calculate(&pricing(standard), &invalid), + Err(PricingError::InvalidRegionMultiplier) + ); +} + +#[test] +fn compilation_sorts_thresholds_and_rejects_duplicate_tiers() { + let high = ThresholdRates { + above_prompt_tokens: 200, + standard: rates(Rate::Value(7.0), Rate::Missing), + tiers: &[], + }; + let low = ThresholdRates { + above_prompt_tokens: 100, + standard: rates(Rate::Value(5.0), Rate::Missing), + tiers: &[], + }; + let specification = Pricing { + standard: rates(Rate::Value(2.0), Rate::Value(4.0)), + tiers: &[], + thresholds: &[high, low], + off_peak: None, + }; + let base = request(); + let above_both = Request { + usage: Usage { + prompt_tokens: 201, + cache_read_tokens: 0, + cache_write_tokens: 0, + ..base.usage + }, + ..base + }; + assert_eq!( + compile(&specification) + .unwrap() + .calculate(&above_both) + .unwrap() + .rates + .input, + 7.0 + ); + let duplicate = TierRates { + tier: ServiceTier::Flex, + rates: Rates::EMPTY, + }; + let invalid = Pricing { + tiers: &[duplicate, duplicate], + thresholds: &[], + ..specification + }; + assert_eq!(compile(&invalid).err(), Some(PricingError::DuplicateTier)); +} diff --git a/litellm-rust/crates/cost/tests/generate_python_reference.py b/litellm-rust/crates/cost/tests/generate_python_reference.py new file mode 100644 index 00000000000..4a179555650 --- /dev/null +++ b/litellm-rust/crates/cost/tests/generate_python_reference.py @@ -0,0 +1,96 @@ +import subprocess +from dataclasses import dataclass +from pathlib import Path + +from litellm.litellm_core_utils.llm_cost_calc.utils import generic_cost_per_token +from litellm.types.utils import Usage + + +@dataclass(frozen=True, slots=True) +class Case: + name: str + prompt: int + completion: int + cache_read: int + cache_write: int + input_rate: float + output_rate: float + cache_read_rate: float | None = None + cache_write_rate: float | None = None + threshold: int | None = None + threshold_input_rate: float | None = None + threshold_output_rate: float | None = None + + +CASES = ( + Case("ordinary", 100, 20, 0, 0, 2.0, 4.0), + Case("cache_fallback", 100, 20, 25, 10, 2.0, 4.0), + Case("cache_specific", 100, 20, 25, 10, 2.0, 4.0, 0.5, 3.0), + Case("free_cache", 100, 20, 25, 10, 2.0, 4.0, 0.0, 0.0), + Case("threshold_below", 99, 20, 0, 0, 2.0, 4.0, threshold=100, threshold_input_rate=5.0, threshold_output_rate=8.0), + Case("threshold_at", 100, 20, 0, 0, 2.0, 4.0, threshold=100, threshold_input_rate=5.0, threshold_output_rate=8.0), + Case( + "threshold_above", 101, 20, 0, 0, 2.0, 4.0, threshold=100, threshold_input_rate=5.0, threshold_output_rate=8.0 + ), + Case( + "cache_threshold_above", + 101, + 20, + 25, + 10, + 2.0, + 4.0, + threshold=100, + threshold_input_rate=5.0, + threshold_output_rate=8.0, + ), +) + + +def reference(case: Case) -> tuple[float, float]: + info = {"input_cost_per_token": case.input_rate, "output_cost_per_token": case.output_rate} + if case.cache_read_rate is not None: + info["cache_read_input_token_cost"] = case.cache_read_rate + if case.cache_write_rate is not None: + info["cache_creation_input_token_cost"] = case.cache_write_rate + if case.threshold is not None: + info[f"input_cost_per_token_above_{case.threshold}_tokens"] = case.threshold_input_rate + info[f"output_cost_per_token_above_{case.threshold}_tokens"] = case.threshold_output_rate + details = {"cached_tokens": case.cache_read, "cache_write_tokens": case.cache_write} + usage = Usage(prompt_tokens=case.prompt, completion_tokens=case.completion, prompt_tokens_details=details) + return generic_cost_per_token( + model="synthetic", + usage=usage, + custom_llm_provider="openai", + model_info=info, + ) + + +def main() -> None: + revision = subprocess.check_output(("git", "rev-parse", "HEAD"), text=True).strip() + rows = ("# Python reference commit: " + revision,) + tuple( + "\t".join( + str(value) if value is not None else "" + for value in ( + case.name, + case.prompt, + case.completion, + case.cache_read, + case.cache_write, + case.input_rate, + case.output_rate, + case.cache_read_rate, + case.cache_write_rate, + case.threshold, + case.threshold_input_rate, + case.threshold_output_rate, + *reference(case), + ) + ) + for case in CASES + ) + Path(__file__).with_name("python_reference.tsv").write_text("\n".join(rows) + "\n") + + +if __name__ == "__main__": + main() diff --git a/litellm-rust/crates/cost/tests/python_reference.tsv b/litellm-rust/crates/cost/tests/python_reference.tsv new file mode 100644 index 00000000000..5abb1329a61 --- /dev/null +++ b/litellm-rust/crates/cost/tests/python_reference.tsv @@ -0,0 +1,9 @@ +# Python reference commit: dc4be2fd987c993aefcf16444e34f960c12c8627 +ordinary 100 20 0 0 2.0 4.0 200.0 80.0 +cache_fallback 100 20 25 10 2.0 4.0 200.0 80.0 +cache_specific 100 20 25 10 2.0 4.0 0.5 3.0 172.5 80.0 +free_cache 100 20 25 10 2.0 4.0 0.0 0.0 130.0 80.0 +threshold_below 99 20 0 0 2.0 4.0 100 5.0 8.0 198.0 80.0 +threshold_at 100 20 0 0 2.0 4.0 100 5.0 8.0 200.0 80.0 +threshold_above 101 20 0 0 2.0 4.0 100 5.0 8.0 505.0 160.0 +cache_threshold_above 101 20 25 10 2.0 4.0 100 5.0 8.0 505.0 160.0 diff --git a/litellm-rust/crates/model-catalog/Cargo.toml b/litellm-rust/crates/model-catalog/Cargo.toml new file mode 100644 index 00000000000..ea75c6386d8 --- /dev/null +++ b/litellm-rust/crates/model-catalog/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "litellm-model-catalog" +version = "0.1.0" +edition.workspace = true +license.workspace = true +repository.workspace = true + +[features] +schema = ["dep:schemars"] + +[dependencies] +indexmap = { version = "2.14.0", features = ["serde"] } +schemars = { version = "1.0", optional = true } +serde.workspace = true +serde_json.workspace = true +thiserror.workspace = true + +[dev-dependencies] +criterion.workspace = true +rstest.workspace = true +litellm-model-catalog = { path = ".", features = ["schema"] } + +[[bench]] +name = "catalog" +harness = false diff --git a/litellm-rust/crates/model-catalog/README.md b/litellm-rust/crates/model-catalog/README.md new file mode 100644 index 00000000000..973f7190614 --- /dev/null +++ b/litellm-rust/crates/model-catalog/README.md @@ -0,0 +1,25 @@ +# Model catalog + +`litellm-model-catalog` builds an immutable snapshot from caller supplied JSON bytes. It has no network, Python, registration, or refresh behavior. The caller supplies optional source, revision, and ETag provenance. Parse and validation are separate so small synthetic catalogs can use explicit integrity limits + +The parser treats `sample_spec` and `fallback_generalizations` as reserved top level metadata. `fallback_rules()` exposes the typed rule array when present; this crate does not execute regex generalizations. Model entries retain all JSON fields except `aliases`, including unknown fields. `field()` returns `None` for an absent key and a JSON null, false, or zero value for a present key. The returned values are borrowed, so callers cannot mutate the snapshot + +Each entry also deserializes into `ModelInfo`, a typed mirror of `model_prices_and_context_window.schema.json`'s `modelEntry` definition, reachable via `ModelEntry::info()`. All schema fields are optional on `ModelInfo`, including `litellm_provider` which the schema marks required, so small synthetic catalogs still parse. Unknown fields are not part of `ModelInfo`; they remain on `fields()`. Building with the `schema` feature adds `schemars` derives and exposes `model_entry_json_schema()` for emitting the entry's JSON Schema. Parse and validation failures are reported by the `Error` enum in `error.rs`, while catalog logic lives in `catalog.rs` + +The integration tests read the repository's catalog and schema files at test time, assert every entry round-trips through `ModelInfo`, and verify that the generated schema's properties match the repository schema + +Aliases point to their canonical entries. An alias that exactly matches any canonical key is skipped; the first canonical entry claiming an alias wins. Invalid alias lists and nonstring names are skipped and reported by `alias_issues()`. Exact lookup wins. For a case insensitive miss, the last key with the same lowercase spelling wins, following Python's lowercase map built after aliases are appended. This uses Rust Unicode lowercasing, which can differ from Python for unusual Unicode model IDs + +`validate()` counts canonical entries before alias expansion and excludes both reserved keys. It enforces an explicit minimum and backup shrink ratio, with Python defaults of 50 models and 0.5. Parsing rejects nonobject model entries and known fields with the wrong JSON type, but ignores unknown fields. It does not enforce every constraint in the JSON schema, calculate prices, resolve providers, or check provenance authenticity. The caller decides how to handle validation failures + +This snapshot does not represent Python's live mutable `litellm.model_cost`, nested dict and list mutation, or mutation of dicts previously returned by Python APIs. It has no bridge or runtime integration + +## Benchmarks + +`cargo bench -p litellm-model-catalog --bench catalog` measures parsing plus alias indexing and exact lookup. For a local Python baseline on the same fixture, use: + +```sh +python3 -m timeit -s 'import json, pathlib; body = pathlib.Path("../model_prices_and_context_window.json").read_bytes()' 'json.loads(body)' +``` + +Run these commands from `litellm-rust`. Python's command measures JSON loading only, without alias expansion or snapshot construction. The Rust benchmark does not include future Python object materialization, so these numbers are not an end to end runtime comparison diff --git a/litellm-rust/crates/model-catalog/benches/catalog.rs b/litellm-rust/crates/model-catalog/benches/catalog.rs new file mode 100644 index 00000000000..d1f51507c2b --- /dev/null +++ b/litellm-rust/crates/model-catalog/benches/catalog.rs @@ -0,0 +1,21 @@ +use criterion::{Criterion, criterion_group, criterion_main}; +use litellm_model_catalog::{Catalog, Provenance}; +use std::hint::black_box; + +fn benchmarks(c: &mut Criterion) { + let body = include_bytes!("../../../../model_prices_and_context_window.json"); + c.bench_function("parse_current_catalog", |b| { + b.iter(|| Catalog::parse(black_box(body), Provenance::default()).unwrap()) + }); + let catalog = Catalog::parse(body, Provenance::default()).unwrap(); + let key = catalog + .model_names() + .next() + .expect("catalog must have a benchmark key"); + c.bench_function("lookup_catalog_key", |b| { + b.iter(|| black_box(&catalog).lookup(black_box(key))) + }); +} + +criterion_group!(benches, benchmarks); +criterion_main!(benches); diff --git a/litellm-rust/crates/model-catalog/src/catalog.rs b/litellm-rust/crates/model-catalog/src/catalog.rs new file mode 100644 index 00000000000..dc7564f9bee --- /dev/null +++ b/litellm-rust/crates/model-catalog/src/catalog.rs @@ -0,0 +1,241 @@ +use crate::error::Error; +use crate::model_info::{FallbackGeneralizations, FallbackRule, ModelInfo}; +use indexmap::IndexMap; +use serde::Deserialize; +use serde_json::{Map, Value}; +use std::collections::HashMap; + +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct Provenance { + pub source: Option, + pub revision: Option, + pub etag: Option, +} + +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct IntegrityLimits { + pub backup_model_count: usize, + pub min_model_count: usize, + pub min_backup_ratio: f64, +} + +impl IntegrityLimits { + pub fn python_defaults(backup_model_count: usize) -> Self { + Self { + backup_model_count, + min_model_count: 50, + min_backup_ratio: 0.5, + } + } +} + +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum AliasIssue { + InvalidList { model: String }, + InvalidName { model: String }, + CanonicalCollision { model: String, alias: String }, + AliasCollision { model: String, alias: String }, +} + +#[derive(Clone, Debug)] +pub struct ModelEntry { + fields: Map, + info: ModelInfo, +} + +impl ModelEntry { + pub fn field(&self, name: &str) -> Option<&Value> { + self.fields.get(name) + } + pub fn fields(&self) -> &Map { + &self.fields + } + /// The entry deserialized into the typed mirror of the catalog schema. + pub fn info(&self) -> &ModelInfo { + &self.info + } +} + +#[derive(Clone, Copy, Debug)] +pub struct ModelMatch<'a> { + pub matched_key: &'a str, + pub canonical_key: &'a str, + pub entry: &'a ModelEntry, +} + +#[derive(Debug)] +pub struct Catalog { + entries: IndexMap, + aliases: IndexMap, + lowercase_keys: HashMap, + sample_spec: Option, + fallback_generalizations: Option, + provenance: Provenance, + alias_issues: Vec, +} + +impl Catalog { + pub fn parse(body: &[u8], provenance: Provenance) -> Result { + let root: IndexMap = serde_json::from_slice(body)?; + if root.is_empty() { + return Err(Error::Empty); + } + + let mut entries = IndexMap::with_capacity(root.len()); + let mut alias_lists = Vec::new(); + let mut alias_issues = Vec::new(); + let mut sample_spec = None; + let mut fallback_generalizations = None; + for (name, value) in root { + match name.as_str() { + "sample_spec" => { + sample_spec = Some(value); + continue; + } + "fallback_generalizations" => { + fallback_generalizations = + Some(serde_json::from_value::(value)?); + continue; + } + _ => {} + } + let Value::Object(ref object) = value else { + return Err(Error::EntryNotObject { model: name }); + }; + let info = ModelInfo::deserialize(object)?; + let Value::Object(mut fields) = value else { + unreachable!("value checked is_object above") + }; + if let Some(aliases) = fields.remove("aliases") + && !aliases.is_null() + { + match aliases { + Value::Array(names) => alias_lists.push((name.clone(), names)), + _ => alias_issues.push(AliasIssue::InvalidList { + model: name.clone(), + }), + } + } + entries.insert(name, ModelEntry { fields, info }); + } + + let mut aliases = IndexMap::new(); + for (model, names) in alias_lists { + for name in names { + let Value::String(alias) = name else { + alias_issues.push(AliasIssue::InvalidName { + model: model.clone(), + }); + continue; + }; + if entries.contains_key(&alias) { + alias_issues.push(AliasIssue::CanonicalCollision { + model: model.clone(), + alias, + }); + } else if aliases.contains_key(&alias) { + alias_issues.push(AliasIssue::AliasCollision { + model: model.clone(), + alias, + }); + } else { + aliases.insert(alias, model.clone()); + } + } + } + + let lowercase_keys = entries + .keys() + .chain(aliases.keys()) + .map(|key| (key.to_lowercase(), key.clone())) + .collect(); + Ok(Self { + entries, + aliases, + lowercase_keys, + sample_spec, + fallback_generalizations, + provenance, + alias_issues, + }) + } + + pub fn validate(&self, limits: IntegrityLimits) -> Result<(), Error> { + if !limits.min_backup_ratio.is_finite() || !(0.0..=1.0).contains(&limits.min_backup_ratio) { + return Err(Error::InvalidRatio); + } + let actual = self.entries.len(); + if actual < limits.min_model_count { + return Err(Error::BelowMinimum { + actual, + minimum: limits.min_model_count, + }); + } + if limits.backup_model_count > 0 + && (actual as f64) < (limits.backup_model_count as f64) * limits.min_backup_ratio + { + return Err(Error::Shrunk { + actual, + backup: limits.backup_model_count, + ratio: limits.min_backup_ratio, + }); + } + Ok(()) + } + + pub fn lookup(&self, key: &str) -> Option> { + let matched_key = if self.entries.contains_key(key) || self.aliases.contains_key(key) { + key + } else { + self.lowercase_keys.get(&key.to_lowercase())?.as_str() + }; + let canonical_key = self + .aliases + .get(matched_key) + .map(String::as_str) + .unwrap_or(matched_key); + let (canonical_key, entry) = self.entries.get_key_value(canonical_key)?; + let matched_key = self + .entries + .get_key_value(matched_key) + .map(|(key, _)| key.as_str()) + .or_else(|| { + self.aliases + .get_key_value(matched_key) + .map(|(key, _)| key.as_str()) + })?; + Some(ModelMatch { + matched_key, + canonical_key, + entry, + }) + } + + pub fn model_count(&self) -> usize { + self.entries.len() + } + pub fn model_names(&self) -> impl Iterator { + self.entries.keys().map(String::as_str) + } + pub fn alias_count(&self) -> usize { + self.aliases.len() + } + pub fn aliases(&self) -> &IndexMap { + &self.aliases + } + pub fn alias_issues(&self) -> &[AliasIssue] { + &self.alias_issues + } + pub fn sample_spec(&self) -> Option<&Value> { + self.sample_spec.as_ref() + } + pub fn fallback_generalizations(&self) -> Option<&FallbackGeneralizations> { + self.fallback_generalizations.as_ref() + } + pub fn fallback_rules(&self) -> Option<&[FallbackRule]> { + Some(self.fallback_generalizations.as_ref()?.rules.as_slice()) + } + pub fn provenance(&self) -> &Provenance { + &self.provenance + } +} diff --git a/litellm-rust/crates/model-catalog/src/error.rs b/litellm-rust/crates/model-catalog/src/error.rs new file mode 100644 index 00000000000..83617312fff --- /dev/null +++ b/litellm-rust/crates/model-catalog/src/error.rs @@ -0,0 +1,28 @@ +use thiserror::Error; + +/// Failures from parsing or validating a catalog snapshot. +#[derive(Debug, Error)] +pub enum Error { + /// The body is not valid JSON, or a model entry fails typed deserialization. + #[error("invalid JSON: {0}")] + Json(#[from] serde_json::Error), + /// The catalog has no entries at all. + #[error("catalog is empty")] + Empty, + /// A non-reserved top level value is not a JSON object. + #[error("model {model:?} must be an object")] + EntryNotObject { model: String }, + /// Canonical entry count is under the configured minimum. + #[error("catalog has {actual} models, below minimum {minimum}")] + BelowMinimum { actual: usize, minimum: usize }, + /// Canonical entry count is under the configured backup shrink ratio. + #[error("catalog has {actual} models, below {ratio} of backup count {backup}")] + Shrunk { + actual: usize, + backup: usize, + ratio: f64, + }, + /// The configured minimum backup ratio is not finite or outside `[0, 1]`. + #[error("minimum backup ratio must be finite and between zero and one")] + InvalidRatio, +} diff --git a/litellm-rust/crates/model-catalog/src/lib.rs b/litellm-rust/crates/model-catalog/src/lib.rs new file mode 100644 index 00000000000..9c942a5521c --- /dev/null +++ b/litellm-rust/crates/model-catalog/src/lib.rs @@ -0,0 +1,16 @@ +mod catalog; +mod error; +mod model_info; +#[cfg(feature = "schema")] +mod schema; + +pub use catalog::{AliasIssue, Catalog, IntegrityLimits, ModelEntry, ModelMatch, Provenance}; +pub use error::Error; +pub use model_info::{ + AudioFormat, FallbackGeneralizations, FallbackRule, InputModality, Mode, ModelInfo, + OffPeakPricing, OffPeakWindow, OutputModality, ReasoningEffort, SearchContextCostPerQuery, + TieredRate, UtcHours, VertexAiAudioApi, WebSearchBillingUnit, Weekday, +}; + +#[cfg(feature = "schema")] +pub use schema::model_entry_json_schema; diff --git a/litellm-rust/crates/model-catalog/src/model_info.rs b/litellm-rust/crates/model-catalog/src/model_info.rs new file mode 100644 index 00000000000..77a8b768e38 --- /dev/null +++ b/litellm-rust/crates/model-catalog/src/model_info.rs @@ -0,0 +1,665 @@ +use serde::{Deserialize, Serialize}; +use serde_json::Value; +use std::collections::BTreeMap; + +/// Primary API surface / task type of the model. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum Mode { + AudioSpeech, + AudioTranscription, + Chat, + Completion, + Embedding, + Evaluation, + Guardrail, + ImageEdit, + ImageGeneration, + Moderation, + Ocr, + Realtime, + Rerank, + Responses, + Search, + VectorStore, + VideoGeneration, +} + +/// Reasoning effort level accepted or applied by the model. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum ReasoningEffort { + None, + Minimal, + Low, + Medium, + High, + Xhigh, + Max, +} + +/// Gemini audio generation API the model is served through. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum VertexAiAudioApi { + LyriaPredict, + LyriaInteractions, +} + +/// Whether web search is billed per query or per prompt. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum WebSearchBillingUnit { + PerQuery, + PerPrompt, +} + +/// Audio container format the model can return. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum AudioFormat { + Mp3, + Wav, +} + +/// Input modality the model accepts. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum InputModality { + Text, + Image, + Audio, + Video, +} + +/// Output modality the model can produce. +#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(rename_all = "snake_case")] +pub enum OutputModality { + Text, + Image, + Audio, + Video, + Code, +} + +/// UTC "HH:MM-HH:MM" window, or a list of them; a window may wrap past midnight. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(untagged)] +pub enum UtcHours { + Single(String), + Multiple(Vec), +} + +/// ISO-8601 weekday number (1 = Monday .. 7 = Sunday) or English day name. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(untagged)] +pub enum Weekday { + Number(u8), + Name(String), +} + +/// One off-peak window entry inside `windows`. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(deny_unknown_fields)] +pub struct OffPeakWindow { + pub hours_utc: UtcHours, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub weekdays: Option>, +} + +/// Rates that replace the same-named base fields inside the stated UTC windows. +#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(deny_unknown_fields)] +pub struct OffPeakPricing { + #[serde(default, skip_serializing_if = "Option::is_none")] + pub hours_utc: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub windows: Option>, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub weekday_timezone: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_reasoning_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost: Option, +} + +/// USD cost per web search query, keyed by search context size. +#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(deny_unknown_fields)] +pub struct SearchContextCostPerQuery { + #[serde(default, skip_serializing_if = "Option::is_none")] + pub search_context_size_low: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub search_context_size_medium: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub search_context_size_high: Option, +} + +/// One tier of a context-length or result-count tiered rate. +#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(deny_unknown_fields)] +pub struct TieredRate { + #[serde(default, skip_serializing_if = "Option::is_none")] + pub range: Option<[f64; 2]>, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub max_results_range: Option<[f64; 2]>, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_reasoning_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_query: Option, +} + +/// One regex rule generalizing unknown model ids to known families. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +pub struct FallbackRule { + pub name: String, + pub pattern: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub description: Option, + #[serde(flatten)] + pub extra: BTreeMap, +} + +/// Regex rules that generalize unknown model ids to known families; not a model entry. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +#[serde(deny_unknown_fields)] +pub struct FallbackGeneralizations { + pub rules: Vec, +} + +/// Typed mirror of one catalog model entry. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] +pub struct ModelInfo { + #[serde(default, skip_serializing_if = "Option::is_none")] + pub annotation_cost_per_page: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub annotation_cost_per_page_batches: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub audio_transcription_config: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub bedrock_converse_supports_strict_tools: Option, + /// Highest reasoning effort the Bedrock output_config accepts for this model. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub bedrock_output_config_effort_ceiling: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_audio_token_cost: Option, + /// USD per token written to the provider's prompt cache. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_128k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_1hr: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_1hr_above_200k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_200k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_256k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_272k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_272k_tokens_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_272k_tokens_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_above_272k_tokens_priority: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_creation_input_token_cost_priority: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_audio_token_cost: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_image_token_cost: Option, + /// USD per prompt token served from the provider's prompt cache. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_128k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_200k_tokens: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_200k_tokens_priority: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_256k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_272k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_272k_tokens_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_272k_tokens_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_272k_tokens_priority: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_above_512k_tokens: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub cache_read_input_token_cost_priority: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub citation_cost_per_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub code_interpreter_cost_per_session: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub comment: Option, + /// Reasoning effort the provider applies when the request omits reasoning_effort. Gates whether a non-default temperature or the top_p/logprobs sampling params are accepted, which hold only when the effort resolves to 'none'. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub default_reasoning_effort: Option, + /// Date the provider deprecates the model, YYYY-MM-DD. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub deprecation_date: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub gemini_audio_only_live: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub gemini_native_audio: Option, + /// USD per Grounding with Google Maps request; billed per query or per prompt per web_search_billing_unit. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub google_maps_grounding_cost_per_query: Option, + /// USD cost per billable guardrail unit, keyed by the provider's usage counter name (e.g. Bedrock's contentPolicyUnits). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub guardrail_cost_per_unit: Option>, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_audio_per_second: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_audio_per_second_above_128k_tokens: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_audio_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_audio_token_batches: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_audio_token_priority: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_character: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_character_above_128k_tokens: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_image: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_image_above_128k_tokens: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_image_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_image_token_batches: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_pixel: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_query: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_request: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_second: Option, + /// USD per prompt token. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_128k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_200k_tokens: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_200k_tokens_priority: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_256k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_272k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_272k_tokens_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_272k_tokens_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_272k_tokens_priority: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_above_512k_tokens: Option, + /// USD per prompt token via the provider's batch API. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_batches: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_cache_hit: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_token_priority: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_video_per_second: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_video_per_second_above_128k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_video_per_second_above_15s_interval: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_video_per_second_above_8s_interval: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_video_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_cost_per_video_token_batches: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub input_dbu_cost_per_token: Option, + /// LiteLLM provider slug; one of https://docs.litellm.ai/docs/providers. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub litellm_provider: Option, + /// Maximum prompt/context tokens the model accepts. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub max_input_tokens: Option, + /// Maximum tokens the model can generate in one response. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub max_output_tokens: Option, + /// Legacy field: max output tokens if the provider specifies it, else max input tokens. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub max_tokens: Option, + /// Free-form notes about the entry (e.g. pricing derivation). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub metadata: Option>, + /// Primary API surface / task type of the model. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub mode: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub ocr_cost_per_credit: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub ocr_cost_per_page: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub ocr_cost_per_page_batches: Option, + /// Rates that replace the same-named base fields while the request falls inside the stated UTC windows. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub off_peak_pricing: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_audio_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_character: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_character_above_128k_tokens: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_image: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_image_1024: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_image_1536: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_image_512: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_image_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_pixel: Option, + /// USD per reasoning/thinking token, when billed separately. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_reasoning_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second_1080p: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second_2k: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second_480p: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second_4k: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second_720p: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_second_768p: Option, + /// USD per generated token. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_128k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_200k_tokens: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_200k_tokens_priority: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_256k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_272k_tokens: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_272k_tokens_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_272k_tokens_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_272k_tokens_priority: Option, + /// Rate applied once the prompt exceeds the token threshold in the field name. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_above_512k_tokens: Option, + /// USD per generated token via the provider's batch API. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_batches: Option, + /// Flex service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_flex: Option, + /// Priority service-tier rate for the same-named base field. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_token_priority: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_video_per_second: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_cost_per_video_token: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_dbu_cost_per_token: Option, + /// Embedding dimension for embedding models. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub output_vector_size: Option, + /// Smallest prefix the provider will actually cache; absent means the provider default applies. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub prompt_cache_min_tokens: Option, + /// Provider-internal routing hints (e.g. bedrock_invocation_schema). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub provider_specific_entry: Option>, + /// Exact reasoning_effort levels this deployment accepts; wins over supports_* flags. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub reasoning_effort_levels: Option>, + /// Multiplier applied to all token costs when served from a non-global Vertex AI endpoint (e.g. 1.10 = +10%). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub regional_endpoint_uplift_multiplier: Option, + /// Multiplier applied to all token costs for EU data residency (e.g. 1.10 = +10%). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub regional_processing_uplift_multiplier_eu: Option, + /// Multiplier applied to all token costs for US data residency (e.g. 1.10 = +10%). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub regional_processing_uplift_multiplier_us: Option, + /// Provider default requests-per-minute limit. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub rpm: Option, + /// USD cost per web search query, keyed by search context size. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub search_context_cost_per_query: Option, + /// URL of the provider pricing/model page this entry was taken from. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub source: Option, + /// Audio container formats the model can return. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supported_audio_formats: Option>, + /// OpenAI-style API routes this model can be called through, e.g. /v1/chat/completions. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supported_endpoints: Option>, + /// Input modalities the model accepts. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supported_modalities: Option>, + /// Output modalities the model can produce. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supported_output_modalities: Option>, + /// Cloud regions the model is available in ('global' or region ids). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supported_regions: Option>, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_adaptive_thinking: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_anthropic_compaction: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_anthropic_thinking_payload: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_assistant_prefill: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_audio_input: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_audio_output: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_computer_use: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_embedding_image_input: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_fast_mode: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_forced_tool_use: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_function_calling: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_image_input: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_image_size: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_legacy_thinking: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_low_reasoning_effort: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_max_reasoning_effort: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_mid_conversation_system: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_minimal_reasoning_effort: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_multimodal: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_native_streaming: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_native_structured_output: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_none_reasoning_effort: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_nova_canvas_image_edit: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_output_config: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_parallel_function_calling: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_parallel_tool_use_config: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_pdf_input: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_prompt_cache_breakpoint: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_prompt_caching: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_reasoning: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_response_schema: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_sampling_params: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_speed: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_system_messages: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_thinking_cache_preservation: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_tool_choice: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_tool_search: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_url_context: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_video_input: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_vision: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_web_search: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub supports_xhigh_reasoning_effort: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub thinking_always_on: Option, + /// Context-length or result-count tiered rates; each tier's costs apply within its range. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub tiered_pricing: Option>, + /// Provider default tokens-per-minute limit. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub tpm: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub use_openai_responses_path: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub uses_embed_content: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub vertex_ai_audio_api: Option, + /// Whether web search is billed per query or per prompt. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub web_search_billing_unit: Option, +} diff --git a/litellm-rust/crates/model-catalog/src/schema.rs b/litellm-rust/crates/model-catalog/src/schema.rs new file mode 100644 index 00000000000..82cfd6c0352 --- /dev/null +++ b/litellm-rust/crates/model-catalog/src/schema.rs @@ -0,0 +1,7 @@ +use crate::model_info::ModelInfo; + +/// JSON Schema for one catalog model entry, mirroring +/// `model_prices_and_context_window.schema.json`'s `modelEntry` definition. +pub fn model_entry_json_schema() -> schemars::Schema { + schemars::schema_for!(ModelInfo) +} diff --git a/litellm-rust/crates/model-catalog/tests/catalog.rs b/litellm-rust/crates/model-catalog/tests/catalog.rs new file mode 100644 index 00000000000..bcadd38e908 --- /dev/null +++ b/litellm-rust/crates/model-catalog/tests/catalog.rs @@ -0,0 +1,253 @@ +use std::path::{Path, PathBuf}; + +use litellm_model_catalog::{AliasIssue, Catalog, Error, IntegrityLimits, Provenance}; +use rstest::{fixture, rstest}; +use serde_json::json; + +const ALPHA_FIXTURE: &[u8] = br#"{ + "sample_spec":{"explanation":"example"}, + "fallback_generalizations":{"rules":[{"name":"family","pattern":"^new-","model_info":{"mode":"chat"}}]}, + "Alpha":{"litellm_provider":"test","aliases":["short"],"price":0,"enabled":false, + "optional":null,"unknown":{"nested":[1,{"x":true}]}} +}"#; + +#[fixture] +fn repo_root() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")).join("../../..") +} + +#[fixture] +fn current_catalog(repo_root: PathBuf) -> Catalog { + let body = std::fs::read(repo_root.join("model_prices_and_context_window.json")).unwrap(); + Catalog::parse(&body, Provenance::default()).unwrap() +} + +#[fixture] +fn backup_catalog(repo_root: PathBuf) -> Catalog { + let body = std::fs::read(repo_root.join("litellm/model_prices_and_context_window_backup.json")) + .unwrap(); + Catalog::parse(&body, Provenance::default()).unwrap() +} + +#[fixture] +fn fixture_catalog() -> Catalog { + Catalog::parse( + ALPHA_FIXTURE, + Provenance { + source: Some("fixture".into()), + revision: Some("rev".into()), + etag: None, + }, + ) + .unwrap() +} + +#[rstest] +fn preserves_fields_and_metadata(fixture_catalog: Catalog) { + let catalog = fixture_catalog; + let entry = catalog.lookup("SHORT").unwrap(); + assert_eq!(entry.canonical_key, "Alpha"); + assert_eq!(entry.matched_key, "short"); + assert_eq!(entry.entry.field("price"), Some(&json!(0))); + assert_eq!(entry.entry.field("enabled"), Some(&json!(false))); + assert_eq!(entry.entry.field("optional"), Some(&json!(null))); + assert_eq!(entry.entry.field("missing"), None); + assert_eq!( + entry.entry.field("unknown"), + Some(&json!({"nested":[1,{"x":true}]})) + ); + assert_eq!(entry.entry.field("aliases"), None); + assert_eq!(entry.entry.info().litellm_provider.as_deref(), Some("test")); + assert_eq!( + catalog.sample_spec(), + Some(&json!({"explanation":"example"})) + ); + assert_eq!(catalog.fallback_rules().unwrap().len(), 1); + assert_eq!(catalog.provenance().revision.as_deref(), Some("rev")); + assert_eq!(catalog.model_count(), 1); +} + +#[rstest] +fn snapshot_does_not_borrow_source() { + let mut source = ALPHA_FIXTURE.to_vec(); + let catalog = Catalog::parse(&source, Provenance::default()).unwrap(); + source.fill(b' '); + + let entry = catalog.lookup("short").unwrap(); + assert_eq!(entry.canonical_key, "Alpha"); + assert_eq!(entry.entry.field("price"), Some(&json!(0))); +} + +#[rstest] +#[case("Shared", "First")] +#[case("Second", "Second")] +#[case("shared", "Second")] +#[case("FIRST", "First")] +#[case("sHaReD", "Second")] +fn alias_collisions_and_case_fallback_follow_python_order( + #[case] lookup: &str, + #[case] expected: &str, +) { + let catalog = Catalog::parse( + br#"{ + "First":{"aliases":["Shared","Second","first"],"value":1}, + "Second":{"aliases":["Shared","sHaReD"],"value":2}, + "SHARED":{"value":3} + }"#, + Provenance::default(), + ) + .unwrap(); + assert_eq!(catalog.lookup(lookup).unwrap().canonical_key, expected); + assert_eq!(catalog.alias_count(), 3); + assert!( + catalog + .alias_issues() + .contains(&AliasIssue::CanonicalCollision { + model: "First".into(), + alias: "Second".into(), + }) + ); + assert!( + catalog + .alias_issues() + .contains(&AliasIssue::AliasCollision { + model: "Second".into(), + alias: "Shared".into(), + }) + ); +} + +#[derive(Debug)] +enum ValidationOutcome { + Ok, + Shrunk, + BelowMinimum, + InvalidRatio, +} + +#[rstest] +#[case( + IntegrityLimits { + backup_model_count: 2, + min_model_count: 1, + min_backup_ratio: 0.5, + }, + ValidationOutcome::Ok +)] +#[case( + IntegrityLimits { + backup_model_count: 3, + min_model_count: 1, + min_backup_ratio: 0.5, + }, + ValidationOutcome::Shrunk +)] +#[case( + IntegrityLimits { + backup_model_count: 0, + min_model_count: 2, + min_backup_ratio: 0.5, + }, + ValidationOutcome::BelowMinimum +)] +#[case( + IntegrityLimits { + backup_model_count: 0, + min_model_count: 0, + min_backup_ratio: f64::NAN, + }, + ValidationOutcome::InvalidRatio +)] +fn integrity_uses_canonical_count_and_strict_shrink_boundary( + #[case] limits: IntegrityLimits, + #[case] expected: ValidationOutcome, +) { + let catalog = Catalog::parse( + br#"{"sample_spec":{},"fallback_generalizations":{"rules":[]},"a":{"aliases":["b","c"]}}"#, + Provenance::default(), + ) + .unwrap(); + let actual = catalog.validate(limits); + match expected { + ValidationOutcome::Ok => assert!(actual.is_ok()), + ValidationOutcome::Shrunk => { + assert!(matches!(actual, Err(Error::Shrunk { actual: 1, .. }))) + } + ValidationOutcome::BelowMinimum => { + assert!(matches!(actual, Err(Error::BelowMinimum { actual: 1, .. }))) + } + ValidationOutcome::InvalidRatio => assert!(matches!(actual, Err(Error::InvalidRatio))), + } +} + +#[derive(Debug)] +enum MalformedOutcome { + Empty, + Json, + EntryNotObject, +} + +#[rstest] +#[case::empty(b"{}", MalformedOutcome::Empty)] +#[case::invalid_json(b"{", MalformedOutcome::Json)] +#[case::entry_not_object(br#"{"a":1}"#, MalformedOutcome::EntryNotObject)] +#[case::fallback_rules_missing( + br#"{"fallback_generalizations":{},"a":{}}"#, + MalformedOutcome::Json +)] +fn malformed_input_and_aliases_have_typed_outcomes( + #[case] body: &[u8], + #[case] expected: MalformedOutcome, +) { + let actual = Catalog::parse(body, Provenance::default()); + match expected { + MalformedOutcome::Empty => assert!(matches!(actual, Err(Error::Empty))), + MalformedOutcome::Json => assert!(matches!(actual, Err(Error::Json(_)))), + MalformedOutcome::EntryNotObject => { + assert!(matches!(actual, Err(Error::EntryNotObject { .. }))) + } + } +} + +#[rstest] +fn invalid_aliases_are_reported_not_fatal() { + let catalog = Catalog::parse( + br#"{"a":{"aliases":"bad"},"b":{"aliases":[9,"ok"]}}"#, + Provenance::default(), + ) + .unwrap(); + assert_eq!( + catalog.alias_issues(), + &[ + AliasIssue::InvalidList { model: "a".into() }, + AliasIssue::InvalidName { model: "b".into() }, + ] + ); + assert_eq!(catalog.lookup("ok").unwrap().canonical_key, "b"); + assert!(catalog.lookup("missing").is_none()); +} + +#[rstest] +fn parses_current_and_packaged_catalogs_without_pinning_counts( + current_catalog: Catalog, + backup_catalog: Catalog, +) { + assert!(current_catalog.model_count() > 0); + assert!(backup_catalog.model_count() > 0); + assert!(current_catalog.sample_spec().is_some()); + assert!(backup_catalog.sample_spec().is_some()); + assert!( + current_catalog + .validate(IntegrityLimits::python_defaults( + backup_catalog.model_count() + )) + .is_ok() + ); + for name in current_catalog.model_names() { + let entry = current_catalog.lookup(name).unwrap().entry; + assert_eq!( + entry.info().litellm_provider.is_some(), + entry.field("litellm_provider").is_some() + ); + } +} diff --git a/litellm-rust/crates/model-catalog/tests/spec_parity.rs b/litellm-rust/crates/model-catalog/tests/spec_parity.rs new file mode 100644 index 00000000000..7296d96f798 --- /dev/null +++ b/litellm-rust/crates/model-catalog/tests/spec_parity.rs @@ -0,0 +1,121 @@ +use std::collections::{BTreeSet, HashSet}; +use std::path::{Path, PathBuf}; + +use indexmap::IndexMap; +use litellm_model_catalog::{ + Catalog, FallbackGeneralizations, ModelInfo, Provenance, model_entry_json_schema, +}; +use rstest::{fixture, rstest}; +use serde_json::{Map, Value}; + +#[fixture] +fn repo_root() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")).join("../../..") +} + +fn json_eq(left: &Value, right: &Value) -> bool { + match (left, right) { + (Value::Number(left), Value::Number(right)) => left.as_f64() == right.as_f64(), + (Value::Array(left), Value::Array(right)) => { + left.len() == right.len() && left.iter().zip(right).all(|(a, b)| json_eq(a, b)) + } + (Value::Object(left), Value::Object(right)) => { + left.len() == right.len() + && left + .iter() + .all(|(key, value)| right.get(key).is_some_and(|other| json_eq(value, other))) + } + _ => left == right, + } +} + +fn keys(value: &Map) -> BTreeSet { + value.keys().cloned().collect() +} + +fn symmetric_difference(left: &BTreeSet, right: &BTreeSet) -> BTreeSet { + left.symmetric_difference(right).cloned().collect() +} + +#[rstest] +#[case("model_prices_and_context_window.json")] +#[case("litellm/model_prices_and_context_window_backup.json")] +fn every_entry_round_trips_through_model_info(repo_root: PathBuf, #[case] filename: &str) { + let body = std::fs::read(repo_root.join(filename)).unwrap(); + let document: IndexMap = serde_json::from_slice(&body).unwrap(); + for (model_name, value) in document { + if matches!( + model_name.as_str(), + "sample_spec" | "fallback_generalizations" + ) { + continue; + } + let object = value + .as_object() + .unwrap_or_else(|| panic!("{model_name} is not an object")); + let info: ModelInfo = serde_json::from_value(value.clone()) + .unwrap_or_else(|error| panic!("{model_name} does not deserialize: {error}")); + let serialized = serde_json::to_value(info).unwrap(); + let serialized_object = serialized + .as_object() + .unwrap_or_else(|| panic!("{model_name} did not serialize as an object")); + let mut expected = object.clone(); + expected.remove("aliases"); + let expected_keys = keys(&expected); + let serialized_keys = keys(serialized_object); + assert_eq!( + expected_keys, + serialized_keys, + "{model_name} key difference: {:?}", + symmetric_difference(&expected_keys, &serialized_keys) + ); + assert!( + json_eq(&Value::Object(expected), &serialized), + "{model_name} changed during ModelInfo round-trip" + ); + } +} + +#[rstest] +fn fallback_generalizations_are_typed(repo_root: PathBuf) { + let body = std::fs::read(repo_root.join("model_prices_and_context_window.json")).unwrap(); + let document: Map = serde_json::from_slice(&body).unwrap(); + let Some(raw_rules) = document.get("fallback_generalizations") else { + return; + }; + let _: FallbackGeneralizations = serde_json::from_value(raw_rules.clone()).unwrap(); + let catalog = Catalog::parse(&body, Provenance::default()).unwrap(); + assert!( + catalog + .fallback_rules() + .is_some_and(|rules| !rules.is_empty()) + ); +} + +#[rstest] +fn generated_schema_properties_match_repo_schema(repo_root: PathBuf) { + let body = + std::fs::read(repo_root.join("model_prices_and_context_window.schema.json")).unwrap(); + let document: Value = serde_json::from_slice(&body).unwrap(); + let repo_entry_properties = document["$defs"]["modelEntry"]["properties"] + .as_object() + .unwrap(); + let generated = serde_json::to_value(model_entry_json_schema()).unwrap(); + let generated_properties = generated["properties"].as_object().unwrap(); + let expected = keys(repo_entry_properties); + let actual = keys(generated_properties); + assert_eq!( + expected, + actual, + "modelEntry property difference: {:?}", + symmetric_difference(&expected, &actual) + ); + + let repo_root_properties = document["properties"].as_object().unwrap(); + let actual_root: HashSet = repo_root_properties.keys().cloned().collect(); + let expected_root: HashSet = ["sample_spec", "fallback_generalizations"] + .into_iter() + .map(str::to_owned) + .collect(); + assert_eq!(actual_root, expected_root); +} diff --git a/litellm-rust/crates/python-bridge/Cargo.toml b/litellm-rust/crates/python-bridge/Cargo.toml index dd0975219e4..85e6b9588dd 100644 --- a/litellm-rust/crates/python-bridge/Cargo.toml +++ b/litellm-rust/crates/python-bridge/Cargo.toml @@ -19,6 +19,9 @@ huggingface = ["litellm-token-counter/huggingface"] tiktoken = ["litellm-token-counter/tiktoken"] [dependencies] +fancy-regex.workspace = true +litellm-tracing.workspace = true +litellm-host.workspace = true bytes.workspace = true futures-util.workspace = true litellm-cache.workspace = true diff --git a/litellm-rust/crates/python-bridge/src/cache/activation.rs b/litellm-rust/crates/python-bridge/src/cache/activation.rs new file mode 100644 index 00000000000..f77032c579d --- /dev/null +++ b/litellm-rust/crates/python-bridge/src/cache/activation.rs @@ -0,0 +1,112 @@ +use crate::logger::run_sync_value; +use litellm_cache_gcs::{DEFAULT_ENDPOINT, GcsConfig}; +use litellm_cache_redis_semantic::RedisSemanticConfig; +use litellm_host_python::release_gil; +use litellm_http::ClientVariant; +use pyo3::prelude::*; + +use super::{ + cache_error, + config::{CacheBackendConfig, NativeCacheConfig, UnsupportedCacheConfig}, + embedder::PythonEmbedder, + host_client, + native::NativeResponseCache, +}; +use crate::errors::RustBridgeDeclined; + +fn declined(reason: UnsupportedCacheConfig) -> PyErr { + RustBridgeDeclined::new_err(reason.message()) +} + +/// Builds the native backend a `Cache` facade's projected configuration describes. `backend` is +/// the facade's `.cache` object, which owns embedding for the Python-embedded semantic caches. +pub(super) fn activate( + py: Python<'_>, + backend: &Bound<'_, PyAny>, + config: NativeCacheConfig, +) -> PyResult { + let policy = config.policy; + let service = match config.backend { + CacheBackendConfig::Memory(memory) => { + NativeResponseCache::memory(memory.capacity, memory.default_ttl, memory.max_entry_bytes) + } + CacheBackendConfig::Redis(redis) => { + let url = redis.connection.native_url().map_err(declined)?; + let flush_size = policy.redis_flush_size.map(|_| redis.flush_size); + release_gil(py, move || { + NativeResponseCache::redis( + &url, + &redis.topology, + Some(redis.default_ttl), + redis.namespace, + ) + }) + .map_err(cache_error)? + .with_redis_flush_size(flush_size) + } + CacheBackendConfig::S3(s3) => { + let http = host_client(py, ClientVariant::NoRedirect)?; + run_sync_value( + py, + async move { Ok(NativeResponseCache::s3(*s3, http).await) }, + )? + } + CacheBackendConfig::Gcs(gcs) => NativeResponseCache::gcs( + GcsConfig { + bucket_name: gcs.bucket_name, + gcs_path: Some(gcs.key_prefix), + path_service_account: gcs.path_service_account, + endpoint: DEFAULT_ENDPOINT.to_owned(), + }, + host_client(py, ClientVariant::NoRedirect)?, + None, + ), + CacheBackendConfig::Disk(disk) => { + release_gil(py, move || NativeResponseCache::disk(&disk.directory)) + .map_err(cache_error)? + } + CacheBackendConfig::AzureBlob(azure) => { + let http = host_client(py, ClientVariant::NoRedirect)?; + run_sync_value(py, async move { + NativeResponseCache::azure_blob(&azure.account_url, &azure.container, http) + .await + .map_err(cache_error) + })? + } + CacheBackendConfig::RedisSemantic(semantic) => { + let url = semantic.native_url().map_err(declined)?.to_owned(); + let embedder = PythonEmbedder::new(backend.clone().unbind()); + let semantic_config = RedisSemanticConfig { + index_name: semantic.index_name, + similarity_threshold: semantic.similarity_threshold as f32, + }; + release_gil(py, move || { + NativeResponseCache::redis_semantic(&url, embedder, semantic_config) + }) + .map_err(cache_error)? + } + CacheBackendConfig::ValkeySemantic(valkey) => { + let url = valkey.connection.native_url().map_err(declined)?; + let embedder = PythonEmbedder::new(backend.clone().unbind()); + release_gil(py, move || { + NativeResponseCache::valkey_semantic( + &url, + valkey.similarity_threshold, + valkey.index_name, + embedder, + ) + }) + .map_err(cache_error)? + } + CacheBackendConfig::QdrantSemantic(qdrant) => { + let client = host_client(py, ClientVariant::Provider)?; + run_sync_value(py, async move { + let runtime = tokio::runtime::Handle::current(); + NativeResponseCache::qdrant_semantic(*qdrant, client, runtime) + .await + .map_err(cache_error) + })? + } + }; + Ok(service.with_scope(policy.semantic_cache_scope)) +} diff --git a/litellm-rust/crates/python-bridge/src/cache/binding.rs b/litellm-rust/crates/python-bridge/src/cache/binding.rs index 273d3f9ca4e..fcf71e10427 100644 --- a/litellm-rust/crates/python-bridge/src/cache/binding.rs +++ b/litellm-rust/crates/python-bridge/src/cache/binding.rs @@ -1,5 +1,6 @@ +use crate::logger::run_async; use litellm_cache_response::PartialHits; -use litellm_host_python::{ExecutionStep, from_py, release_gil, run_async, to_py}; +use litellm_host_python::{ExecutionStep, from_py, release_gil, to_py}; use pyo3::{ PyTraverseError, PyVisit, exceptions::{PyRuntimeError, PyValueError}, @@ -9,11 +10,12 @@ use pyo3::{ use serde_json::Value; use super::{ + activation::activate, cache_error, callback::PythonCallback, - config::{CacheBackendConfig, CacheConfigProjection, NativeCacheConfig}, + config::{CacheConfigProjection, NativeCacheConfig}, future::{ready_none, ready_value}, - native::NativeResponseCache, + native::{NativeResponseCache, SemanticReply}, request::{now, request, requests}, }; use crate::errors::RustBridgeDeclined; @@ -76,23 +78,9 @@ impl ResolvedCache { return Err(RustBridgeDeclined::new_err(reason.message())); } }; - let service = match config.backend { - CacheBackendConfig::Memory(memory) => NativeResponseCache::memory( - memory.capacity, - memory.default_ttl, - memory.max_entry_bytes, - ), - _ => { - return Err(RustBridgeDeclined::new_err( - "native response cache activation is not implemented for this backend", - )); - } - }; - Ok(Self::new(CacheBinding::Native( - service - .with_scope(config.policy.semantic_cache_scope) - .with_redis_flush_size(config.policy.redis_flush_size), - ))) + let backend = cache.getattr("cache")?; + let service = activate(cache.py(), &backend, config)?; + Ok(Self::new(CacheBinding::Native(service))) } #[getter] @@ -127,6 +115,41 @@ impl ResolvedCache { } } + /// `(response, similarity)`: the similarity is `None` when the backend reports none. + fn lookup_semantic(&self, py: Python<'_>, request: &Bound<'_, PyAny>) -> PyResult> { + self.check_process()?; + match &self.binding { + CacheBinding::Native(service) => { + let request = self::request(request)?; + let service = service.clone(); + let lookup = release_gil(py, move || service.lookup_semantic(&request, now())) + .map_err(cache_error)?; + to_py(py, &SemanticReply::from(lookup)) + } + CacheBinding::Disabled => to_py(py, &SemanticReply(None, None)), + CacheBinding::PythonCallback(_) => Err(PyRuntimeError::new_err( + "semantic lookups require a native cache binding", + )), + } + } + + fn async_lookup_semantic<'py>( + &self, + py: Python<'py>, + request: &Bound<'py, PyAny>, + ) -> PyResult> { + self.check_process()?; + match &self.binding { + CacheBinding::Native(service) => { + service.async_lookup_semantic_py(py, self::request(request)?) + } + CacheBinding::Disabled => ready_value(py, &SemanticReply(None, None)), + CacheBinding::PythonCallback(_) => Err(PyRuntimeError::new_err( + "semantic lookups require a native cache binding", + )), + } + } + #[pyo3(signature = (request, response, *, callback_kwargs=None))] fn store( &self, diff --git a/litellm-rust/crates/python-bridge/src/cache/config.rs b/litellm-rust/crates/python-bridge/src/cache/config.rs index b6e08102e18..6e25f07efa1 100644 --- a/litellm-rust/crates/python-bridge/src/cache/config.rs +++ b/litellm-rust/crates/python-bridge/src/cache/config.rs @@ -13,12 +13,7 @@ use pyo3::{ use super::{identity::BackendIdentity, native::NativeResponseCache, request::duration}; -#[allow(dead_code, reason = "consumed by the cache activation follow-up")] pub(super) struct CachePolicy { - pub(super) mode: String, - pub(super) ttl: Option, - pub(super) namespace: Option, - pub(super) supported_call_types: Option>, pub(super) redis_flush_size: Option, pub(super) semantic_cache_scope: String, } @@ -46,7 +41,6 @@ pub(super) enum CertificateRequirement { Required, } -#[allow(dead_code, reason = "consumed by the cache activation follow-up")] pub(super) struct RedisTlsConfig { pub(super) certificate_requirement: CertificateRequirement, pub(super) check_hostname: bool, @@ -56,7 +50,6 @@ pub(super) struct RedisTlsConfig { pub(super) client_key: Option, } -#[allow(dead_code, reason = "consumed by the cache activation follow-up")] pub(super) struct RedisConnectionConfig { pub(super) host: String, pub(super) port: u16, @@ -73,7 +66,6 @@ pub(super) struct RedisConnectionConfig { pub(super) tls: Option, } -#[allow(dead_code, reason = "consumed by the cache activation follow-up")] pub(super) struct RedisCacheConfig { pub(super) default_ttl: Duration, pub(super) namespace: Option, @@ -94,17 +86,10 @@ pub(super) struct AzureBlobCacheConfig { pub(super) container: String, } -#[allow( - dead_code, - reason = "embedding settings are projected so drift falls back to Python" -)] pub(super) struct RedisSemanticCacheConfig { pub(super) redis_url: String, pub(super) index_name: String, pub(super) similarity_threshold: f64, - pub(super) embedding_model: String, - pub(super) embedding_max_input_tokens: Option, - pub(super) embedding_timeout: Option, } struct RedisClientProjection<'py> { @@ -118,11 +103,13 @@ struct RedisClientProjection<'py> { const REDIS_PY_DEFAULT_MAX_CONNECTIONS: usize = 1 << 31; -#[allow(dead_code, reason = "consumed by the cache activation follow-up")] +/// The read and write timeout every native Redis connection uses, which is also `RedisCache`'s +/// default `socket_timeout`. +const NATIVE_REDIS_SOCKET_TIMEOUT: Duration = Duration::from_secs(5); + pub(super) struct ValkeySemanticCacheConfig { pub(super) similarity_threshold: f64, pub(super) index_name: String, - pub(super) embedding_model: String, pub(super) connection: RedisConnectionConfig, } @@ -147,6 +134,93 @@ impl QdrantSemanticCacheConfig { } } +impl RedisTlsConfig { + /// Whether redis-rs with rustls behaves like this redis-py `SSLConnection`: it verifies the + /// certificate chain against the system roots and always checks the hostname. + fn native(&self) -> Result<(), UnsupportedCacheConfig> { + if self.ca_certificate.is_some() + || self.ca_data.is_some() + || self.client_certificate.is_some() + || self.client_key.is_some() + { + return Err(UnsupportedCacheConfig::RedisTlsCertificates); + } + if self.certificate_requirement == CertificateRequirement::None || !self.check_hostname { + return Err(UnsupportedCacheConfig::RedisTlsVerification); + } + Ok(()) + } +} + +impl RedisConnectionConfig { + /// The redis-rs URL for this connection, or the first setting the native client cannot + /// honor. The native pool and socket timeouts are fixed, so only redis-py's unbounded pool, + /// its unset timeouts and `RedisCache`'s five-second `socket_timeout` map onto them. + pub(super) fn native_url(&self) -> Result { + if self.pool_size != REDIS_PY_DEFAULT_MAX_CONNECTIONS { + return Err(UnsupportedCacheConfig::RedisPoolSize); + } + if self + .read_timeout + .is_some_and(|timeout| timeout != NATIVE_REDIS_SOCKET_TIMEOUT) + || self.connect_timeout.is_some() + { + return Err(UnsupportedCacheConfig::RedisTimeout); + } + if self.socket_keepalive == Some(true) { + return Err(UnsupportedCacheConfig::RedisKeepalive); + } + if !self.health_check_interval.is_zero() { + return Err(UnsupportedCacheConfig::RedisHealthCheck); + } + if self.client_name.is_some() { + return Err(UnsupportedCacheConfig::RedisClientName); + } + let scheme = match &self.tls { + None => "redis", + Some(tls) => { + tls.native()?; + "rediss" + } + }; + let host = if self.host.contains(':') { + format!("[{}]", self.host) + } else { + self.host.clone() + }; + let mut url = url::Url::parse(&format!( + "{scheme}://{host}:{}/{}", + self.port, self.database + )) + .map_err(|_| UnsupportedCacheConfig::RedisConnection)?; + if let Some(username) = &self.username { + url.set_username(username) + .map_err(|()| UnsupportedCacheConfig::RedisConnection)?; + } + if let Some(password) = &self.password { + url.set_password(Some(password)) + .map_err(|()| UnsupportedCacheConfig::RedisConnection)?; + } + if self.protocol == RedisProtocol::Resp3 { + url.set_query(Some("protocol=resp3")); + } + Ok(url.into()) + } +} + +impl RedisSemanticCacheConfig { + /// redisvl hands `redis_url` to redis-py, which reads TLS and socket options from the URL; + /// redis-rs ignores those, so only a plain URL keeps its meaning. + pub(super) fn native_url(&self) -> Result<&str, UnsupportedCacheConfig> { + let url = url::Url::parse(&self.redis_url) + .map_err(|_| UnsupportedCacheConfig::RedisSemanticUrl)?; + if !matches!(url.scheme(), "redis" | "unix") || url.query().is_some() { + return Err(UnsupportedCacheConfig::RedisSemanticUrl); + } + Ok(&self.redis_url) + } +} + pub(super) enum CacheBackendConfig { Memory(MemoryCacheConfig), Redis(Box), @@ -159,7 +233,6 @@ pub(super) enum CacheBackendConfig { QdrantSemantic(Box), } -#[allow(dead_code, reason = "consumed by the cache activation follow-up")] pub(super) struct NativeCacheConfig { pub(super) policy: CachePolicy, pub(super) backend: CacheBackendConfig, @@ -178,6 +251,15 @@ pub(super) enum UnsupportedCacheConfig { DiskStore, QdrantEndpoint, SemanticEmbedding, + RedisPoolSize, + RedisTimeout, + RedisKeepalive, + RedisHealthCheck, + RedisClientName, + RedisTlsCertificates, + RedisTlsVerification, + RedisSemanticUrl, + ValkeyTls, } impl UnsupportedCacheConfig { @@ -197,6 +279,28 @@ impl UnsupportedCacheConfig { "native Qdrant requires the default REST port so the gRPC port can be derived" } Self::SemanticEmbedding => "native semantic embedding requires Python", + Self::RedisPoolSize => { + "native Redis uses a fixed connection pool; max_connections requires Python" + } + Self::RedisTimeout => { + "native Redis uses fixed socket timeouts; socket_timeout and \ + socket_connect_timeout require Python" + } + Self::RedisKeepalive => "native Redis does not support socket_keepalive", + Self::RedisHealthCheck => "native Redis does not support health_check_interval", + Self::RedisClientName => "native Redis does not support client_name", + Self::RedisTlsCertificates => { + "native Redis TLS does not support ssl_ca_certs, ssl_ca_data, ssl_certfile or \ + ssl_keyfile" + } + Self::RedisTlsVerification => { + "native Redis TLS always verifies the certificate and hostname; \ + ssl_cert_reqs=none and ssl_check_hostname=false require Python" + } + Self::RedisSemanticUrl => { + "native Redis semantic cache does not support TLS or query options in redis_url" + } + Self::ValkeyTls => "native Valkey semantic cache does not support TLS connections", } } } @@ -211,12 +315,6 @@ impl NativeCacheConfig { pub(super) fn project(facade: &Bound<'_, PyAny>) -> PyResult { let backend_name = facade.getattr("type")?.extract::()?; let policy = CachePolicy { - mode: facade.getattr("mode")?.extract::()?, - ttl: optional_duration(facade.getattr("ttl")?)?, - namespace: optional_string(facade.getattr("namespace")?)?, - supported_call_types: facade - .getattr("supported_call_types")? - .extract::>>()?, redis_flush_size: facade .getattr("redis_flush_size")? .extract::>()?, @@ -475,13 +573,6 @@ pub(super) fn project_redis_semantic( .extract::>()? .unwrap_or_else(|| "litellm_semantic_cache_index".into()), similarity_threshold: backend.getattr("similarity_threshold")?.extract::()?, - embedding_model: backend.getattr("embedding_model")?.extract::()?, - embedding_max_input_tokens: backend - .getattr("embedding_max_input_tokens")? - .extract::>()?, - embedding_timeout: backend - .getattr("embedding_timeout")? - .extract::>()?, }) } @@ -592,37 +683,48 @@ fn project_redis( if has_value(&resolved, "credential_provider")? { return Ok(Err(UnsupportedCacheConfig::RedisCredentials)); } - - let protocol = match optional_i64(&resolved, "protocol")?.unwrap_or(2) { - 2 => RedisProtocol::Resp2, - 3 => RedisProtocol::Resp3, - _ => return Err(PyValueError::new_err("unsupported Redis protocol version")), - }; - let health_check_interval = - duration(optional_f64(&resolved, "health_check_interval")?.unwrap_or(0.0))?; Ok(Ok(RedisCacheConfig { default_ttl: duration(backend.getattr("default_ttl")?.extract::()?)?, namespace: optional_attribute_string(backend, "namespace")?, flush_size: backend.getattr("redis_flush_size")?.extract::()?, topology, - connection: RedisConnectionConfig { - host, - port, - database: optional_i64(&resolved, "db")?.unwrap_or(0), - username: optional_dict_string(&resolved, "username")?, - password: optional_dict_string(&resolved, "password")?, - protocol, - pool_size, - read_timeout: optional_dict_duration(&resolved, "socket_timeout")?, - connect_timeout: optional_dict_duration(&resolved, "socket_connect_timeout")?, - socket_keepalive: optional_bool(&resolved, "socket_keepalive")?, - health_check_interval, - client_name: optional_dict_string(&resolved, "client_name")?, - tls, - }, + connection: resolved_connection(&resolved, host, port, pool_size, tls)?, })) } +/// The connection settings redis-py resolved for one client's pool. +#[inline(never)] +fn resolved_connection( + resolved: &Bound<'_, PyDict>, + host: String, + port: u16, + pool_size: usize, + tls: Option, +) -> PyResult { + let protocol = match optional_i64(resolved, "protocol")?.unwrap_or(2) { + 2 => RedisProtocol::Resp2, + 3 => RedisProtocol::Resp3, + _ => return Err(PyValueError::new_err("unsupported Redis protocol version")), + }; + Ok(RedisConnectionConfig { + host, + port, + database: optional_i64(resolved, "db")?.unwrap_or(0), + username: optional_dict_string(resolved, "username")?, + password: optional_dict_string(resolved, "password")?, + protocol, + pool_size, + read_timeout: optional_dict_duration(resolved, "socket_timeout")?, + connect_timeout: optional_dict_duration(resolved, "socket_connect_timeout")?, + socket_keepalive: optional_bool(resolved, "socket_keepalive")?, + health_check_interval: duration( + optional_f64(resolved, "health_check_interval")?.unwrap_or(0.0), + )?, + client_name: optional_dict_string(resolved, "client_name")?, + tls, + }) +} + #[inline(never)] fn project_s3( backend: &Bound<'_, PyAny>, @@ -831,31 +933,22 @@ fn project_valkey_semantic( } } if is_tls { + return Ok(Err(UnsupportedCacheConfig::ValkeyTls)); + } + let host = required_string(&resolved, "host")?; + if host.is_empty() { return Ok(Err(UnsupportedCacheConfig::RedisConnection)); } - let connection = RedisConnectionConfig { - host: required_string(&resolved, "host")?, - port: u16::try_from(required_i64(&resolved, "port")?) - .map_err(|_| PyValueError::new_err("invalid Redis port"))?, - database: optional_i64(&resolved, "db")?.unwrap_or(0), - username: optional_dict_string(&resolved, "username")?, - password: optional_dict_string(&resolved, "password")?, - protocol: RedisProtocol::Resp2, - pool_size: pool.getattr("max_connections")?.extract::()?, - read_timeout: None, - connect_timeout: None, - socket_keepalive: None, - health_check_interval: Duration::ZERO, - client_name: None, - tls: None, - }; - if connection.host.is_empty() { - return Ok(Err(UnsupportedCacheConfig::RedisConnection)); - } + let connection = resolved_connection( + &resolved, + host, + port(required_i64(&resolved, "port")?)?, + pool.getattr("max_connections")?.extract::()?, + None, + )?; Ok(Ok(ValkeySemanticCacheConfig { similarity_threshold: backend.getattr("similarity_threshold")?.extract()?, index_name: backend.getattr("index_name")?.extract()?, - embedding_model: backend.getattr("embedding_model")?.extract()?, connection, })) } @@ -946,11 +1039,6 @@ fn class_is(value: &Bound<'_, PyAny>, module: &str, name: &str) -> PyResult) -> PyResult> { - value.extract::>()?.map(duration).transpose() -} - #[inline(never)] fn optional_attribute_string(value: &Bound<'_, PyAny>, name: &str) -> PyResult> { match value.getattr(name) { @@ -1070,16 +1158,17 @@ fn optional_dict_duration(values: &Bound<'_, PyDict>, key: &str) -> PyResult) -> NativeCacheConfig { + match NativeCacheConfig::project(facade).unwrap() { + CacheConfigProjection::Native(config) => *config, + CacheConfigProjection::Unsupported(reason) => panic!("{}", reason.message()), + } + } + + fn unsupported(facade: &Bound<'_, PyAny>) -> UnsupportedCacheConfig { + match NativeCacheConfig::project(facade).unwrap() { + CacheConfigProjection::Native(_) => panic!("configuration must stay on Python"), + CacheConfigProjection::Unsupported(reason) => reason, + } + } + + #[fixture] + fn interpreter() { Python::initialize(); + } + + #[fixture] + fn connection() -> RedisConnectionConfig { + RedisConnectionConfig { + host: "cache.internal".into(), + port: 6380, + database: 4, + username: None, + password: None, + protocol: RedisProtocol::Resp2, + pool_size: REDIS_PY_DEFAULT_MAX_CONNECTIONS, + read_timeout: None, + connect_timeout: None, + socket_keepalive: None, + health_check_interval: Duration::ZERO, + client_name: None, + tls: None, + } + } + + fn verified_tls() -> RedisTlsConfig { + RedisTlsConfig { + certificate_requirement: CertificateRequirement::Required, + check_hostname: true, + ca_certificate: None, + ca_data: None, + client_certificate: None, + client_key: None, + } + } + + #[rstest] + fn projects_effective_memory_configuration(_interpreter: ()) { Python::attach(|py| { let facade = facade( py, "backend = SimpleNamespace(default_ttl=913, max_size_in_memory=37, max_size_per_item=8)\n\ facade = SimpleNamespace(type='local', mode='default-on', ttl=11.5, namespace=None, supported_call_types=['completion'], redis_flush_size=None, semantic_cache_scope='key', cache=backend)", ); - let CacheConfigProjection::Native(config) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("memory cache should be supported"); - }; - assert_eq!( - config.policy.ttl.unwrap(), - std::time::Duration::from_secs_f64(11.5) - ); + let config = native(&facade); + assert_eq!(config.policy.semantic_cache_scope, "key"); + assert_eq!(config.policy.redis_flush_size, None); let CacheBackendConfig::Memory(memory) = config.backend else { panic!("expected memory configuration"); }; - assert_eq!(memory.default_ttl, std::time::Duration::from_secs(913)); + assert_eq!(memory.default_ttl, Duration::from_secs(913)); assert_eq!(memory.capacity, 37); assert_eq!(memory.max_entry_bytes, 8192); - let matching = - NativeResponseCache::memory(37, std::time::Duration::from_secs(913), 8192); - let mismatched = - NativeResponseCache::memory(37, std::time::Duration::from_secs(913), 8191); + let matching = NativeResponseCache::memory(37, Duration::from_secs(913), 8192); + let mismatched = NativeResponseCache::memory(37, Duration::from_secs(913), 8191); let matching_config = NativeCacheConfig { policy: config.policy, backend: CacheBackendConfig::Memory(memory), @@ -1154,9 +1283,8 @@ mod tests { }); } - #[test] - fn redis_semantic_service_mismatch_accepts_backend_precision_threshold() { - Python::initialize(); + #[rstest] + fn redis_semantic_service_mismatch_accepts_backend_precision_threshold(_interpreter: ()) { Python::attach(|py| { let facade = facade( py, @@ -1165,12 +1293,7 @@ mod tests { ); let backend = facade.getattr("cache").unwrap(); let embedder = PythonEmbedder::new(backend.clone().unbind()); - let CacheConfigProjection::Native(config) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("Redis semantic cache should be supported"); - }; - let CacheBackendConfig::RedisSemantic(config) = config.backend else { + let CacheBackendConfig::RedisSemantic(config) = native(&facade).backend else { panic!("expected Redis semantic configuration"); }; let service = NativeResponseCache::redis_semantic( @@ -1184,10 +1307,6 @@ mod tests { .unwrap(); let matching_config = NativeCacheConfig { policy: CachePolicy { - mode: "default-on".into(), - ttl: None, - namespace: None, - supported_call_types: None, redis_flush_size: None, semantic_cache_scope: "key".into(), }, @@ -1197,9 +1316,8 @@ mod tests { }); } - #[test] - fn projects_resolved_redis_tls_configuration() { - Python::initialize(); + #[rstest] + fn projects_resolved_redis_tls_configuration(_interpreter: ()) { Python::attach(|py| { let facade = facade( py, @@ -1211,15 +1329,12 @@ mod tests { backend = SimpleNamespace(default_ttl=777, namespace='team', redis_flush_size=31, redis_kwargs={}, redis_client=client)\n\ facade = SimpleNamespace(type='redis', mode='default-off', ttl=None, namespace='team', supported_call_types=None, redis_flush_size=31, semantic_cache_scope='key', cache=backend)", ); - let CacheConfigProjection::Native(config) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("Redis cache should be supported"); - }; + let config = native(&facade); + assert_eq!(config.policy.redis_flush_size, Some(31)); let CacheBackendConfig::Redis(redis) = config.backend else { panic!("expected Redis configuration"); }; - assert_eq!(redis.default_ttl, std::time::Duration::from_secs(777)); + assert_eq!(redis.default_ttl, Duration::from_secs(777)); assert_eq!(redis.namespace.as_deref(), Some("team")); assert_eq!(redis.flush_size, 31); assert_eq!(redis.connection.host, "cache.internal"); @@ -1227,7 +1342,21 @@ mod tests { assert_eq!(redis.connection.database, 4); assert_eq!(redis.connection.protocol, RedisProtocol::Resp3); assert_eq!(redis.connection.pool_size, 29); - let tls = redis.connection.tls.unwrap(); + assert_eq!( + redis.connection.read_timeout, + Some(Duration::from_secs_f64(7.5)) + ); + assert_eq!( + redis.connection.connect_timeout, + Some(Duration::from_secs(2)) + ); + assert_eq!(redis.connection.socket_keepalive, Some(true)); + assert_eq!( + redis.connection.health_check_interval, + Duration::from_secs(15) + ); + assert_eq!(redis.connection.client_name.as_deref(), Some("litellm")); + let tls = redis.connection.tls.as_ref().unwrap(); assert_eq!( tls.certificate_requirement, CertificateRequirement::Optional @@ -1237,123 +1366,89 @@ mod tests { assert_eq!(tls.ca_data.as_deref(), Some("CA DATA")); assert_eq!(tls.client_certificate.as_deref(), Some("/client.pem")); assert_eq!(tls.client_key.as_deref(), Some("/client.key")); + assert!(matches!( + redis.connection.native_url(), + Err(UnsupportedCacheConfig::RedisPoolSize) + )); }); } - #[test] - fn projects_valkey_semantic_configuration() { - Python::initialize(); + #[rstest] + fn projects_valkey_semantic_configuration(_interpreter: ()) { Python::attach(|py| { let facade = facade( py, "pool = ConnectionPool()\n\ pool.connection_class = Connection\n\ pool.max_connections = 12\n\ - pool.connection_kwargs = {'host': 'cache.internal', 'port': 6390, 'db': 2}\n\ + pool.connection_kwargs = {'host': 'cache.internal', 'port': 6390, 'db': 2, 'socket_timeout': 3}\n\ client = SimpleNamespace(connection_pool=pool)\n\ backend = SimpleNamespace(similarity_threshold=0.85, index_name='semantic_idx', embedding_model='text-embedding-3-small', sync_client=client)\n\ facade = SimpleNamespace(type='valkey-semantic', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", ); - let CacheConfigProjection::Native(config) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("Valkey semantic cache should be supported"); - }; - let CacheBackendConfig::ValkeySemantic(valkey) = config.backend else { + let CacheBackendConfig::ValkeySemantic(valkey) = native(&facade).backend else { panic!("expected Valkey semantic configuration"); }; assert_eq!(valkey.similarity_threshold, 0.85); assert_eq!(valkey.index_name, "semantic_idx"); - assert_eq!(valkey.embedding_model, "text-embedding-3-small"); assert_eq!(valkey.connection.host, "cache.internal"); assert_eq!(valkey.connection.port, 6390); assert_eq!(valkey.connection.database, 2); assert_eq!(valkey.connection.pool_size, 12); assert_eq!(valkey.connection.protocol, RedisProtocol::Resp2); + assert_eq!(valkey.connection.read_timeout, Some(Duration::from_secs(3))); assert!(valkey.connection.tls.is_none()); }); } - #[test] - fn valkey_semantic_tls_stays_on_python() { - Python::initialize(); + #[rstest] + #[case::valkey_tls( + "pool = ConnectionPool()\n\ + pool.connection_class = SSLConnection\n\ + pool.connection_kwargs = {'host': 'cache.internal', 'port': 6390}\n\ + client = SimpleNamespace(connection_pool=pool)\n\ + backend = SimpleNamespace(similarity_threshold=0.85, index_name='semantic_idx', embedding_model='text-embedding-3-small', sync_client=client)\n\ + facade = SimpleNamespace(type='valkey-semantic', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", + "native Valkey semantic cache does not support TLS connections" + )] + #[case::valkey_dynamic_auth( + "pool = ConnectionPool()\n\ + pool.connection_class = Connection\n\ + pool.connection_kwargs = {'host': 'cache.internal', 'port': 6390, 'credential_provider': object()}\n\ + client = SimpleNamespace(connection_pool=pool)\n\ + backend = SimpleNamespace(similarity_threshold=0.85, index_name='semantic_idx', embedding_model='text-embedding-3-small', sync_client=client)\n\ + facade = SimpleNamespace(type='valkey-semantic', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", + "native Redis credentials require Python" + )] + #[case::redis_dynamic_auth( + "backend = SimpleNamespace(redis_kwargs={'credential_provider': object()})\n\ + facade = SimpleNamespace(type='redis', mode='default-on', ttl=None, namespace=None, supported_call_types=[], redis_flush_size=None, semantic_cache_scope='key', cache=backend)", + "native Redis credentials require Python" + )] + #[case::gcs_without_bucket( + "backend = SimpleNamespace(bucket_name=None, key_prefix='', path_service_account=None)\n\ + facade = SimpleNamespace(type='gcs', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", + "native GCS cache requires a configured bucket name" + )] + fn configurations_that_stay_on_python( + _interpreter: (), + #[case] body: &str, + #[case] message: &str, + ) { Python::attach(|py| { - let facade = facade( - py, - "pool = ConnectionPool()\n\ - pool.connection_class = SSLConnection\n\ - pool.connection_kwargs = {'host': 'cache.internal', 'port': 6390}\n\ - client = SimpleNamespace(connection_pool=pool)\n\ - backend = SimpleNamespace(similarity_threshold=0.85, index_name='semantic_idx', embedding_model='text-embedding-3-small', sync_client=client)\n\ - facade = SimpleNamespace(type='valkey-semantic', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", - ); - let CacheConfigProjection::Unsupported(reason) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("TLS Valkey semantic cache should stay on Python"); - }; - assert_eq!( - reason.message(), - "native Redis connection type is not implemented" - ); + assert_eq!(unsupported(&facade(py, body)).message(), message); }); } - #[test] - fn valkey_semantic_dynamic_auth_stays_on_python() { - Python::initialize(); - Python::attach(|py| { - let facade = facade( - py, - "pool = ConnectionPool()\n\ - pool.connection_class = Connection\n\ - pool.connection_kwargs = {'host': 'cache.internal', 'port': 6390, 'credential_provider': object()}\n\ - client = SimpleNamespace(connection_pool=pool)\n\ - backend = SimpleNamespace(similarity_threshold=0.85, index_name='semantic_idx', embedding_model='text-embedding-3-small', sync_client=client)\n\ - facade = SimpleNamespace(type='valkey-semantic', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", - ); - let CacheConfigProjection::Unsupported(reason) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("dynamic Valkey authentication must stay on Python"); - }; - assert_eq!(reason.message(), "native Redis credentials require Python"); - }); - } - - #[test] - fn dynamic_redis_auth_stays_on_python() { - Python::initialize(); - Python::attach(|py| { - let facade = facade( - py, - "backend = SimpleNamespace(redis_kwargs={'credential_provider': object()})\n\ - facade = SimpleNamespace(type='redis', mode='default-on', ttl=None, namespace=None, supported_call_types=[], redis_flush_size=None, semantic_cache_scope='key', cache=backend)", - ); - let CacheConfigProjection::Unsupported(reason) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("dynamic authentication must stay on Python"); - }; - assert_eq!(reason.message(), "native Redis credentials require Python"); - }); - } - - #[test] - fn projects_cluster_startup_nodes_as_redis_topology() { - Python::initialize(); + #[rstest] + fn projects_cluster_startup_nodes_as_redis_topology(_interpreter: ()) { Python::attach(|py| { let facade = cluster_facade( py, "[{'host': 'node-a', 'port': 7000}, {'host': 'node-b', 'port': 7001}]", "client.on_connect", ); - let CacheConfigProjection::Native(config) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("cluster startup nodes should project natively"); - }; - let CacheBackendConfig::Redis(redis) = &config.backend else { + let CacheBackendConfig::Redis(redis) = native(&facade).backend else { panic!("expected Redis configuration"); }; let expected = RedisTopology::Cluster { @@ -1382,23 +1477,22 @@ mod tests { .certificate_requirement, CertificateRequirement::None ); + assert!(matches!( + redis.connection.native_url(), + Err(UnsupportedCacheConfig::RedisTlsVerification) + )); }); } - #[test] - fn projects_gcs_configuration() { - Python::initialize(); + #[rstest] + fn projects_gcs_configuration(_interpreter: ()) { Python::attach(|py| { let facade = facade( py, "backend = SimpleNamespace(bucket_name='bucket', key_prefix='cache/', path_service_account='credentials.json')\n\ facade = SimpleNamespace(type='gcs', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", ); - let CacheConfigProjection::Native(config) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("GCS cache should be supported"); - }; + let config = native(&facade); let CacheBackendConfig::Gcs(gcs) = config.backend else { panic!("expected GCS configuration"); }; @@ -1417,9 +1511,9 @@ mod tests { path_service_account: Some("credentials.json".into()), endpoint: litellm_cache_gcs::DEFAULT_ENDPOINT.into(), }, + reqwest::Client::new(), Some("token".into()), - ) - .unwrap(); + ); let matching_config = NativeCacheConfig { policy: config.policy, backend: CacheBackendConfig::Gcs(gcs), @@ -1428,62 +1522,194 @@ mod tests { }); } - #[test] - fn rejects_gcs_without_a_bucket_name() { - Python::initialize(); + #[rstest] + #[case::extra_node_field( + "[{'host': 'node-a', 'port': 7000, 'server_type': 'primary'}]", + "client.on_connect", + "native Redis topology is not implemented" + )] + #[case::non_numeric_port( + "[{'host': 'node-a', 'port': 'seven'}]", + "client.on_connect", + "native Redis topology is not implemented" + )] + #[case::empty("[]", "client.on_connect", "native Redis topology is not implemented")] + #[case::foreign_hook( + "[{'host': 'node-a', 'port': 7000}]", + "lambda connection: None", + "native Redis credentials require Python" + )] + fn malformed_startup_nodes_and_foreign_connect_hooks_stay_on_python( + _interpreter: (), + #[case] startup_nodes: &str, + #[case] hook: &str, + #[case] message: &str, + ) { Python::attach(|py| { - let facade = facade( - py, - "backend = SimpleNamespace(bucket_name=None, key_prefix='', path_service_account=None)\n\ - facade = SimpleNamespace(type='gcs', mode='default-on', ttl=None, namespace=None, supported_call_types=None, redis_flush_size=None, semantic_cache_scope='key', cache=backend)", - ); - let CacheConfigProjection::Unsupported(reason) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("GCS cache without a bucket should be unsupported"); - }; - assert!(matches!(&reason, UnsupportedCacheConfig::GcsBucket)); - assert_eq!( - reason.message(), - "native GCS cache requires a configured bucket name" - ); + let facade = cluster_facade(py, startup_nodes, hook); + assert_eq!(unsupported(&facade).message(), message); }); } - #[test] - fn malformed_startup_nodes_and_foreign_connect_hooks_stay_on_python() { - Python::initialize(); - Python::attach(|py| { - for (startup_nodes, hook, message) in [ - ( - "[{'host': 'node-a', 'port': 7000, 'server_type': 'primary'}]", - "client.on_connect", - "native Redis topology is not implemented", - ), - ( - "[{'host': 'node-a', 'port': 'seven'}]", - "client.on_connect", - "native Redis topology is not implemented", - ), - ( - "[]", - "client.on_connect", - "native Redis topology is not implemented", - ), - ( - "[{'host': 'node-a', 'port': 7000}]", - "lambda connection: None", - "native Redis credentials require Python", - ), - ] { - let facade = cluster_facade(py, startup_nodes, hook); - let CacheConfigProjection::Unsupported(reason) = - NativeCacheConfig::project(&facade).unwrap() - else { - panic!("{startup_nodes} with {hook} must stay on Python"); - }; - assert_eq!(reason.message(), message, "{startup_nodes} with {hook}"); + #[rstest] + #[case::plain(|_: &mut RedisConnectionConfig| {}, "redis://cache.internal:6380/4")] + #[case::credentials( + |connection: &mut RedisConnectionConfig| { + connection.username = Some("user".into()); + connection.password = Some("p@ss:word".into()); + }, + "redis://user:p%40ss%3Aword@cache.internal:6380/4" + )] + #[case::password_only( + |connection: &mut RedisConnectionConfig| connection.password = Some("secret".into()), + "redis://:secret@cache.internal:6380/4" + )] + #[case::resp3( + |connection: &mut RedisConnectionConfig| connection.protocol = RedisProtocol::Resp3, + "redis://cache.internal:6380/4?protocol=resp3" + )] + #[case::ipv6( + |connection: &mut RedisConnectionConfig| connection.host = "::1".into(), + "redis://[::1]:6380/4" + )] + #[case::verified_tls( + |connection: &mut RedisConnectionConfig| connection.tls = Some(verified_tls()), + "rediss://cache.internal:6380/4" + )] + #[case::optional_certificate( + |connection: &mut RedisConnectionConfig| { + connection.tls = Some(RedisTlsConfig { + certificate_requirement: CertificateRequirement::Optional, + ..verified_tls() + }); + }, + "rediss://cache.internal:6380/4" + )] + #[case::keepalive_off( + |connection: &mut RedisConnectionConfig| connection.socket_keepalive = Some(false), + "redis://cache.internal:6380/4" + )] + #[case::redis_cache_socket_timeout( + |connection: &mut RedisConnectionConfig| { + connection.read_timeout = Some(Duration::from_secs(5)); + }, + "redis://cache.internal:6380/4" + )] + fn native_url_encodes_the_resolved_connection( + mut connection: RedisConnectionConfig, + #[case] configure: fn(&mut RedisConnectionConfig), + #[case] expected: &str, + ) { + configure(&mut connection); + assert_eq!(connection.native_url().ok().as_deref(), Some(expected)); + } + + #[rstest] + #[case::pool_size( + |connection: &mut RedisConnectionConfig| connection.pool_size = 50, + "native Redis uses a fixed connection pool; max_connections requires Python" + )] + #[case::socket_timeout( + |connection: &mut RedisConnectionConfig| { + connection.read_timeout = Some(Duration::from_millis(100)); + }, + "native Redis uses fixed socket timeouts; socket_timeout and socket_connect_timeout require Python" + )] + #[case::connect_timeout( + |connection: &mut RedisConnectionConfig| { + connection.connect_timeout = Some(Duration::from_secs(1)); + }, + "native Redis uses fixed socket timeouts; socket_timeout and socket_connect_timeout require Python" + )] + #[case::keepalive( + |connection: &mut RedisConnectionConfig| connection.socket_keepalive = Some(true), + "native Redis does not support socket_keepalive" + )] + #[case::health_check( + |connection: &mut RedisConnectionConfig| { + connection.health_check_interval = Duration::from_secs(25); + }, + "native Redis does not support health_check_interval" + )] + #[case::client_name( + |connection: &mut RedisConnectionConfig| connection.client_name = Some("litellm".into()), + "native Redis does not support client_name" + )] + #[case::custom_ca( + |connection: &mut RedisConnectionConfig| { + connection.tls = Some(RedisTlsConfig { + ca_certificate: Some("/ca.pem".into()), + ..verified_tls() + }); + }, + "native Redis TLS does not support ssl_ca_certs, ssl_ca_data, ssl_certfile or ssl_keyfile" + )] + #[case::client_certificate( + |connection: &mut RedisConnectionConfig| { + connection.tls = Some(RedisTlsConfig { + client_certificate: Some("/client.pem".into()), + client_key: Some("/client.key".into()), + ..verified_tls() + }); + }, + "native Redis TLS does not support ssl_ca_certs, ssl_ca_data, ssl_certfile or ssl_keyfile" + )] + #[case::unverified( + |connection: &mut RedisConnectionConfig| { + connection.tls = Some(RedisTlsConfig { + certificate_requirement: CertificateRequirement::None, + check_hostname: false, + ..verified_tls() + }); + }, + "native Redis TLS always verifies the certificate and hostname; ssl_cert_reqs=none and ssl_check_hostname=false require Python" + )] + #[case::hostname_unchecked( + |connection: &mut RedisConnectionConfig| { + connection.tls = Some(RedisTlsConfig { + check_hostname: false, + ..verified_tls() + }); + }, + "native Redis TLS always verifies the certificate and hostname; ssl_cert_reqs=none and ssl_check_hostname=false require Python" + )] + fn native_url_declines_settings_the_native_client_cannot_honor( + mut connection: RedisConnectionConfig, + #[case] configure: fn(&mut RedisConnectionConfig), + #[case] message: &str, + ) { + configure(&mut connection); + let Err(reason) = connection.native_url() else { + panic!("{message}"); + }; + assert_eq!(reason.message(), message); + } + + #[rstest] + #[case::plain("redis://:secret@127.0.0.1:6379", true)] + #[case::database("redis://127.0.0.1:6379/2", true)] + #[case::unix("unix:///tmp/redis.sock", true)] + #[case::tls("rediss://cache.internal:6380", false)] + #[case::query_options("redis://127.0.0.1:6379?socket_timeout=1", false)] + #[case::malformed("not a url", false)] + fn redis_semantic_native_url_accepts_only_plain_urls(#[case] url: &str, #[case] native: bool) { + let config = RedisSemanticCacheConfig { + redis_url: url.into(), + index_name: "idx".into(), + similarity_threshold: 0.8, + }; + match config.native_url() { + Ok(value) => { + assert!(native, "{url} must decline"); + assert_eq!(value, url); } - }); + Err(reason) => { + assert!(!native, "{url} must be native"); + assert_eq!( + reason.message(), + "native Redis semantic cache does not support TLS or query options in redis_url" + ); + } + } } } diff --git a/litellm-rust/crates/python-bridge/src/cache/embedder.rs b/litellm-rust/crates/python-bridge/src/cache/embedder.rs index ffd72e33e1b..7eadd9bc4b0 100644 --- a/litellm-rust/crates/python-bridge/src/cache/embedder.rs +++ b/litellm-rust/crates/python-bridge/src/cache/embedder.rs @@ -90,21 +90,7 @@ impl PythonEmbedder { } } -impl litellm_cache_valkey_semantic::Embedder for PythonEmbedder { - fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { - self.embed_sync(prompt, metadata) - } - - fn async_embed( - &self, - _prompt: &str, - _metadata: Option<&Value>, - ) -> impl Future, Error>> + Send { - std::future::ready(Self::seeded_embedding()) - } -} - -impl litellm_cache_redis_semantic::Embedder for PythonEmbedder { +impl litellm_cache::semantic::Embedder for PythonEmbedder { fn embed(&self, prompt: &str, metadata: Option<&Value>) -> Result, Error> { self.embed_sync(prompt, metadata) } @@ -129,15 +115,14 @@ mod tests { let embedder = PythonEmbedder::new(object); let scoped_embedder = embedder.clone(); let scoped = with_prepared_embedding(Ok(vec![0.25]), async move { - litellm_cache_redis_semantic::Embedder::async_embed(&scoped_embedder, "prompt", None) - .await + litellm_cache::semantic::Embedder::async_embed(&scoped_embedder, "prompt", None).await }); assert_eq!(scoped.await, Ok(vec![0.25])); let unscoped = - litellm_cache_redis_semantic::Embedder::async_embed(&embedder, "prompt", None).await; + litellm_cache::semantic::Embedder::async_embed(&embedder, "prompt", None).await; assert_eq!(unscoped, Err(Error::Unavailable)); let valkey = with_prepared_embedding(Ok(vec![0.5]), async move { - litellm_cache_valkey_semantic::Embedder::async_embed(&embedder, "prompt", None).await + litellm_cache::semantic::Embedder::async_embed(&embedder, "prompt", None).await }); assert_eq!(valkey.await, Ok(vec![0.5])); } diff --git a/litellm-rust/crates/python-bridge/src/cache/facade.rs b/litellm-rust/crates/python-bridge/src/cache/facade.rs index 17fa278ae5e..88fde2f6de0 100644 --- a/litellm-rust/crates/python-bridge/src/cache/facade.rs +++ b/litellm-rust/crates/python-bridge/src/cache/facade.rs @@ -80,6 +80,10 @@ const CLUSTER_POOL: RedisPoolAttributes = RedisPoolAttributes { const VALKEY_POOL: RedisPoolAttributes = STANDALONE_POOL; +/// Class-level defaults an instance overwrites with its own state rather than behavior: +/// `Cache._native_cache` holds the runtime `Cache.__init__` resolved. +const INSTANCE_STATE: &[&str] = &["_native_cache"]; + pub(super) struct FacadeGuard { outer: ObjectGuard, backend: ObjectGuard, @@ -166,7 +170,9 @@ impl ObjectGuard { return Ok(false); } for (name, value) in &expected.attributes { - if (instance.contains(name)? && !self.config_names.contains(&name.as_str())) + if (instance.contains(name)? + && !self.config_names.contains(&name.as_str()) + && !INSTANCE_STATE.contains(&name.as_str())) || !attributes.get_item(name)?.is(value.bind(py)) { return Ok(false); diff --git a/litellm-rust/crates/python-bridge/src/cache/handle.rs b/litellm-rust/crates/python-bridge/src/cache/handle.rs index 61993f42279..e14916b25c6 100644 --- a/litellm-rust/crates/python-bridge/src/cache/handle.rs +++ b/litellm-rust/crates/python-bridge/src/cache/handle.rs @@ -1,16 +1,16 @@ +use crate::logger::run_sync_value; use litellm_auth_aws::AwsAuthConfig; use litellm_cache_gcs::{DEFAULT_ENDPOINT, GcsConfig}; use litellm_cache_qdrant_semantic::{OpenAiEmbedderConfig, Quantization}; use litellm_cache_redis::{RedisNode, RedisTopology}; use litellm_cache_redis_semantic::RedisSemanticConfig; use litellm_cache_s3::{S3CacheConfig, S3Endpoint}; -use litellm_host_python::{release_gil, run_sync_value}; +use litellm_host_python::release_gil; use litellm_http::ClientVariant; use pyo3::{ PyTraverseError, PyVisit, exceptions::{PyRuntimeError, PyTypeError}, prelude::*, - types::PyDict, }; use url::Url; @@ -19,6 +19,7 @@ use super::{ config::{QdrantSemanticCacheConfig, project_redis_semantic}, embedder::PythonEmbedder, facade::FacadeGuard, + host_client, native::NativeResponseCache, request::duration, }; @@ -109,7 +110,10 @@ impl CacheTestHandle { ..Default::default() }, }; - let service = run_sync_value(py, async move { Ok(NativeResponseCache::s3(config).await) })?; + let http = host_client(py, ClientVariant::NoRedirect)?; + let service = run_sync_value(py, async move { + Ok(NativeResponseCache::s3(config, http).await) + })?; Ok(Self { service, guard: None, @@ -133,8 +137,8 @@ impl CacheTestHandle { path_service_account, endpoint: endpoint.unwrap_or_else(|| DEFAULT_ENDPOINT.to_string()), }; - let service = release_gil(py, move || NativeResponseCache::gcs(config, token)) - .map_err(cache_error)?; + let client = host_client(py, ClientVariant::NoRedirect)?; + let service = NativeResponseCache::gcs(config, client, token); Ok(Self { service, guard: None, @@ -236,10 +240,7 @@ impl CacheTestHandle { }, quantization, }; - let http_config = crate::http::call_config(py, &PyDict::new(py), true)?; - let client = crate::http::pool() - .client(&http_config, ClientVariant::Provider) - .map_err(crate::http::client_error)?; + let client = host_client(py, ClientVariant::Provider)?; let service = run_sync_value(py, async move { let handle = tokio::runtime::Handle::current(); NativeResponseCache::qdrant_semantic(config, client, handle) @@ -279,8 +280,9 @@ impl CacheTestHandle { #[staticmethod] #[pyo3(signature = (account_url, container))] fn azure_blob(py: Python<'_>, account_url: String, container: String) -> PyResult { + let http = host_client(py, ClientVariant::NoRedirect)?; let service = run_sync_value(py, async move { - NativeResponseCache::azure_blob(&account_url, &container) + NativeResponseCache::azure_blob(&account_url, &container, http) .await .map_err(cache_error) })?; diff --git a/litellm-rust/crates/python-bridge/src/cache/mod.rs b/litellm-rust/crates/python-bridge/src/cache/mod.rs index 28dd6c3e798..0cfd4ac8138 100644 --- a/litellm-rust/crates/python-bridge/src/cache/mod.rs +++ b/litellm-rust/crates/python-bridge/src/cache/mod.rs @@ -1,3 +1,4 @@ +mod activation; mod binding; mod callback; mod config; @@ -12,9 +13,11 @@ mod resolver; mod semantic; use litellm_cache::Error; +use litellm_http::ClientVariant; use pyo3::{ exceptions::{PyNotImplementedError, PyRuntimeError, PyValueError}, prelude::*, + types::PyDict, }; pub(crate) use self::{ @@ -28,3 +31,11 @@ fn cache_error(error: Error) -> PyErr { _ => PyRuntimeError::new_err(error.to_string()), } } + +/// The host's pooled HTTP client, configured from the proxy's HTTP settings. +fn host_client(py: Python<'_>, variant: ClientVariant) -> PyResult { + let http_config = crate::http::call_config(py, &PyDict::new(py), true)?; + crate::http::pool() + .client(&http_config, variant) + .map_err(crate::http::client_error) +} diff --git a/litellm-rust/crates/python-bridge/src/cache/native.rs b/litellm-rust/crates/python-bridge/src/cache/native.rs index 254b9cdea4d..0e279046812 100644 --- a/litellm-rust/crates/python-bridge/src/cache/native.rs +++ b/litellm-rust/crates/python-bridge/src/cache/native.rs @@ -1,15 +1,16 @@ use std::{sync::Arc, time::Duration}; -use litellm_cache::{CacheCodec, CacheConnectionResult, Error}; +use litellm_cache::{CacheCodec, CacheConnectionResult, Error, semantic::SemanticLookup}; use litellm_cache_azure_blob::AzureBlobCache; use litellm_cache_disk::DiskCache; use litellm_cache_gcs::{GcsCache, GcsConfig, StaticTokenSource}; use litellm_cache_memory::InMemoryCache; -use litellm_cache_qdrant_semantic::{Embedder, OpenAiEmbedder, QdrantSemanticCache}; +use litellm_cache_qdrant_semantic::{OpenAiEmbedder, QdrantSemanticCache}; use litellm_cache_redis::{RedisCache, RedisTopology}; use litellm_cache_redis_semantic::{RedisSemanticCache, RedisSemanticConfig}; use litellm_cache_response::{ - ExactResponseCache, PartialHits, ResponseCache, ResponseCacheCodec, WriteBuffer, + ConnectionProbe, ExactResponseCache, PartialHits, ResponseCache, ResponseCacheCodec, + WriteBuffer, }; use litellm_cache_s3::{S3Cache, S3CacheConfig}; use litellm_cache_valkey_semantic::{ValkeySemanticCache, ValkeySemanticConfig}; @@ -33,20 +34,11 @@ pub(super) struct EmbeddingInput { /// An exact-match backend behind one pointer, with the identity its facade must reproduce. pub(super) struct ExactService { cache: Arc, + probe: Option>, buffer: Option, identity: BackendIdentity, } -impl ExactService { - fn new(cache: Arc, identity: BackendIdentity) -> Arc { - Arc::new(Self { - cache, - buffer: None, - identity, - }) - } -} - #[derive(Clone)] pub(super) enum NativeResponseCache { Exact(Arc), @@ -56,7 +48,7 @@ pub(super) enum NativeResponseCache { scope: String, }, RedisSemantic { - cache: Arc>>, + cache: Arc>>, embedder: PythonEmbedder, }, QdrantSemantic(Arc>>), @@ -94,12 +86,15 @@ impl NativeResponseCache { namespace: backend.namespace().map(str::to_owned), default_ttl: None, }; - Ok(Self::exact(ResponseCache::new(Arc::new(backend)), identity)) + Ok(Self::exact_probed( + ResponseCache::new(Arc::new(backend)), + identity, + )) } - pub async fn s3(config: S3CacheConfig) -> Self { + pub async fn s3(config: S3CacheConfig, http: reqwest::Client) -> Self { let runtime = tokio::runtime::Handle::current(); - let backend = S3Cache::new(config, ResponseCacheCodec, runtime); + let backend = S3Cache::new(config, http, ResponseCacheCodec, runtime); let identity = BackendIdentity::S3 { bucket: backend.bucket().to_owned(), key_prefix: backend.key_prefix().to_owned(), @@ -109,7 +104,7 @@ impl NativeResponseCache { Self::exact(ResponseCache::new(Arc::new(backend)), identity) } - pub fn disk(directory: &str) -> Result { + pub fn disk(directory: impl AsRef) -> Result { let backend = DiskCache::open(directory, ResponseCacheCodec)?; let identity = BackendIdentity::Disk { directory: backend.directory().to_path_buf(), @@ -117,27 +112,33 @@ impl NativeResponseCache { Ok(Self::exact(ResponseCache::new(Arc::new(backend)), identity)) } - pub fn gcs(config: GcsConfig, token: Option) -> Result { + pub fn gcs(config: GcsConfig, client: reqwest::Client, token: Option) -> Self { let backend = match token { Some(token) => GcsCache::with_token_source( config, + client, ResponseCacheCodec, Arc::new(StaticTokenSource(token)), - )?, - None => GcsCache::new(config, ResponseCacheCodec)?, + ), + None => GcsCache::new(config, client, ResponseCacheCodec), }; let identity = BackendIdentity::Gcs { bucket_name: backend.bucket_name().to_owned(), key_prefix: backend.key_prefix().to_owned(), path_service_account: backend.path_service_account().map(str::to_owned), }; - Ok(Self::exact(ResponseCache::new(Arc::new(backend)), identity)) + Self::exact(ResponseCache::new(Arc::new(backend)), identity) } - pub async fn azure_blob(account_url: &str, container: &str) -> Result { + pub async fn azure_blob( + account_url: &str, + container: &str, + http: reqwest::Client, + ) -> Result { let backend = AzureBlobCache::connect( account_url, container, + http, ResponseCacheCodec, tokio::runtime::Handle::current(), ) @@ -156,7 +157,25 @@ impl NativeResponseCache { B: litellm_cache::BaseCache, B::Context: Default + PartialEq, { - let cache: Arc = Arc::new(cache); + Self::exact_service(Arc::new(cache), None, identity) + } + + /// Wraps an exact backend whose Python class defines `test_connection`. + fn exact_probed(cache: ResponseCache, identity: BackendIdentity) -> Self + where + ResponseCache: ExactResponseCache + ConnectionProbe + 'static, + B: litellm_cache::BaseCache, + B::Context: Default + PartialEq, + { + let cache = Arc::new(cache); + Self::exact_service(cache.clone(), Some(cache), identity) + } + + fn exact_service( + cache: Arc, + probe: Option>, + identity: BackendIdentity, + ) -> Self { let default_ttl = cache.default_ttl(); let identity = match identity { BackendIdentity::Memory { @@ -179,7 +198,12 @@ impl NativeResponseCache { }, other => other, }; - Self::Exact(ExactService::new(cache, identity)) + Self::Exact(Arc::new(ExactService { + cache, + probe, + buffer: None, + identity, + })) } pub fn valkey_semantic( @@ -209,7 +233,7 @@ impl NativeResponseCache { embedder: PythonEmbedder, config: RedisSemanticConfig, ) -> Result { - let backend = RedisSemanticCache::new(url, embedder.clone(), config)?; + let backend = RedisSemanticCache::new(url, embedder.clone(), ResponseCacheCodec, config)?; Ok(Self::RedisSemantic { cache: Arc::new(ResponseCache::new(Arc::new(backend))), embedder, @@ -270,6 +294,7 @@ impl NativeResponseCache { Self::Exact(service) if matches!(service.identity, BackendIdentity::Redis { .. }) => { Self::Exact(Arc::new(ExactService { cache: Arc::clone(&service.cache), + probe: service.probe.clone(), buffer: flush_size.map(WriteBuffer::new), identity: service.identity.clone(), })) @@ -305,7 +330,7 @@ impl NativeResponseCache { Self::RedisSemantic { .. } => request.semantic().context, Self::Exact(_) | Self::QdrantSemantic(_) => return None, }; - let prompt = litellm_cache_redis_semantic::prompt_from_context(&context)?; + let prompt = litellm_cache::semantic::prompt_from_context(&context)?; Some(EmbeddingInput { prompt, metadata: context.metadata, @@ -344,6 +369,28 @@ impl NativeResponseCache { } } + /// `lookup` plus the similarity Python's semantic backend writes to the request metadata. + /// Exact backends report none. + pub fn lookup_semantic( + &self, + request: &NativeRequest, + now: Duration, + ) -> Result, Error> { + match self { + Self::Exact(service) => service + .cache + .lookup(&request.exact(), now) + .map(exact_lookup), + Self::ValkeySemantic { cache, scope, .. } => { + redis_family(cache.lookup_semantic(&request.scoped_semantic(scope), now)) + } + Self::RedisSemantic { cache, .. } => { + redis_family(cache.lookup_semantic(&request.semantic(), now)) + } + Self::QdrantSemantic(cache) => cache.lookup_semantic(&request.semantic(), now), + } + } + pub fn store( &self, request: &NativeRequest, @@ -390,6 +437,56 @@ impl NativeResponseCache { } } + pub async fn async_lookup_semantic( + &self, + request: &NativeRequest, + now: Duration, + ) -> Result, Error> { + match self { + Self::Exact(service) => service + .cache + .async_lookup(&request.exact(), now) + .await + .map(exact_lookup), + Self::ValkeySemantic { cache, scope, .. } => redis_family( + cache + .async_lookup_semantic(&request.scoped_semantic(scope), now) + .await, + ), + Self::RedisSemantic { cache, .. } => { + redis_family(cache.async_lookup_semantic(&request.semantic(), now).await) + } + Self::QdrantSemantic(cache) => { + cache.async_lookup_semantic(&request.semantic(), now).await + } + } + } + + pub(super) fn async_lookup_semantic_py<'py>( + &self, + py: Python<'py>, + request: NativeRequest, + ) -> PyResult> { + match self { + Self::Exact(_) | Self::QdrantSemantic(_) => { + let service = self.clone(); + crate::logger::run_async( + py, + async move { + service + .async_lookup_semantic(&request, now()) + .await + .map(SemanticReply::from) + }, + super::cache_error, + ) + } + Self::ValkeySemantic { .. } | Self::RedisSemantic { .. } => { + self.python_semantic(py, SemanticOperation::LookupSemantic(request)) + } + } + } + pub(super) fn async_lookup_py<'py>( &self, py: Python<'py>, @@ -398,7 +495,7 @@ impl NativeResponseCache { match self { Self::Exact(_) | Self::QdrantSemantic(_) => { let service = self.clone(); - litellm_host_python::run_async( + crate::logger::run_async( py, async move { service.async_lookup(&request, now()).await }, super::cache_error, @@ -453,7 +550,7 @@ impl NativeResponseCache { match self { Self::Exact(_) | Self::QdrantSemantic(_) => { let service = self.clone(); - litellm_host_python::run_async( + crate::logger::run_async( py, async move { service.async_store(&request, response, now()).await }, super::cache_error, @@ -522,7 +619,7 @@ impl NativeResponseCache { match self { Self::Exact(_) | Self::QdrantSemantic(_) => { let service = self.clone(); - litellm_host_python::run_async( + crate::logger::run_async( py, async move { service.async_store_batch(entries, now()).await }, super::cache_error, @@ -550,9 +647,11 @@ impl NativeResponseCache { pub async fn test_connection(&self) -> Result { match self { - Self::Exact(service) => service.cache.test_connection().await, - Self::ValkeySemantic { cache, .. } => cache.test_connection().await, - Self::RedisSemantic { .. } | Self::QdrantSemantic(_) => { + Self::Exact(service) => match &service.probe { + Some(probe) => probe.test_connection().await, + None => Err(Error::UnsupportedOperation), + }, + Self::ValkeySemantic { .. } | Self::RedisSemantic { .. } | Self::QdrantSemantic(_) => { Err(Error::UnsupportedOperation) } } @@ -571,3 +670,27 @@ impl NativeResponseCache { fn exact_requests(requests: &[NativeRequest]) -> Vec { requests.iter().map(NativeRequest::exact).collect() } + +/// What `lookup_semantic` hands Python: the response and the similarity to stamp, if any. +#[derive(serde::Serialize)] +pub(super) struct SemanticReply(pub(super) Option, pub(super) Option); + +impl From> for SemanticReply { + fn from(lookup: SemanticLookup) -> Self { + Self(lookup.value, lookup.similarity) + } +} + +fn exact_lookup(value: Option) -> SemanticLookup { + SemanticLookup { + value, + similarity: None, + } +} + +/// Python's Redis and Valkey semantic caches catch every lookup failure and stamp `0.0`. +fn redis_family( + lookup: Result, Error>, +) -> Result, Error> { + Ok(lookup.unwrap_or_else(|_| SemanticLookup::miss(Some(0.0)))) +} diff --git a/litellm-rust/crates/python-bridge/src/cache/semantic.rs b/litellm-rust/crates/python-bridge/src/cache/semantic.rs index 9f4d18d45cd..eb67f5594e2 100644 --- a/litellm-rust/crates/python-bridge/src/cache/semantic.rs +++ b/litellm-rust/crates/python-bridge/src/cache/semantic.rs @@ -1,7 +1,8 @@ +use crate::logger::run_async; use std::{collections::VecDeque, time::Duration}; use litellm_cache::Error; -use litellm_host_python::{Execution, ExecutionBody, ExecutionStep, run_async}; +use litellm_host_python::{Execution, ExecutionBody, ExecutionStep}; use pyo3::{ PyTraverseError, PyVisit, exceptions::{PyException, PyRuntimeError}, @@ -12,12 +13,14 @@ use serde_json::Value; use super::{ cache_error, embedder::{PythonEmbedder, with_prepared_embedding}, - native::NativeResponseCache, + native::{NativeResponseCache, SemanticReply}, request::{NativeRequest, now}, }; pub(super) enum SemanticOperation { Lookup(NativeRequest), + /// A lookup that also reports the similarity, as `SemanticReply`. + LookupSemantic(NativeRequest), Store(NativeRequest, Value), StoreBatch(VecDeque<(NativeRequest, Value)>), } @@ -71,7 +74,9 @@ impl SemanticExecution { /// Takes the next entry of the operation; `None` once a batch is exhausted. fn next_pending(&mut self) -> Option<(NativeRequest, Option)> { match &mut self.operation { - SemanticOperation::Lookup(request) => Some((request.clone(), None)), + SemanticOperation::Lookup(request) | SemanticOperation::LookupSemantic(request) => { + Some((request.clone(), None)) + } SemanticOperation::Store(request, response) => { Some((request.clone(), Some(std::mem::take(response)))) } @@ -109,7 +114,7 @@ impl SemanticExecution { Ok(vector) => { PythonEmbedder::extract(vector.into_bound(py)).map_err(|_| Error::Unavailable) } - Err(error) => match self.failure { + Err(error) => match self.embedding_failure() { EmbeddingFailure::Propagate => return Err(error), EmbeddingFailure::Unavailable if error.is_instance_of::(py) => { Err(Error::Unavailable) @@ -120,6 +125,14 @@ impl SemanticExecution { self.backend_step(py, seed) } + /// Python's semantic lookups catch embedding errors and stamp a similarity of `0.0`. + fn embedding_failure(&self) -> EmbeddingFailure { + match self.operation { + SemanticOperation::LookupSemantic(_) => EmbeddingFailure::Unavailable, + _ => self.failure, + } + } + fn backend_step( &mut self, py: Python<'_>, @@ -131,13 +144,18 @@ impl SemanticExecution { })?; let service = self.service.clone(); let now = self.now; + let with_similarity = matches!(self.operation, SemanticOperation::LookupSemantic(_)); let future = async move { match response { - None => service.async_lookup(&request, now).await, + None if with_similarity => service + .async_lookup_semantic(&request, now) + .await + .map(|lookup| Reply::Semantic(lookup.into())), + None => service.async_lookup(&request, now).await.map(Reply::Plain), Some(response) => service .async_store(&request, response, now) .await - .map(|_| None), + .map(|_| Reply::Plain(None)), } }; let awaitable = run_async(py, with_prepared_embedding(seed, future), cache_error)?; @@ -171,6 +189,13 @@ impl SemanticExecution { } } +#[derive(serde::Serialize)] +#[serde(untagged)] +enum Reply { + Plain(Option), + Semantic(SemanticReply), +} + impl ExecutionBody for SemanticExecution { fn resume(&mut self, result: Option>>) -> PyResult { Python::attach(|py| self.resume_py(py, result)) diff --git a/litellm-rust/crates/python-bridge/src/http.rs b/litellm-rust/crates/python-bridge/src/http.rs index 2515b409c54..3dad3447f45 100644 --- a/litellm-rust/crates/python-bridge/src/http.rs +++ b/litellm-rust/crates/python-bridge/src/http.rs @@ -102,7 +102,7 @@ pub(crate) fn call_config( .without_missing_files(&|path: &Path| path.exists()); let resolution = Resolution::from(&settings); for unsupported in unreported(&REPORTED_UNSUPPORTED, resolution.unsupported) { - PythonSettings::warn(py, &unsupported.to_string())?; + crate::logger::capture(py).scope(|| litellm_tracing::warn!("{unsupported}")); } Ok(resolution.config) } diff --git a/litellm-rust/crates/python-bridge/src/lib.rs b/litellm-rust/crates/python-bridge/src/lib.rs index b1fc5244d6f..76de2ae2b7b 100644 --- a/litellm-rust/crates/python-bridge/src/lib.rs +++ b/litellm-rust/crates/python-bridge/src/lib.rs @@ -4,6 +4,7 @@ mod credentials; mod diagnostics; mod errors; mod http; +mod logger; mod marshal; mod python_settings; mod routes; @@ -25,6 +26,8 @@ mod _native { #[pymodule_export] use crate::errors::{RustBridgeDeclined, RustUpstreamError}; #[pymodule_export] + use crate::logger::NativeDiagnosticProcessor; + #[pymodule_export] use crate::routes::audio_transcription::{atranscription, transcription}; #[pymodule_export] use crate::routes::chat_completions::{ @@ -87,6 +90,7 @@ mod tests { "chat_completions", "achat_completions", "ResponsesWebSocketConnection", + "NativeDiagnosticProcessor", "TokenCounter", "Tokenizer", "gil_stats", diff --git a/litellm-rust/crates/python-bridge/src/logger/execution.rs b/litellm-rust/crates/python-bridge/src/logger/execution.rs new file mode 100644 index 00000000000..c8d5c0023e3 --- /dev/null +++ b/litellm-rust/crates/python-bridge/src/logger/execution.rs @@ -0,0 +1,46 @@ +use std::future::Future; + +use pyo3::prelude::*; +use serde::Serialize; + +pub(crate) fn run_sync( + py: Python<'_>, + future: F, + map_error: fn(E) -> PyErr, +) -> PyResult> +where + T: Serialize + Send + 'static, + E: Send + 'static, + F: Future> + Send + 'static, +{ + litellm_host_python::run_sync(py, super::capture(py).instrument(future), map_error) +} + +pub(crate) fn run_async( + py: Python<'_>, + future: F, + map_error: fn(E) -> PyErr, +) -> PyResult> +where + T: Serialize + Send + 'static, + E: Send + 'static, + F: Future> + Send + 'static, +{ + litellm_host_python::run_async(py, super::capture(py).instrument(future), map_error) +} + +pub(crate) fn run_sync_value(py: Python<'_>, future: F) -> PyResult +where + T: Send + 'static, + F: Future> + Send + 'static, +{ + litellm_host_python::run_sync_value(py, super::capture(py).instrument(future)) +} + +pub(crate) fn run_async_value(py: Python<'_>, future: F) -> PyResult> +where + T: for<'py> IntoPyObject<'py> + Send + 'static, + F: Future> + Send + 'static, +{ + litellm_host_python::run_async_value(py, super::capture(py).instrument(future)) +} diff --git a/litellm-rust/crates/python-bridge/src/logger/machine.rs b/litellm-rust/crates/python-bridge/src/logger/machine.rs new file mode 100644 index 00000000000..7234308e67e --- /dev/null +++ b/litellm-rust/crates/python-bridge/src/logger/machine.rs @@ -0,0 +1,41 @@ +use std::sync::OnceLock; + +use litellm_host::{ + host::HostResult, + machine::{HostFailure, Interrupted, Machine, Step}, + route::Route, +}; +use litellm_tracing::Logger; +use pyo3::Python; + +pub(crate) struct LoggedMachine { + machine: M, + logger: OnceLock, +} + +impl LoggedMachine { + pub(crate) fn new(machine: M) -> Self { + Self { + machine, + logger: OnceLock::new(), + } + } +} + +impl Machine for LoggedMachine { + type Route = M::Route; + type Complete = M::Complete; + + fn resume(&mut self, result: Option>) -> Step<'_, Self> { + let logger = self.logger.get_or_init(|| Python::attach(super::capture)); + Box::pin(logger.instrument(logger.scope(|| self.machine.resume(result)))) + } + + fn interrupt( + &mut self, + failure: HostFailure<::Error>, + ) -> Interrupted<'_, Self> { + let logger = self.logger.get_or_init(|| Python::attach(super::capture)); + Box::pin(logger.instrument(logger.scope(|| self.machine.interrupt(failure)))) + } +} diff --git a/litellm-rust/crates/python-bridge/src/logger/mod.rs b/litellm-rust/crates/python-bridge/src/logger/mod.rs new file mode 100644 index 00000000000..6421fe1d554 --- /dev/null +++ b/litellm-rust/crates/python-bridge/src/logger/mod.rs @@ -0,0 +1,166 @@ +mod execution; +mod machine; + +pub(crate) use execution::{run_async, run_async_value, run_sync, run_sync_value}; +pub(crate) use machine::LoggedMachine; + +use litellm_host_python::Pythonized; +use litellm_tracing::{DiagnosticInput, Level, Logger, Metadata, Policy, Processor, Record, Sink}; +use pyo3::exceptions::PyRuntimeError; +use pyo3::prelude::*; + +const MODULE: &str = "litellm.rust_bridge.logger"; +type NativeDiagnosticOutput = (String, Option, Option, Vec, bool); + +#[pyclass] +pub(crate) struct NativeDiagnosticProcessor { + inner: Processor, +} + +#[pymethods] +impl NativeDiagnosticProcessor { + #[new] + fn new(minimum_custom_key_length: usize) -> Self { + Self { + inner: Processor::new(minimum_custom_key_length), + } + } + + fn redact_text(&self, text: &str) -> PyResult { + self.inner.redact_text(text).map_err(processing_error) + } + + fn redact_structured_text(&self, key: Option<&str>, text: &str) -> PyResult { + self.inner + .redact_structured_text(key, text) + .map_err(processing_error) + } + + fn redact_client_message(&self, text: &str) -> PyResult { + self.inner + .redact_client_message(text) + .map_err(processing_error) + } + + #[pyo3(signature = (message, exception, stack, leaves, policy))] + fn process_diagnostic( + &self, + message: String, + exception: Option, + stack: Option, + leaves: Vec<(Option, String)>, + policy: (bool, i64, i64), + ) -> PyResult { + let input = DiagnosticInput { + message, + exception, + stack, + leaves, + }; + let policy = Policy { + redact: policy.0, + base64_limit: policy.1, + text_limit: policy.2, + }; + self.inner + .process_diagnostic(&input, policy) + .map(|output| { + ( + output.message, + output.exception, + output.stack, + output.leaves, + output.changed, + ) + }) + .map_err(processing_error) + } + + fn scrub_access_arguments(&self, arguments: Vec) -> PyResult> { + self.inner + .scrub_access_arguments(&arguments) + .map_err(processing_error) + } +} + +fn processing_error(_: fancy_regex::Error) -> PyErr { + PyRuntimeError::new_err("diagnostic processing failed") +} + +struct PythonSink { + correlation: (String, String), +} + +fn level(level: &Level) -> u8 { + match *level { + Level::ERROR => 40, + Level::WARN => 30, + Level::INFO => 20, + Level::DEBUG | Level::TRACE => 10, + } +} + +fn report(py: Python<'_>, result: PyResult) -> T { + match result { + Ok(value) => value, + Err(error) => { + error.write_unraisable(py, None); + T::default() + } + } +} + +impl Sink for PythonSink { + fn enabled(&self, metadata: &Metadata<'_>) -> bool { + if !metadata.target().starts_with("litellm_") && !metadata.target().starts_with("_native::") + { + return false; + } + Python::try_attach(|py| { + report( + py, + py.import(MODULE) + .and_then(|module| module.call_method1("enabled", (level(metadata.level()),))) + .and_then(|enabled| enabled.extract()), + ) + }) + .unwrap_or(false) + } + + fn emit(&self, record: &Record) { + Python::try_attach(|py| { + report( + py, + py.import(MODULE).and_then(|module| { + module + .call_method1( + "emit", + ( + level(record.metadata.level()), + &record.message, + record.metadata.file().unwrap_or_default(), + record.metadata.line().unwrap_or_default(), + record.metadata.target(), + Pythonized(&record.fields), + (&self.correlation.0, &self.correlation.1), + ), + ) + .map(|_| ()) + }), + ); + }); + } +} + +pub(crate) fn capture(py: Python<'_>) -> Logger { + report( + py, + py.import(MODULE) + .and_then(|module| module.call_method0("context")) + .and_then(|value| value.extract()) + .map(|correlation| Logger::new(PythonSink { correlation })), + ) +} + +#[cfg(test)] +mod tests; diff --git a/litellm-rust/crates/python-bridge/src/logger/tests.rs b/litellm-rust/crates/python-bridge/src/logger/tests.rs new file mode 100644 index 00000000000..9312d4c187c --- /dev/null +++ b/litellm-rust/crates/python-bridge/src/logger/tests.rs @@ -0,0 +1,295 @@ +use std::{process::Command, task::Poll}; + +use litellm_host::{ + host::HostResult, + machine::{HostFailure, Interrupted, Machine, MachineStep, Step}, + route::Route, +}; + +use pyo3::{prelude::*, types::PyDict}; + +struct DiagnosticMachine; + +impl Route for DiagnosticMachine { + type Response = (); + type Error = String; + type Op = (); + type OpResult = (); + type Chunk = (); + type StreamHead = (); +} + +impl Machine for DiagnosticMachine { + type Route = Self; + type Complete = (); + + fn resume(&mut self, _: Option>) -> Step<'_, Self> { + litellm_tracing::warn!("machine started"); + Box::pin(async { + tokio::task::yield_now().await; + litellm_tracing::warn!("machine warning"); + Ok(MachineStep::Complete(())) + }) + } + + fn interrupt(&mut self, _: HostFailure) -> Interrupted<'_, Self> { + Box::pin(async { + litellm_tracing::warn!("machine interrupted"); + Ok(()) + }) + } +} + +#[pyfunction] +fn machine_warning(py: Python<'_>) -> PyResult> { + let mut machine = super::LoggedMachine::new(DiagnosticMachine); + let mut future = Box::pin(async move { + machine + .resume(None) + .await + .map_err(pyo3::exceptions::PyValueError::new_err)?; + machine + .interrupt(HostFailure::Error("stop".into())) + .await + .map_err(pyo3::exceptions::PyValueError::new_err) + }); + assert!(matches!( + litellm_host_python::poll_async_value(py, future.as_mut())?, + Poll::Pending + )); + litellm_host_python::run_async_value(py, future) +} + +#[pyfunction] +fn warning(py: Python<'_>) { + super::capture(py).scope(|| { + litellm_tracing::warn!(attempt = 3, retry = true, "native warning"); + }); +} + +#[pyfunction] +fn levels(py: Python<'_>) { + super::capture(py).scope(|| { + litellm_tracing::trace!("trace"); + litellm_tracing::debug!("debug"); + litellm_tracing::info!("info"); + litellm_tracing::warn!("warn"); + litellm_tracing::error!("error"); + litellm_tracing::warn!(target: "unrelated_transport", "private wire data"); + }); +} + +#[pyfunction] +fn asynchronous_warning(py: Python<'_>) -> PyResult> { + super::run_async_value(py, async { + tokio::task::yield_now().await; + litellm_tracing::warn!("async warning"); + Ok(()) + }) +} + +#[pyfunction] +fn synchronous_warning(py: Python<'_>) -> PyResult<()> { + super::run_sync_value(py, async { + tokio::task::yield_now().await; + litellm_tracing::warn!("sync warning"); + Ok(()) + }) +} + +#[pyfunction] +fn synchronous_failure(py: Python<'_>) -> PyResult<()> { + super::run_sync_value(py, async { + litellm_tracing::warn!("failure diagnostic"); + Err(pyo3::exceptions::PyValueError::new_err("request failed")) + }) +} + +#[pyfunction] +fn http_warning(py: Python<'_>) -> PyResult<()> { + crate::http::call_config(py, &PyDict::new(py), false).map(|_| ()) +} + +#[test] +fn native_events_reach_python_with_levels_context_reentry_and_http_deduplication() { + if std::env::var_os("LITELLM_LOGGER_TEST_PROCESS").is_none() { + let output = Command::new(std::env::current_exe().unwrap()) + .args([ + "--exact", + std::thread::current().name().unwrap(), + "--nocapture", + ]) + .env("LITELLM_LOGGER_TEST_PROCESS", "1") + .output() + .unwrap(); + assert!( + output.status.success(), + "{}\n{}", + String::from_utf8_lossy(&output.stdout), + String::from_utf8_lossy(&output.stderr) + ); + return; + } + Python::initialize(); + Python::attach(|py| { + let locals = PyDict::new(py); + locals + .set_item( + "repo_root", + concat!(env!("CARGO_MANIFEST_DIR"), "/../../.."), + ) + .unwrap(); + locals + .set_item( + "machine_warning", + wrap_pyfunction!(machine_warning, py).unwrap(), + ) + .unwrap(); + locals + .set_item( + "synchronous_failure", + wrap_pyfunction!(synchronous_failure, py).unwrap(), + ) + .unwrap(); + locals + .set_item("levels", wrap_pyfunction!(levels, py).unwrap()) + .unwrap(); + locals + .set_item("warning", wrap_pyfunction!(warning, py).unwrap()) + .unwrap(); + locals + .set_item( + "asynchronous_warning", + wrap_pyfunction!(asynchronous_warning, py).unwrap(), + ) + .unwrap(); + locals + .set_item( + "synchronous_warning", + wrap_pyfunction!(synchronous_warning, py).unwrap(), + ) + .unwrap(); + locals + .set_item("http_warning", wrap_pyfunction!(http_warning, py).unwrap()) + .unwrap(); + let importable = py + .eval( + c"__import__('importlib.util', fromlist=['util']).find_spec('dotenv') is not None", + Some(&locals), + Some(&locals), + ) + .unwrap() + .is_truthy() + .unwrap(); + if !importable { + eprintln!("SKIP: litellm package dependencies are not importable in this interpreter"); + return; + } + py.run(c" +import asyncio +import logging +import sys +sys.path.insert(0, repo_root) +import litellm +from litellm._logging import verbose_logger, session_id_var, trace_id_var + +class Capture(logging.Handler): + def __init__(self): + super().__init__() + self.records = [] + def emit(self, record): + self.records.append(record) + warning() + +class Broken(logging.Handler): + def emit(self, record): + raise ValueError('handler failed') + +capture = Capture() +old_handlers = verbose_logger.handlers +old_level = verbose_logger.level +old_correlation = litellm.request_correlation_in_logs +old_curve = litellm.ssl_ecdh_curve +old_unraisable = sys.unraisablehook +failures = [] +try: + verbose_logger.handlers = [capture] + litellm.request_correlation_in_logs = True + verbose_logger.setLevel(logging.ERROR) + warning() + assert capture.records == [] + verbose_logger.setLevel(logging.WARNING) + warning() + assert len(capture.records) == 1 + record = capture.records[0] + assert record.getMessage() == 'native warning' + assert record.levelno == logging.WARNING + assert record.rust_fields == {'attempt': 3, 'retry': True} + assert record.pathname.endswith('logger/tests.rs') + assert record.lineno > 0 + assert record.rust_target.endswith('logger::tests') + verbose_logger.setLevel(logging.ERROR) + warning() + assert len(capture.records) == 1 + verbose_logger.setLevel(logging.WARNING) + + async def request(name): + session = session_id_var.set(name) + trace = trace_id_var.set('trace-' + name) + try: + await asynchronous_warning() + await machine_warning() + synchronous_warning() + assert session_id_var.get() == name + assert trace_id_var.get() == 'trace-' + name + finally: + trace_id_var.reset(trace) + session_id_var.reset(session) + + async def concurrent(): + await asyncio.gather(request('first'), request('second')) + + asyncio.run(concurrent()) + assert sorted((r.getMessage(), r.session_id, r.trace_id) for r in capture.records[1:]) == sorted( + (message, name, 'trace-' + name) + for name in ('first', 'second') + for message in ('async warning', 'sync warning', 'machine started', 'machine warning', 'machine interrupted') + ) + + verbose_logger.setLevel(logging.DEBUG) + before_levels = len(capture.records) + levels() + assert [(r.getMessage(), r.levelno) for r in capture.records[before_levels:]] == [ + ('trace', logging.DEBUG), ('debug', logging.DEBUG), ('info', logging.INFO), + ('warn', logging.WARNING), ('error', logging.ERROR), + ] + + before = len(capture.records) + litellm.ssl_ecdh_curve = 'logger-test-unsupported-curve' + http_warning() + http_warning() + assert len(capture.records) == before + 1 + assert 'logger-test-unsupported-curve' in capture.records[-1].getMessage() + assert capture.records[-1].pathname.endswith('http.rs') + + verbose_logger.handlers = [Broken()] + sys.unraisablehook = failures.append + warning() + assert len(failures) == 1 + assert str(failures[0].exc_value) == 'handler failed' + try: + synchronous_failure() + except ValueError as error: + assert str(error) == 'request failed' + else: + raise AssertionError('request failure was lost') + assert len(failures) == 2 +finally: + sys.unraisablehook = old_unraisable + verbose_logger.handlers = old_handlers + verbose_logger.setLevel(old_level) + litellm.request_correlation_in_logs = old_correlation + litellm.ssl_ecdh_curve = old_curve +", Some(&locals), Some(&locals)).unwrap(); + }); +} diff --git a/litellm-rust/crates/python-bridge/src/python_settings.rs b/litellm-rust/crates/python-bridge/src/python_settings.rs index 111ac3bc259..abf664b795d 100644 --- a/litellm-rust/crates/python-bridge/src/python_settings.rs +++ b/litellm-rust/crates/python-bridge/src/python_settings.rs @@ -44,11 +44,6 @@ impl PythonSettings { pub(crate) fn snapshot(self, value: Bound<'_, PyAny>) -> Snapshot<'_> { Snapshot { group: self, value } } - - pub(crate) fn warn(py: Python<'_>, message: &str) -> PyResult<()> { - py.import(MODULE)?.getattr("warn")?.call1((message,))?; - Ok(()) - } } #[cfg(test)] diff --git a/litellm-rust/crates/python-bridge/src/routes/audio_transcription.rs b/litellm-rust/crates/python-bridge/src/routes/audio_transcription.rs index d63e9a1feaf..dec4dcea21c 100644 --- a/litellm-rust/crates/python-bridge/src/routes/audio_transcription.rs +++ b/litellm-rust/crates/python-bridge/src/routes/audio_transcription.rs @@ -1,7 +1,8 @@ +use crate::logger::{run_async, run_sync}; use litellm_core::audio_transcription::{ Error, audio_transcription as run_audio_transcription, types::AudioTranscriptionRequest, }; -use litellm_host_python::{from_py_argument, run_async, run_sync}; +use litellm_host_python::from_py_argument; use pyo3::prelude::*; use serde_json::{Map, Value}; diff --git a/litellm-rust/crates/python-bridge/src/routes/chat_completions.rs b/litellm-rust/crates/python-bridge/src/routes/chat_completions.rs index 049a507dcdc..1fa2ca00c42 100644 --- a/litellm-rust/crates/python-bridge/src/routes/chat_completions.rs +++ b/litellm-rust/crates/python-bridge/src/routes/chat_completions.rs @@ -1,8 +1,9 @@ +use crate::logger::{run_async, run_sync}; use litellm_core::chat_completions::{ Error, chat_completions as run_chat_completions, chat_completions_decline_reason, types::ChatCompletionsRequest, }; -use litellm_host_python::{from_py_argument, run_async, run_sync}; +use litellm_host_python::from_py_argument; use litellm_types::utils::ChatCompletionsResponse; use pyo3::prelude::*; use serde_json::{Map, Value}; diff --git a/litellm-rust/crates/python-bridge/src/routes/messages/mod.rs b/litellm-rust/crates/python-bridge/src/routes/messages/mod.rs index b606293f79f..804d883e9ae 100644 --- a/litellm-rust/crates/python-bridge/src/routes/messages/mod.rs +++ b/litellm-rust/crates/python-bridge/src/routes/messages/mod.rs @@ -43,7 +43,7 @@ fn run_messages( py, SURFACE, PublicCall::capture(&request, &args, &kwargs)?, - messages_machine(), + crate::logger::LoggedMachine::new(messages_machine()), MessagesRouteHost::new(request.unbind()), asynchronous, ) diff --git a/litellm-rust/crates/python-bridge/src/routes/ocr/mod.rs b/litellm-rust/crates/python-bridge/src/routes/ocr/mod.rs index 2dca6da66cd..ca5abf1f80e 100644 --- a/litellm-rust/crates/python-bridge/src/routes/ocr/mod.rs +++ b/litellm-rust/crates/python-bridge/src/routes/ocr/mod.rs @@ -73,7 +73,7 @@ fn run_ocr( py, if asynchronous { ASYNC_SURFACE } else { SURFACE }, PublicCall::capture(&request, &args, &kwargs)?, - ocr_machine(client), + crate::logger::LoggedMachine::new(ocr_machine(client)), OcrRouteHost::new(request.unbind()), asynchronous, ) diff --git a/litellm-rust/crates/python-bridge/src/routes/responses.rs b/litellm-rust/crates/python-bridge/src/routes/responses.rs index 2e7e8fcbc21..ffbb945c415 100644 --- a/litellm-rust/crates/python-bridge/src/routes/responses.rs +++ b/litellm-rust/crates/python-bridge/src/routes/responses.rs @@ -25,7 +25,7 @@ impl ResponsesWebSocketConnection { ) -> PyResult> { let headers = marshal_headers(headers)?; let timeout = optional_timeout(timeout_seconds); - litellm_host_python::run_async_value(py, async move { + crate::logger::run_async_value(py, async move { let inner = RustResponsesWebSocketConnection::connect_url(&url, &headers, timeout) .await .map_err(responses_error_to_pyerr)?; @@ -35,7 +35,7 @@ impl ResponsesWebSocketConnection { fn send_text<'py>(&self, py: Python<'py>, text: String) -> PyResult> { let inner = self.inner.clone(); - litellm_host_python::run_async_value(py, async move { + crate::logger::run_async_value(py, async move { inner .send_text(text) .await @@ -45,14 +45,14 @@ impl ResponsesWebSocketConnection { fn recv_text<'py>(&self, py: Python<'py>) -> PyResult> { let inner = self.inner.clone(); - litellm_host_python::run_async_value(py, async move { + crate::logger::run_async_value(py, async move { inner.recv_text().await.map_err(responses_error_to_pyerr) }) } fn close<'py>(&self, py: Python<'py>) -> PyResult> { let inner = self.inner.clone(); - litellm_host_python::run_async_value(py, async move { + crate::logger::run_async_value(py, async move { inner.close().await.map_err(responses_error_to_pyerr) }) } diff --git a/litellm-rust/crates/python-bridge/src/routes/token_counter.rs b/litellm-rust/crates/python-bridge/src/routes/token_counter.rs index 168c4883b0b..21589aa3fe9 100644 --- a/litellm-rust/crates/python-bridge/src/routes/token_counter.rs +++ b/litellm-rust/crates/python-bridge/src/routes/token_counter.rs @@ -1,7 +1,8 @@ +use crate::logger::run_async; use std::sync::Arc; use std::{num::NonZero, thread::available_parallelism}; -use litellm_host_python::{enter_native, run_async}; +use litellm_host_python::enter_native; use litellm_token_counter::{ CountableRequest, Error, InputTokenCount, TokenCounter as CoreTokenCounter, }; diff --git a/litellm-rust/crates/python-compat/AGENTS.md b/litellm-rust/crates/python-compat/AGENTS.md new file mode 100644 index 00000000000..0869568d33b --- /dev/null +++ b/litellm-rust/crates/python-compat/AGENTS.md @@ -0,0 +1,23 @@ +- Pure Python *data formats* in Rust, for state Python LiteLLM writes and Rust must read or write byte-compatibly + - No PyO3, no live objects: truthiness, `__str__`, descriptors of real Python objects belong to `python-bridge`'s coercion layer + - Format *choices* stay with callers: the `{timestamp, response}` envelope, diskcache modes, and the cache-key recipe live in the cache crates and only call into this crate +- Intended users + - `cache-response` codec: reading `str(dict)` values Python's sync Redis path writes (`literal_eval`) + - `cache-disk`: diskcache's pickled values (`pickle`), falsy-is-miss (`truthy`) + - Cache-key derivation: sha256 over `str(value)` must match Python byte for byte (`repr::to_str`) + - Byte-identical writes where Python compares raw values (`json::dumps`, `repr`) +- Relation to [`py_literal`](https://docs.rs/py_literal/latest/py_literal/): replaced, do not reintroduce + - Its pest grammar backtracks: parse time doubles per nested `[`/`{` (105 ms at depth 16); ours is linear (19 µs at depth 128) + - Its formatter is not `repr` (`2e-1`, always single quotes, escapes non-ASCII); it also lost `-0.0`, `(1+2j)`, `set()` + - `cache-response` and `cache-disk` still depend on it; migrate them here +- Relation to [`serde-pickle`](https://docs.rs/serde-pickle/latest/serde_pickle/): the pickle codec, used only through its serde interface + - Never `serde_pickle::Value`: its `BTreeMap` dicts reorder keys + - Accepted limits: ints beyond i64, `tuple`/`set`/`frozenset` decode as lists, class references (`GLOBAL`/`REDUCE`) fail; writes protocol 3 +- Every behavior is pinned by CPython output, not by reasoning; everything under `generated/` is script output, never hand-edited + - Regenerate `generated/values.json` with `scripts/generate_fixtures.py`; add a corpus row before changing behavior + - Divergences go in `KNOWN` in `tests/fixtures.rs` with a reason; an entry that starts matching fails until deleted + - Regenerate `generated/nonprintable.rs` with `scripts/generate_nonprintable.py` when the target Python's Unicode version changes + - `scripts/verify_rust_pickles.py` checks CPython reads Rust pickles, with class resolution disabled; CI does not run Python +- Decoders recurse, so they reject nesting beyond `MAX_DEPTH` for stack safety: deliberately stricter than CPython, whose parser takes ~200 levels and whose unpickler has no limit (pinned as `nested_150`) + - Formatters (`repr`, `json`) are unbounded; values from the decoders are already capped, a hand-built `Value` is the caller's responsibility + - `literal_eval` must stay linear in depth: `tests/limits.rs` times the deepest parse, `benches/formats.rs` measures the curve but is manual, since CI runs no Rust bench diff --git a/litellm-rust/crates/python-compat/Cargo.toml b/litellm-rust/crates/python-compat/Cargo.toml new file mode 100644 index 00000000000..2ab6fb29843 --- /dev/null +++ b/litellm-rust/crates/python-compat/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "litellm-python-compat" +version = "0.1.0" +edition.workspace = true +license.workspace = true +repository.workspace = true +description = "Python data formats (repr, literal_eval, json.dumps, pickle) reproduced for interop with persisted LiteLLM state" + +[dependencies] +num-bigint = "0.4" +num-traits = "0.2" +serde.workspace = true +serde-pickle = "1.2" +serde_json = { workspace = true, features = ["preserve_order"] } +thiserror.workspace = true + +[dev-dependencies] +criterion.workspace = true +hex = "0.4" +rstest.workspace = true + +[[bench]] +name = "formats" +harness = false diff --git a/litellm-rust/crates/python-compat/benches/formats.rs b/litellm-rust/crates/python-compat/benches/formats.rs new file mode 100644 index 00000000000..f0b83cb1658 --- /dev/null +++ b/litellm-rust/crates/python-compat/benches/formats.rs @@ -0,0 +1,111 @@ +//! Throughput of each format on a cached chat completion, and `literal_eval` cost by nesting. +//! +//! Run one group with `cargo bench -p litellm-python-compat -- cached_completion`, and compare +//! against a stored run with `--save-baseline ` / `--baseline `. +//! +//! `literal_eval/nesting` guards against backtracking: the `py_literal` grammar this parser +//! replaced doubled its time per nested `[` or `{` (105 ms at depth 16), so cost must stay +//! linear in depth for every container shape. + +use std::{hint::black_box, time::Duration}; + +use criterion::{ + BatchSize, BenchmarkGroup, BenchmarkId, Criterion, Throughput, criterion_group, criterion_main, + measurement::WallTime, +}; +use litellm_python_compat::{Value, json, literal::literal_eval, pickle, repr::repr}; + +/// `str(entry)` for the `{timestamp, response}` envelope Python's sync Redis path writes. +fn cached_completion() -> String { + let choices: Vec = (0..4) + .map(|index| { + format!( + "{{'finish_reason': 'stop', 'index': {index}, 'message': {{'content': \ + 'Benchmarks compare the same workload under controlled conditions, so a \ + change in time reflects the code rather than the environment. café 日本 \ + {index}', 'role': 'assistant', 'tool_calls': None, 'function_call': None}}, \ + 'logprobs': None}}" + ) + }) + .collect(); + format!( + "{{'timestamp': 1726000000.123, 'response': {{'id': 'chatcmpl-9x1', 'created': \ + 1726000000, 'model': 'gpt-4o-2024-08-06', 'object': 'chat.completion', \ + 'system_fingerprint': 'fp_1', 'choices': [{}], 'usage': {{'completion_tokens': 120, \ + 'prompt_tokens': 42, 'total_tokens': 162, 'completion_tokens_details': None}}}}}}", + choices.join(", ") + ) +} + +/// Every text format, measured against the source bytes it reads or writes. +fn text_formats(group: &mut BenchmarkGroup<'_, WallTime>, text: &str, value: &Value) { + group.throughput(Throughput::Bytes(text.len() as u64)); + group.bench_function("literal_eval", |bencher| { + bencher.iter(|| literal_eval(black_box(text))) + }); + group.bench_function("repr", |bencher| bencher.iter(|| repr(black_box(value)))); + group.bench_function("json_dumps", |bencher| { + bencher.iter(|| json::dumps(black_box(value))) + }); + group.bench_function("to_json", |bencher| { + bencher.iter(|| json::to_json(black_box(value))) + }); +} + +/// Pickle, measured against its own encoding rather than the source text. +fn binary_formats(group: &mut BenchmarkGroup<'_, WallTime>, value: &Value, pickled: &[u8]) { + group.throughput(Throughput::Bytes(pickled.len() as u64)); + group.bench_function("pickle_dumps", |bencher| { + bencher.iter(|| pickle::dumps(black_box(value))) + }); + group.bench_function("pickle_loads", |bencher| { + bencher.iter(|| pickle::loads(black_box(pickled))) + }); +} + +fn formats(c: &mut Criterion) { + let text = cached_completion(); + let value = literal_eval(&text).expect("benchmark payload is a literal"); + let pickled = pickle::dumps(&value).expect("benchmark payload pickles"); + let dumped = json::dumps(&value).expect("benchmark payload is JSON serializable"); + + let mut group = c.benchmark_group("cached_completion"); + text_formats(&mut group, &text, &value); + binary_formats(&mut group, &value, &pickled); + // `from_json` consumes its input, so each iteration gets a freshly parsed one. + group.throughput(Throughput::Bytes(dumped.len() as u64)); + group.bench_function("from_json", |bencher| { + bencher.iter_batched( + || serde_json::from_str::(&dumped).expect("dumps output parses"), + json::from_json, + BatchSize::SmallInput, + ) + }); + group.finish(); +} + +/// One nesting level of each container shape, as `(name, open, close)`. +const SHAPES: [(&str, &str, &str); 3] = [ + ("list", "[", "]"), + ("dict", "{'a': ", "}"), + ("tuple", "(", ",)"), +]; + +fn literal_nesting(c: &mut Criterion) { + let mut group = c.benchmark_group("literal_eval/nesting"); + group.sample_size(10); + group.measurement_time(Duration::from_secs(3)); + for depth in [4, 16, 64, 128] { + for (shape, open, close) in SHAPES { + let text = format!("{}1{}", open.repeat(depth), close.repeat(depth)); + group.throughput(Throughput::Bytes(text.len() as u64)); + group.bench_with_input(BenchmarkId::new(shape, depth), &text, |bencher, text| { + bencher.iter(|| literal_eval(black_box(text))) + }); + } + } + group.finish(); +} + +criterion_group!(benches, formats, literal_nesting); +criterion_main!(benches); diff --git a/litellm-rust/crates/python-compat/generated/nonprintable.rs b/litellm-rust/crates/python-compat/generated/nonprintable.rs new file mode 100644 index 00000000000..a044210f07d --- /dev/null +++ b/litellm-rust/crates/python-compat/generated/nonprintable.rs @@ -0,0 +1,745 @@ +// Generated by scripts/generate_nonprintable.py from Python 3.14.7 +// (Unicode 16.0.0). Do not edit by hand. + +pub(crate) const UNICODE_VERSION: &str = "16.0.0"; + +/// Inclusive code point ranges for which Python's `str.isprintable()` is false. +pub(crate) const NONPRINTABLE: [(u32, u32); 737] = [ + (0x0000, 0x001F), + (0x007F, 0x00A0), + (0x00AD, 0x00AD), + (0x0378, 0x0379), + (0x0380, 0x0383), + (0x038B, 0x038B), + (0x038D, 0x038D), + (0x03A2, 0x03A2), + (0x0530, 0x0530), + (0x0557, 0x0558), + (0x058B, 0x058C), + (0x0590, 0x0590), + (0x05C8, 0x05CF), + (0x05EB, 0x05EE), + (0x05F5, 0x0605), + (0x061C, 0x061C), + (0x06DD, 0x06DD), + (0x070E, 0x070F), + (0x074B, 0x074C), + (0x07B2, 0x07BF), + (0x07FB, 0x07FC), + (0x082E, 0x082F), + (0x083F, 0x083F), + (0x085C, 0x085D), + (0x085F, 0x085F), + (0x086B, 0x086F), + (0x088F, 0x0896), + (0x08E2, 0x08E2), + (0x0984, 0x0984), + (0x098D, 0x098E), + (0x0991, 0x0992), + (0x09A9, 0x09A9), + (0x09B1, 0x09B1), + (0x09B3, 0x09B5), + (0x09BA, 0x09BB), + (0x09C5, 0x09C6), + (0x09C9, 0x09CA), + (0x09CF, 0x09D6), + (0x09D8, 0x09DB), + (0x09DE, 0x09DE), + (0x09E4, 0x09E5), + (0x09FF, 0x0A00), + (0x0A04, 0x0A04), + (0x0A0B, 0x0A0E), + (0x0A11, 0x0A12), + (0x0A29, 0x0A29), + (0x0A31, 0x0A31), + (0x0A34, 0x0A34), + (0x0A37, 0x0A37), + (0x0A3A, 0x0A3B), + (0x0A3D, 0x0A3D), + (0x0A43, 0x0A46), + (0x0A49, 0x0A4A), + (0x0A4E, 0x0A50), + (0x0A52, 0x0A58), + (0x0A5D, 0x0A5D), + (0x0A5F, 0x0A65), + (0x0A77, 0x0A80), + (0x0A84, 0x0A84), + (0x0A8E, 0x0A8E), + (0x0A92, 0x0A92), + (0x0AA9, 0x0AA9), + (0x0AB1, 0x0AB1), + (0x0AB4, 0x0AB4), + (0x0ABA, 0x0ABB), + (0x0AC6, 0x0AC6), + (0x0ACA, 0x0ACA), + (0x0ACE, 0x0ACF), + (0x0AD1, 0x0ADF), + (0x0AE4, 0x0AE5), + (0x0AF2, 0x0AF8), + (0x0B00, 0x0B00), + (0x0B04, 0x0B04), + (0x0B0D, 0x0B0E), + (0x0B11, 0x0B12), + (0x0B29, 0x0B29), + (0x0B31, 0x0B31), + (0x0B34, 0x0B34), + (0x0B3A, 0x0B3B), + (0x0B45, 0x0B46), + (0x0B49, 0x0B4A), + (0x0B4E, 0x0B54), + (0x0B58, 0x0B5B), + (0x0B5E, 0x0B5E), + (0x0B64, 0x0B65), + (0x0B78, 0x0B81), + (0x0B84, 0x0B84), + (0x0B8B, 0x0B8D), + (0x0B91, 0x0B91), + (0x0B96, 0x0B98), + (0x0B9B, 0x0B9B), + (0x0B9D, 0x0B9D), + (0x0BA0, 0x0BA2), + (0x0BA5, 0x0BA7), + (0x0BAB, 0x0BAD), + (0x0BBA, 0x0BBD), + (0x0BC3, 0x0BC5), + (0x0BC9, 0x0BC9), + (0x0BCE, 0x0BCF), + (0x0BD1, 0x0BD6), + (0x0BD8, 0x0BE5), + (0x0BFB, 0x0BFF), + (0x0C0D, 0x0C0D), + (0x0C11, 0x0C11), + (0x0C29, 0x0C29), + (0x0C3A, 0x0C3B), + (0x0C45, 0x0C45), + (0x0C49, 0x0C49), + (0x0C4E, 0x0C54), + (0x0C57, 0x0C57), + (0x0C5B, 0x0C5C), + (0x0C5E, 0x0C5F), + (0x0C64, 0x0C65), + (0x0C70, 0x0C76), + (0x0C8D, 0x0C8D), + (0x0C91, 0x0C91), + (0x0CA9, 0x0CA9), + (0x0CB4, 0x0CB4), + (0x0CBA, 0x0CBB), + (0x0CC5, 0x0CC5), + (0x0CC9, 0x0CC9), + (0x0CCE, 0x0CD4), + (0x0CD7, 0x0CDC), + (0x0CDF, 0x0CDF), + (0x0CE4, 0x0CE5), + (0x0CF0, 0x0CF0), + (0x0CF4, 0x0CFF), + (0x0D0D, 0x0D0D), + (0x0D11, 0x0D11), + (0x0D45, 0x0D45), + (0x0D49, 0x0D49), + (0x0D50, 0x0D53), + (0x0D64, 0x0D65), + (0x0D80, 0x0D80), + (0x0D84, 0x0D84), + (0x0D97, 0x0D99), + (0x0DB2, 0x0DB2), + (0x0DBC, 0x0DBC), + (0x0DBE, 0x0DBF), + (0x0DC7, 0x0DC9), + (0x0DCB, 0x0DCE), + (0x0DD5, 0x0DD5), + (0x0DD7, 0x0DD7), + (0x0DE0, 0x0DE5), + (0x0DF0, 0x0DF1), + (0x0DF5, 0x0E00), + (0x0E3B, 0x0E3E), + (0x0E5C, 0x0E80), + (0x0E83, 0x0E83), + (0x0E85, 0x0E85), + (0x0E8B, 0x0E8B), + (0x0EA4, 0x0EA4), + (0x0EA6, 0x0EA6), + (0x0EBE, 0x0EBF), + (0x0EC5, 0x0EC5), + (0x0EC7, 0x0EC7), + (0x0ECF, 0x0ECF), + (0x0EDA, 0x0EDB), + (0x0EE0, 0x0EFF), + (0x0F48, 0x0F48), + (0x0F6D, 0x0F70), + (0x0F98, 0x0F98), + (0x0FBD, 0x0FBD), + (0x0FCD, 0x0FCD), + (0x0FDB, 0x0FFF), + (0x10C6, 0x10C6), + (0x10C8, 0x10CC), + (0x10CE, 0x10CF), + (0x1249, 0x1249), + (0x124E, 0x124F), + (0x1257, 0x1257), + (0x1259, 0x1259), + (0x125E, 0x125F), + (0x1289, 0x1289), + (0x128E, 0x128F), + (0x12B1, 0x12B1), + (0x12B6, 0x12B7), + (0x12BF, 0x12BF), + (0x12C1, 0x12C1), + (0x12C6, 0x12C7), + (0x12D7, 0x12D7), + (0x1311, 0x1311), + (0x1316, 0x1317), + (0x135B, 0x135C), + (0x137D, 0x137F), + (0x139A, 0x139F), + (0x13F6, 0x13F7), + (0x13FE, 0x13FF), + (0x1680, 0x1680), + (0x169D, 0x169F), + (0x16F9, 0x16FF), + (0x1716, 0x171E), + (0x1737, 0x173F), + (0x1754, 0x175F), + (0x176D, 0x176D), + (0x1771, 0x1771), + (0x1774, 0x177F), + (0x17DE, 0x17DF), + (0x17EA, 0x17EF), + (0x17FA, 0x17FF), + (0x180E, 0x180E), + (0x181A, 0x181F), + (0x1879, 0x187F), + (0x18AB, 0x18AF), + (0x18F6, 0x18FF), + (0x191F, 0x191F), + (0x192C, 0x192F), + (0x193C, 0x193F), + (0x1941, 0x1943), + (0x196E, 0x196F), + (0x1975, 0x197F), + (0x19AC, 0x19AF), + (0x19CA, 0x19CF), + (0x19DB, 0x19DD), + (0x1A1C, 0x1A1D), + (0x1A5F, 0x1A5F), + (0x1A7D, 0x1A7E), + (0x1A8A, 0x1A8F), + (0x1A9A, 0x1A9F), + (0x1AAE, 0x1AAF), + (0x1ACF, 0x1AFF), + (0x1B4D, 0x1B4D), + (0x1BF4, 0x1BFB), + (0x1C38, 0x1C3A), + (0x1C4A, 0x1C4C), + (0x1C8B, 0x1C8F), + (0x1CBB, 0x1CBC), + (0x1CC8, 0x1CCF), + (0x1CFB, 0x1CFF), + (0x1F16, 0x1F17), + (0x1F1E, 0x1F1F), + (0x1F46, 0x1F47), + (0x1F4E, 0x1F4F), + (0x1F58, 0x1F58), + (0x1F5A, 0x1F5A), + (0x1F5C, 0x1F5C), + (0x1F5E, 0x1F5E), + (0x1F7E, 0x1F7F), + (0x1FB5, 0x1FB5), + (0x1FC5, 0x1FC5), + (0x1FD4, 0x1FD5), + (0x1FDC, 0x1FDC), + (0x1FF0, 0x1FF1), + (0x1FF5, 0x1FF5), + (0x1FFF, 0x200F), + (0x2028, 0x202F), + (0x205F, 0x206F), + (0x2072, 0x2073), + (0x208F, 0x208F), + (0x209D, 0x209F), + (0x20C1, 0x20CF), + (0x20F1, 0x20FF), + (0x218C, 0x218F), + (0x242A, 0x243F), + (0x244B, 0x245F), + (0x2B74, 0x2B75), + (0x2B96, 0x2B96), + (0x2CF4, 0x2CF8), + (0x2D26, 0x2D26), + (0x2D28, 0x2D2C), + (0x2D2E, 0x2D2F), + (0x2D68, 0x2D6E), + (0x2D71, 0x2D7E), + (0x2D97, 0x2D9F), + (0x2DA7, 0x2DA7), + (0x2DAF, 0x2DAF), + (0x2DB7, 0x2DB7), + (0x2DBF, 0x2DBF), + (0x2DC7, 0x2DC7), + (0x2DCF, 0x2DCF), + (0x2DD7, 0x2DD7), + (0x2DDF, 0x2DDF), + (0x2E5E, 0x2E7F), + (0x2E9A, 0x2E9A), + (0x2EF4, 0x2EFF), + (0x2FD6, 0x2FEF), + (0x3000, 0x3000), + (0x3040, 0x3040), + (0x3097, 0x3098), + (0x3100, 0x3104), + (0x3130, 0x3130), + (0x318F, 0x318F), + (0x31E6, 0x31EE), + (0x321F, 0x321F), + (0xA48D, 0xA48F), + (0xA4C7, 0xA4CF), + (0xA62C, 0xA63F), + (0xA6F8, 0xA6FF), + (0xA7CE, 0xA7CF), + (0xA7D2, 0xA7D2), + (0xA7D4, 0xA7D4), + (0xA7DD, 0xA7F1), + (0xA82D, 0xA82F), + (0xA83A, 0xA83F), + (0xA878, 0xA87F), + (0xA8C6, 0xA8CD), + (0xA8DA, 0xA8DF), + (0xA954, 0xA95E), + (0xA97D, 0xA97F), + (0xA9CE, 0xA9CE), + (0xA9DA, 0xA9DD), + (0xA9FF, 0xA9FF), + (0xAA37, 0xAA3F), + (0xAA4E, 0xAA4F), + (0xAA5A, 0xAA5B), + (0xAAC3, 0xAADA), + (0xAAF7, 0xAB00), + (0xAB07, 0xAB08), + (0xAB0F, 0xAB10), + (0xAB17, 0xAB1F), + (0xAB27, 0xAB27), + (0xAB2F, 0xAB2F), + (0xAB6C, 0xAB6F), + (0xABEE, 0xABEF), + (0xABFA, 0xABFF), + (0xD7A4, 0xD7AF), + (0xD7C7, 0xD7CA), + (0xD7FC, 0xF8FF), + (0xFA6E, 0xFA6F), + (0xFADA, 0xFAFF), + (0xFB07, 0xFB12), + (0xFB18, 0xFB1C), + (0xFB37, 0xFB37), + (0xFB3D, 0xFB3D), + (0xFB3F, 0xFB3F), + (0xFB42, 0xFB42), + (0xFB45, 0xFB45), + (0xFBC3, 0xFBD2), + (0xFD90, 0xFD91), + (0xFDC8, 0xFDCE), + (0xFDD0, 0xFDEF), + (0xFE1A, 0xFE1F), + (0xFE53, 0xFE53), + (0xFE67, 0xFE67), + (0xFE6C, 0xFE6F), + (0xFE75, 0xFE75), + (0xFEFD, 0xFF00), + (0xFFBF, 0xFFC1), + (0xFFC8, 0xFFC9), + (0xFFD0, 0xFFD1), + (0xFFD8, 0xFFD9), + (0xFFDD, 0xFFDF), + (0xFFE7, 0xFFE7), + (0xFFEF, 0xFFFB), + (0xFFFE, 0xFFFF), + (0x1000C, 0x1000C), + (0x10027, 0x10027), + (0x1003B, 0x1003B), + (0x1003E, 0x1003E), + (0x1004E, 0x1004F), + (0x1005E, 0x1007F), + (0x100FB, 0x100FF), + (0x10103, 0x10106), + (0x10134, 0x10136), + (0x1018F, 0x1018F), + (0x1019D, 0x1019F), + (0x101A1, 0x101CF), + (0x101FE, 0x1027F), + (0x1029D, 0x1029F), + (0x102D1, 0x102DF), + (0x102FC, 0x102FF), + (0x10324, 0x1032C), + (0x1034B, 0x1034F), + (0x1037B, 0x1037F), + (0x1039E, 0x1039E), + (0x103C4, 0x103C7), + (0x103D6, 0x103FF), + (0x1049E, 0x1049F), + (0x104AA, 0x104AF), + (0x104D4, 0x104D7), + (0x104FC, 0x104FF), + (0x10528, 0x1052F), + (0x10564, 0x1056E), + (0x1057B, 0x1057B), + (0x1058B, 0x1058B), + (0x10593, 0x10593), + (0x10596, 0x10596), + (0x105A2, 0x105A2), + (0x105B2, 0x105B2), + (0x105BA, 0x105BA), + (0x105BD, 0x105BF), + (0x105F4, 0x105FF), + (0x10737, 0x1073F), + (0x10756, 0x1075F), + (0x10768, 0x1077F), + (0x10786, 0x10786), + (0x107B1, 0x107B1), + (0x107BB, 0x107FF), + (0x10806, 0x10807), + (0x10809, 0x10809), + (0x10836, 0x10836), + (0x10839, 0x1083B), + (0x1083D, 0x1083E), + (0x10856, 0x10856), + (0x1089F, 0x108A6), + (0x108B0, 0x108DF), + (0x108F3, 0x108F3), + (0x108F6, 0x108FA), + (0x1091C, 0x1091E), + (0x1093A, 0x1093E), + (0x10940, 0x1097F), + (0x109B8, 0x109BB), + (0x109D0, 0x109D1), + (0x10A04, 0x10A04), + (0x10A07, 0x10A0B), + (0x10A14, 0x10A14), + (0x10A18, 0x10A18), + (0x10A36, 0x10A37), + (0x10A3B, 0x10A3E), + (0x10A49, 0x10A4F), + (0x10A59, 0x10A5F), + (0x10AA0, 0x10ABF), + (0x10AE7, 0x10AEA), + (0x10AF7, 0x10AFF), + (0x10B36, 0x10B38), + (0x10B56, 0x10B57), + (0x10B73, 0x10B77), + (0x10B92, 0x10B98), + (0x10B9D, 0x10BA8), + (0x10BB0, 0x10BFF), + (0x10C49, 0x10C7F), + (0x10CB3, 0x10CBF), + (0x10CF3, 0x10CF9), + (0x10D28, 0x10D2F), + (0x10D3A, 0x10D3F), + (0x10D66, 0x10D68), + (0x10D86, 0x10D8D), + (0x10D90, 0x10E5F), + (0x10E7F, 0x10E7F), + (0x10EAA, 0x10EAA), + (0x10EAE, 0x10EAF), + (0x10EB2, 0x10EC1), + (0x10EC5, 0x10EFB), + (0x10F28, 0x10F2F), + (0x10F5A, 0x10F6F), + (0x10F8A, 0x10FAF), + (0x10FCC, 0x10FDF), + (0x10FF7, 0x10FFF), + (0x1104E, 0x11051), + (0x11076, 0x1107E), + (0x110BD, 0x110BD), + (0x110C3, 0x110CF), + (0x110E9, 0x110EF), + (0x110FA, 0x110FF), + (0x11135, 0x11135), + (0x11148, 0x1114F), + (0x11177, 0x1117F), + (0x111E0, 0x111E0), + (0x111F5, 0x111FF), + (0x11212, 0x11212), + (0x11242, 0x1127F), + (0x11287, 0x11287), + (0x11289, 0x11289), + (0x1128E, 0x1128E), + (0x1129E, 0x1129E), + (0x112AA, 0x112AF), + (0x112EB, 0x112EF), + (0x112FA, 0x112FF), + (0x11304, 0x11304), + (0x1130D, 0x1130E), + (0x11311, 0x11312), + (0x11329, 0x11329), + (0x11331, 0x11331), + (0x11334, 0x11334), + (0x1133A, 0x1133A), + (0x11345, 0x11346), + (0x11349, 0x1134A), + (0x1134E, 0x1134F), + (0x11351, 0x11356), + (0x11358, 0x1135C), + (0x11364, 0x11365), + (0x1136D, 0x1136F), + (0x11375, 0x1137F), + (0x1138A, 0x1138A), + (0x1138C, 0x1138D), + (0x1138F, 0x1138F), + (0x113B6, 0x113B6), + (0x113C1, 0x113C1), + (0x113C3, 0x113C4), + (0x113C6, 0x113C6), + (0x113CB, 0x113CB), + (0x113D6, 0x113D6), + (0x113D9, 0x113E0), + (0x113E3, 0x113FF), + (0x1145C, 0x1145C), + (0x11462, 0x1147F), + (0x114C8, 0x114CF), + (0x114DA, 0x1157F), + (0x115B6, 0x115B7), + (0x115DE, 0x115FF), + (0x11645, 0x1164F), + (0x1165A, 0x1165F), + (0x1166D, 0x1167F), + (0x116BA, 0x116BF), + (0x116CA, 0x116CF), + (0x116E4, 0x116FF), + (0x1171B, 0x1171C), + (0x1172C, 0x1172F), + (0x11747, 0x117FF), + (0x1183C, 0x1189F), + (0x118F3, 0x118FE), + (0x11907, 0x11908), + (0x1190A, 0x1190B), + (0x11914, 0x11914), + (0x11917, 0x11917), + (0x11936, 0x11936), + (0x11939, 0x1193A), + (0x11947, 0x1194F), + (0x1195A, 0x1199F), + (0x119A8, 0x119A9), + (0x119D8, 0x119D9), + (0x119E5, 0x119FF), + (0x11A48, 0x11A4F), + (0x11AA3, 0x11AAF), + (0x11AF9, 0x11AFF), + (0x11B0A, 0x11BBF), + (0x11BE2, 0x11BEF), + (0x11BFA, 0x11BFF), + (0x11C09, 0x11C09), + (0x11C37, 0x11C37), + (0x11C46, 0x11C4F), + (0x11C6D, 0x11C6F), + (0x11C90, 0x11C91), + (0x11CA8, 0x11CA8), + (0x11CB7, 0x11CFF), + (0x11D07, 0x11D07), + (0x11D0A, 0x11D0A), + (0x11D37, 0x11D39), + (0x11D3B, 0x11D3B), + (0x11D3E, 0x11D3E), + (0x11D48, 0x11D4F), + (0x11D5A, 0x11D5F), + (0x11D66, 0x11D66), + (0x11D69, 0x11D69), + (0x11D8F, 0x11D8F), + (0x11D92, 0x11D92), + (0x11D99, 0x11D9F), + (0x11DAA, 0x11EDF), + (0x11EF9, 0x11EFF), + (0x11F11, 0x11F11), + (0x11F3B, 0x11F3D), + (0x11F5B, 0x11FAF), + (0x11FB1, 0x11FBF), + (0x11FF2, 0x11FFE), + (0x1239A, 0x123FF), + (0x1246F, 0x1246F), + (0x12475, 0x1247F), + (0x12544, 0x12F8F), + (0x12FF3, 0x12FFF), + (0x13430, 0x1343F), + (0x13456, 0x1345F), + (0x143FB, 0x143FF), + (0x14647, 0x160FF), + (0x1613A, 0x167FF), + (0x16A39, 0x16A3F), + (0x16A5F, 0x16A5F), + (0x16A6A, 0x16A6D), + (0x16ABF, 0x16ABF), + (0x16ACA, 0x16ACF), + (0x16AEE, 0x16AEF), + (0x16AF6, 0x16AFF), + (0x16B46, 0x16B4F), + (0x16B5A, 0x16B5A), + (0x16B62, 0x16B62), + (0x16B78, 0x16B7C), + (0x16B90, 0x16D3F), + (0x16D7A, 0x16E3F), + (0x16E9B, 0x16EFF), + (0x16F4B, 0x16F4E), + (0x16F88, 0x16F8E), + (0x16FA0, 0x16FDF), + (0x16FE5, 0x16FEF), + (0x16FF2, 0x16FFF), + (0x187F8, 0x187FF), + (0x18CD6, 0x18CFE), + (0x18D09, 0x1AFEF), + (0x1AFF4, 0x1AFF4), + (0x1AFFC, 0x1AFFC), + (0x1AFFF, 0x1AFFF), + (0x1B123, 0x1B131), + (0x1B133, 0x1B14F), + (0x1B153, 0x1B154), + (0x1B156, 0x1B163), + (0x1B168, 0x1B16F), + (0x1B2FC, 0x1BBFF), + (0x1BC6B, 0x1BC6F), + (0x1BC7D, 0x1BC7F), + (0x1BC89, 0x1BC8F), + (0x1BC9A, 0x1BC9B), + (0x1BCA0, 0x1CBFF), + (0x1CCFA, 0x1CCFF), + (0x1CEB4, 0x1CEFF), + (0x1CF2E, 0x1CF2F), + (0x1CF47, 0x1CF4F), + (0x1CFC4, 0x1CFFF), + (0x1D0F6, 0x1D0FF), + (0x1D127, 0x1D128), + (0x1D173, 0x1D17A), + (0x1D1EB, 0x1D1FF), + (0x1D246, 0x1D2BF), + (0x1D2D4, 0x1D2DF), + (0x1D2F4, 0x1D2FF), + (0x1D357, 0x1D35F), + (0x1D379, 0x1D3FF), + (0x1D455, 0x1D455), + (0x1D49D, 0x1D49D), + (0x1D4A0, 0x1D4A1), + (0x1D4A3, 0x1D4A4), + (0x1D4A7, 0x1D4A8), + (0x1D4AD, 0x1D4AD), + (0x1D4BA, 0x1D4BA), + (0x1D4BC, 0x1D4BC), + (0x1D4C4, 0x1D4C4), + (0x1D506, 0x1D506), + (0x1D50B, 0x1D50C), + (0x1D515, 0x1D515), + (0x1D51D, 0x1D51D), + (0x1D53A, 0x1D53A), + (0x1D53F, 0x1D53F), + (0x1D545, 0x1D545), + (0x1D547, 0x1D549), + (0x1D551, 0x1D551), + (0x1D6A6, 0x1D6A7), + (0x1D7CC, 0x1D7CD), + (0x1DA8C, 0x1DA9A), + (0x1DAA0, 0x1DAA0), + (0x1DAB0, 0x1DEFF), + (0x1DF1F, 0x1DF24), + (0x1DF2B, 0x1DFFF), + (0x1E007, 0x1E007), + (0x1E019, 0x1E01A), + (0x1E022, 0x1E022), + (0x1E025, 0x1E025), + (0x1E02B, 0x1E02F), + (0x1E06E, 0x1E08E), + (0x1E090, 0x1E0FF), + (0x1E12D, 0x1E12F), + (0x1E13E, 0x1E13F), + (0x1E14A, 0x1E14D), + (0x1E150, 0x1E28F), + (0x1E2AF, 0x1E2BF), + (0x1E2FA, 0x1E2FE), + (0x1E300, 0x1E4CF), + (0x1E4FA, 0x1E5CF), + (0x1E5FB, 0x1E5FE), + (0x1E600, 0x1E7DF), + (0x1E7E7, 0x1E7E7), + (0x1E7EC, 0x1E7EC), + (0x1E7EF, 0x1E7EF), + (0x1E7FF, 0x1E7FF), + (0x1E8C5, 0x1E8C6), + (0x1E8D7, 0x1E8FF), + (0x1E94C, 0x1E94F), + (0x1E95A, 0x1E95D), + (0x1E960, 0x1EC70), + (0x1ECB5, 0x1ED00), + (0x1ED3E, 0x1EDFF), + (0x1EE04, 0x1EE04), + (0x1EE20, 0x1EE20), + (0x1EE23, 0x1EE23), + (0x1EE25, 0x1EE26), + (0x1EE28, 0x1EE28), + (0x1EE33, 0x1EE33), + (0x1EE38, 0x1EE38), + (0x1EE3A, 0x1EE3A), + (0x1EE3C, 0x1EE41), + (0x1EE43, 0x1EE46), + (0x1EE48, 0x1EE48), + (0x1EE4A, 0x1EE4A), + (0x1EE4C, 0x1EE4C), + (0x1EE50, 0x1EE50), + (0x1EE53, 0x1EE53), + (0x1EE55, 0x1EE56), + (0x1EE58, 0x1EE58), + (0x1EE5A, 0x1EE5A), + (0x1EE5C, 0x1EE5C), + (0x1EE5E, 0x1EE5E), + (0x1EE60, 0x1EE60), + (0x1EE63, 0x1EE63), + (0x1EE65, 0x1EE66), + (0x1EE6B, 0x1EE6B), + (0x1EE73, 0x1EE73), + (0x1EE78, 0x1EE78), + (0x1EE7D, 0x1EE7D), + (0x1EE7F, 0x1EE7F), + (0x1EE8A, 0x1EE8A), + (0x1EE9C, 0x1EEA0), + (0x1EEA4, 0x1EEA4), + (0x1EEAA, 0x1EEAA), + (0x1EEBC, 0x1EEEF), + (0x1EEF2, 0x1EFFF), + (0x1F02C, 0x1F02F), + (0x1F094, 0x1F09F), + (0x1F0AF, 0x1F0B0), + (0x1F0C0, 0x1F0C0), + (0x1F0D0, 0x1F0D0), + (0x1F0F6, 0x1F0FF), + (0x1F1AE, 0x1F1E5), + (0x1F203, 0x1F20F), + (0x1F23C, 0x1F23F), + (0x1F249, 0x1F24F), + (0x1F252, 0x1F25F), + (0x1F266, 0x1F2FF), + (0x1F6D8, 0x1F6DB), + (0x1F6ED, 0x1F6EF), + (0x1F6FD, 0x1F6FF), + (0x1F777, 0x1F77A), + (0x1F7DA, 0x1F7DF), + (0x1F7EC, 0x1F7EF), + (0x1F7F1, 0x1F7FF), + (0x1F80C, 0x1F80F), + (0x1F848, 0x1F84F), + (0x1F85A, 0x1F85F), + (0x1F888, 0x1F88F), + (0x1F8AE, 0x1F8AF), + (0x1F8BC, 0x1F8BF), + (0x1F8C2, 0x1F8FF), + (0x1FA54, 0x1FA5F), + (0x1FA6E, 0x1FA6F), + (0x1FA7D, 0x1FA7F), + (0x1FA8A, 0x1FA8E), + (0x1FAC7, 0x1FACD), + (0x1FADD, 0x1FADE), + (0x1FAEA, 0x1FAEF), + (0x1FAF9, 0x1FAFF), + (0x1FB93, 0x1FB93), + (0x1FBFA, 0x1FFFF), + (0x2A6E0, 0x2A6FF), + (0x2B73A, 0x2B73F), + (0x2B81E, 0x2B81F), + (0x2CEA2, 0x2CEAF), + (0x2EBE1, 0x2EBEF), + (0x2EE5E, 0x2F7FF), + (0x2FA1E, 0x2FFFF), + (0x3134B, 0x3134F), + (0x323B0, 0xE00FF), + (0xE01F0, 0x10FFFF), +]; diff --git a/litellm-rust/crates/python-compat/generated/values.json b/litellm-rust/crates/python-compat/generated/values.json new file mode 100644 index 00000000000..7f7e1e35a7d --- /dev/null +++ b/litellm-rust/crates/python-compat/generated/values.json @@ -0,0 +1,2164 @@ +{ + "python": "3.14.7", + "rows": [ + { + "name": "None", + "source": "None", + "literal": true, + "plain": true, + "repr": "None", + "str": "None", + "truthy": false, + "json": "null", + "pickle": { + "0": "4e2e", + "1": "4e2e", + "2": "80024e2e", + "3": "80034e2e", + "4": "80044e2e", + "5": "80054e2e" + }, + "view": "None" + }, + { + "name": "True", + "source": "True", + "literal": true, + "plain": true, + "repr": "True", + "str": "True", + "truthy": true, + "json": "true", + "pickle": { + "0": "4930310a2e", + "1": "4930310a2e", + "2": "8002882e", + "3": "8003882e", + "4": "8004882e", + "5": "8005882e" + }, + "view": "True" + }, + { + "name": "False", + "source": "False", + "literal": true, + "plain": true, + "repr": "False", + "str": "False", + "truthy": false, + "json": "false", + "pickle": { + "0": "4930300a2e", + "1": "4930300a2e", + "2": "8002892e", + "3": "8003892e", + "4": "8004892e", + "5": "8005892e" + }, + "view": "False" + }, + { + "name": "0", + "source": "0", + "literal": true, + "plain": true, + "repr": "0", + "str": "0", + "truthy": false, + "json": "0", + "pickle": { + "0": "49300a2e", + "1": "4b002e", + "2": "80024b002e", + "3": "80034b002e", + "4": "80044b002e", + "5": "80054b002e" + }, + "view": "0" + }, + { + "name": "-7", + "source": "-7", + "literal": true, + "plain": true, + "repr": "-7", + "str": "-7", + "truthy": true, + "json": "-7", + "pickle": { + "0": "492d370a2e", + "1": "4af9ffffff2e", + "2": "80024af9ffffff2e", + "3": "80034af9ffffff2e", + "4": "80049506000000000000004af9ffffff2e", + "5": "80059506000000000000004af9ffffff2e" + }, + "view": "-7" + }, + { + "name": "2**63 - 1", + "source": "2**63 - 1", + "literal": true, + "plain": true, + "repr": "9223372036854775807", + "str": "9223372036854775807", + "truthy": true, + "json": "9223372036854775807", + "pickle": { + "0": "4c393232333337323033363835343737353830374c0a2e", + "1": "4c393232333337323033363835343737353830374c0a2e", + "2": "80028a08ffffffffffffff7f2e", + "3": "80038a08ffffffffffffff7f2e", + "4": "8004950b000000000000008a08ffffffffffffff7f2e", + "5": "8005950b000000000000008a08ffffffffffffff7f2e" + }, + "view": "9223372036854775807" + }, + { + "name": "-(2**63)", + "source": "-(2**63)", + "literal": true, + "plain": true, + "repr": "-9223372036854775808", + "str": "-9223372036854775808", + "truthy": true, + "json": "-9223372036854775808", + "pickle": { + "0": "4c2d393232333337323033363835343737353830384c0a2e", + "1": "4c2d393232333337323033363835343737353830384c0a2e", + "2": "80028a0800000000000000802e", + "3": "80038a0800000000000000802e", + "4": "8004950b000000000000008a0800000000000000802e", + "5": "8005950b000000000000008a0800000000000000802e" + }, + "view": "-9223372036854775808" + }, + { + "name": "2**64", + "source": "2**64", + "literal": true, + "plain": true, + "repr": "18446744073709551616", + "str": "18446744073709551616", + "truthy": true, + "json": "18446744073709551616", + "pickle": { + "0": "4c31383434363734343037333730393535313631364c0a2e", + "1": "4c31383434363734343037333730393535313631364c0a2e", + "2": "80028a090000000000000000012e", + "3": "80038a090000000000000000012e", + "4": "8004950c000000000000008a090000000000000000012e", + "5": "8005950c000000000000008a090000000000000000012e" + }, + "view": "18446744073709551616" + }, + { + "name": "-(2**70)", + "source": "-(2**70)", + "literal": true, + "plain": true, + "repr": "-1180591620717411303424", + "str": "-1180591620717411303424", + "truthy": true, + "json": "-1180591620717411303424", + "pickle": { + "0": "4c2d313138303539313632303731373431313330333432344c0a2e", + "1": "4c2d313138303539313632303731373431313330333432344c0a2e", + "2": "80028a090000000000000000c02e", + "3": "80038a090000000000000000c02e", + "4": "8004950c000000000000008a090000000000000000c02e", + "5": "8005950c000000000000008a090000000000000000c02e" + }, + "view": "-1180591620717411303424" + }, + { + "name": "0.0", + "source": "0.0", + "literal": true, + "plain": true, + "repr": "0.0", + "str": "0.0", + "truthy": false, + "json": "0.0", + "pickle": { + "0": "46302e300a2e", + "1": "4700000000000000002e", + "2": "80024700000000000000002e", + "3": "80034700000000000000002e", + "4": "8004950a000000000000004700000000000000002e", + "5": "8005950a000000000000004700000000000000002e" + }, + "view": "0.0" + }, + { + "name": "-0.0", + "source": "-0.0", + "literal": true, + "plain": true, + "repr": "-0.0", + "str": "-0.0", + "truthy": false, + "json": "-0.0", + "pickle": { + "0": "462d302e300a2e", + "1": "4780000000000000002e", + "2": "80024780000000000000002e", + "3": "80034780000000000000002e", + "4": "8004950a000000000000004780000000000000002e", + "5": "8005950a000000000000004780000000000000002e" + }, + "view": "-0.0" + }, + { + "name": "0.2", + "source": "0.2", + "literal": true, + "plain": true, + "repr": "0.2", + "str": "0.2", + "truthy": true, + "json": "0.2", + "pickle": { + "0": "46302e320a2e", + "1": "473fc999999999999a2e", + "2": "8002473fc999999999999a2e", + "3": "8003473fc999999999999a2e", + "4": "8004950a00000000000000473fc999999999999a2e", + "5": "8005950a00000000000000473fc999999999999a2e" + }, + "view": "0.2" + }, + { + "name": "1.0", + "source": "1.0", + "literal": true, + "plain": true, + "repr": "1.0", + "str": "1.0", + "truthy": true, + "json": "1.0", + "pickle": { + "0": "46312e300a2e", + "1": "473ff00000000000002e", + "2": "8002473ff00000000000002e", + "3": "8003473ff00000000000002e", + "4": "8004950a00000000000000473ff00000000000002e", + "5": "8005950a00000000000000473ff00000000000002e" + }, + "view": "1.0" + }, + { + "name": "-1.5", + "source": "-1.5", + "literal": true, + "plain": true, + "repr": "-1.5", + "str": "-1.5", + "truthy": true, + "json": "-1.5", + "pickle": { + "0": "462d312e350a2e", + "1": "47bff80000000000002e", + "2": "800247bff80000000000002e", + "3": "800347bff80000000000002e", + "4": "8004950a0000000000000047bff80000000000002e", + "5": "8005950a0000000000000047bff80000000000002e" + }, + "view": "-1.5" + }, + { + "name": "0.1 + 0.2", + "source": "0.1 + 0.2", + "literal": true, + "plain": true, + "repr": "0.30000000000000004", + "str": "0.30000000000000004", + "truthy": true, + "json": "0.30000000000000004", + "pickle": { + "0": "46302e33303030303030303030303030303030340a2e", + "1": "473fd33333333333342e", + "2": "8002473fd33333333333342e", + "3": "8003473fd33333333333342e", + "4": "8004950a00000000000000473fd33333333333342e", + "5": "8005950a00000000000000473fd33333333333342e" + }, + "view": "0.30000000000000004" + }, + { + "name": "123456789.123", + "source": "123456789.123", + "literal": true, + "plain": true, + "repr": "123456789.123", + "str": "123456789.123", + "truthy": true, + "json": "123456789.123", + "pickle": { + "0": "463132333435363738392e3132330a2e", + "1": "47419d6f34547df3b62e", + "2": "800247419d6f34547df3b62e", + "3": "800347419d6f34547df3b62e", + "4": "8004950a0000000000000047419d6f34547df3b62e", + "5": "8005950a0000000000000047419d6f34547df3b62e" + }, + "view": "123456789.123" + }, + { + "name": "1e15", + "source": "1e15", + "literal": true, + "plain": true, + "repr": "1000000000000000.0", + "str": "1000000000000000.0", + "truthy": true, + "json": "1000000000000000.0", + "pickle": { + "0": "46313030303030303030303030303030302e300a2e", + "1": "47430c6bf5263400002e", + "2": "800247430c6bf5263400002e", + "3": "800347430c6bf5263400002e", + "4": "8004950a0000000000000047430c6bf5263400002e", + "5": "8005950a0000000000000047430c6bf5263400002e" + }, + "view": "1000000000000000.0" + }, + { + "name": "1e16", + "source": "1e16", + "literal": true, + "plain": true, + "repr": "1e+16", + "str": "1e+16", + "truthy": true, + "json": "1e+16", + "pickle": { + "0": "4631652b31360a2e", + "1": "474341c37937e080002e", + "2": "8002474341c37937e080002e", + "3": "8003474341c37937e080002e", + "4": "8004950a00000000000000474341c37937e080002e", + "5": "8005950a00000000000000474341c37937e080002e" + }, + "view": "1e+16" + }, + { + "name": "1.5e16", + "source": "1.5e16", + "literal": true, + "plain": true, + "repr": "1.5e+16", + "str": "1.5e+16", + "truthy": true, + "json": "1.5e+16", + "pickle": { + "0": "46312e35652b31360a2e", + "1": "47434aa535d3d0c0002e", + "2": "800247434aa535d3d0c0002e", + "3": "800347434aa535d3d0c0002e", + "4": "8004950a0000000000000047434aa535d3d0c0002e", + "5": "8005950a0000000000000047434aa535d3d0c0002e" + }, + "view": "1.5e+16" + }, + { + "name": "9999999999999998.0", + "source": "9999999999999998.0", + "literal": true, + "plain": true, + "repr": "9999999999999998.0", + "str": "9999999999999998.0", + "truthy": true, + "json": "9999999999999998.0", + "pickle": { + "0": "46393939393939393939393939393939382e300a2e", + "1": "474341c37937e07fff2e", + "2": "8002474341c37937e07fff2e", + "3": "8003474341c37937e07fff2e", + "4": "8004950a00000000000000474341c37937e07fff2e", + "5": "8005950a00000000000000474341c37937e07fff2e" + }, + "view": "9999999999999998.0" + }, + { + "name": "0.0001", + "source": "0.0001", + "literal": true, + "plain": true, + "repr": "0.0001", + "str": "0.0001", + "truthy": true, + "json": "0.0001", + "pickle": { + "0": "46302e303030310a2e", + "1": "473f1a36e2eb1c432d2e", + "2": "8002473f1a36e2eb1c432d2e", + "3": "8003473f1a36e2eb1c432d2e", + "4": "8004950a00000000000000473f1a36e2eb1c432d2e", + "5": "8005950a00000000000000473f1a36e2eb1c432d2e" + }, + "view": "0.0001" + }, + { + "name": "1e-05", + "source": "1e-05", + "literal": true, + "plain": true, + "repr": "1e-05", + "str": "1e-05", + "truthy": true, + "json": "1e-05", + "pickle": { + "0": "4631652d30350a2e", + "1": "473ee4f8b588e368f12e", + "2": "8002473ee4f8b588e368f12e", + "3": "8003473ee4f8b588e368f12e", + "4": "8004950a00000000000000473ee4f8b588e368f12e", + "5": "8005950a00000000000000473ee4f8b588e368f12e" + }, + "view": "1e-05" + }, + { + "name": "1.25e-07", + "source": "1.25e-07", + "literal": true, + "plain": true, + "repr": "1.25e-07", + "str": "1.25e-07", + "truthy": true, + "json": "1.25e-07", + "pickle": { + "0": "46312e3235652d30370a2e", + "1": "473e80c6f7a0b5ed8d2e", + "2": "8002473e80c6f7a0b5ed8d2e", + "3": "8003473e80c6f7a0b5ed8d2e", + "4": "8004950a00000000000000473e80c6f7a0b5ed8d2e", + "5": "8005950a00000000000000473e80c6f7a0b5ed8d2e" + }, + "view": "1.25e-07" + }, + { + "name": "5e-324", + "source": "5e-324", + "literal": true, + "plain": true, + "repr": "5e-324", + "str": "5e-324", + "truthy": true, + "json": "5e-324", + "pickle": { + "0": "4635652d3332340a2e", + "1": "4700000000000000012e", + "2": "80024700000000000000012e", + "3": "80034700000000000000012e", + "4": "8004950a000000000000004700000000000000012e", + "5": "8005950a000000000000004700000000000000012e" + }, + "view": "5e-324" + }, + { + "name": "1.7976931348623157e308", + "source": "1.7976931348623157e308", + "literal": true, + "plain": true, + "repr": "1.7976931348623157e+308", + "str": "1.7976931348623157e+308", + "truthy": true, + "json": "1.7976931348623157e+308", + "pickle": { + "0": "46312e37393736393331333438363233313537652b3330380a2e", + "1": "477fefffffffffffff2e", + "2": "8002477fefffffffffffff2e", + "3": "8003477fefffffffffffff2e", + "4": "8004950a00000000000000477fefffffffffffff2e", + "5": "8005950a00000000000000477fefffffffffffff2e" + }, + "view": "1.7976931348623157e+308" + }, + { + "name": "1e22", + "source": "1e22", + "literal": true, + "plain": true, + "repr": "1e+22", + "str": "1e+22", + "truthy": true, + "json": "1e+22", + "pickle": { + "0": "4631652b32320a2e", + "1": "474480f0cf064dd5922e", + "2": "8002474480f0cf064dd5922e", + "3": "8003474480f0cf064dd5922e", + "4": "8004950a00000000000000474480f0cf064dd5922e", + "5": "8005950a00000000000000474480f0cf064dd5922e" + }, + "view": "1e+22" + }, + { + "name": "float('inf')", + "source": "float('inf')", + "literal": false, + "plain": true, + "repr": "inf", + "str": "inf", + "truthy": true, + "json": "Infinity", + "pickle": { + "0": "46696e660a2e", + "1": "477ff00000000000002e", + "2": "8002477ff00000000000002e", + "3": "8003477ff00000000000002e", + "4": "8004950a00000000000000477ff00000000000002e", + "5": "8005950a00000000000000477ff00000000000002e" + }, + "view": "inf" + }, + { + "name": "float('-inf')", + "source": "float('-inf')", + "literal": false, + "plain": true, + "repr": "-inf", + "str": "-inf", + "truthy": true, + "json": "-Infinity", + "pickle": { + "0": "462d696e660a2e", + "1": "47fff00000000000002e", + "2": "800247fff00000000000002e", + "3": "800347fff00000000000002e", + "4": "8004950a0000000000000047fff00000000000002e", + "5": "8005950a0000000000000047fff00000000000002e" + }, + "view": "-inf" + }, + { + "name": "float('nan')", + "source": "float('nan')", + "literal": false, + "plain": true, + "repr": "nan", + "str": "nan", + "truthy": true, + "json": "NaN", + "pickle": { + "0": "466e616e0a2e", + "1": "477ff80000000000002e", + "2": "8002477ff80000000000002e", + "3": "8003477ff80000000000002e", + "4": "8004950a00000000000000477ff80000000000002e", + "5": "8005950a00000000000000477ff80000000000002e" + }, + "view": "nan" + }, + { + "name": "1j", + "source": "1j", + "literal": true, + "plain": false, + "repr": "1j", + "str": "1j", + "truthy": true, + "json_error": "Object of type complex is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a636f6d706c65780a70300a2846302e300a46312e300a7470310a5270320a2e", + "1": "635f5f6275696c74696e5f5f0a636f6d706c65780a710028470000000000000000473ff00000000000007471015271022e", + "2": "8002635f5f6275696c74696e5f5f0a636f6d706c65780a7100470000000000000000473ff00000000000008671015271022e", + "3": "8003636275696c74696e730a636f6d706c65780a7100470000000000000000473ff00000000000008671015271022e", + "4": "8004952e000000000000008c086275696c74696e73948c07636f6d706c6578949394470000000000000000473ff0000000000000869452942e", + "5": "8005952e000000000000008c086275696c74696e73948c07636f6d706c6578949394470000000000000000473ff0000000000000869452942e" + }, + "view": "1j" + }, + { + "name": "-1j", + "source": "-1j", + "literal": false, + "plain": false, + "repr": "(-0-1j)", + "str": "(-0-1j)", + "truthy": true, + "json_error": "Object of type complex is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a636f6d706c65780a70300a28462d302e300a462d312e300a7470310a5270320a2e", + "1": "635f5f6275696c74696e5f5f0a636f6d706c65780a71002847800000000000000047bff00000000000007471015271022e", + "2": "8002635f5f6275696c74696e5f5f0a636f6d706c65780a710047800000000000000047bff00000000000008671015271022e", + "3": "8003636275696c74696e730a636f6d706c65780a710047800000000000000047bff00000000000008671015271022e", + "4": "8004952e000000000000008c086275696c74696e73948c07636f6d706c657894939447800000000000000047bff0000000000000869452942e", + "5": "8005952e000000000000008c086275696c74696e73948c07636f6d706c657894939447800000000000000047bff0000000000000869452942e" + }, + "view": "(-0-1j)" + }, + { + "name": "complex(0, -1)", + "source": "complex(0, -1)", + "literal": false, + "plain": false, + "repr": "-1j", + "str": "-1j", + "truthy": true, + "json_error": "Object of type complex is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a636f6d706c65780a70300a2846302e300a462d312e300a7470310a5270320a2e", + "1": "635f5f6275696c74696e5f5f0a636f6d706c65780a71002847000000000000000047bff00000000000007471015271022e", + "2": "8002635f5f6275696c74696e5f5f0a636f6d706c65780a710047000000000000000047bff00000000000008671015271022e", + "3": "8003636275696c74696e730a636f6d706c65780a710047000000000000000047bff00000000000008671015271022e", + "4": "8004952e000000000000008c086275696c74696e73948c07636f6d706c657894939447000000000000000047bff0000000000000869452942e", + "5": "8005952e000000000000008c086275696c74696e73948c07636f6d706c657894939447000000000000000047bff0000000000000869452942e" + }, + "view": "-1j" + }, + { + "name": "1+2j", + "source": "1+2j", + "literal": true, + "plain": false, + "repr": "(1+2j)", + "str": "(1+2j)", + "truthy": true, + "json_error": "Object of type complex is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a636f6d706c65780a70300a2846312e300a46322e300a7470310a5270320a2e", + "1": "635f5f6275696c74696e5f5f0a636f6d706c65780a710028473ff00000000000004740000000000000007471015271022e", + "2": "8002635f5f6275696c74696e5f5f0a636f6d706c65780a7100473ff00000000000004740000000000000008671015271022e", + "3": "8003636275696c74696e730a636f6d706c65780a7100473ff00000000000004740000000000000008671015271022e", + "4": "8004952e000000000000008c086275696c74696e73948c07636f6d706c6578949394473ff0000000000000474000000000000000869452942e", + "5": "8005952e000000000000008c086275696c74696e73948c07636f6d706c6578949394473ff0000000000000474000000000000000869452942e" + }, + "view": "(1+2j)" + }, + { + "name": "-1.5-0.5j", + "source": "-1.5-0.5j", + "literal": true, + "plain": false, + "repr": "(-1.5-0.5j)", + "str": "(-1.5-0.5j)", + "truthy": true, + "json_error": "Object of type complex is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a636f6d706c65780a70300a28462d312e350a462d302e350a7470310a5270320a2e", + "1": "635f5f6275696c74696e5f5f0a636f6d706c65780a71002847bff800000000000047bfe00000000000007471015271022e", + "2": "8002635f5f6275696c74696e5f5f0a636f6d706c65780a710047bff800000000000047bfe00000000000008671015271022e", + "3": "8003636275696c74696e730a636f6d706c65780a710047bff800000000000047bfe00000000000008671015271022e", + "4": "8004952e000000000000008c086275696c74696e73948c07636f6d706c657894939447bff800000000000047bfe0000000000000869452942e", + "5": "8005952e000000000000008c086275696c74696e73948c07636f6d706c657894939447bff800000000000047bfe0000000000000869452942e" + }, + "view": "(-1.5-0.5j)" + }, + { + "name": "complex(0.0, 1e16)", + "source": "complex(0.0, 1e16)", + "literal": true, + "plain": false, + "repr": "1e+16j", + "str": "1e+16j", + "truthy": true, + "json_error": "Object of type complex is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a636f6d706c65780a70300a2846302e300a4631652b31360a7470310a5270320a2e", + "1": "635f5f6275696c74696e5f5f0a636f6d706c65780a710028470000000000000000474341c37937e080007471015271022e", + "2": "8002635f5f6275696c74696e5f5f0a636f6d706c65780a7100470000000000000000474341c37937e080008671015271022e", + "3": "8003636275696c74696e730a636f6d706c65780a7100470000000000000000474341c37937e080008671015271022e", + "4": "8004952e000000000000008c086275696c74696e73948c07636f6d706c6578949394470000000000000000474341c37937e08000869452942e", + "5": "8005952e000000000000008c086275696c74696e73948c07636f6d706c6578949394470000000000000000474341c37937e08000869452942e" + }, + "view": "1e+16j" + }, + { + "name": "''", + "source": "''", + "literal": true, + "plain": true, + "repr": "''", + "str": "", + "truthy": false, + "json": "\"\"", + "pickle": { + "0": "560a70300a2e", + "1": "580000000071002e", + "2": "8002580000000071002e", + "3": "8003580000000071002e", + "4": "80049504000000000000008c00942e", + "5": "80059504000000000000008c00942e" + }, + "view": "''" + }, + { + "name": "'plain'", + "source": "'plain'", + "literal": true, + "plain": true, + "repr": "'plain'", + "str": "plain", + "truthy": true, + "json": "\"plain\"", + "pickle": { + "0": "56706c61696e0a70300a2e", + "1": "5805000000706c61696e71002e", + "2": "80025805000000706c61696e71002e", + "3": "80035805000000706c61696e71002e", + "4": "80049509000000000000008c05706c61696e942e", + "5": "80059509000000000000008c05706c61696e942e" + }, + "view": "'plain'" + }, + { + "name": "\"it's\"", + "source": "\"it's\"", + "literal": true, + "plain": true, + "repr": "\"it's\"", + "str": "it's", + "truthy": true, + "json": "\"it's\"", + "pickle": { + "0": "56697427730a70300a2e", + "1": "58040000006974277371002e", + "2": "800258040000006974277371002e", + "3": "800358040000006974277371002e", + "4": "80049508000000000000008c0469742773942e", + "5": "80059508000000000000008c0469742773942e" + }, + "view": "\"it's\"" + }, + { + "name": "'say \"hi\"'", + "source": "'say \"hi\"'", + "literal": true, + "plain": true, + "repr": "'say \"hi\"'", + "str": "say \"hi\"", + "truthy": true, + "json": "\"say \\\"hi\\\"\"", + "pickle": { + "0": "5673617920226869220a70300a2e", + "1": "5808000000736179202268692271002e", + "2": "80025808000000736179202268692271002e", + "3": "80035808000000736179202268692271002e", + "4": "8004950c000000000000008c087361792022686922942e", + "5": "8005950c000000000000008c087361792022686922942e" + }, + "view": "'say \"hi\"'" + }, + { + "name": "'both \\' and \"'", + "source": "'both \\' and \"'", + "literal": true, + "plain": true, + "repr": "'both \\' and \"'", + "str": "both ' and \"", + "truthy": true, + "json": "\"both ' and \\\"\"", + "pickle": { + "0": "56626f7468202720616e6420220a70300a2e", + "1": "580c000000626f7468202720616e64202271002e", + "2": "8002580c000000626f7468202720616e64202271002e", + "3": "8003580c000000626f7468202720616e64202271002e", + "4": "80049510000000000000008c0c626f7468202720616e642022942e", + "5": "80059510000000000000008c0c626f7468202720616e642022942e" + }, + "view": "'both \\' and \"'" + }, + { + "name": "'back\\\\slash'", + "source": "'back\\\\slash'", + "literal": true, + "plain": true, + "repr": "'back\\\\slash'", + "str": "back\\slash", + "truthy": true, + "json": "\"back\\\\slash\"", + "pickle": { + "0": "566261636b5c7530303563736c6173680a70300a2e", + "1": "580a0000006261636b5c736c61736871002e", + "2": "8002580a0000006261636b5c736c61736871002e", + "3": "8003580a0000006261636b5c736c61736871002e", + "4": "8004950e000000000000008c0a6261636b5c736c617368942e", + "5": "8005950e000000000000008c0a6261636b5c736c617368942e" + }, + "view": "'back\\\\slash'" + }, + { + "name": "'\\t\\n\\r'", + "source": "'\\t\\n\\r'", + "literal": true, + "plain": true, + "repr": "'\\t\\n\\r'", + "str": "\t\n\r", + "truthy": true, + "json": "\"\\t\\n\\r\"", + "pickle": { + "0": "56095c75303030615c75303030640a70300a2e", + "1": "5803000000090a0d71002e", + "2": "80025803000000090a0d71002e", + "3": "80035803000000090a0d71002e", + "4": "80049507000000000000008c03090a0d942e", + "5": "80059507000000000000008c03090a0d942e" + }, + "view": "'\\t\\n\\r'" + }, + { + "name": "'\\x00\\x1f\\x7f'", + "source": "'\\x00\\x1f\\x7f'", + "literal": true, + "plain": true, + "repr": "'\\x00\\x1f\\x7f'", + "str": "\u0000\u001f\u007f", + "truthy": true, + "json": "\"\\u0000\\u001f\\u007f\"", + "pickle": { + "0": "565c75303030301f7f0a70300a2e", + "1": "5803000000001f7f71002e", + "2": "80025803000000001f7f71002e", + "3": "80035803000000001f7f71002e", + "4": "80049507000000000000008c03001f7f942e", + "5": "80059507000000000000008c03001f7f942e" + }, + "view": "'\\x00\\x1f\\x7f'" + }, + { + "name": "'\\x85\\xa0\\xad'", + "source": "'\\x85\\xa0\\xad'", + "literal": true, + "plain": true, + "repr": "'\\x85\\xa0\\xad'", + "str": "\u0085\u00a0\u00ad", + "truthy": true, + "json": "\"\\u0085\\u00a0\\u00ad\"", + "pickle": { + "0": "5685a0ad0a70300a2e", + "1": "5806000000c285c2a0c2ad71002e", + "2": "80025806000000c285c2a0c2ad71002e", + "3": "80035806000000c285c2a0c2ad71002e", + "4": "8004950a000000000000008c06c285c2a0c2ad942e", + "5": "8005950a000000000000008c06c285c2a0c2ad942e" + }, + "view": "'\\x85\\xa0\\xad'" + }, + { + "name": "'caf\\xe9'", + "source": "'caf\\xe9'", + "literal": true, + "plain": true, + "repr": "'caf\u00e9'", + "str": "caf\u00e9", + "truthy": true, + "json": "\"caf\\u00e9\"", + "pickle": { + "0": "56636166e90a70300a2e", + "1": "5805000000636166c3a971002e", + "2": "80025805000000636166c3a971002e", + "3": "80035805000000636166c3a971002e", + "4": "80049509000000000000008c05636166c3a9942e", + "5": "80059509000000000000008c05636166c3a9942e" + }, + "view": "'caf\u00e9'" + }, + { + "name": "'\\u65e5\\u672c'", + "source": "'\\u65e5\\u672c'", + "literal": true, + "plain": true, + "repr": "'\u65e5\u672c'", + "str": "\u65e5\u672c", + "truthy": true, + "json": "\"\\u65e5\\u672c\"", + "pickle": { + "0": "565c75363565355c75363732630a70300a2e", + "1": "5806000000e697a5e69cac71002e", + "2": "80025806000000e697a5e69cac71002e", + "3": "80035806000000e697a5e69cac71002e", + "4": "8004950a000000000000008c06e697a5e69cac942e", + "5": "8005950a000000000000008c06e697a5e69cac942e" + }, + "view": "'\u65e5\u672c'" + }, + { + "name": "'\\u200b\\u2028\\u3000'", + "source": "'\\u200b\\u2028\\u3000'", + "literal": true, + "plain": true, + "repr": "'\\u200b\\u2028\\u3000'", + "str": "\u200b\u2028\u3000", + "truthy": true, + "json": "\"\\u200b\\u2028\\u3000\"", + "pickle": { + "0": "565c75323030625c75323032385c75333030300a70300a2e", + "1": "5809000000e2808be280a8e3808071002e", + "2": "80025809000000e2808be280a8e3808071002e", + "3": "80035809000000e2808be280a8e3808071002e", + "4": "8004950d000000000000008c09e2808be280a8e38080942e", + "5": "8005950d000000000000008c09e2808be280a8e38080942e" + }, + "view": "'\\u200b\\u2028\\u3000'" + }, + { + "name": "'\\U0001f600'", + "source": "'\\U0001f600'", + "literal": true, + "plain": true, + "repr": "'\ud83d\ude00'", + "str": "\ud83d\ude00", + "truthy": true, + "json": "\"\\ud83d\\ude00\"", + "pickle": { + "0": "565c5530303031663630300a70300a2e", + "1": "5804000000f09f988071002e", + "2": "80025804000000f09f988071002e", + "3": "80035804000000f09f988071002e", + "4": "80049508000000000000008c04f09f9880942e", + "5": "80059508000000000000008c04f09f9880942e" + }, + "view": "'\ud83d\ude00'" + }, + { + "name": "'\\U000e0001\\U0010ffff'", + "source": "'\\U000e0001\\U0010ffff'", + "literal": true, + "plain": true, + "repr": "'\\U000e0001\\U0010ffff'", + "str": "\udb40\udc01\udbff\udfff", + "truthy": true, + "json": "\"\\udb40\\udc01\\udbff\\udfff\"", + "pickle": { + "0": "565c5530303065303030315c5530303130666666660a70300a2e", + "1": "5808000000f3a08081f48fbfbf71002e", + "2": "80025808000000f3a08081f48fbfbf71002e", + "3": "80035808000000f3a08081f48fbfbf71002e", + "4": "8004950c000000000000008c08f3a08081f48fbfbf942e", + "5": "8005950c000000000000008c08f3a08081f48fbfbf942e" + }, + "view": "'\\U000e0001\\U0010ffff'" + }, + { + "name": "'\\b\\f'", + "source": "'\\b\\f'", + "literal": true, + "plain": true, + "repr": "'\\x08\\x0c'", + "str": "\b\f", + "truthy": true, + "json": "\"\\b\\f\"", + "pickle": { + "0": "56080c0a70300a2e", + "1": "5802000000080c71002e", + "2": "80025802000000080c71002e", + "3": "80035802000000080c71002e", + "4": "80049506000000000000008c02080c942e", + "5": "80059506000000000000008c02080c942e" + }, + "view": "'\\x08\\x0c'" + }, + { + "name": "b''", + "source": "b''", + "literal": true, + "plain": true, + "repr": "b''", + "str": "b''", + "truthy": false, + "json_error": "Object of type bytes is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a62797465730a70300a28745270310a2e", + "1": "635f5f6275696c74696e5f5f0a62797465730a7100295271012e", + "2": "8002635f5f6275696c74696e5f5f0a62797465730a7100295271012e", + "3": "8003430071002e", + "4": "80049504000000000000004300942e", + "5": "80059504000000000000004300942e" + }, + "view": "b''" + }, + { + "name": "b'abc'", + "source": "b'abc'", + "literal": true, + "plain": true, + "repr": "b'abc'", + "str": "b'abc'", + "truthy": true, + "json_error": "Object of type bytes is not JSON serializable", + "pickle": { + "0": "635f636f646563730a656e636f64650a70300a28566162630a70310a566c6174696e310a70320a7470330a5270340a2e", + "1": "635f636f646563730a656e636f64650a7100285803000000616263710158060000006c6174696e3171027471035271042e", + "2": "8002635f636f646563730a656e636f64650a71005803000000616263710158060000006c6174696e3171028671035271042e", + "3": "8003430361626371002e", + "4": "80049507000000000000004303616263942e", + "5": "80059507000000000000004303616263942e" + }, + "view": "b'abc'" + }, + { + "name": "b\"a'b\"", + "source": "b\"a'b\"", + "literal": true, + "plain": true, + "repr": "b\"a'b\"", + "str": "b\"a'b\"", + "truthy": true, + "json_error": "Object of type bytes is not JSON serializable", + "pickle": { + "0": "635f636f646563730a656e636f64650a70300a28566127620a70310a566c6174696e310a70320a7470330a5270340a2e", + "1": "635f636f646563730a656e636f64650a7100285803000000612762710158060000006c6174696e3171027471035271042e", + "2": "8002635f636f646563730a656e636f64650a71005803000000612762710158060000006c6174696e3171028671035271042e", + "3": "8003430361276271002e", + "4": "80049507000000000000004303612762942e", + "5": "80059507000000000000004303612762942e" + }, + "view": "b\"a'b\"" + }, + { + "name": "b'a\"b\\'c'", + "source": "b'a\"b\\'c'", + "literal": true, + "plain": true, + "repr": "b'a\"b\\'c'", + "str": "b'a\"b\\'c'", + "truthy": true, + "json_error": "Object of type bytes is not JSON serializable", + "pickle": { + "0": "635f636f646563730a656e636f64650a70300a285661226227630a70310a566c6174696e310a70320a7470330a5270340a2e", + "1": "635f636f646563730a656e636f64650a71002858050000006122622763710158060000006c6174696e3171027471035271042e", + "2": "8002635f636f646563730a656e636f64650a710058050000006122622763710158060000006c6174696e3171028671035271042e", + "3": "80034305612262276371002e", + "4": "800495090000000000000043056122622763942e", + "5": "800595090000000000000043056122622763942e" + }, + "view": "b'a\"b\\'c'" + }, + { + "name": "b'\\x00\\t\\n\\r\\x7f\\x80\\xff'", + "source": "b'\\x00\\t\\n\\r\\x7f\\x80\\xff'", + "literal": true, + "plain": true, + "repr": "b'\\x00\\t\\n\\r\\x7f\\x80\\xff'", + "str": "b'\\x00\\t\\n\\r\\x7f\\x80\\xff'", + "truthy": true, + "json_error": "Object of type bytes is not JSON serializable", + "pickle": { + "0": "635f636f646563730a656e636f64650a70300a28565c7530303030095c75303030615c75303030647f80ff0a70310a566c6174696e310a70320a7470330a5270340a2e", + "1": "635f636f646563730a656e636f64650a710028580900000000090a0d7fc280c3bf710158060000006c6174696e3171027471035271042e", + "2": "8002635f636f646563730a656e636f64650a7100580900000000090a0d7fc280c3bf710158060000006c6174696e3171028671035271042e", + "3": "8003430700090a0d7f80ff71002e", + "4": "8004950b00000000000000430700090a0d7f80ff942e", + "5": "8005950b00000000000000430700090a0d7f80ff942e" + }, + "view": "b'\\x00\\t\\n\\r\\x7f\\x80\\xff'" + }, + { + "name": "[]", + "source": "[]", + "literal": true, + "plain": true, + "repr": "[]", + "str": "[]", + "truthy": false, + "json": "[]", + "pickle": { + "0": "286c70300a2e", + "1": "5d71002e", + "2": "80025d71002e", + "3": "80035d71002e", + "4": "80045d942e", + "5": "80055d942e" + }, + "view": "[]" + }, + { + "name": "[1, 'a', None, True]", + "source": "[1, 'a', None, True]", + "literal": true, + "plain": true, + "repr": "[1, 'a', None, True]", + "str": "[1, 'a', None, True]", + "truthy": true, + "json": "[1, \"a\", null, true]", + "pickle": { + "0": "286c70300a49310a6156610a70310a614e614930310a612e", + "1": "5d7100284b0158010000006171014e4930310a652e", + "2": "80025d7100284b0158010000006171014e88652e", + "3": "80035d7100284b0158010000006171014e88652e", + "4": "8004950d000000000000005d94284b018c0161944e88652e", + "5": "8005950d000000000000005d94284b018c0161944e88652e" + }, + "view": "[1, 'a', None, True]" + }, + { + "name": "()", + "source": "()", + "literal": true, + "plain": true, + "repr": "()", + "str": "()", + "truthy": false, + "json": "[]", + "pickle": { + "0": "28742e", + "1": "292e", + "2": "8002292e", + "3": "8003292e", + "4": "8004292e", + "5": "8005292e" + }, + "view": "[]" + }, + { + "name": "(1,)", + "source": "(1,)", + "literal": true, + "plain": true, + "repr": "(1,)", + "str": "(1,)", + "truthy": true, + "json": "[1]", + "pickle": { + "0": "2849310a7470300a2e", + "1": "284b017471002e", + "2": "80024b018571002e", + "3": "80034b018571002e", + "4": "80049505000000000000004b0185942e", + "5": "80059505000000000000004b0185942e" + }, + "view": "[1]" + }, + { + "name": "(1, (2, 3))", + "source": "(1, (2, 3))", + "literal": true, + "plain": true, + "repr": "(1, (2, 3))", + "str": "(1, (2, 3))", + "truthy": true, + "json": "[1, [2, 3]]", + "pickle": { + "0": "2849310a2849320a49330a7470300a7470310a2e", + "1": "284b01284b024b037471007471012e", + "2": "80024b014b024b038671008671012e", + "3": "80034b014b024b038671008671012e", + "4": "8004950b000000000000004b014b024b03869486942e", + "5": "8005950b000000000000004b014b024b03869486942e" + }, + "view": "[1, [2, 3]]" + }, + { + "name": "{}", + "source": "{}", + "literal": true, + "plain": true, + "repr": "{}", + "str": "{}", + "truthy": false, + "json": "{}", + "pickle": { + "0": "286470300a2e", + "1": "7d71002e", + "2": "80027d71002e", + "3": "80037d71002e", + "4": "80047d942e", + "5": "80057d942e" + }, + "view": "{}" + }, + { + "name": "{'a': 1, 'b': [1.0, 2.5]}", + "source": "{'a': 1, 'b': [1.0, 2.5]}", + "literal": true, + "plain": true, + "repr": "{'a': 1, 'b': [1.0, 2.5]}", + "str": "{'a': 1, 'b': [1.0, 2.5]}", + "truthy": true, + "json": "{\"a\": 1, \"b\": [1.0, 2.5]}", + "pickle": { + "0": "286470300a56610a70310a49310a7356620a70320a286c70330a46312e300a6146322e350a61732e", + "1": "7d71002858010000006171014b0158010000006271025d710328473ff000000000000047400400000000000065752e", + "2": "80027d71002858010000006171014b0158010000006271025d710328473ff000000000000047400400000000000065752e", + "3": "80037d71002858010000006171014b0158010000006271025d710328473ff000000000000047400400000000000065752e", + "4": "80049525000000000000007d94288c0161944b018c0162945d9428473ff000000000000047400400000000000065752e", + "5": "80059525000000000000007d94288c0161944b018c0162945d9428473ff000000000000047400400000000000065752e" + }, + "view": "{'a': 1, 'b': [1.0, 2.5]}" + }, + { + "name": "{'z': 1, 'a': 2, 'm': 3}", + "source": "{'z': 1, 'a': 2, 'm': 3}", + "literal": true, + "plain": true, + "repr": "{'z': 1, 'a': 2, 'm': 3}", + "str": "{'z': 1, 'a': 2, 'm': 3}", + "truthy": true, + "json": "{\"z\": 1, \"a\": 2, \"m\": 3}", + "pickle": { + "0": "286470300a567a0a70310a49310a7356610a70320a49320a73566d0a70330a49330a732e", + "1": "7d71002858010000007a71014b0158010000006171024b0258010000006d71034b03752e", + "2": "80027d71002858010000007a71014b0158010000006171024b0258010000006d71034b03752e", + "3": "80037d71002858010000007a71014b0158010000006171024b0258010000006d71034b03752e", + "4": "80049517000000000000007d94288c017a944b018c0161944b028c016d944b03752e", + "5": "80059517000000000000007d94288c017a944b018c0161944b028c016d944b03752e" + }, + "view": "{'z': 1, 'a': 2, 'm': 3}" + }, + { + "name": "{1: 'int', 2.5: 'float', True: 'bool', None: 'none'}", + "source": "{1: 'int', 2.5: 'float', True: 'bool', None: 'none'}", + "literal": true, + "plain": true, + "repr": "{1: 'bool', 2.5: 'float', None: 'none'}", + "str": "{1: 'bool', 2.5: 'float', None: 'none'}", + "truthy": true, + "json": "{\"1\": \"bool\", \"2.5\": \"float\", \"null\": \"none\"}", + "pickle": { + "0": "286470300a49310a56626f6f6c0a70310a7346322e350a56666c6f61740a70320a734e566e6f6e650a70330a732e", + "1": "7d7100284b015804000000626f6f6c71014740040000000000005805000000666c6f617471024e58040000006e6f6e657103752e", + "2": "80027d7100284b015804000000626f6f6c71014740040000000000005805000000666c6f617471024e58040000006e6f6e657103752e", + "3": "80037d7100284b015804000000626f6f6c71014740040000000000005805000000666c6f617471024e58040000006e6f6e657103752e", + "4": "80049527000000000000007d94284b018c04626f6f6c944740040000000000008c05666c6f6174944e8c046e6f6e6594752e", + "5": "80059527000000000000007d94284b018c04626f6f6c944740040000000000008c05666c6f6174944e8c046e6f6e6594752e" + }, + "view": "{1: 'bool', 2.5: 'float', None: 'none'}" + }, + { + "name": "{(1, 2): 'tuple key'}", + "source": "{(1, 2): 'tuple key'}", + "literal": true, + "plain": true, + "repr": "{(1, 2): 'tuple key'}", + "str": "{(1, 2): 'tuple key'}", + "truthy": true, + "json_error": "keys must be str, int, float, bool or None, not tuple", + "pickle": { + "0": "286470300a2849310a49320a7470310a567475706c65206b65790a70320a732e", + "1": "7d7100284b014b0274710158090000007475706c65206b65797102732e", + "2": "80027d71004b014b0286710158090000007475706c65206b65797102732e", + "3": "80037d71004b014b0286710158090000007475706c65206b65797102732e", + "4": "80049516000000000000007d944b014b0286948c097475706c65206b657994732e", + "5": "80059516000000000000007d944b014b0286948c097475706c65206b657994732e" + }, + "view": "{[1, 2]: 'tuple key'}" + }, + { + "name": "{'nested': {'deeper': {'deepest': [{}]}}}", + "source": "{'nested': {'deeper': {'deepest': [{}]}}}", + "literal": true, + "plain": true, + "repr": "{'nested': {'deeper': {'deepest': [{}]}}}", + "str": "{'nested': {'deeper': {'deepest': [{}]}}}", + "truthy": true, + "json": "{\"nested\": {\"deeper\": {\"deepest\": [{}]}}}", + "pickle": { + "0": "286470300a566e65737465640a70310a286470320a566465657065720a70330a286470340a56646565706573740a70350a286c70360a286470370a617373732e", + "1": "7d710058060000006e657374656471017d7102580600000064656570657271037d710458070000006465657065737471055d71067d7107617373732e", + "2": "80027d710058060000006e657374656471017d7102580600000064656570657271037d710458070000006465657065737471055d71067d7107617373732e", + "3": "80037d710058060000006e657374656471017d7102580600000064656570657271037d710458070000006465657065737471055d71067d7107617373732e", + "4": "8004952b000000000000007d948c066e6573746564947d948c06646565706572947d948c0764656570657374945d947d94617373732e", + "5": "8005952b000000000000007d948c066e6573746564947d948c06646565706572947d948c0764656570657374945d947d94617373732e" + }, + "view": "{'nested': {'deeper': {'deepest': [{}]}}}" + }, + { + "name": "{1}", + "source": "{1}", + "literal": true, + "plain": true, + "repr": "{1}", + "str": "{1}", + "truthy": true, + "json_error": "Object of type set is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a7365740a70300a28286c70310a49310a617470320a5270330a2e", + "1": "635f5f6275696c74696e5f5f0a7365740a7100285d71014b01617471025271032e", + "2": "8002635f5f6275696c74696e5f5f0a7365740a71005d71014b01618571025271032e", + "3": "8003636275696c74696e730a7365740a71005d71014b01618571025271032e", + "4": "80049507000000000000008f94284b01902e", + "5": "80059507000000000000008f94284b01902e" + }, + "view": "[1]" + }, + { + "name": "set()", + "source": "set()", + "literal": true, + "plain": true, + "repr": "set()", + "str": "set()", + "truthy": false, + "json_error": "Object of type set is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a7365740a70300a28286c70310a7470320a5270330a2e", + "1": "635f5f6275696c74696e5f5f0a7365740a7100285d71017471025271032e", + "2": "8002635f5f6275696c74696e5f5f0a7365740a71005d71018571025271032e", + "3": "8003636275696c74696e730a7365740a71005d71018571025271032e", + "4": "80048f942e", + "5": "80058f942e" + }, + "view": "[]" + }, + { + "name": "frozenset({1})", + "source": "frozenset({1})", + "literal": false, + "plain": true, + "repr": "frozenset({1})", + "str": "frozenset({1})", + "truthy": true, + "json_error": "Object of type frozenset is not JSON serializable", + "pickle": { + "0": "635f5f6275696c74696e5f5f0a66726f7a656e7365740a70300a28286c70310a49310a617470320a5270330a2e", + "1": "635f5f6275696c74696e5f5f0a66726f7a656e7365740a7100285d71014b01617471025271032e", + "2": "8002635f5f6275696c74696e5f5f0a66726f7a656e7365740a71005d71014b01618571025271032e", + "3": "8003636275696c74696e730a66726f7a656e7365740a71005d71014b01618571025271032e", + "4": "8004950600000000000000284b0191942e", + "5": "8005950600000000000000284b0191942e" + }, + "view": "[1]" + }, + { + "name": "[[[[[[[[[[1]]]]]]]]]]", + "source": "[[[[[[[[[[1]]]]]]]]]]", + "literal": true, + "plain": true, + "repr": "[[[[[[[[[[1]]]]]]]]]]", + "str": "[[[[[[[[[[1]]]]]]]]]]", + "truthy": true, + "json": "[[[[[[[[[[1]]]]]]]]]]", + "pickle": { + "0": "286c70300a286c70310a286c70320a286c70330a286c70340a286c70350a286c70360a286c70370a286c70380a286c70390a49310a616161616161616161612e", + "1": "5d71005d71015d71025d71035d71045d71055d71065d71075d71085d71094b01616161616161616161612e", + "2": "80025d71005d71015d71025d71035d71045d71055d71065d71075d71085d71094b01616161616161616161612e", + "3": "80035d71005d71015d71025d71035d71045d71055d71065d71075d71085d71094b01616161616161616161612e", + "4": "80049521000000000000005d945d945d945d945d945d945d945d945d945d944b01616161616161616161612e", + "5": "80059521000000000000005d945d945d945d945d945d945d945d945d945d944b01616161616161616161612e" + }, + "view": "[[[[[[[[[[1]]]]]]]]]]" + }, + { + "name": "nested_150", + "source": "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[1]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]", + "literal": true, + "plain": true, + "repr": "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[1]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]", + "str": "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[1]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]", + "truthy": true, + "json": "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[1]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]", + "pickle": { + "0": "286c70300a286c70310a286c70320a286c70330a286c70340a286c70350a286c70360a286c70370a286c70380a286c70390a286c7031300a286c7031310a286c7031320a286c7031330a286c7031340a286c7031350a286c7031360a286c7031370a286c7031380a286c7031390a286c7032300a286c7032310a286c7032320a286c7032330a286c7032340a286c7032350a286c7032360a286c7032370a286c7032380a286c7032390a286c7033300a286c7033310a286c7033320a286c7033330a286c7033340a286c7033350a286c7033360a286c7033370a286c7033380a286c7033390a286c7034300a286c7034310a286c7034320a286c7034330a286c7034340a286c7034350a286c7034360a286c7034370a286c7034380a286c7034390a286c7035300a286c7035310a286c7035320a286c7035330a286c7035340a286c7035350a286c7035360a286c7035370a286c7035380a286c7035390a286c7036300a286c7036310a286c7036320a286c7036330a286c7036340a286c7036350a286c7036360a286c7036370a286c7036380a286c7036390a286c7037300a286c7037310a286c7037320a286c7037330a286c7037340a286c7037350a286c7037360a286c7037370a286c7037380a286c7037390a286c7038300a286c7038310a286c7038320a286c7038330a286c7038340a286c7038350a286c7038360a286c7038370a286c7038380a286c7038390a286c7039300a286c7039310a286c7039320a286c7039330a286c7039340a286c7039350a286c7039360a286c7039370a286c7039380a286c7039390a286c703130300a286c703130310a286c703130320a286c703130330a286c703130340a286c703130350a286c703130360a286c703130370a286c703130380a286c703130390a286c703131300a286c703131310a286c703131320a286c703131330a286c703131340a286c703131350a286c703131360a286c703131370a286c703131380a286c703131390a286c703132300a286c703132310a286c703132320a286c703132330a286c703132340a286c703132350a286c703132360a286c703132370a286c703132380a286c703132390a286c703133300a286c703133310a286c703133320a286c703133330a286c703133340a286c703133350a286c703133360a286c703133370a286c703133380a286c703133390a286c703134300a286c703134310a286c703134320a286c703134330a286c703134340a286c703134350a286c703134360a286c703134370a286c703134380a286c703134390a49310a6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e", + "1": "5d71005d71015d71025d71035d71045d71055d71065d71075d71085d71095d710a5d710b5d710c5d710d5d710e5d710f5d71105d71115d71125d71135d71145d71155d71165d71175d71185d71195d711a5d711b5d711c5d711d5d711e5d711f5d71205d71215d71225d71235d71245d71255d71265d71275d71285d71295d712a5d712b5d712c5d712d5d712e5d712f5d71305d71315d71325d71335d71345d71355d71365d71375d71385d71395d713a5d713b5d713c5d713d5d713e5d713f5d71405d71415d71425d71435d71445d71455d71465d71475d71485d71495d714a5d714b5d714c5d714d5d714e5d714f5d71505d71515d71525d71535d71545d71555d71565d71575d71585d71595d715a5d715b5d715c5d715d5d715e5d715f5d71605d71615d71625d71635d71645d71655d71665d71675d71685d71695d716a5d716b5d716c5d716d5d716e5d716f5d71705d71715d71725d71735d71745d71755d71765d71775d71785d71795d717a5d717b5d717c5d717d5d717e5d717f5d71805d71815d71825d71835d71845d71855d71865d71875d71885d71895d718a5d718b5d718c5d718d5d718e5d718f5d71905d71915d71925d71935d71945d71954b016161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e", + "2": "80025d71005d71015d71025d71035d71045d71055d71065d71075d71085d71095d710a5d710b5d710c5d710d5d710e5d710f5d71105d71115d71125d71135d71145d71155d71165d71175d71185d71195d711a5d711b5d711c5d711d5d711e5d711f5d71205d71215d71225d71235d71245d71255d71265d71275d71285d71295d712a5d712b5d712c5d712d5d712e5d712f5d71305d71315d71325d71335d71345d71355d71365d71375d71385d71395d713a5d713b5d713c5d713d5d713e5d713f5d71405d71415d71425d71435d71445d71455d71465d71475d71485d71495d714a5d714b5d714c5d714d5d714e5d714f5d71505d71515d71525d71535d71545d71555d71565d71575d71585d71595d715a5d715b5d715c5d715d5d715e5d715f5d71605d71615d71625d71635d71645d71655d71665d71675d71685d71695d716a5d716b5d716c5d716d5d716e5d716f5d71705d71715d71725d71735d71745d71755d71765d71775d71785d71795d717a5d717b5d717c5d717d5d717e5d717f5d71805d71815d71825d71835d71845d71855d71865d71875d71885d71895d718a5d718b5d718c5d718d5d718e5d718f5d71905d71915d71925d71935d71945d71954b016161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e", + "3": "80035d71005d71015d71025d71035d71045d71055d71065d71075d71085d71095d710a5d710b5d710c5d710d5d710e5d710f5d71105d71115d71125d71135d71145d71155d71165d71175d71185d71195d711a5d711b5d711c5d711d5d711e5d711f5d71205d71215d71225d71235d71245d71255d71265d71275d71285d71295d712a5d712b5d712c5d712d5d712e5d712f5d71305d71315d71325d71335d71345d71355d71365d71375d71385d71395d713a5d713b5d713c5d713d5d713e5d713f5d71405d71415d71425d71435d71445d71455d71465d71475d71485d71495d714a5d714b5d714c5d714d5d714e5d714f5d71505d71515d71525d71535d71545d71555d71565d71575d71585d71595d715a5d715b5d715c5d715d5d715e5d715f5d71605d71615d71625d71635d71645d71655d71665d71675d71685d71695d716a5d716b5d716c5d716d5d716e5d716f5d71705d71715d71725d71735d71745d71755d71765d71775d71785d71795d717a5d717b5d717c5d717d5d717e5d717f5d71805d71815d71825d71835d71845d71855d71865d71875d71885d71895d718a5d718b5d718c5d718d5d718e5d718f5d71905d71915d71925d71935d71945d71954b016161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e", + "4": "800495c5010000000000005d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d944b016161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e", + "5": "800595c5010000000000005d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d945d944b016161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e" + }, + "view": "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[1]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + }, + { + "name": "{'timestamp': 1726000000.123, 'response': '{\"id\": \"chatcmpl-1\", \"object\": \"chat.completion\"}'}", + "source": "{'timestamp': 1726000000.123, 'response': '{\"id\": \"chatcmpl-1\", \"object\": \"chat.completion\"}'}", + "literal": true, + "plain": true, + "repr": "{'timestamp': 1726000000.123, 'response': '{\"id\": \"chatcmpl-1\", \"object\": \"chat.completion\"}'}", + "str": "{'timestamp': 1726000000.123, 'response': '{\"id\": \"chatcmpl-1\", \"object\": \"chat.completion\"}'}", + "truthy": true, + "json": "{\"timestamp\": 1726000000.123, \"response\": \"{\\\"id\\\": \\\"chatcmpl-1\\\", \\\"object\\\": \\\"chat.completion\\\"}\"}", + "pickle": { + "0": "286470300a5674696d657374616d700a70310a46313732363030303030302e3132330a7356726573706f6e73650a70320a567b226964223a202263686174636d706c2d31222c20226f626a656374223a2022636861742e636f6d706c6574696f6e227d0a70330a732e", + "1": "7d710028580900000074696d657374616d7071014741d9b82ae007df3b5808000000726573706f6e7365710258310000007b226964223a202263686174636d706c2d31222c20226f626a656374223a2022636861742e636f6d706c6574696f6e227d7103752e", + "2": "80027d710028580900000074696d657374616d7071014741d9b82ae007df3b5808000000726573706f6e7365710258310000007b226964223a202263686174636d706c2d31222c20226f626a656374223a2022636861742e636f6d706c6574696f6e227d7103752e", + "3": "80037d710028580900000074696d657374616d7071014741d9b82ae007df3b5808000000726573706f6e7365710258310000007b226964223a202263686174636d706c2d31222c20226f626a656374223a2022636861742e636f6d706c6574696f6e227d7103752e", + "4": "80049559000000000000007d94288c0974696d657374616d70944741d9b82ae007df3b8c08726573706f6e7365948c317b226964223a202263686174636d706c2d31222c20226f626a656374223a2022636861742e636f6d706c6574696f6e227d94752e", + "5": "80059559000000000000007d94288c0974696d657374616d70944741d9b82ae007df3b8c08726573706f6e7365948c317b226964223a202263686174636d706c2d31222c20226f626a656374223a2022636861742e636f6d706c6574696f6e227d94752e" + }, + "view": "{'timestamp': 1726000000.123, 'response': '{\"id\": \"chatcmpl-1\", \"object\": \"chat.completion\"}'}" + }, + { + "name": "{'model': 'gpt-4o', 'messages': [{'role': 'user', 'content': 'hi'}], 'temperature': 0.2, 'stream': False}", + "source": "{'model': 'gpt-4o', 'messages': [{'role': 'user', 'content': 'hi'}], 'temperature': 0.2, 'stream': False}", + "literal": true, + "plain": true, + "repr": "{'model': 'gpt-4o', 'messages': [{'role': 'user', 'content': 'hi'}], 'temperature': 0.2, 'stream': False}", + "str": "{'model': 'gpt-4o', 'messages': [{'role': 'user', 'content': 'hi'}], 'temperature': 0.2, 'stream': False}", + "truthy": true, + "json": "{\"model\": \"gpt-4o\", \"messages\": [{\"role\": \"user\", \"content\": \"hi\"}], \"temperature\": 0.2, \"stream\": false}", + "pickle": { + "0": "286470300a566d6f64656c0a70310a566770742d346f0a70320a73566d657373616765730a70330a286c70340a286470350a56726f6c650a70360a56757365720a70370a7356636f6e74656e740a70380a5668690a70390a7361735674656d70657261747572650a7031300a46302e320a735673747265616d0a7031310a4930300a732e", + "1": "7d71002858050000006d6f64656c710158060000006770742d346f710258080000006d6573736167657371035d71047d7105285804000000726f6c65710658040000007573657271075807000000636f6e74656e7471085802000000686971097561580b00000074656d7065726174757265710a473fc999999999999a580600000073747265616d710b4930300a752e", + "2": "80027d71002858050000006d6f64656c710158060000006770742d346f710258080000006d6573736167657371035d71047d7105285804000000726f6c65710658040000007573657271075807000000636f6e74656e7471085802000000686971097561580b00000074656d7065726174757265710a473fc999999999999a580600000073747265616d710b89752e", + "3": "80037d71002858050000006d6f64656c710158060000006770742d346f710258080000006d6573736167657371035d71047d7105285804000000726f6c65710658040000007573657271075807000000636f6e74656e7471085802000000686971097561580b00000074656d7065726174757265710a473fc999999999999a580600000073747265616d710b89752e", + "4": "80049566000000000000007d94288c056d6f64656c948c066770742d346f948c086d65737361676573945d947d94288c04726f6c65948c0475736572948c07636f6e74656e74948c0268699475618c0b74656d706572617475726594473fc999999999999a8c0673747265616d9489752e", + "5": "80059566000000000000007d94288c056d6f64656c948c066770742d346f948c086d65737361676573945d947d94288c04726f6c65948c0475736572948c07636f6e74656e74948c0268699475618c0b74656d706572617475726594473fc999999999999a8c0673747265616d9489752e" + }, + "view": "{'model': 'gpt-4o', 'messages': [{'role': 'user', 'content': 'hi'}], 'temperature': 0.2, 'stream': False}" + } + ], + "sources": [ + { + "name": "1", + "source": "1", + "repr": "1" + }, + { + "name": " 1", + "source": " 1", + "repr": "1" + }, + { + "name": "\t1", + "source": "\t1", + "repr": "1" + }, + { + "name": "\n1", + "source": "\n1", + "repr": "1" + }, + { + "name": " \n 1", + "source": " \n 1", + "error": "IndentationError" + }, + { + "name": "1\n", + "source": "1\n", + "repr": "1" + }, + { + "name": "1 # comment", + "source": "1 # comment", + "repr": "1" + }, + { + "name": "# c\n1", + "source": "# c\n1", + "repr": "1" + }, + { + "name": "1 \\\n", + "source": "1 \\\n", + "error": "SyntaxError" + }, + { + "name": "1,", + "source": "1,", + "repr": "(1,)" + }, + { + "name": "1, 2", + "source": "1, 2", + "repr": "(1, 2)" + }, + { + "name": "1,\n2", + "source": "1,\n2", + "error": "SyntaxError" + }, + { + "name": "(1,\n2)", + "source": "(1,\n2)", + "repr": "(1, 2)" + }, + { + "name": "[1,\n 2,\n]", + "source": "[1,\n 2,\n]", + "repr": "[1, 2]" + }, + { + "name": "()", + "source": "()", + "repr": "()" + }, + { + "name": "(1)", + "source": "(1)", + "repr": "1" + }, + { + "name": "((1,))", + "source": "((1,))", + "repr": "(1,)" + }, + { + "name": "(,)", + "source": "(,)", + "error": "SyntaxError" + }, + { + "name": "[,]", + "source": "[,]", + "error": "SyntaxError" + }, + { + "name": "{,}", + "source": "{,}", + "error": "SyntaxError" + }, + { + "name": "[1,]", + "source": "[1,]", + "repr": "[1]" + }, + { + "name": "{'a': 1,}", + "source": "{'a': 1,}", + "repr": "{'a': 1}" + }, + { + "name": "{1,}", + "source": "{1,}", + "repr": "{1}" + }, + { + "name": "{'a': 1 'b': 2}", + "source": "{'a': 1 'b': 2}", + "error": "SyntaxError" + }, + { + "name": "{1: 'a', True: 'b'}", + "source": "{1: 'a', True: 'b'}", + "repr": "{1: 'b'}" + }, + { + "name": "{1, True, 1.0}", + "source": "{1, True, 1.0}", + "repr": "{1}" + }, + { + "name": "{(1, 2): 'x', (1.0, 2): 'y'}", + "source": "{(1, 2): 'x', (1.0, 2): 'y'}", + "repr": "{(1, 2): 'y'}" + }, + { + "name": "{[1]: 2}", + "source": "{[1]: 2}", + "error": "TypeError" + }, + { + "name": "{{1}}", + "source": "{{1}}", + "error": "TypeError" + }, + { + "name": "{(1, [2])}", + "source": "{(1, [2])}", + "error": "TypeError" + }, + { + "name": "set()", + "source": "set()", + "repr": "set()" + }, + { + "name": "set( )", + "source": "set( )", + "repr": "set()" + }, + { + "name": "set([1])", + "source": "set([1])", + "error": "ValueError" + }, + { + "name": "frozenset()", + "source": "frozenset()", + "error": "ValueError" + }, + { + "name": "True", + "source": "True", + "repr": "True" + }, + { + "name": "False", + "source": "False", + "repr": "False" + }, + { + "name": "None", + "source": "None", + "repr": "None" + }, + { + "name": "Truex", + "source": "Truex", + "error": "ValueError" + }, + { + "name": "true", + "source": "true", + "error": "ValueError" + }, + { + "name": "...", + "source": "...", + "repr": "Ellipsis" + }, + { + "name": "0", + "source": "0", + "repr": "0" + }, + { + "name": "00", + "source": "00", + "repr": "0" + }, + { + "name": "0_0", + "source": "0_0", + "repr": "0" + }, + { + "name": "01", + "source": "01", + "error": "SyntaxError" + }, + { + "name": "007", + "source": "007", + "error": "SyntaxError" + }, + { + "name": "1_000", + "source": "1_000", + "repr": "1000" + }, + { + "name": "1_", + "source": "1_", + "error": "SyntaxError" + }, + { + "name": "1__0", + "source": "1__0", + "error": "SyntaxError" + }, + { + "name": "_1", + "source": "_1", + "error": "ValueError" + }, + { + "name": "0x1F", + "source": "0x1F", + "repr": "31" + }, + { + "name": "0X_1f", + "source": "0X_1f", + "repr": "31" + }, + { + "name": "0o17", + "source": "0o17", + "repr": "15" + }, + { + "name": "0b101", + "source": "0b101", + "repr": "5" + }, + { + "name": "0b102", + "source": "0b102", + "error": "SyntaxError" + }, + { + "name": "0x", + "source": "0x", + "error": "SyntaxError" + }, + { + "name": "1e3", + "source": "1e3", + "repr": "1000.0" + }, + { + "name": "1E-3", + "source": "1E-3", + "repr": "0.001" + }, + { + "name": "1e", + "source": "1e", + "error": "SyntaxError" + }, + { + "name": "1.e5", + "source": "1.e5", + "repr": "100000.0" + }, + { + "name": ".5", + "source": ".5", + "repr": "0.5" + }, + { + "name": "5.", + "source": "5.", + "repr": "5.0" + }, + { + "name": "1..", + "source": "1..", + "error": "SyntaxError" + }, + { + "name": "1.5.2", + "source": "1.5.2", + "error": "SyntaxError" + }, + { + "name": "1_0.0_1e1_0", + "source": "1_0.0_1e1_0", + "repr": "100100000000.0" + }, + { + "name": "1e999", + "source": "1e999", + "repr": "inf" + }, + { + "name": "-1e999", + "source": "-1e999", + "repr": "-inf" + }, + { + "name": "1j", + "source": "1j", + "repr": "1j" + }, + { + "name": "1.5J", + "source": "1.5J", + "repr": "1.5j" + }, + { + "name": "010j", + "source": "010j", + "repr": "10j" + }, + { + "name": "010.5", + "source": "010.5", + "repr": "10.5" + }, + { + "name": "1a", + "source": "1a", + "error": "SyntaxError" + }, + { + "name": "0x1g", + "source": "0x1g", + "error": "SyntaxError" + }, + { + "name": "-1", + "source": "-1", + "repr": "-1" + }, + { + "name": "+1", + "source": "+1", + "repr": "1" + }, + { + "name": "- 1", + "source": "- 1", + "repr": "-1" + }, + { + "name": "--1", + "source": "--1", + "error": "ValueError" + }, + { + "name": "-+1", + "source": "-+1", + "error": "ValueError" + }, + { + "name": "-(1)", + "source": "-(1)", + "repr": "-1" + }, + { + "name": "-(-1)", + "source": "-(-1)", + "error": "ValueError" + }, + { + "name": "-(1+2j)", + "source": "-(1+2j)", + "error": "ValueError" + }, + { + "name": "-True", + "source": "-True", + "error": "ValueError" + }, + { + "name": "-'a'", + "source": "-'a'", + "error": "ValueError" + }, + { + "name": "-[1]", + "source": "-[1]", + "error": "ValueError" + }, + { + "name": "1+2j", + "source": "1+2j", + "repr": "(1+2j)" + }, + { + "name": "1-2j", + "source": "1-2j", + "repr": "(1-2j)" + }, + { + "name": "1 + 2j", + "source": "1 + 2j", + "repr": "(1+2j)" + }, + { + "name": "(1)+(2j)", + "source": "(1)+(2j)", + "repr": "(1+2j)" + }, + { + "name": "1+2", + "source": "1+2", + "error": "ValueError" + }, + { + "name": "1+2+3j", + "source": "1+2+3j", + "error": "ValueError" + }, + { + "name": "1+-2j", + "source": "1+-2j", + "error": "ValueError" + }, + { + "name": "2j+1", + "source": "2j+1", + "error": "ValueError" + }, + { + "name": "True+1j", + "source": "True+1j", + "error": "ValueError" + }, + { + "name": "1-0j", + "source": "1-0j", + "repr": "(1-0j)" + }, + { + "name": "0.0-0j", + "source": "0.0-0j", + "repr": "-0j" + }, + { + "name": "-0.0+1j", + "source": "-0.0+1j", + "repr": "1j" + }, + { + "name": "-0.0", + "source": "-0.0", + "repr": "-0.0" + }, + { + "name": "-0", + "source": "-0", + "repr": "0" + }, + { + "name": "(-0.0)", + "source": "(-0.0)", + "repr": "-0.0" + }, + { + "name": "[-0.0, (-0.0)]", + "source": "[-0.0, (-0.0)]", + "repr": "[-0.0, -0.0]" + }, + { + "name": "2**3", + "source": "2**3", + "error": "ValueError" + }, + { + "name": "1*2", + "source": "1*2", + "error": "ValueError" + }, + { + "name": "1 if 1 else 2", + "source": "1 if 1 else 2", + "error": "ValueError" + }, + { + "name": "(1,)(2)", + "source": "(1,)(2)", + "error": "ValueError" + }, + { + "name": "''", + "source": "''", + "repr": "''" + }, + { + "name": "\"\"", + "source": "\"\"", + "repr": "''" + }, + { + "name": "'a' 'b'", + "source": "'a' 'b'", + "repr": "'ab'" + }, + { + "name": "'a' \"b\" '''c'''", + "source": "'a' \"b\" '''c'''", + "repr": "'abc'" + }, + { + "name": "'a' b'b'", + "source": "'a' b'b'", + "error": "SyntaxError" + }, + { + "name": "b'a' b'b'", + "source": "b'a' b'b'", + "repr": "b'ab'" + }, + { + "name": "u'x'", + "source": "u'x'", + "repr": "'x'" + }, + { + "name": "U'x'", + "source": "U'x'", + "repr": "'x'" + }, + { + "name": "r'x'", + "source": "r'x'", + "repr": "'x'" + }, + { + "name": "R'x'", + "source": "R'x'", + "repr": "'x'" + }, + { + "name": "b'x'", + "source": "b'x'", + "repr": "b'x'" + }, + { + "name": "B'x'", + "source": "B'x'", + "repr": "b'x'" + }, + { + "name": "br'x'", + "source": "br'x'", + "repr": "b'x'" + }, + { + "name": "Rb'x'", + "source": "Rb'x'", + "repr": "b'x'" + }, + { + "name": "rB'x'", + "source": "rB'x'", + "repr": "b'x'" + }, + { + "name": "ur'x'", + "source": "ur'x'", + "error": "SyntaxError" + }, + { + "name": "bu'x'", + "source": "bu'x'", + "error": "SyntaxError" + }, + { + "name": "f'x'", + "source": "f'x'", + "error": "ValueError" + }, + { + "name": "rf'x'", + "source": "rf'x'", + "error": "ValueError" + }, + { + "name": "'''a\nb'''", + "source": "'''a\nb'''", + "repr": "'a\\nb'" + }, + { + "name": "\"\"\"a\\\"\"\"\"", + "source": "\"\"\"a\\\"\"\"\"", + "repr": "'a\"'" + }, + { + "name": "'a\nb'", + "source": "'a\nb'", + "error": "SyntaxError" + }, + { + "name": "'a\\\nb'", + "source": "'a\\\nb'", + "repr": "'ab'" + }, + { + "name": "r'a\\\nb'", + "source": "r'a\\\nb'", + "repr": "'a\\\\\\nb'" + }, + { + "name": "'unterminated", + "source": "'unterminated", + "error": "SyntaxError" + }, + { + "name": "'\\a\\b\\f\\n\\r\\t\\v'", + "source": "'\\a\\b\\f\\n\\r\\t\\v'", + "repr": "'\\x07\\x08\\x0c\\n\\r\\t\\x0b'" + }, + { + "name": "'\\0\\12\\101\\1011'", + "source": "'\\0\\12\\101\\1011'", + "repr": "'\\x00\\nAA1'" + }, + { + "name": "'\\777'", + "source": "'\\777'", + "repr": "'\u01ff'" + }, + { + "name": "b'\\777'", + "source": "b'\\777'", + "repr": "b'\\xff'" + }, + { + "name": "b'\\400'", + "source": "b'\\400'", + "repr": "b'\\x00'" + }, + { + "name": "'\\x41'", + "source": "'\\x41'", + "repr": "'A'" + }, + { + "name": "'\\x4'", + "source": "'\\x4'", + "error": "SyntaxError" + }, + { + "name": "'\\u00e9'", + "source": "'\\u00e9'", + "repr": "'\u00e9'" + }, + { + "name": "'\\u00e'", + "source": "'\\u00e'", + "error": "SyntaxError" + }, + { + "name": "'\\U0001F600'", + "source": "'\\U0001F600'", + "repr": "'\ud83d\ude00'" + }, + { + "name": "'\\U00110000'", + "source": "'\\U00110000'", + "error": "SyntaxError" + }, + { + "name": "'\\ud800'", + "source": "'\\ud800'", + "repr": "'\\ud800'" + }, + { + "name": "'\\N{BULLET}'", + "source": "'\\N{BULLET}'", + "repr": "'\u2022'" + }, + { + "name": "'\\q'", + "source": "'\\q'", + "repr": "'\\\\q'" + }, + { + "name": "'\\\\'", + "source": "'\\\\'", + "repr": "'\\\\'" + }, + { + "name": "'\\''", + "source": "'\\''", + "repr": "\"'\"" + }, + { + "name": "\"\\\"\"", + "source": "\"\\\"\"", + "repr": "'\"'" + }, + { + "name": "b'\\u0041'", + "source": "b'\\u0041'", + "repr": "b'\\\\u0041'" + }, + { + "name": "b'\\x41\\xff'", + "source": "b'\\x41\\xff'", + "repr": "b'A\\xff'" + }, + { + "name": "b'caf\u00e9'", + "source": "b'caf\u00e9'", + "error": "SyntaxError" + }, + { + "name": "'caf\u00e9'", + "source": "'caf\u00e9'", + "repr": "'caf\u00e9'" + }, + { + "name": "r'\\d'", + "source": "r'\\d'", + "repr": "'\\\\d'" + }, + { + "name": "r'\\''", + "source": "r'\\''", + "repr": "\"\\\\'\"" + }, + { + "name": "rb'\\d'", + "source": "rb'\\d'", + "repr": "b'\\\\d'" + }, + { + "name": "r'\\'", + "source": "r'\\'", + "error": "SyntaxError" + }, + { + "name": "'\u65e5\ud83d\ude00'", + "source": "'\u65e5\ud83d\ude00'", + "repr": "'\u65e5\ud83d\ude00'" + } + ] +} diff --git a/litellm-rust/crates/python-compat/scripts/generate_fixtures.py b/litellm-rust/crates/python-compat/scripts/generate_fixtures.py new file mode 100644 index 00000000000..26456a638f6 --- /dev/null +++ b/litellm-rust/crates/python-compat/scripts/generate_fixtures.py @@ -0,0 +1,352 @@ +"""Regenerate generated/values.json: what CPython produces for each value in CORPUS. + + python scripts/generate_fixtures.py > generated/values.json + +Each row records `repr`, `str`, `json.dumps` (or its error), `bool`, and `pickle.dumps` at +every protocol. `literal` says whether `ast.literal_eval(repr(value))` gives the value back, +which is how Python reads `str(dict)` text back from a cache; the Rust tests reach the other +rows only through pickle. `view` is `repr` of the value as `pickle::loads` decodes it, with +tuples, sets, and frozensets rendered as lists. `sources` records `ast.literal_eval` on raw +source texts: its result, or the exception it raises. +""" + +import ast +import json +import pickle +import sys +import warnings + +# Entries are source texts, or `(name, source)` when the source is too long to read in a +# test report. `name` is what the Rust `KNOWN` table keys on. +CORPUS = [ + # Scalars + "None", + "True", + "False", + "0", + "-7", + "2**63 - 1", + "-(2**63)", + "2**64", + "-(2**70)", + # Floats around CPython's repr thresholds + "0.0", + "-0.0", + "0.2", + "1.0", + "-1.5", + "0.1 + 0.2", + "123456789.123", + "1e15", + "1e16", + "1.5e16", + "9999999999999998.0", + "0.0001", + "1e-05", + "1.25e-07", + "5e-324", + "1.7976931348623157e308", + "1e22", + "float('inf')", + "float('-inf')", + "float('nan')", + # Complex + "1j", + "-1j", + "complex(0, -1)", + "1+2j", + "-1.5-0.5j", + "complex(0.0, 1e16)", + # Strings: quote selection, escapes, printable and non-printable non-ASCII + "''", + "'plain'", + '"it\'s"', + "'say \"hi\"'", + "'both \\' and \"'", + "'back\\\\slash'", + "'\\t\\n\\r'", + "'\\x00\\x1f\\x7f'", + "'\\x85\\xa0\\xad'", + "'caf\\xe9'", + "'\\u65e5\\u672c'", + "'\\u200b\\u2028\\u3000'", + "'\\U0001f600'", + "'\\U000e0001\\U0010ffff'", + "'\\b\\f'", + # Bytes + "b''", + "b'abc'", + 'b"a\'b"', + "b'a\"b\\'c'", + "b'\\x00\\t\\n\\r\\x7f\\x80\\xff'", + # Containers + "[]", + "[1, 'a', None, True]", + "()", + "(1,)", + "(1, (2, 3))", + "{}", + "{'a': 1, 'b': [1.0, 2.5]}", + "{'z': 1, 'a': 2, 'm': 3}", + "{1: 'int', 2.5: 'float', True: 'bool', None: 'none'}", + "{(1, 2): 'tuple key'}", + "{'nested': {'deeper': {'deepest': [{}]}}}", + "{1}", + "set()", + "frozenset({1})", + "[[[[[[[[[[1]]]]]]]]]]", + # Deeper than the Rust decoders allow: CPython's parser accepts ~200 nested brackets + # and its unpickler has no limit, so this row records a deliberate divergence. + ("nested_150", "[" * 150 + "1" + "]" * 150), + # The shape LiteLLM caches + '{\'timestamp\': 1726000000.123, \'response\': \'{"id": "chatcmpl-1", "object": "chat.completion"}\'}', + "{'model': 'gpt-4o', 'messages': [{'role': 'user', 'content': 'hi'}], 'temperature': 0.2, 'stream': False}", +] + +# Source texts for `literal_eval` itself: tokenizer and evaluator edge cases, recorded with +# CPython's result or the exception it raises. Raw strings keep backslashes literal. +SOURCES = [ + # Layout: leading/trailing whitespace, comments, newlines, continuations + "1", + " 1", + "\t1", + "\n1", + " \n 1", + "1\n", + "1 # comment", + "# c\n1", + "1 \\\n", + "1,", + "1, 2", + "1,\n2", + "(1,\n2)", + "[1,\n 2,\n]", + # Containers and grouping + "()", + "(1)", + "((1,))", + "(,)", + "[,]", + "{,}", + "[1,]", + "{'a': 1,}", + "{1,}", + "{'a': 1 'b': 2}", + "{1: 'a', True: 'b'}", + "{1, True, 1.0}", + "{(1, 2): 'x', (1.0, 2): 'y'}", + "{[1]: 2}", + "{{1}}", + "{(1, [2])}", + "set()", + "set( )", + "set([1])", + "frozenset()", + # Names + "True", + "False", + "None", + "Truex", + "true", + "...", + # Integers and floats + "0", + "00", + "0_0", + "01", + "007", + "1_000", + "1_", + "1__0", + "_1", + "0x1F", + "0X_1f", + "0o17", + "0b101", + "0b102", + "0x", + "1e3", + "1E-3", + "1e", + "1.e5", + ".5", + "5.", + "1..", + "1.5.2", + "1_0.0_1e1_0", + "1e999", + "-1e999", + "1j", + "1.5J", + "010j", + "010.5", + "1a", + "0x1g", + # Signs and complex sums + "-1", + "+1", + "- 1", + "--1", + "-+1", + "-(1)", + "-(-1)", + "-(1+2j)", + "-True", + "-'a'", + "-[1]", + "1+2j", + "1-2j", + "1 + 2j", + "(1)+(2j)", + "1+2", + "1+2+3j", + "1+-2j", + "2j+1", + "True+1j", + "1-0j", + "0.0-0j", + "-0.0+1j", + "-0.0", + "-0", + "(-0.0)", + "[-0.0, (-0.0)]", + "2**3", + "1*2", + "1 if 1 else 2", + "(1,)(2)", + # String prefixes, quoting, and concatenation + "''", + '""', + "'a' 'b'", + "'a' \"b\" '''c'''", + "'a' b'b'", + "b'a' b'b'", + "u'x'", + "U'x'", + "r'x'", + "R'x'", + "b'x'", + "B'x'", + "br'x'", + "Rb'x'", + "rB'x'", + "ur'x'", + "bu'x'", + "f'x'", + "rf'x'", + "'''a\nb'''", + '"""a\\""""', + "'a\nb'", + "'a\\\nb'", + "r'a\\\nb'", + "'unterminated", + # Escapes + r"'\a\b\f\n\r\t\v'", + r"'\0\12\101\1011'", + r"'\777'", + r"b'\777'", + r"b'\400'", + r"'\x41'", + r"'\x4'", + r"'\u00e9'", + r"'\u00e'", + r"'\U0001F600'", + r"'\U00110000'", + r"'\ud800'", + r"'\N{BULLET}'", + r"'\q'", + r"'\\'", + r"'\''", + r'"\""', + r"b'\u0041'", + r"b'\x41\xff'", + "b'café'", + "'café'", + r"r'\d'", + r"r'\''", + r"rb'\d'", + r"r'\'", + "'日\U0001f600'", +] + + +def named(entry): + """Split a corpus entry into its report name and its source text.""" + if isinstance(entry, tuple): + return entry + return entry, entry + + +def evaluate(entry): + name, source = named(entry) + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + try: + return {"name": name, "source": source, "repr": repr(ast.literal_eval(source))} + except Exception as error: # noqa: BLE001 - recorded, not raised + return {"name": name, "source": source, "error": type(error).__name__} + + +def view(value): + if isinstance(value, (list, tuple, set, frozenset)): + return "[" + ", ".join(view(item) for item in value) + "]" + if isinstance(value, dict): + return "{" + ", ".join(f"{view(key)}: {view(item)}" for key, item in value.items()) + "}" + return repr(value) + + +def plain(value): + """Whether pickle can encode the value without a class reference such as `complex`.""" + if isinstance(value, complex): + return False + if isinstance(value, (list, tuple, set, frozenset)): + return all(plain(item) for item in value) + if isinstance(value, dict): + return all(plain(key) and plain(item) for key, item in value.items()) + return True + + +def is_literal(value): + try: + parsed = ast.literal_eval(repr(value)) + except (ValueError, SyntaxError): + return False + return repr(parsed) == repr(value) + + +def row(entry): + name, source = named(entry) + value = eval(source) + entry = { + "name": name, + "source": source, + "literal": is_literal(value), + "plain": plain(value), + "repr": repr(value), + "str": str(value), + "truthy": bool(value), + } + try: + entry["json"] = json.dumps(value) + except (TypeError, ValueError) as error: + entry["json_error"] = str(error) + try: + entry["pickle"] = {str(protocol): pickle.dumps(value, protocol=protocol).hex() for protocol in range(6)} + entry["view"] = view(value) + except Exception as error: # noqa: BLE001 - recorded, not raised + entry["pickle_error"] = f"{type(error).__name__}: {error}" + return entry + + +if __name__ == "__main__": + json.dump( + { + "python": sys.version.split()[0], + "rows": [row(entry) for entry in CORPUS], + "sources": [evaluate(entry) for entry in SOURCES], + }, + sys.stdout, + indent=2, + ensure_ascii=True, + ) + sys.stdout.write("\n") diff --git a/litellm-rust/crates/python-compat/scripts/generate_nonprintable.py b/litellm-rust/crates/python-compat/scripts/generate_nonprintable.py new file mode 100644 index 00000000000..70d1fbd2dd1 --- /dev/null +++ b/litellm-rust/crates/python-compat/scripts/generate_nonprintable.py @@ -0,0 +1,35 @@ +"""Regenerate generated/nonprintable.rs from this interpreter's `str.isprintable`. + +`repr(str)` escapes exactly the characters for which `str.isprintable()` is false, so the +table must come from the Python version the gateway interoperates with. + + python scripts/generate_nonprintable.py > generated/nonprintable.rs +""" + +import sys +import unicodedata + +ranges = [] +start = None +for code in range(0x110000): + printable = chr(code).isprintable() + if not printable and start is None: + start = code + elif printable and start is not None: + ranges.append((start, code - 1)) + start = None +if start is not None: + ranges.append((start, 0x10FFFF)) + +lines = [ + f"// Generated by scripts/generate_nonprintable.py from Python {sys.version.split()[0]}", + f"// (Unicode {unicodedata.unidata_version}). Do not edit by hand.", + "", + f'pub(crate) const UNICODE_VERSION: &str = "{unicodedata.unidata_version}";', + "", + "/// Inclusive code point ranges for which Python's `str.isprintable()` is false.", + f"pub(crate) const NONPRINTABLE: [(u32, u32); {len(ranges)}] = [", + *(f" (0x{low:04X}, 0x{high:04X})," for low, high in ranges), + "];", +] +sys.stdout.write("\n".join(lines) + "\n") diff --git a/litellm-rust/crates/python-compat/scripts/verify_rust_pickles.py b/litellm-rust/crates/python-compat/scripts/verify_rust_pickles.py new file mode 100644 index 00000000000..793acad61f9 --- /dev/null +++ b/litellm-rust/crates/python-compat/scripts/verify_rust_pickles.py @@ -0,0 +1,43 @@ +"""Check that CPython unpickles what `pickle::dumps` writes, to the value it was given. + + PYTHON_COMPAT_RUST_PICKLES=rust.tsv cargo test -p litellm-python-compat --test fixtures + python scripts/verify_rust_pickles.py rust.tsv + +The rows are plain data by construction, so this refuses to resolve any class rather than +handing file-controlled bytes to an unrestricted `pickle.loads`. +""" + +import ast +import io +import pickle +import sys + + +class PlainDataUnpickler(pickle.Unpickler): + """An unpickler with `GLOBAL`/`REDUCE` disabled, mirroring `pickle::loads` in Rust.""" + + def find_class(self, module, name): + raise pickle.UnpicklingError(f"refusing to resolve {module}.{name}") + + +def loads(data): + return PlainDataUnpickler(io.BytesIO(data)).load() + + +def main(path): + failures = 0 + rows = 0 + with open(path, encoding="utf-8") as lines: + for line in lines: + data, expected = line.rstrip("\n").split("\t", 1) + rows += 1 + actual = repr(loads(bytes.fromhex(data))) + if actual != repr(ast.literal_eval(expected)): + failures += 1 + sys.stdout.write(f"mismatch: expected {expected}, got {actual}\n") + sys.stdout.write(f"{rows} Rust pickles checked, {failures} mismatches\n") + return 1 if failures or not rows else 0 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1])) diff --git a/litellm-rust/crates/python-compat/src/error.rs b/litellm-rust/crates/python-compat/src/error.rs new file mode 100644 index 00000000000..43990eb7602 --- /dev/null +++ b/litellm-rust/crates/python-compat/src/error.rs @@ -0,0 +1,25 @@ +use crate::MAX_DEPTH; + +/// A failure to read or write a Python format. Messages quote CPython's own wording where +/// the Python side raises (`TypeError`, `ValueError`), so callers can log them as is. +#[derive(Debug, thiserror::Error)] +pub enum Error { + #[error("malformed Python literal at byte {0}")] + InvalidLiteral(usize), + #[error("unhashable type: '{0}'")] + Unhashable(&'static str), + #[error("value nests deeper than {MAX_DEPTH} levels")] + TooDeep, + #[error("invalid pickle: {0}")] + InvalidPickle(String), + #[error("Object of type {0} is not JSON serializable")] + NotJsonSerializable(&'static str), + #[error("keys must be str, int, float, bool or None, not {0}")] + InvalidJsonKey(&'static str), + #[error("Out of range float values are not JSON compliant")] + NonFiniteFloat, + #[error("integer does not fit in the JSON number range")] + IntegerOutOfRange, + #[error("Object of type {0} cannot be pickled as plain data")] + NotPicklable(&'static str), +} diff --git a/litellm-rust/crates/python-compat/src/json.rs b/litellm-rust/crates/python-compat/src/json.rs new file mode 100644 index 00000000000..d3436519ac4 --- /dev/null +++ b/litellm-rust/crates/python-compat/src/json.rs @@ -0,0 +1,168 @@ +//! `json.dumps` with CPython's default options, and the JSON value `json.loads` returns. +//! +//! Defaults are `ensure_ascii=True`, `allow_nan=True`, separators `(", ", ": ")`, and no key +//! sorting. Python's `json.loads` is mapped by [`from_json`]; a `serde_json` number that does +//! not fit `i64` or `u64` arrives as a float, where Python would keep an `int`. + +use std::fmt::Write; + +use serde_json::{Map, Number}; + +use crate::{Error, Value, repr::float_repr}; + +/// `json.dumps(value)`. +pub fn dumps(value: &Value) -> Result { + let mut out = String::new(); + write_value(&mut out, value)?; + Ok(out) +} + +/// The Python value `json.loads` returns for a JSON document. +pub fn from_json(value: serde_json::Value) -> Value { + match value { + serde_json::Value::Null => Value::None, + serde_json::Value::Bool(value) => Value::Bool(value), + serde_json::Value::Number(number) => { + if let Some(value) = number.as_i64() { + Value::Int(value.into()) + } else if let Some(value) = number.as_u64() { + Value::Int(value.into()) + } else { + Value::Float(number.as_f64().unwrap_or(f64::NAN)) + } + } + serde_json::Value::String(text) => Value::Str(text), + serde_json::Value::Array(values) => { + Value::List(values.into_iter().map(from_json).collect()) + } + serde_json::Value::Object(entries) => Value::Dict( + entries + .into_iter() + .map(|(key, value)| (Value::Str(key), from_json(value))) + .collect(), + ), + } +} + +/// `json.loads(json.dumps(value))` as a `serde_json` value: tuples become arrays and dict +/// keys are coerced to strings as `json.dumps` does. Non-finite floats, which Python writes +/// as `NaN` and `Infinity`, have no `serde_json` form and fail with [`Error::NonFiniteFloat`]. +pub fn to_json(value: &Value) -> Result { + Ok(match value { + Value::None => serde_json::Value::Null, + Value::Bool(value) => serde_json::Value::Bool(*value), + Value::Int(value) => { + let text = value.to_string(); + serde_json::Value::Number( + text.parse::() + .map(Number::from) + .or_else(|_| text.parse::().map(Number::from)) + .map_err(|_| Error::IntegerOutOfRange)?, + ) + } + Value::Float(value) => { + serde_json::Value::Number(Number::from_f64(*value).ok_or(Error::NonFiniteFloat)?) + } + Value::Str(text) => serde_json::Value::String(text.clone()), + Value::List(values) | Value::Tuple(values) => { + serde_json::Value::Array(values.iter().map(to_json).collect::, _>>()?) + } + Value::Dict(entries) => serde_json::Value::Object( + entries + .iter() + .map(|(key, value)| Ok((json_key(key)?, to_json(value)?))) + .collect::, Error>>()?, + ), + value @ (Value::Bytes(_) | Value::Set(_) | Value::Complex { .. }) => { + return Err(Error::NotJsonSerializable(value.type_name())); + } + }) +} + +fn write_value(out: &mut String, value: &Value) -> Result<(), Error> { + match value { + Value::None => out.push_str("null"), + Value::Bool(true) => out.push_str("true"), + Value::Bool(false) => out.push_str("false"), + Value::Int(value) => { + let _ = write!(out, "{value}"); + } + Value::Float(value) => out.push_str(&float_text(*value)), + Value::Str(text) => write_string(out, text), + Value::List(values) | Value::Tuple(values) => { + out.push('['); + for (index, value) in values.iter().enumerate() { + if index > 0 { + out.push_str(", "); + } + write_value(out, value)?; + } + out.push(']'); + } + Value::Dict(entries) => { + out.push('{'); + for (index, (key, value)) in entries.iter().enumerate() { + if index > 0 { + out.push_str(", "); + } + write_string(out, &json_key(key)?); + out.push_str(": "); + write_value(out, value)?; + } + out.push('}'); + } + value @ (Value::Bytes(_) | Value::Set(_) | Value::Complex { .. }) => { + return Err(Error::NotJsonSerializable(value.type_name())); + } + } + Ok(()) +} + +/// `json.encoder.JSONEncoder.iterencode`'s `floatstr` with `allow_nan=True`. +fn float_text(value: f64) -> String { + if value.is_nan() { + "NaN".to_owned() + } else if value.is_infinite() { + if value > 0.0 { "Infinity" } else { "-Infinity" }.to_owned() + } else { + float_repr(value) + } +} + +/// Dict key coercion in `json.dumps`: scalars become their JSON text, other keys fail. +fn json_key(key: &Value) -> Result { + Ok(match key { + Value::Str(text) => text.clone(), + Value::Int(value) => value.to_string(), + Value::Float(value) => float_text(*value), + Value::Bool(true) => "true".to_owned(), + Value::Bool(false) => "false".to_owned(), + Value::None => "null".to_owned(), + key => return Err(Error::InvalidJsonKey(key.type_name())), + }) +} + +/// `py_encode_basestring_ascii`: escape `"`, `\`, control characters, and everything outside +/// printable ASCII as `\uXXXX`, with surrogate pairs above the BMP. +fn write_string(out: &mut String, text: &str) { + out.push('"'); + for ch in text.chars() { + match ch { + '"' => out.push_str("\\\""), + '\\' => out.push_str("\\\\"), + '\n' => out.push_str("\\n"), + '\r' => out.push_str("\\r"), + '\t' => out.push_str("\\t"), + '\u{8}' => out.push_str("\\b"), + '\u{c}' => out.push_str("\\f"), + ' '..='~' => out.push(ch), + ch => { + let mut units = [0u16; 2]; + for unit in ch.encode_utf16(&mut units) { + let _ = write!(out, "\\u{unit:04x}"); + } + } + } + } + out.push('"'); +} diff --git a/litellm-rust/crates/python-compat/src/lib.rs b/litellm-rust/crates/python-compat/src/lib.rs new file mode 100644 index 00000000000..b23aff409f2 --- /dev/null +++ b/litellm-rust/crates/python-compat/src/lib.rs @@ -0,0 +1,39 @@ +//! Python data formats reproduced in Rust, for state that Python LiteLLM writes and reads. +//! +//! Each module mirrors one Python operation over plain data values, and its tests replay +//! fixtures generated by that operation in CPython (`scripts/generate_fixtures.py`): +//! +//! | Module | Python operation | +//! |---|---| +//! | [`literal`] | `ast.literal_eval(text)` | +//! | [`repr`] | `repr(value)` and `str(value)` | +//! | [`json`] | `json.dumps(value)`, and `json.loads(json.dumps(value))` as a JSON value | +//! | [`pickle`] | `pickle.loads(data)` and `pickle.dumps(value)` for plain data | +//! | [`truthy`] | `bool(value)` | +//! +//! [`Value`] is the closed data model these formats share. Live Python objects +//! (descriptors, `__bool__`, `__str__`, callbacks) are out of scope: those belong to the +//! PyO3 boundary in `litellm-python-bridge`, which runs the real protocol. +//! +//! Known limits, each pinned by a test: +//! - `set` iteration order follows Python's hash order, which this crate does not model +//! (string hashes are randomized per process). Sets keep their literal order. +//! - `str` values are Rust `String`s, so lone surrogates cannot be represented. +//! - [`pickle::loads`] decodes `tuple`, `set`, and `frozenset` as lists. + +mod error; +pub mod json; +pub mod literal; +pub mod pickle; +pub mod repr; +pub mod truthy; +mod value; + +pub use error::Error; +pub use num_bigint::BigInt; +pub use value::Value; + +/// Nesting limit for the decoders, which recurse. It keeps untrusted persisted data from +/// overflowing the Rust stack, and is deliberately stricter than CPython, whose parser takes +/// about 200 nested brackets and whose unpickler has no limit. +pub const MAX_DEPTH: usize = 128; diff --git a/litellm-rust/crates/python-compat/src/literal.rs b/litellm-rust/crates/python-compat/src/literal.rs new file mode 100644 index 00000000000..12e9036572f --- /dev/null +++ b/litellm-rust/crates/python-compat/src/literal.rs @@ -0,0 +1,745 @@ +//! `ast.literal_eval(text)`, as a single-pass recursive-descent parser. +//! +//! Tokens follow CPython's tokenizer (string prefixes, escapes, implicit concatenation, +//! numeric underscores and radixes, comments, line continuations). Expressions follow +//! `ast.literal_eval`'s evaluator: +//! +//! - one unary `+`/`-`, applied only to a numeric constant (`-(1)` is fine, `--1` is not) +//! - `a + b` / `a - b` only as a signed real plus or minus a complex constant, with 3.14's +//! mixed-mode rules (`1 - 0j` is `(1-0j)`) +//! - parentheses group without making a tuple; `set()` is the only call +//! - dict keys and set members are deduplicated with Python equality (`1 == 1.0 == True`) +//! +//! Not supported, each pinned by a fixture: `\N{NAME}` escapes, `...`, and escapes that +//! produce lone surrogates. + +use std::collections::{HashMap, hash_map::Entry}; + +use num_bigint::BigInt; +use num_traits::{FromPrimitive, ToPrimitive}; + +use crate::{Error, MAX_DEPTH, Value}; + +pub fn literal_eval(text: &str) -> Result { + let mut parser = Parser { + bytes: text.trim_start_matches([' ', '\t']).as_bytes(), + offset: text.len() - text.trim_start_matches([' ', '\t']).len(), + pos: 0, + depth: 0, + brackets: 0, + }; + parser.skip_leading_lines()?; + let value = parser.top_level()?.value; + parser.skip_trivia(true); + if parser.pos != parser.bytes.len() { + return Err(parser.error()); + } + Ok(value) +} + +/// How a parsed term may take part in `+`/`-`, per `ast.literal_eval`'s `_convert_num` +/// (`Constant`) and `_convert_signed_num` (`Signed`). `Other` is any other node. +#[derive(Clone, Copy, PartialEq)] +enum Kind { + Constant, + Signed, + Other, +} + +struct Term { + value: Value, + kind: Kind, +} + +impl Term { + fn other(value: Value) -> Self { + Self { + value, + kind: Kind::Other, + } + } + + fn is_number(&self) -> bool { + matches!( + self.value, + Value::Int(_) | Value::Float(_) | Value::Complex { .. } + ) + } +} + +struct Parser<'a> { + bytes: &'a [u8], + /// Bytes stripped before `bytes` starts, so errors report offsets into the input. + offset: usize, + pos: usize, + depth: usize, + /// Open brackets: newlines are insignificant only inside them. + brackets: usize, +} + +impl Parser<'_> { + fn error(&self) -> Error { + Error::InvalidLiteral(self.offset + self.pos) + } + + fn peek(&self) -> Option { + self.bytes.get(self.pos).copied() + } + + fn peek_at(&self, ahead: usize) -> Option { + self.bytes.get(self.pos + ahead).copied() + } + + fn expect(&mut self, byte: u8) -> Result<(), Error> { + if self.peek() != Some(byte) { + return Err(self.error()); + } + self.pos += 1; + Ok(()) + } + + fn enter(&mut self) -> Result<(), Error> { + self.depth += 1; + if self.depth > MAX_DEPTH { + return Err(Error::TooDeep); + } + Ok(()) + } + + /// Whitespace, comments, and backslash continuations; newlines too when `newlines`. + fn skip_trivia(&mut self, newlines: bool) { + while let Some(byte) = self.peek() { + match byte { + b' ' | b'\t' | b'\x0c' => self.pos += 1, + b'#' => { + while !matches!(self.peek(), None | Some(b'\n' | b'\r')) { + self.pos += 1; + } + } + // A continuation joins two lines; one that ends the input is an EOF error. + b'\\' if matches!(self.peek_at(1), Some(b'\n' | b'\r')) => { + let len = match (self.peek_at(1), self.peek_at(2)) { + (Some(b'\r'), Some(b'\n')) => 3, + _ => 2, + }; + if self.pos + len >= self.bytes.len() { + break; + } + self.pos += len; + } + b'\n' | b'\r' if newlines => self.pos += 1, + _ => break, + } + } + } + + /// Blank and comment-only lines may precede the expression, whose own line must not be + /// indented (CPython raises `IndentationError`). + fn skip_leading_lines(&mut self) -> Result<(), Error> { + loop { + let line_start = self.pos; + self.skip_trivia(false); + match self.peek() { + Some(b'\n' | b'\r') => self.pos += 1, + Some(_) if line_start > 0 && self.pos > line_start => { + self.pos = line_start; + return Err(self.error()); + } + _ => return Ok(()), + } + } + } + + fn at_logical_line_end(&self) -> bool { + matches!(self.peek(), None | Some(b'\n' | b'\r')) + } + + /// The `eval` input: an expression, or a tuple without parentheses. + fn top_level(&mut self) -> Result { + let first = self.expression()?; + self.skip_trivia(false); + if self.peek() != Some(b',') { + return Ok(first); + } + let mut values = vec![first.value]; + while self.peek() == Some(b',') { + self.pos += 1; + self.skip_trivia(false); + if self.at_logical_line_end() { + break; + } + values.push(self.expression()?.value); + self.skip_trivia(false); + } + Ok(Term::other(Value::Tuple(values))) + } + + /// A sum of unary terms, checked as `ast.literal_eval` checks `BinOp`. + fn expression(&mut self) -> Result { + let mut left = self.unary()?; + loop { + self.skip_trivia(self.brackets > 0); + let subtract = match self.peek() { + Some(b'+') => false, + Some(b'-') => true, + _ => return Ok(left), + }; + let at = self.pos; + self.pos += 1; + let right = self.unary()?; + left = complex_sum(left, subtract, right) + .ok_or(Error::InvalidLiteral(self.offset + at))?; + } + } + + fn unary(&mut self) -> Result { + self.skip_trivia(self.brackets > 0); + let negative = match self.peek() { + Some(b'+') => false, + Some(b'-') => true, + _ => return self.primary(), + }; + let at = self.pos; + self.pos += 1; + self.enter()?; + let operand = self.unary()?; + self.depth -= 1; + if operand.kind != Kind::Constant || !operand.is_number() { + return Err(Error::InvalidLiteral(self.offset + at)); + } + let value = if !negative { + operand.value + } else { + match operand.value { + Value::Int(value) => Value::Int(-value), + Value::Float(value) => Value::Float(-value), + Value::Complex { re, im } => Value::Complex { re: -re, im: -im }, + _ => unreachable!("checked numeric above"), + } + }; + Ok(Term { + value, + kind: Kind::Signed, + }) + } + + fn primary(&mut self) -> Result { + match self.peek() { + Some(b'(') => self.parenthesized(), + Some(b'[') => self.list(), + Some(b'{') => self.braced(), + Some(b'0'..=b'9') => self.number(), + Some(b'.') if matches!(self.peek_at(1), Some(b'0'..=b'9')) => self.number(), + Some(b'\'' | b'"') => self.strings(), + Some(byte) if byte.is_ascii_alphabetic() || byte == b'_' => { + if self.string_prefix_len().is_some() { + return self.strings(); + } + self.name() + } + _ => Err(self.error()), + } + } + + fn open(&mut self) -> Result<(), Error> { + self.enter()?; + self.brackets += 1; + self.pos += 1; + Ok(()) + } + + fn close(&mut self, byte: u8) -> Result<(), Error> { + self.skip_trivia(true); + self.expect(byte)?; + self.brackets -= 1; + self.depth -= 1; + Ok(()) + } + + /// Comma-separated expressions up to `close`, with an optional trailing comma. + fn elements(&mut self, close: u8) -> Result, Error> { + let mut values = Vec::new(); + loop { + self.skip_trivia(true); + if self.peek() == Some(close) { + return Ok(values); + } + values.push(self.expression()?.value); + self.skip_trivia(true); + if self.peek() != Some(b',') { + return Ok(values); + } + self.pos += 1; + } + } + + fn parenthesized(&mut self) -> Result { + self.open()?; + self.skip_trivia(true); + if self.peek() == Some(b')') { + self.close(b')')?; + return Ok(Term::other(Value::Tuple(Vec::new()))); + } + let first = self.expression()?; + self.skip_trivia(true); + if self.peek() != Some(b',') { + self.close(b')')?; + return Ok(first); + } + self.pos += 1; + let mut values = vec![first.value]; + values.extend(self.elements(b')')?); + self.close(b')')?; + Ok(Term::other(Value::Tuple(values))) + } + + fn list(&mut self) -> Result { + self.open()?; + let values = self.elements(b']')?; + self.close(b']')?; + Ok(Term::other(Value::List(values))) + } + + fn braced(&mut self) -> Result { + self.open()?; + self.skip_trivia(true); + if self.peek() == Some(b'}') { + self.close(b'}')?; + return Ok(Term::other(Value::Dict(Vec::new()))); + } + let first = self.expression()?.value; + self.skip_trivia(true); + if self.peek() != Some(b':') { + let mut members = UniqueValues::default(); + members.insert(first, None)?; + if self.peek() == Some(b',') { + self.pos += 1; + for member in self.elements(b'}')? { + members.insert(member, None)?; + } + } + self.close(b'}')?; + return Ok(Term::other(Value::Set(members.keys))); + } + let mut entries = UniqueValues::default(); + let mut key = first; + loop { + self.expect(b':')?; + let value = self.expression()?.value; + entries.insert(key, Some(value))?; + self.skip_trivia(true); + if self.peek() != Some(b',') { + break; + } + self.pos += 1; + self.skip_trivia(true); + if self.peek() == Some(b'}') { + break; + } + key = self.expression()?.value; + self.skip_trivia(true); + } + self.close(b'}')?; + Ok(Term::other(Value::Dict(entries.into_entries()))) + } + + fn identifier(&mut self) -> &[u8] { + let start = self.pos; + while matches!(self.peek(), Some(byte) if byte.is_ascii_alphanumeric() || byte == b'_') { + self.pos += 1; + } + &self.bytes[start..self.pos] + } + + fn name(&mut self) -> Result { + let at = self.pos; + let value = match self.identifier() { + b"True" => Value::Bool(true), + b"False" => Value::Bool(false), + b"None" => Value::None, + b"set" => { + self.skip_trivia(self.brackets > 0); + self.expect(b'(')?; + self.skip_trivia(true); + self.expect(b')')?; + return Ok(Term::other(Value::Set(Vec::new()))); + } + _ => return Err(Error::InvalidLiteral(self.offset + at)), + }; + Ok(Term { + value, + kind: Kind::Constant, + }) + } + + /// Digits with single underscores between them, as CPython's `digitpart`. + fn digits(&mut self, radix: u32, out: &mut String) -> Result<(), Error> { + let start = out.len(); + loop { + match self.peek() { + Some(byte) if (byte as char).is_digit(radix) => { + out.push(byte as char); + self.pos += 1; + } + Some(b'_') + if out.len() > start + && matches!(self.peek_at(1), Some(next) if (next as char).is_digit(radix)) => + { + self.pos += 1; + } + _ => break, + } + } + if out.len() == start { + return Err(self.error()); + } + Ok(()) + } + + fn number(&mut self) -> Result { + let start = self.pos; + let radix = match ( + self.peek(), + self.peek_at(1).map(|byte| byte.to_ascii_lowercase()), + ) { + (Some(b'0'), Some(b'x')) => Some(16), + (Some(b'0'), Some(b'o')) => Some(8), + (Some(b'0'), Some(b'b')) => Some(2), + _ => None, + }; + let mut text = String::new(); + let value = if let Some(radix) = radix { + self.pos += 2; + if self.peek() == Some(b'_') { + self.pos += 1; + } + self.digits(radix, &mut text)?; + Value::Int(BigInt::parse_bytes(text.as_bytes(), radix).ok_or(self.error())?) + } else { + let mut is_float = false; + if self.peek() != Some(b'.') { + self.digits(10, &mut text)?; + } + let integer_digits = text.clone(); + if self.peek() == Some(b'.') { + is_float = true; + self.pos += 1; + text.push('.'); + if matches!(self.peek(), Some(b'0'..=b'9')) { + self.digits(10, &mut text)?; + } + } + if matches!(self.peek(), Some(b'e' | b'E')) { + is_float = true; + self.pos += 1; + text.push('e'); + if let Some(sign @ (b'+' | b'-')) = self.peek() { + text.push(sign as char); + self.pos += 1; + } + self.digits(10, &mut text)?; + } + if matches!(self.peek(), Some(b'j' | b'J')) { + self.pos += 1; + let im = text.parse::().map_err(|_| self.error())?; + Value::Complex { re: 0.0, im } + } else if is_float { + Value::Float(text.parse::().map_err(|_| self.error())?) + } else { + if integer_digits.len() > 1 + && integer_digits.starts_with('0') + && integer_digits.bytes().any(|digit| digit != b'0') + { + return Err(Error::InvalidLiteral(self.offset + start)); + } + Value::Int(BigInt::parse_bytes(integer_digits.as_bytes(), 10).ok_or(self.error())?) + } + }; + if matches!(self.peek(), Some(byte) if byte.is_ascii_alphanumeric() || byte == b'_' || byte == b'.') + { + return Err(self.error()); + } + Ok(Term { + value, + kind: Kind::Constant, + }) + } + + /// The length of a valid string prefix (`r`, `u`, `b`, `br`, `rb`, any case) directly + /// followed by a quote. + fn string_prefix_len(&self) -> Option { + let mut len = 0; + while matches!(self.peek_at(len), Some(byte) if byte.is_ascii_alphabetic()) && len < 3 { + len += 1; + } + if !matches!(self.peek_at(len), Some(b'\'' | b'"')) { + return None; + } + let prefix: Vec = self.bytes[self.pos..self.pos + len] + .iter() + .map(u8::to_ascii_lowercase) + .collect(); + matches!(prefix.as_slice(), b"" | b"r" | b"u" | b"b" | b"br" | b"rb").then_some(len) + } + + /// Adjacent string literals concatenate; `str` and `bytes` cannot mix. + fn strings(&mut self) -> Result { + let mut text: Option = None; + let mut bytes: Option> = None; + loop { + let at = self.pos; + let Some(prefix_len) = self.string_prefix_len() else { + break; + }; + let prefix = &self.bytes[self.pos..self.pos + prefix_len]; + let raw = prefix.iter().any(|byte| byte.eq_ignore_ascii_case(&b'r')); + let is_bytes = prefix.iter().any(|byte| byte.eq_ignore_ascii_case(&b'b')); + self.pos += prefix_len; + let mut out = Vec::new(); + self.string_body(raw, is_bytes, &mut out)?; + if is_bytes { + if text.is_some() { + return Err(Error::InvalidLiteral(self.offset + at)); + } + bytes.get_or_insert_with(Vec::new).extend(out); + } else { + if bytes.is_some() { + return Err(Error::InvalidLiteral(self.offset + at)); + } + let piece = + String::from_utf8(out).map_err(|_| Error::InvalidLiteral(self.offset + at))?; + text.get_or_insert_with(String::new).push_str(&piece); + } + self.skip_trivia(self.brackets > 0); + } + let value = match (text, bytes) { + (Some(text), None) => Value::Str(text), + (None, Some(bytes)) => Value::Bytes(bytes), + _ => return Err(self.error()), + }; + Ok(Term { + value, + kind: Kind::Constant, + }) + } + + /// One quoted body, decoded into UTF-8 (`str`) or raw bytes (`bytes`). + fn string_body(&mut self, raw: bool, is_bytes: bool, out: &mut Vec) -> Result<(), Error> { + let quote = self.bytes[self.pos]; + let triple = self.peek_at(1) == Some(quote) && self.peek_at(2) == Some(quote); + self.pos += if triple { 3 } else { 1 }; + loop { + let Some(byte) = self.peek() else { + return Err(self.error()); + }; + if byte == quote + && (!triple || (self.peek_at(1) == Some(quote) && self.peek_at(2) == Some(quote))) + { + self.pos += if triple { 3 } else { 1 }; + return Ok(()); + } + match byte { + b'\n' | b'\r' if !triple => return Err(self.error()), + b'\\' if raw => { + let Some(next) = self.peek_at(1) else { + return Err(self.error()); + }; + out.push(b'\\'); + self.pos += 1; + if next == b'\n' || next == b'\r' || next == quote || next == b'\\' { + out.push(next); + self.pos += 1; + } + } + b'\\' => { + self.pos += 1; + self.escape(is_bytes, out)?; + } + byte if is_bytes && !byte.is_ascii() => return Err(self.error()), + byte => { + out.push(byte); + self.pos += 1; + } + } + } + } + + fn escape(&mut self, is_bytes: bool, out: &mut Vec) -> Result<(), Error> { + let Some(byte) = self.peek() else { + return Err(self.error()); + }; + self.pos += 1; + let simple = match byte { + b'\n' => return Ok(()), + b'\r' => { + if self.peek() == Some(b'\n') { + self.pos += 1; + } + return Ok(()); + } + b'\\' | b'\'' | b'"' => byte, + b'a' => 0x07, + b'b' => 0x08, + b'f' => 0x0c, + b'n' => b'\n', + b'r' => b'\r', + b't' => b'\t', + b'v' => 0x0b, + b'0'..=b'7' => { + let mut code = u32::from(byte - b'0'); + for _ in 0..2 { + match self.peek() { + Some(digit @ b'0'..=b'7') => { + code = code * 8 + u32::from(digit - b'0'); + self.pos += 1; + } + _ => break, + } + } + // Bytes keep the low eight bits of `\400`-`\777`, as CPython does. + return self.push_code(if is_bytes { code & 0xff } else { code }, is_bytes, out); + } + b'x' => { + let code = self.hex(2)?; + return self.push_code(code, is_bytes, out); + } + b'u' if !is_bytes => { + let code = self.hex(4)?; + return self.push_code(code, is_bytes, out); + } + b'U' if !is_bytes => { + let code = self.hex(8)?; + return self.push_code(code, is_bytes, out); + } + b'N' if !is_bytes => return Err(self.error()), + _ => { + // Unknown escapes keep the backslash (a `SyntaxWarning` in CPython). + out.push(b'\\'); + self.pos -= 1; + return Ok(()); + } + }; + out.push(simple); + Ok(()) + } + + fn hex(&mut self, count: usize) -> Result { + let mut code = 0u32; + for _ in 0..count { + let digit = self + .peek() + .and_then(|byte| (byte as char).to_digit(16)) + .ok_or(self.error())?; + code = code * 16 + digit; + self.pos += 1; + } + Ok(code) + } + + fn push_code(&self, code: u32, is_bytes: bool, out: &mut Vec) -> Result<(), Error> { + if is_bytes { + out.push(u8::try_from(code).map_err(|_| self.error())?); + return Ok(()); + } + let ch = char::from_u32(code).ok_or(self.error())?; + let mut buffer = [0u8; 4]; + out.extend_from_slice(ch.encode_utf8(&mut buffer).as_bytes()); + Ok(()) + } +} + +/// `left + right` or `left - right` as `ast.literal_eval` permits: a signed real on the +/// left and an unsigned complex constant on the right, combined with CPython 3.14's +/// mixed-mode rules, which leave the imaginary part untouched by the real operand. +fn complex_sum(left: Term, subtract: bool, right: Term) -> Option { + if left.kind == Kind::Other || right.kind != Kind::Constant { + return None; + } + let real = match &left.value { + Value::Int(value) => value.to_f64().filter(|value| value.is_finite())?, + Value::Float(value) => *value, + _ => return None, + }; + let Value::Complex { re, im } = right.value else { + return None; + }; + let value = if subtract { + Value::Complex { + re: real - re, + im: -im, + } + } else { + Value::Complex { re: real + re, im } + }; + Some(Term::other(value)) +} + +/// Python equality for hashable literal values: numbers compare by value across `bool`, +/// `int`, `float`, and `complex`, so `1`, `1.0`, `True`, and `(1+0j)` are one key. +#[derive(Hash, PartialEq, Eq)] +enum KeyId { + None, + Int(BigInt), + Float(u64), + Complex(u64, u64), + Str(String), + Bytes(Vec), + Tuple(Vec), +} + +fn float_key(value: f64) -> KeyId { + if value.fract() == 0.0 + && let Some(integer) = BigInt::from_f64(value) + { + return KeyId::Int(integer); + } + KeyId::Float(value.to_bits()) +} + +fn key_id(value: &Value) -> Result { + Ok(match value { + Value::None => KeyId::None, + Value::Bool(value) => KeyId::Int(BigInt::from(u8::from(*value))), + Value::Int(value) => KeyId::Int(value.clone()), + Value::Float(value) => float_key(*value), + Value::Complex { re, im } if *im == 0.0 => float_key(*re), + Value::Complex { re, im } => KeyId::Complex((re + 0.0).to_bits(), (im + 0.0).to_bits()), + Value::Str(text) => KeyId::Str(text.clone()), + Value::Bytes(bytes) => KeyId::Bytes(bytes.clone()), + Value::Tuple(values) => KeyId::Tuple(values.iter().map(key_id).collect::>()?), + value @ (Value::List(_) | Value::Dict(_) | Value::Set(_)) => { + return Err(Error::Unhashable(value.type_name())); + } + }) +} + +/// Dict entries or set members in first-seen order: a repeated key keeps its first +/// position and, for dicts, takes the latest value. +#[derive(Default)] +struct UniqueValues { + keys: Vec, + values: Vec, + index: HashMap, +} + +impl UniqueValues { + fn insert(&mut self, key: Value, value: Option) -> Result<(), Error> { + match self.index.entry(key_id(&key)?) { + Entry::Occupied(slot) => { + if let Some(value) = value { + self.values[*slot.get()] = value; + } + } + Entry::Vacant(slot) => { + slot.insert(self.keys.len()); + self.keys.push(key); + self.values.extend(value); + } + } + Ok(()) + } + + fn into_entries(self) -> Vec<(Value, Value)> { + self.keys.into_iter().zip(self.values).collect() + } +} diff --git a/litellm-rust/crates/python-compat/src/pickle.rs b/litellm-rust/crates/python-compat/src/pickle.rs new file mode 100644 index 00000000000..bff7442dc6b --- /dev/null +++ b/litellm-rust/crates/python-compat/src/pickle.rs @@ -0,0 +1,187 @@ +//! `pickle.loads` and `pickle.dumps` for plain data, as diskcache stores LiteLLM values. +//! +//! Both directions go through `serde-pickle`'s serde interface rather than +//! `serde_pickle::Value`, because that value type keeps dicts in a `BTreeMap` and would +//! reorder keys. The serde interface keeps insertion order, at the cost of reporting +//! `tuple`, `set`, and `frozenset` as sequences: [`loads`] decodes all three as lists. +//! Python objects that need a class (`GLOBAL`/`REDUCE`) and recursive structures fail. + +use std::fmt; + +use serde::{ + Deserializer, Serialize, Serializer, + de::{self, DeserializeSeed, MapAccess, SeqAccess, Visitor}, + ser::{SerializeMap, SerializeSeq, SerializeTuple}, +}; +use serde_pickle::{DeOptions, SerOptions}; + +use crate::{Error, MAX_DEPTH, Value}; + +/// `pickle.loads(data)` for any protocol from 0 to 5. +pub fn loads(data: &[u8]) -> Result { + let mut deserializer = serde_pickle::Deserializer::new(data, DeOptions::new()); + let value = Seed { depth: 0 } + .deserialize(&mut deserializer) + .map_err(|error| Error::InvalidPickle(error.to_string()))?; + deserializer + .end() + .map_err(|error| Error::InvalidPickle(error.to_string()))?; + Ok(value) +} + +/// `pickle.dumps(value, protocol=3)`. Every Python 3 reads protocol 3, whatever its own +/// default. Sets and complex numbers are rejected rather than silently changing type. +pub fn dumps(value: &Value) -> Result, Error> { + check_picklable(value, 0)?; + serde_pickle::to_vec(&Pickled(value), SerOptions::new()) + .map_err(|error| Error::InvalidPickle(error.to_string())) +} + +fn check_picklable(value: &Value, depth: usize) -> Result<(), Error> { + if depth > MAX_DEPTH { + return Err(Error::TooDeep); + } + match value { + Value::Int(value) if i64::try_from(value).is_err() => Err(Error::IntegerOutOfRange), + value @ (Value::Set(_) | Value::Complex { .. }) => { + Err(Error::NotPicklable(value.type_name())) + } + Value::List(values) | Value::Tuple(values) => values + .iter() + .try_for_each(|value| check_picklable(value, depth + 1)), + Value::Dict(entries) => entries.iter().try_for_each(|(key, value)| { + check_picklable(key, depth + 1)?; + check_picklable(value, depth + 1) + }), + _ => Ok(()), + } +} + +struct Pickled<'a>(&'a Value); + +impl Serialize for Pickled<'_> { + fn serialize(&self, serializer: S) -> Result { + match self.0 { + Value::None => serializer.serialize_unit(), + Value::Bool(value) => serializer.serialize_bool(*value), + Value::Int(value) => { + let value = i64::try_from(value) + .map_err(|_| serde::ser::Error::custom("integer out of i64 range"))?; + serializer.serialize_i64(value) + } + Value::Float(value) => serializer.serialize_f64(*value), + Value::Str(text) => serializer.serialize_str(text), + Value::Bytes(bytes) => serializer.serialize_bytes(bytes), + Value::List(values) => { + let mut seq = serializer.serialize_seq(Some(values.len()))?; + for value in values { + seq.serialize_element(&Pickled(value))?; + } + seq.end() + } + Value::Tuple(values) => { + let mut tuple = serializer.serialize_tuple(values.len())?; + for value in values { + tuple.serialize_element(&Pickled(value))?; + } + tuple.end() + } + Value::Dict(entries) => { + let mut map = serializer.serialize_map(Some(entries.len()))?; + for (key, value) in entries { + map.serialize_entry(&Pickled(key), &Pickled(value))?; + } + map.end() + } + value @ (Value::Set(_) | Value::Complex { .. }) => Err(serde::ser::Error::custom( + format!("{} cannot be pickled as plain data", value.type_name()), + )), + } + } +} + +#[derive(Clone, Copy)] +struct Seed { + depth: usize, +} + +impl Seed { + fn child(self) -> Result { + if self.depth >= MAX_DEPTH { + return Err(E::custom(Error::TooDeep)); + } + Ok(Self { + depth: self.depth + 1, + }) + } +} + +impl<'de> DeserializeSeed<'de> for Seed { + type Value = Value; + + fn deserialize>(self, deserializer: D) -> Result { + deserializer.deserialize_any(self) + } +} + +impl<'de> Visitor<'de> for Seed { + type Value = Value; + + fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { + formatter.write_str("a plain Python data value") + } + + fn visit_unit(self) -> Result { + Ok(Value::None) + } + + fn visit_bool(self, value: bool) -> Result { + Ok(Value::Bool(value)) + } + + fn visit_i64(self, value: i64) -> Result { + Ok(Value::Int(value.into())) + } + + fn visit_u64(self, value: u64) -> Result { + Ok(Value::Int(value.into())) + } + + fn visit_f64(self, value: f64) -> Result { + Ok(Value::Float(value)) + } + + fn visit_str(self, value: &str) -> Result { + Ok(Value::Str(value.to_owned())) + } + + fn visit_string(self, value: String) -> Result { + Ok(Value::Str(value)) + } + + fn visit_bytes(self, value: &[u8]) -> Result { + Ok(Value::Bytes(value.to_vec())) + } + + fn visit_byte_buf(self, value: Vec) -> Result { + Ok(Value::Bytes(value)) + } + + fn visit_seq>(self, mut seq: A) -> Result { + let child = self.child()?; + let mut values = Vec::with_capacity(seq.size_hint().unwrap_or(0).min(4096)); + while let Some(value) = seq.next_element_seed(child)? { + values.push(value); + } + Ok(Value::List(values)) + } + + fn visit_map>(self, mut map: A) -> Result { + let child = self.child()?; + let mut entries = Vec::with_capacity(map.size_hint().unwrap_or(0).min(4096)); + while let Some(key) = map.next_key_seed(child)? { + entries.push((key, map.next_value_seed(child)?)); + } + Ok(Value::Dict(entries)) + } +} diff --git a/litellm-rust/crates/python-compat/src/repr.rs b/litellm-rust/crates/python-compat/src/repr.rs new file mode 100644 index 00000000000..1cf20d87716 --- /dev/null +++ b/litellm-rust/crates/python-compat/src/repr.rs @@ -0,0 +1,237 @@ +//! `repr(value)` and `str(value)` byte for byte. +//! +//! LiteLLM hashes `str(value)` into cache keys and writes `str(dict)` into Redis, so these +//! strings are persisted identifiers rather than display text: every quote choice, escape, +//! and float digit must match CPython. + +use std::fmt::Write; + +use crate::Value; + +/// Generated by `scripts/generate_nonprintable.py`; see `generated/nonprintable.rs`. +mod nonprintable { + include!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/generated/nonprintable.rs" + )); +} + +/// Unicode version of the printable-character table, from the Python that generated it. +pub const UNICODE_VERSION: &str = nonprintable::UNICODE_VERSION; + +/// `repr(value)`. +pub fn repr(value: &Value) -> String { + let mut out = String::new(); + write_repr(&mut out, value); + out +} + +/// `str(value)`: a string's own contents, and `repr` for every other value. +pub fn to_str(value: &Value) -> String { + match value { + Value::Str(text) => text.clone(), + value => repr(value), + } +} + +/// `repr(float)`, the shortest round-trip form with CPython's exponent thresholds. +pub fn float_repr(value: f64) -> String { + format_float(value, true) +} + +fn write_repr(out: &mut String, value: &Value) { + match value { + Value::None => out.push_str("None"), + Value::Bool(true) => out.push_str("True"), + Value::Bool(false) => out.push_str("False"), + Value::Int(value) => { + let _ = write!(out, "{value}"); + } + Value::Float(value) => out.push_str(&float_repr(*value)), + Value::Complex { re, im } => write_complex(out, *re, *im), + Value::Str(text) => write_str(out, text), + Value::Bytes(bytes) => write_bytes(out, bytes), + Value::List(values) => write_sequence(out, '[', values, ']'), + Value::Tuple(values) if values.len() == 1 => { + out.push('('); + write_repr(out, &values[0]); + out.push_str(",)"); + } + Value::Tuple(values) => write_sequence(out, '(', values, ')'), + Value::Set(values) if values.is_empty() => out.push_str("set()"), + Value::Set(values) => write_sequence(out, '{', values, '}'), + Value::Dict(entries) => { + out.push('{'); + for (index, (key, value)) in entries.iter().enumerate() { + if index > 0 { + out.push_str(", "); + } + write_repr(out, key); + out.push_str(": "); + write_repr(out, value); + } + out.push('}'); + } + } +} + +fn write_sequence(out: &mut String, open: char, values: &[Value], close: char) { + out.push(open); + for (index, value) in values.iter().enumerate() { + if index > 0 { + out.push_str(", "); + } + write_repr(out, value); + } + out.push(close); +} + +/// `complex.__repr__`: a `+0.0` real part prints only the imaginary part, without parens. +fn write_complex(out: &mut String, re: f64, im: f64) { + if re == 0.0 && re.is_sign_positive() { + out.push_str(&format_float(im, false)); + out.push('j'); + return; + } + out.push('('); + out.push_str(&format_float(re, false)); + let im_text = format_float(im, false); + if !im_text.starts_with('-') { + out.push('+'); + } + out.push_str(&im_text); + out.push_str("j)"); +} + +/// `PyOS_double_to_string(value, 'r', 0, flags)`: scientific notation below 1e-4 and from +/// 1e16 up, with a signed exponent of at least two digits. `add_dot_0` is +/// `Py_DTSF_ADD_DOT_0`, which `float` sets and `complex` does not. +fn format_float(value: f64, add_dot_0: bool) -> String { + if value.is_nan() { + return "nan".to_owned(); + } + if value.is_infinite() { + return if value > 0.0 { "inf" } else { "-inf" }.to_owned(); + } + // Rust's `{:e}` prints the shortest round-trip digits, like CPython's 'r' mode. + let scientific = format!("{value:e}"); + let (mantissa, exponent) = scientific + .split_once('e') + .expect("`{:e}` always prints an exponent"); + let exponent: i32 = exponent.parse().expect("`{:e}` exponent is an integer"); + let (sign, mantissa) = match mantissa.strip_prefix('-') { + Some(mantissa) => ("-", mantissa), + None => ("", mantissa), + }; + let digits: String = mantissa.chars().filter(|ch| *ch != '.').collect(); + + let mut out = String::from(sign); + if !(-4..16).contains(&exponent) { + out.push_str(&digits[..1]); + if digits.len() > 1 { + out.push('.'); + out.push_str(&digits[1..]); + } + let _ = write!( + out, + "e{}{:02}", + if exponent < 0 { '-' } else { '+' }, + exponent.unsigned_abs() + ); + } else if exponent < 0 { + out.push_str("0."); + out.extend(std::iter::repeat_n('0', (-exponent - 1) as usize)); + out.push_str(&digits); + } else { + let integer_digits = exponent as usize + 1; + if digits.len() > integer_digits { + out.push_str(&digits[..integer_digits]); + out.push('.'); + out.push_str(&digits[integer_digits..]); + } else { + out.push_str(&digits); + out.extend(std::iter::repeat_n('0', integer_digits - digits.len())); + if add_dot_0 { + out.push_str(".0"); + } + } + } + out +} + +/// `unicode_repr`: single quotes unless the text has a `'` and no `"`. Printable non-ASCII +/// stays literal; everything `str.isprintable()` rejects is escaped. +fn write_str(out: &mut String, text: &str) { + let quote = if text.contains('\'') && !text.contains('"') { + '"' + } else { + '\'' + }; + out.push(quote); + for ch in text.chars() { + match ch { + '\\' => out.push_str("\\\\"), + '\t' => out.push_str("\\t"), + '\n' => out.push_str("\\n"), + '\r' => out.push_str("\\r"), + ch if ch == quote => { + out.push('\\'); + out.push(ch); + } + ch if is_printable(ch) => out.push(ch), + ch => { + let code = ch as u32; + let _ = match code { + 0..=0xff => write!(out, "\\x{code:02x}"), + 0x100..=0xffff => write!(out, "\\u{code:04x}"), + _ => write!(out, "\\U{code:08x}"), + }; + } + } + } + out.push(quote); +} + +/// `bytes.__repr__`: the same quote rule as `str`, with every byte outside printable ASCII +/// escaped as `\xhh`. +fn write_bytes(out: &mut String, bytes: &[u8]) { + let quote = if bytes.contains(&b'\'') && !bytes.contains(&b'"') { + b'"' + } else { + b'\'' + }; + out.push('b'); + out.push(quote as char); + for &byte in bytes { + match byte { + b'\\' => out.push_str("\\\\"), + b'\t' => out.push_str("\\t"), + b'\n' => out.push_str("\\n"), + b'\r' => out.push_str("\\r"), + byte if byte == quote => { + out.push('\\'); + out.push(byte as char); + } + 0x20..=0x7e => out.push(byte as char), + byte => { + let _ = write!(out, "\\x{byte:02x}"); + } + } + } + out.push(quote as char); +} + +fn is_printable(ch: char) -> bool { + let code = ch as u32; + nonprintable::NONPRINTABLE + .binary_search_by(|&(low, high)| { + if high < code { + std::cmp::Ordering::Less + } else if low > code { + std::cmp::Ordering::Greater + } else { + std::cmp::Ordering::Equal + } + }) + .is_err() +} diff --git a/litellm-rust/crates/python-compat/src/truthy.rs b/litellm-rust/crates/python-compat/src/truthy.rs new file mode 100644 index 00000000000..af747202572 --- /dev/null +++ b/litellm-rust/crates/python-compat/src/truthy.rs @@ -0,0 +1,18 @@ +use num_bigint::Sign; + +use crate::Value; + +/// `bool(value)` for plain data: `None`, `False`, zero, and empty containers are false. +pub fn truthy(value: &Value) -> bool { + match value { + Value::None => false, + Value::Bool(value) => *value, + Value::Int(value) => value.sign() != Sign::NoSign, + Value::Float(value) => *value != 0.0, + Value::Complex { re, im } => *re != 0.0 || *im != 0.0, + Value::Str(value) => !value.is_empty(), + Value::Bytes(value) => !value.is_empty(), + Value::Tuple(values) | Value::List(values) | Value::Set(values) => !values.is_empty(), + Value::Dict(entries) => !entries.is_empty(), + } +} diff --git a/litellm-rust/crates/python-compat/src/value.rs b/litellm-rust/crates/python-compat/src/value.rs new file mode 100644 index 00000000000..b1397190638 --- /dev/null +++ b/litellm-rust/crates/python-compat/src/value.rs @@ -0,0 +1,53 @@ +use num_bigint::BigInt; + +/// A Python value built only from literals: what `ast.literal_eval` can return. +#[derive(Clone, Debug, PartialEq)] +pub enum Value { + None, + Bool(bool), + Int(BigInt), + Float(f64), + Complex { + re: f64, + im: f64, + }, + Str(String), + Bytes(Vec), + Tuple(Vec), + List(Vec), + /// Insertion-ordered, with Python's key equality already applied. + Dict(Vec<(Value, Value)>), + /// Literal order, with Python's member equality already applied. + Set(Vec), +} + +impl Value { + /// Python's type name, as it appears in `TypeError` messages. + pub fn type_name(&self) -> &'static str { + match self { + Value::None => "NoneType", + Value::Bool(_) => "bool", + Value::Int(_) => "int", + Value::Float(_) => "float", + Value::Complex { .. } => "complex", + Value::Str(_) => "str", + Value::Bytes(_) => "bytes", + Value::Tuple(_) => "tuple", + Value::List(_) => "list", + Value::Dict(_) => "dict", + Value::Set(_) => "set", + } + } +} + +impl From for Value { + fn from(value: i64) -> Self { + Value::Int(value.into()) + } +} + +impl From<&str> for Value { + fn from(value: &str) -> Self { + Value::Str(value.to_owned()) + } +} diff --git a/litellm-rust/crates/python-compat/tests/fixtures.rs b/litellm-rust/crates/python-compat/tests/fixtures.rs new file mode 100644 index 00000000000..9c202fdc5f1 --- /dev/null +++ b/litellm-rust/crates/python-compat/tests/fixtures.rs @@ -0,0 +1,343 @@ +//! Replays `generated/values.json`, which CPython wrote with `scripts/generate_fixtures.py`. + +use std::{collections::BTreeMap, fs::File, io::Write}; + +use litellm_python_compat::{ + Value, json, + literal::literal_eval, + pickle, + repr::{repr, to_str}, + truthy::truthy, +}; +use rstest::{fixture, rstest}; +use serde::Deserialize; + +#[derive(Deserialize)] +struct Fixtures { + rows: Vec, + sources: Vec, +} + +/// `ast.literal_eval(source)`: the `repr` of its result, or the exception class it raised. +#[derive(Deserialize)] +struct Source { + name: String, + source: String, + repr: Option, + error: Option, +} + +#[derive(Deserialize)] +struct Row { + name: String, + source: String, + literal: bool, + plain: bool, + repr: String, + str: String, + truthy: bool, + json: Option, + json_error: Option, + pickle: Option>, + view: Option, +} + +/// Parsed once for the whole test binary. +#[fixture] +#[once] +fn fixtures() -> Fixtures { + serde_json::from_str(include_str!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/generated/values.json" + ))) + .expect("values.json matches the fixture schema") +} + +/// Accepted differences from CPython: `(fixture source, check prefix, reason)`. Each entry +/// must still differ, so a dependency fix that removes one fails the test until it is deleted. +const KNOWN: &[(&str, &str, &str)] = &[ + ( + "...", + "literal_eval source", + "`Ellipsis` is not part of the data model", + ), + ( + r"'\ud800'", + "literal_eval source", + "a Rust `String` cannot hold a lone surrogate", + ), + ( + r"'\N{BULLET}'", + "literal_eval source", + "`\\N{NAME}` needs the Unicode name table", + ), + ( + "nested_150", + "literal_eval", + "deeper than MAX_DEPTH: rejected for stack safety, where CPython still parses it", + ), + ( + "nested_150", + "pickle.loads", + "deeper than MAX_DEPTH: rejected for stack safety, where CPython has no limit", + ), + ( + "2**64", + "pickle.loads", + "serde-pickle's serde interface stops at i64", + ), + ( + "-(2**70)", + "pickle.loads", + "serde-pickle's serde interface stops at i64", + ), + ( + "2**64", + "pickle.dumps", + "serde-pickle's serde interface stops at i64", + ), + ( + "-(2**70)", + "pickle.dumps", + "serde-pickle's serde interface stops at i64", + ), + ( + "2**64", + "to_json", + "serde_json has no exact form for integers beyond u64", + ), + ( + "-(2**70)", + "to_json", + "serde_json has no exact form for integers beyond i64", + ), + ( + "b''", + "pickle.loads protocol 0", + "protocols 0-2 pickle `b''` as a `bytes()` call", + ), + ( + "b''", + "pickle.loads protocol 1", + "protocols 0-2 pickle `b''` as a `bytes()` call", + ), + ( + "b''", + "pickle.loads protocol 2", + "protocols 0-2 pickle `b''` as a `bytes()` call", + ), +]; + +/// Collects every mismatch so one run reports the whole divergence set. +#[derive(Default)] +struct Mismatches { + unexpected: Vec, + known_seen: Vec, + known_scope: Vec, +} + +impl Mismatches { + fn known(source: &str, what: &str) -> Option { + KNOWN + .iter() + .position(|(known, prefix, _)| *known == source && what.starts_with(prefix)) + } + + fn check(&mut self, row: &Row, what: &str, expected: &str, actual: &str) { + self.check_source(&row.name, what, expected, actual); + } + + /// `name` identifies the fixture row in reports and in [`KNOWN`]. + fn check_source(&mut self, name: &str, what: &str, expected: &str, actual: &str) { + let known = Self::known(name, what); + if let Some(index) = known { + self.known_scope.push(index); + } + if expected == actual { + return; + } + match known { + Some(index) => self.known_seen.push(index), + None => self.unexpected.push(format!( + "{name:?} [{what}]\n python: {expected}\n rust: {actual}" + )), + } + } + + fn finish(self) { + let resolved: Vec<_> = self + .known_scope + .iter() + .filter(|index| !self.known_seen.contains(index)) + .map(|&index| format!("{} [{}]", KNOWN[index].0, KNOWN[index].1)) + .collect(); + assert!( + self.unexpected.is_empty() && resolved.is_empty(), + "{} mismatches with CPython:\n{}\nknown divergences that now match (delete them \ + from KNOWN): {resolved:?}", + self.unexpected.len(), + self.unexpected.join("\n"), + ); + } +} + +fn check_value(mismatches: &mut Mismatches, row: &Row, value: &Value) { + mismatches.check(row, "repr", &row.repr, &repr(value)); + mismatches.check(row, "str", &row.str, &to_str(value)); + mismatches.check( + row, + "bool", + &row.truthy.to_string(), + &truthy(value).to_string(), + ); + let expected = row.json.clone().or_else(|| { + row.json_error + .clone() + .map(|error| format!("error: {error}")) + }); + let actual = match json::dumps(value) { + Ok(text) => text, + Err(error) => format!("error: {error}"), + }; + mismatches.check( + row, + "json.dumps", + expected.as_deref().unwrap_or(""), + &actual, + ); +} + +#[rstest] +fn literal_rows_match_python_repr_str_bool_and_json(fixtures: &Fixtures) { + let mut mismatches = Mismatches::default(); + for row in fixtures.rows.iter().filter(|row| row.literal) { + match literal_eval(&row.repr) { + Ok(value) => check_value(&mut mismatches, row, &value), + Err(error) => mismatches.check(row, "literal_eval", &row.repr, &error.to_string()), + } + } + mismatches.finish(); +} + +/// Errors compare by outcome only: CPython's exception class is not part of the contract. +#[rstest] +fn literal_eval_matches_python_on_source_texts(fixtures: &Fixtures) { + let mut mismatches = Mismatches::default(); + for case in &fixtures.sources { + let expected = match (&case.repr, &case.error) { + (Some(repr), None) => repr.clone(), + (None, Some(_)) => "an error".to_owned(), + _ => panic!("{:?}: a source records a repr or an error", case.source), + }; + let actual = match literal_eval(&case.source) { + Ok(value) => repr(&value), + Err(_) => "an error".to_owned(), + }; + mismatches.check_source(&case.name, "literal_eval source", &expected, &actual); + } + mismatches.finish(); +} + +#[rstest] +fn pickle_loads_matches_python_at_every_protocol(fixtures: &Fixtures) { + let mut mismatches = Mismatches::default(); + for row in &fixtures.rows { + let Some(pickles) = &row.pickle else { continue }; + for (protocol, data) in pickles { + let data = hex::decode(data).expect("fixture pickle is hex"); + let what = format!("pickle.loads protocol {protocol}"); + match (pickle::loads(&data), row.plain) { + (Ok(value), true) => { + let view = row.view.as_deref().expect("picklable rows have a view"); + mismatches.check(row, &what, view, &repr(&value)); + } + (Err(error), true) => { + mismatches.check(row, &what, "a value", &format!("error: {error}")) + } + (Ok(value), false) => { + mismatches.check(row, &what, "a class-reference error", &repr(&value)) + } + (Err(pickle_error), false) => assert!( + matches!(pickle_error, litellm_python_compat::Error::InvalidPickle(_)), + "{}: {pickle_error}", + row.source + ), + } + } + } + mismatches.finish(); +} + +/// Non-finite floats have no literal form; pickle is how Rust receives them. +#[rstest] +fn values_reached_only_through_pickle_match_python(fixtures: &Fixtures) { + let mut mismatches = Mismatches::default(); + for row in fixtures + .rows + .iter() + .filter(|row| !row.literal && row.plain && row.view.as_deref() == Some(&row.repr)) + { + let data = hex::decode(&row.pickle.as_ref().expect("plain rows pickle")["5"]) + .expect("fixture pickle is hex"); + let value = pickle::loads(&data).expect("plain pickle decodes"); + check_value(&mut mismatches, row, &value); + } + mismatches.finish(); +} + +/// Byte equality with CPython is not the contract: CPython adds memo opcodes and picks the +/// smallest integer opcode. `scripts/verify_rust_pickles.py` checks that CPython reads these +/// back; set `PYTHON_COMPAT_RUST_PICKLES` to a file path to export them. +#[rstest] +fn pickle_dumps_round_trips_every_plain_literal(fixtures: &Fixtures) { + // Truncate up front: the verifier must read this run's rows and nothing else. + let mut export = std::env::var_os("PYTHON_COMPAT_RUST_PICKLES") + .map(|path| File::create(path).expect("the export path is writable")); + let mut mismatches = Mismatches::default(); + for row in fixtures + .rows + .iter() + .filter(|row| row.literal && row.plain && row.view.as_deref() == Some(&row.repr)) + { + // Rows past `MAX_DEPTH` are covered by the literal test's own KNOWN entry. + let Ok(value) = literal_eval(&row.repr) else { + continue; + }; + let data = match pickle::dumps(&value) { + Ok(data) => data, + Err(error) => { + mismatches.check(row, "pickle.dumps", "a pickle", &format!("error: {error}")); + continue; + } + }; + let decoded = pickle::loads(&data).expect("rust pickle decodes"); + mismatches.check(row, "pickle round trip", &row.repr, &repr(&decoded)); + if let Some(file) = &mut export { + writeln!(file, "{}\t{}", hex::encode(&data), repr(&value)) + .expect("the export file is writable"); + } + } + mismatches.finish(); +} + +#[rstest] +fn to_json_matches_python_json_round_trip(fixtures: &Fixtures) { + let mut mismatches = Mismatches::default(); + for row in fixtures.rows.iter().filter(|row| row.literal) { + let Some(expected) = &row.json else { continue }; + let Ok(value) = literal_eval(&row.repr) else { + continue; + }; + let expected: serde_json::Value = + serde_json::from_str(expected).expect("python json.dumps output parses"); + match json::to_json(&value) { + Ok(actual) => { + mismatches.check(row, "to_json", &expected.to_string(), &actual.to_string()) + } + Err(error) => { + mismatches.check(row, "to_json", &expected.to_string(), &error.to_string()) + } + } + } + mismatches.finish(); +} diff --git a/litellm-rust/crates/python-compat/tests/limits.rs b/litellm-rust/crates/python-compat/tests/limits.rs new file mode 100644 index 00000000000..c4d931034c4 --- /dev/null +++ b/litellm-rust/crates/python-compat/tests/limits.rs @@ -0,0 +1,122 @@ +use std::time::{Duration, Instant}; + +use litellm_python_compat::{Error, MAX_DEPTH, Value, json, literal::literal_eval, pickle}; +use rstest::{fixture, rstest}; + +/// The bracket pair of one container shape, as `(open, close)`. +#[fixture] +fn shapes() -> [(&'static str, &'static str); 3] { + [("[", "]"), ("{'a': ", "}"), ("(", ",)")] +} + +fn nested_text(open: &str, close: &str, depth: usize) -> String { + format!("{}1{}", open.repeat(depth), close.repeat(depth)) +} + +fn nested_list(depth: usize) -> Value { + (0..depth).fold(Value::from(1), |value, _| Value::List(vec![value])) +} + +/// A protocol 3 pickle of `depth` nested lists around `1`: `EMPTY_LIST` per level, then +/// `BININT1 1`, then `APPEND` per level. Written by hand because `dumps` refuses the depth. +fn nested_list_pickle(depth: usize) -> Vec { + let mut data = vec![0x80, 3]; + data.extend(std::iter::repeat_n(b']', depth)); + data.extend([b'K', 1]); + data.extend(std::iter::repeat_n(b'a', depth)); + data.push(b'.'); + data +} + +#[rstest] +fn literal_eval_accepts_the_limit_and_rejects_past_it(shapes: [(&'static str, &'static str); 3]) { + for (open, close) in shapes { + assert!(literal_eval(&nested_text(open, close, MAX_DEPTH)).is_ok()); + assert!(matches!( + literal_eval(&nested_text(open, close, MAX_DEPTH + 1)), + Err(Error::TooDeep) + )); + } +} + +/// A backtracking parser (the `py_literal` grammar this replaced) doubles per nested level +/// and takes minutes here; the bound is loose enough to survive a slow debug build. +#[rstest] +fn literal_eval_stays_linear_in_depth(shapes: [(&'static str, &'static str); 3]) { + for (open, close) in shapes { + let text = nested_text(open, close, MAX_DEPTH); + let start = Instant::now(); + assert!(literal_eval(&text).is_ok()); + let elapsed = start.elapsed(); + assert!( + elapsed < Duration::from_millis(50), + "{open} nested {MAX_DEPTH} deep took {elapsed:?}" + ); + } +} + +#[rstest] +fn literal_eval_ignores_brackets_inside_strings() { + let text = format!("'{}'", "[".repeat(MAX_DEPTH + 1)); + assert!(matches!(literal_eval(&text), Ok(Value::Str(_)))); +} + +#[rstest] +fn pickle_nesting_is_bounded_in_both_directions() { + assert_eq!( + pickle::loads(&nested_list_pickle(MAX_DEPTH)).unwrap(), + nested_list(MAX_DEPTH) + ); + assert!(matches!( + pickle::loads(&nested_list_pickle(MAX_DEPTH + 1)), + Err(Error::InvalidPickle(_)) + )); + assert!(pickle::dumps(&nested_list(MAX_DEPTH)).is_ok()); + assert!(matches!( + pickle::dumps(&nested_list(MAX_DEPTH + 2)), + Err(Error::TooDeep) + )); +} + +#[rstest] +#[case("{1, 2}", "set")] +#[case("1+2j", "complex")] +fn pickle_dumps_refuses_types_it_would_change(#[case] source: &str, #[case] type_name: &str) { + let value = literal_eval(source).expect("source is a literal"); + assert!(matches!(pickle::dumps(&value), Err(Error::NotPicklable(name)) if name == type_name)); +} + +#[rstest] +#[case(b"\x80\x02c__builtin__\ncomplex\nq\x00.".to_vec(), "a class reference")] +#[case({ let mut data = pickle::dumps(&Value::from(1)).unwrap(); data.push(b'.'); data }, "trailing data")] +fn pickle_loads_rejects(#[case] data: Vec, #[case] what: &str) { + assert!( + matches!(pickle::loads(&data), Err(Error::InvalidPickle(_))), + "{what} must not decode" + ); +} + +#[rstest] +#[case(Value::Bytes(b"x".to_vec()), "Object of type bytes is not JSON serializable")] +#[case(Value::Set(vec![Value::from(1)]), "Object of type set is not JSON serializable")] +#[case(Value::Complex { re: 1.0, im: 2.0 }, "Object of type complex is not JSON serializable")] +#[case( + Value::Float(f64::NAN), + "Out of range float values are not JSON compliant" +)] +fn to_json_reports_what_python_json_dumps_would_reject( + #[case] value: Value, + #[case] message: &str, +) { + let error = json::to_json(&value).expect_err("value has no serde_json form"); + assert_eq!(error.to_string(), message); +} + +/// `json.dumps` writes the non-finite floats that `to_json` cannot represent. +#[rstest] +#[case(f64::NAN, "NaN")] +#[case(f64::INFINITY, "Infinity")] +#[case(f64::NEG_INFINITY, "-Infinity")] +fn json_dumps_writes_non_finite_floats(#[case] value: f64, #[case] text: &str) { + assert_eq!(json::dumps(&Value::Float(value)).unwrap(), text); +} diff --git a/litellm-rust/crates/secrets-aws/Cargo.toml b/litellm-rust/crates/secrets-aws/Cargo.toml index b1dc5b33cda..9c926bb441b 100644 --- a/litellm-rust/crates/secrets-aws/Cargo.toml +++ b/litellm-rust/crates/secrets-aws/Cargo.toml @@ -11,7 +11,7 @@ litellm-secrets-types.workspace = true litellm-core-utils.workspace = true serde_json.workspace = true thiserror.workspace = true -tracing = "0.1" +litellm-tracing.workspace = true veil.workspace = true aws-sdk-kms = "1.120.0" aws-sdk-secretsmanager = "1.117.0" diff --git a/litellm-rust/crates/secrets-aws/src/secret_manager.rs b/litellm-rust/crates/secrets-aws/src/secret_manager.rs index 76c61534861..5658b6d7e11 100644 --- a/litellm-rust/crates/secrets-aws/src/secret_manager.rs +++ b/litellm-rust/crates/secrets-aws/src/secret_manager.rs @@ -215,7 +215,7 @@ impl AwsSecretsManagerV2 { .await .is_err() { - tracing::warn!("secret created but replication failed"); + litellm_tracing::warn!("secret created but replication failed"); } Ok(response) } diff --git a/litellm-rust/crates/secrets-cyberark/Cargo.toml b/litellm-rust/crates/secrets-cyberark/Cargo.toml index 3c1159c40be..c1613f96403 100644 --- a/litellm-rust/crates/secrets-cyberark/Cargo.toml +++ b/litellm-rust/crates/secrets-cyberark/Cargo.toml @@ -14,7 +14,7 @@ reqwest.workspace = true serde_json.workspace = true thiserror.workspace = true veil.workspace = true -tracing = "0.1" +litellm-tracing.workspace = true percent-encoding = "2.3" tokio = { workspace = true, features = ["sync"] } diff --git a/litellm-rust/crates/secrets-cyberark/src/secret_manager.rs b/litellm-rust/crates/secrets-cyberark/src/secret_manager.rs index 80e6fb12f9e..dd36cf183d8 100644 --- a/litellm-rust/crates/secrets-cyberark/src/secret_manager.rs +++ b/litellm-rust/crates/secrets-cyberark/src/secret_manager.rs @@ -92,7 +92,7 @@ impl CyberArkSecretManager { .unwrap_or(true); let mut builder = reqwest::Client::builder(); if !verify { - tracing::warn!( + litellm_tracing::warn!( "CyberArk SSL verification is disabled. This is insecure and should only be used for testing with self-signed certificates." ); builder = builder.danger_accept_invalid_certs(true); @@ -259,11 +259,13 @@ impl CyberArkSecretManager { .endpoint .join(&format!("policies/{}/policy/root", self.account)); let Ok(policy_url) = policy_url else { - tracing::warn!("Could not build CyberArk policy endpoint"); + litellm_tracing::warn!("Could not build CyberArk policy endpoint"); return; }; let Ok(authorization) = self.authorization_header(context).await else { - tracing::warn!("Could not authenticate while ensuring CyberArk variable exists"); + litellm_tracing::warn!( + "Could not authenticate while ensuring CyberArk variable exists" + ); return; }; let body = format!( @@ -288,19 +290,19 @@ impl CyberArkSecretManager { reqwest::StatusCode::CONFLICT | reqwest::StatusCode::UNPROCESSABLE_ENTITY ) => { - tracing::debug!( + litellm_tracing::debug!( "CyberArk variable policy already exists or conflicts: {}", response.status() ); } Ok(response) => { - tracing::warn!( + litellm_tracing::warn!( "Could not ensure CyberArk variable exists: {}", response.status() ); } Err(error) => { - tracing::warn!("Error ensuring CyberArk variable exists: {error}"); + litellm_tracing::warn!("Error ensuring CyberArk variable exists: {error}"); } } } @@ -324,7 +326,7 @@ impl CyberArkSecretManager { _recovery_window_in_days: Option, _context: &SecretOperationContext, ) -> Result { - tracing::warn!( + litellm_tracing::warn!( "CyberArk Conjur does not support direct secret deletion. Secrets must be removed through policy updates." ); self.secrets.invalidate(name).await; diff --git a/litellm-rust/crates/tracing/Cargo.toml b/litellm-rust/crates/tracing/Cargo.toml new file mode 100644 index 00000000000..41ad20afb3e --- /dev/null +++ b/litellm-rust/crates/tracing/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "litellm-tracing" +version = "0.1.0" +edition.workspace = true +license.workspace = true +repository.workspace = true + +[dependencies] +fancy-regex.workspace = true +percent-encoding.workspace = true +serde_json.workspace = true +tracing.workspace = true +tracing-subscriber = { version = "0.3", default-features = false, features = ["registry", "std"] } + +[dev-dependencies] +rstest.workspace = true +tokio.workspace = true diff --git a/litellm-rust/crates/tracing/README.md b/litellm-rust/crates/tracing/README.md new file mode 100644 index 00000000000..7f086067f3e --- /dev/null +++ b/litellm-rust/crates/tracing/README.md @@ -0,0 +1,26 @@ +# Native diagnostic tracing + +`litellm-tracing` connects standard `tracing` events to a host-provided `Sink`. It has no Python dependency and does not install a global subscriber + +Use the exported `debug!`, `info!`, `warn!`, and `error!` macros in native code. A host creates a `Logger` with its sink, uses `scope` for synchronous operations, and wraps futures with `instrument`. Instrument spawned futures explicitly because thread-local subscribers do not automatically follow spawned work + +Bindings implement `litellm_tracing::Sink` to connect events to their host runtime: + +```rust +pub trait Sink: Send + Sync + 'static { + fn enabled(&self, metadata: &Metadata<'_>) -> bool; + fn emit(&self, record: &Record); +} +``` + +Pass the implementation to `litellm_tracing::Logger::new(sink)`, then call `logger.scope(|| litellm_tracing::info!(attempt = 1, "request started"))`. The sink owns host access, level mapping, correlation capture, and delivery failures. `enabled` runs before event fields are evaluated or formatted. `emit` borrows a record; an adapter that queues delivery must copy the data it needs into an owned value + +Records retain event metadata, the message, and typed event fields. Sink filtering runs for each event so runtime level changes take effect. Logging from inside a sink is suppressed to prevent recursion + +The Python bridge scopes native execution to a sink that uses LiteLLM's existing Python logger. It preserves request correlation, redacts before delivering to handlers, maps Rust trace events to Python debug, and reports handler failures through `sys.unraisablehook`. It accepts LiteLLM targets only, keeping dependency wire diagnostics out of the application logger + +Python consumers continue using `litellm._logging` and its existing loggers, filters, formatters, and context setters. Catalog dispatch selects the processing backend for both Python and native diagnostics. The pure `Processor` takes explicit settings and never emits events + +A future Node bridge can implement the same sink with runtime-specific delivery and expose the same processor through N-API. Node callback scheduling, queue limits, and shutdown belong in that bridge; this crate has no interpreter handles or output queue + +This is diagnostic logging. Request lifecycle hooks and `CustomLogger` dispatch remain separate diff --git a/litellm-rust/crates/tracing/src/lib.rs b/litellm-rust/crates/tracing/src/lib.rs new file mode 100644 index 00000000000..47f97d6db27 --- /dev/null +++ b/litellm-rust/crates/tracing/src/lib.rs @@ -0,0 +1,146 @@ +use std::{ + cell::Cell, + fmt, + future::{Future, poll_fn}, + pin::pin, +}; + +use serde_json::{Map, Value}; +use tracing::{ + Dispatch, Event, Subscriber, + field::{Field, Visit}, + subscriber::Interest, +}; +use tracing_subscriber::{Layer, Registry, layer::Context, prelude::*}; + +mod processing; +mod redaction; + +pub use processing::{DiagnosticInput, DiagnosticOutput, Policy, Processor}; +pub use redaction::{REDACTED, SecretRedactor}; +pub use tracing::{Level, Metadata, debug, error, info, trace, warn}; + +pub trait Sink: Send + Sync + 'static { + fn enabled(&self, metadata: &Metadata<'_>) -> bool; + fn emit(&self, record: &Record); +} + +#[derive(Debug)] +pub struct Record { + pub metadata: &'static Metadata<'static>, + pub message: String, + pub fields: Map, +} + +#[derive(Clone, Default)] +pub struct Logger { + dispatch: Dispatch, +} + +impl Logger { + pub fn new(sink: impl Sink) -> Self { + Self { + dispatch: Dispatch::new(Registry::default().with(Output(sink))), + } + } + + pub fn scope(&self, operation: impl FnOnce() -> T) -> T { + if EMITTING.get() { + return operation(); + } + tracing::dispatcher::with_default(&self.dispatch, operation) + } + + pub fn instrument(&self, future: F) -> impl Future + use { + let logger = self.clone(); + async move { + let mut future = pin!(future); + poll_fn(|context| logger.scope(|| future.as_mut().poll(context))).await + } + } +} + +thread_local! { + static EMITTING: Cell = const { Cell::new(false) }; +} + +struct Emitting; + +impl Emitting { + fn enter() -> Option { + EMITTING.with(|active| (!active.replace(true)).then_some(Self)) + } +} + +impl Drop for Emitting { + fn drop(&mut self) { + EMITTING.set(false); + } +} + +struct Output(S); + +impl Layer for Output { + fn register_callsite(&self, _: &'static Metadata<'static>) -> Interest { + Interest::sometimes() + } + + fn enabled(&self, metadata: &Metadata<'_>, _: Context<'_, R>) -> bool { + let Some(_guard) = Emitting::enter() else { + return false; + }; + self.0.enabled(metadata) + } + + fn on_event(&self, event: &Event<'_>, _: Context<'_, R>) { + let Some(_guard) = Emitting::enter() else { + return; + }; + let mut record = Record { + metadata: event.metadata(), + message: String::new(), + fields: Map::new(), + }; + event.record(&mut record); + self.0.emit(&record); + } +} + +impl Record { + fn field(&mut self, field: &Field, value: Value) { + if field.name() == "message" { + self.message = match value { + Value::String(message) => message, + value => value.to_string(), + }; + } else { + self.fields.insert(field.name().to_owned(), value); + } + } +} + +impl Visit for Record { + fn record_debug(&mut self, field: &Field, value: &dyn fmt::Debug) { + self.field(field, format!("{value:?}").into()); + } + + fn record_str(&mut self, field: &Field, value: &str) { + self.field(field, value.into()); + } + + fn record_bool(&mut self, field: &Field, value: bool) { + self.field(field, value.into()); + } + + fn record_i64(&mut self, field: &Field, value: i64) { + self.field(field, value.into()); + } + + fn record_u64(&mut self, field: &Field, value: u64) { + self.field(field, value.into()); + } + + fn record_f64(&mut self, field: &Field, value: f64) { + self.field(field, value.into()); + } +} diff --git a/litellm-rust/crates/tracing/src/processing.rs b/litellm-rust/crates/tracing/src/processing.rs new file mode 100644 index 00000000000..29f5f6c71ea --- /dev/null +++ b/litellm-rust/crates/tracing/src/processing.rs @@ -0,0 +1,333 @@ +use fancy_regex::Result; +use percent_encoding::percent_decode_str; + +use crate::{REDACTED, SecretRedactor}; + +#[derive(Clone, Copy, Debug)] +pub struct Policy { + pub redact: bool, + pub base64_limit: i64, + pub text_limit: i64, +} + +#[derive(Clone, Debug)] +pub struct DiagnosticInput { + pub message: String, + pub exception: Option, + pub stack: Option, + pub leaves: Vec<(Option, String)>, +} + +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct DiagnosticOutput { + pub message: String, + pub exception: Option, + pub stack: Option, + pub leaves: Vec, + pub changed: bool, +} + +pub struct Processor { + redactor: SecretRedactor, +} + +impl Processor { + pub fn new(minimum_custom_key_length: usize) -> Self { + Self { + redactor: SecretRedactor::new(minimum_custom_key_length), + } + } + + pub fn redact_text(&self, text: &str) -> Result { + self.redactor.try_redact(text) + } + + pub fn redact_structured_text(&self, key: Option<&str>, text: &str) -> Result { + self.redactor.try_redact_structured(key, text) + } + + pub fn redact_client_message(&self, text: &str) -> Result { + self.redactor.try_redact_internal(text) + } + + pub fn process_diagnostic( + &self, + input: &DiagnosticInput, + policy: Policy, + ) -> Result { + let message = self.process_text(&input.message, policy)?; + let exception = input + .exception + .as_deref() + .map(|text| self.process_text(text, policy)) + .transpose()?; + let stack = input + .stack + .as_deref() + .map(|text| { + if policy.redact { + self.redact_text(text) + } else { + Ok(text.to_owned()) + } + }) + .transpose()?; + let leaves = input + .leaves + .iter() + .map(|(key, text)| { + if policy.redact { + self.redact_structured_text(key.as_deref(), text) + } else { + Ok(text.clone()) + } + }) + .collect::>>()?; + let changed = message != input.message + || exception != input.exception + || stack != input.stack + || leaves + .iter() + .zip(&input.leaves) + .any(|(processed, (_, original))| processed != original); + Ok(DiagnosticOutput { + message, + exception, + stack, + leaves, + changed, + }) + } + + pub fn scrub_access_arguments(&self, arguments: &[String]) -> Result> { + arguments + .iter() + .map(|argument| self.scrub_access_arg(argument)) + .collect() + } + + fn process_text(&self, text: &str, policy: Policy) -> Result { + let collapsed = if policy.base64_limit > 0 { + collapse_base64(text, policy.base64_limit as usize) + } else { + text.to_owned() + }; + let redacted = if policy.redact { + self.redact_text(&collapsed)? + } else { + collapsed + }; + Ok( + if policy.text_limit > 0 && redacted.chars().count() > policy.text_limit as usize { + truncate_text(&redacted, policy.text_limit as usize) + } else { + redacted + }, + ) + } + + fn scrub_access_arg(&self, value: &str) -> Result { + let length = value.chars().count(); + let scanned = if length <= 512 { + value + } else { + let head = &value[..char_offset(value, 512)]; + if head.contains('?') { + &head[..head.rfind(['?', '&']).unwrap_or(0)] + } else { + head + } + }; + let scrubbed = self.redact_text(scanned)?; + let (path, query) = scrubbed + .split_once('?') + .map_or((scrubbed.as_str(), None), |(path, query)| { + (path, Some(query)) + }); + let safe = if self.hides_encoded_credential(path)? { + REDACTED.to_owned() + } else if query.is_some() && self.hides_encoded_credential(&scrubbed)? { + format!("{path}?{REDACTED}") + } else { + scrubbed + }; + Ok(if length > 512 { + format!( + "{safe}... ({} more chars truncated) ...", + length - scanned.chars().count() + ) + } else { + safe + }) + } + + fn hides_encoded_credential(&self, value: &str) -> Result { + if !value.as_bytes().contains(&b'%') { + return Ok(false); + } + let decoded = percent_decode_str(value).decode_utf8_lossy(); + Ok(self.redact_text(&decoded)? != decoded) + } +} + +fn char_offset(text: &str, count: usize) -> usize { + text.char_indices() + .nth(count) + .map_or(text.len(), |(index, _)| index) +} + +fn marker(skipped_chars: usize) -> String { + format!( + "... (litellm_truncated skipped {skipped_chars} chars. Truncation is a stdout logging safeguard. Full, untruncated data is logged to logging callbacks (OTEL, Datadog, etc.) and at DEBUG level. To increase the truncation limit, set `MAX_STRING_LENGTH_STDOUT_LOG` in your env.) ..." + ) +} + +fn truncate_text(text: &str, limit: usize) -> String { + let length = text.chars().count(); + let kept = limit.saturating_sub(marker(length).len()); + if kept == 0 { + return text[..char_offset(text, limit)].to_owned(); + } + let head = kept / 2; + let tail = kept - head; + format!( + "{}{}{}", + &text[..char_offset(text, head)], + marker(length - kept), + &text[char_offset(text, length - tail)..] + ) +} + +fn base64_byte(byte: u8) -> bool { + byte.is_ascii_alphanumeric() || byte == b'+' || byte == b'/' +} + +fn looks_like_base64(run: &str) -> bool { + let unpadded = run.trim_end_matches('='); + let lower_hex = unpadded + .bytes() + .all(|byte| byte.is_ascii_digit() || (b'a'..=b'f').contains(&byte)); + let upper_hex = unpadded + .bytes() + .all(|byte| byte.is_ascii_digit() || (b'A'..=b'F').contains(&byte)); + let repeated = unpadded.bytes().all(|byte| byte == unpadded.as_bytes()[0]); + (!lower_hex && !upper_hex) || repeated +} + +fn base64_size(chars: usize) -> String { + let bytes = chars as f64 * 3.0 / 4.0; + if bytes >= 1024.0 * 1024.0 { + return format!("{:.2}MB", bytes / (1024.0 * 1024.0)); + } + if bytes >= 1024.0 { + return format!("{:.1}KB", bytes / 1024.0); + } + format!("{}B", bytes as usize) +} + +fn collapse_base64(text: &str, limit: usize) -> String { + let bytes = text.as_bytes(); + let mut position = 0; + let mut previous = 0; + let mut output = String::new(); + while position < bytes.len() { + if !base64_byte(bytes[position]) || (position > 0 && base64_byte(bytes[position - 1])) { + position += 1; + continue; + } + let start = position; + while position < bytes.len() && base64_byte(bytes[position]) { + position += 1; + } + let run_end = position; + while position < bytes.len() && position - run_end < 2 && bytes[position] == b'=' { + position += 1; + } + let run = &text[start..position]; + if run_end - start > limit && looks_like_base64(run) { + output.push_str(&text[previous..start]); + output.push_str(&format!( + "[base64_data truncated: {}]", + base64_size(run.len()) + )); + previous = position; + } + } + output.push_str(&text[previous..]); + output +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn redaction_precedes_the_text_bound_and_preserves_unicode_character_limits() { + let processor = Processor::new(16); + let secret = format!("sk-{}", "q".repeat(48)); + let text = format!("{}{}{}", "é".repeat(110), secret, "界".repeat(1000)); + let input = DiagnosticInput { + message: text, + exception: None, + stack: None, + leaves: vec![], + }; + let output = processor + .process_diagnostic( + &input, + Policy { + redact: true, + base64_limit: 0, + text_limit: 500, + }, + ) + .unwrap(); + assert!(output.message.chars().count() <= 500); + assert!(!output.message.contains("sk-qq")); + assert!(output.changed); + } + + #[test] + fn base64_collapse_applies_to_debug_and_exceptions_without_touching_hex() { + let processor = Processor::new(16); + let input = DiagnosticInput { + message: format!("image={} digest={}", "Q".repeat(100), "a1".repeat(50)), + exception: Some(format!("upload failed: {}", "Q".repeat(100))), + stack: Some("api_key=secret123".to_owned()), + leaves: vec![(Some("api_key".to_owned()), "secret123".to_owned())], + }; + let output = processor + .process_diagnostic( + &input, + Policy { + redact: true, + base64_limit: 20, + text_limit: 0, + }, + ) + .unwrap(); + assert!(output.message.contains("[base64_data truncated: 75B]")); + assert!(output.message.contains(&"a1".repeat(50))); + assert!( + output + .exception + .unwrap() + .contains("[base64_data truncated: 75B]") + ); + assert_eq!(output.stack.as_deref(), Some(REDACTED)); + assert_eq!(output.leaves, vec![REDACTED]); + } + + #[test] + fn access_arguments_keep_encoded_paths_and_drop_decoded_credentials() { + let processor = Processor::new(16); + let arguments = vec![ + "/v1/models?filter=gpt%2D4o&page=2".to_owned(), + "/v1/models?k%65y=sk%2Dabcdefghijklmnopqrstuvwxyz&page=2".to_owned(), + ]; + assert_eq!( + processor.scrub_access_arguments(&arguments).unwrap(), + vec![arguments[0].clone(), "/v1/models?REDACTED".to_owned()] + ); + } +} diff --git a/litellm-rust/crates/tracing/src/redaction.rs b/litellm-rust/crates/tracing/src/redaction.rs new file mode 100644 index 00000000000..4bef14148d3 --- /dev/null +++ b/litellm-rust/crates/tracing/src/redaction.rs @@ -0,0 +1,140 @@ +use fancy_regex::{NoExpand, Regex}; + +pub const REDACTED: &str = "REDACTED"; + +#[cfg(test)] +const DEFAULT_MINIMUM_CUSTOM_KEY_LENGTH: usize = 16; + +fn secret_patterns(minimum_custom_key_length: usize) -> String { + let sk_suffix_length = minimum_custom_key_length.saturating_sub("sk-".len()); + [ + r"-----BEGIN[A-Z \-]*PRIVATE KEY-----[\s\S]*?-----END[A-Z \-]*PRIVATE KEY-----", + r"\bya29\.[A-Za-z0-9_.~+/-]+", + r#"(?:client_secret|azure_password|azure_username)\s+[^\s,'"})\]{}>]+"#, + r"(?:AKIA|ASIA)[0-9A-Z]{16}", + r"Bearer\s+[A-Za-z0-9\-._~+/]{10,}=*", + r"Basic\s+[A-Za-z0-9+/]{10,}={0,2}", + &format!(r"sk-[A-Za-z0-9\-_]{{{sk_suffix_length},}}"), + r#"(?<=[?&])(?:api[_-]?key|\w*(?:token|password|passwd|client_secret|secret_key|_secret))=[^\s&'"]+"#, + r#"(?:api[_-]?key)['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]{8,}"#, + r#"(?:x-api-key|api-key)['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, + r"x-ak-[A-Za-z0-9\-_]{20,}", + r"AIza[0-9A-Za-z\-_]{35}", + r#"(?<=[?&])key=[^\s&'"]{8,}"#, + r#"(?:^|(?<=\W))\w*(?:password|passwd|client_secret|secret_key|_secret)['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, + r#"(?<=://)[^\s'":]{0,4096}:[^\s'"]{1,4096}(?=@)"#, + r"dapi[0-9a-f]{32}", + r#"litellm\.[A-Za-z0-9_]*_key['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, + r#"private_key['"]?\s*[:=]\s*['"]?(?:-----BEGIN[A-Z \-]*PRIVATE KEY-----[\s\S]*?-----END[A-Z \-]*PRIVATE KEY-----|[^\s,'"})\]{}>]+)"#, + concat!( + r"(?:master_key|xai_key|database_url|db_url|connection_string|", + r"aws_secret_access_key|aws_session_token|aws_access_key_id|s3_secret_access_key|s3_access_key_id|", + r"signing_key|encryption_key|", + r"auth_token|access_token|refresh_token|", + r"slack_webhook_url|webhook_url|", + r"database_connection_string|", + r"huggingface_token|jwt_secret)", + r#"['"]?\s*[:=]\s*['"]?[^\s,'"})\]{}>]+"#, + ), + r"\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*", + r"(?<=[?&])sig=[A-Za-z0-9%+/=]+", + r#"\{[^{}]*"type"\s*:\s*"service_account"[^{}]*(?:\{[^{}]*\}[^{}]*)*\}"#, + ] + .join("|") +} + +#[derive(Clone, Debug)] +pub struct SecretRedactor { + pattern: Regex, + internal_pattern: Regex, +} + +impl SecretRedactor { + pub fn new(minimum_custom_key_length: usize) -> Self { + let pattern = Regex::new(&format!( + "(?i){}", + secret_patterns(minimum_custom_key_length) + )) + .expect("secret redaction patterns compile"); + let internal_pattern = Regex::new(concat!( + r#"(?i)/(?:etc|var|opt|usr|home|root|private|Users|tmp|mnt|srv)/[^\s'"\)\]}>,]+|"#, + r#"[A-Za-z]:\\[^\s'"\)\]}>,]+|"#, + r"\b(?:10(?:\.\d{1,3}){3}|172\.(?:1[6-9]|2\d|3[01])(?:\.\d{1,3}){2}|", + r"192\.168(?:\.\d{1,3}){2}|127(?:\.\d{1,3}){3})\b|", + r"\b[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*\.(?:internal|local|corp|lan|intra|private)\b", + )) + .expect("internal detail patterns compile"); + Self { + pattern, + internal_pattern, + } + } + + pub fn redact(&self, value: &str) -> String { + self.try_redact(value) + .unwrap_or_else(|_| REDACTED.to_owned()) + } + + pub fn try_redact(&self, value: &str) -> fancy_regex::Result { + self.pattern + .try_replacen(value, 0, NoExpand(REDACTED)) + .map(|value| value.into_owned()) + } + + pub fn try_redact_structured( + &self, + key: Option<&str>, + value: &str, + ) -> fancy_regex::Result { + let scrubbed = self.try_redact(value)?; + if scrubbed != value || key.is_none() { + return Ok(scrubbed); + } + let rendered = format!("'{}': '{value}'", key.unwrap_or_default()); + Ok(if self.try_redact(&rendered)? != rendered { + REDACTED.to_owned() + } else { + value.to_owned() + }) + } + + pub fn try_redact_internal(&self, value: &str) -> fancy_regex::Result { + let without_traceback = value + .split_once("Traceback (most recent call last):") + .map_or(value, |(prefix, _)| prefix.trim_end()); + self.internal_pattern + .try_replacen(&self.try_redact(without_traceback)?, 0, NoExpand(REDACTED)) + .map(|value| value.into_owned()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[rstest::rstest] + #[case::bearer("auth failed: Bearer abcdefghijklmnop", "auth failed: REDACTED")] + #[case::sk_key("key sk-abcdefghijklmnopqrstuvwxyz rejected", "key REDACTED rejected")] + #[case::short_sk_key_is_kept("sk-abc", "sk-abc")] + #[case::query_param("GET /v1?api_key=secret123&x=1", "GET /v1?REDACTED&x=1")] + #[case::dict_repr("{'api_key': 'abcdefghij'}", "{'REDACTED'}")] + #[case::url_credentials("postgres://user:pass@host/db", "postgres://REDACTED@host/db")] + #[case::case_insensitive("BEARER ABCDEFGHIJKLMNOP", "REDACTED")] + #[case::aws_key("AKIAABCDEFGHIJKLMNOP", "REDACTED")] + #[case::sas_signature("https://x.blob/a?sv=1&sig=abc%2B=", "https://x.blob/a?sv=1&REDACTED")] + #[case::password_needs_word_boundary("db_password=hunter2", "REDACTED")] + #[case::plain_text_is_kept(r#"{"message": "rejected"}"#, r#"{"message": "rejected"}"#)] + fn redacts_the_same_spans_as_the_python_patterns(#[case] input: &str, #[case] expected: &str) { + assert_eq!( + SecretRedactor::new(DEFAULT_MINIMUM_CUSTOM_KEY_LENGTH).redact(input), + expected + ); + } + + #[test] + fn sk_threshold_follows_the_minimum_custom_key_length() { + let redactor = SecretRedactor::new(8); + assert_eq!(redactor.redact("sk-abcde"), REDACTED); + assert_eq!(redactor.redact("sk-abcd"), "sk-abcd"); + } +} diff --git a/litellm-rust/crates/tracing/tests/logging.rs b/litellm-rust/crates/tracing/tests/logging.rs new file mode 100644 index 00000000000..585e442dad1 --- /dev/null +++ b/litellm-rust/crates/tracing/tests/logging.rs @@ -0,0 +1,122 @@ +use std::sync::{ + Arc, + atomic::{AtomicBool, Ordering}, + mpsc, +}; + +use litellm_tracing::{Level, Logger, Metadata, Record, Sink, info, warn}; +use serde_json::{Value, json}; + +struct Output { + enabled: Arc, + sender: mpsc::Sender<(String, Value, Level, &'static str, Option)>, +} + +impl Sink for Output { + fn enabled(&self, _: &Metadata<'_>) -> bool { + self.enabled.load(Ordering::Relaxed) + } + + fn emit(&self, record: &Record) { + self.sender + .send(( + record.message.clone(), + Value::Object(record.fields.clone()), + *record.metadata.level(), + record.metadata.target(), + record.metadata.line(), + )) + .unwrap(); + Logger::default().scope(|| warn!("a sink must not recursively emit")); + } +} + +fn emit() { + warn!( + attempt = 3_u64, + elapsed = 1.5, + retry = true, + reason = "timeout", + "retry {}", + 3 + ); +} + +#[test] +fn records_preserve_fields_metadata_and_dynamic_filtering_without_recursion() { + let (sender, receiver) = mpsc::channel(); + let enabled = Arc::new(AtomicBool::new(false)); + let logger = Logger::new(Output { + enabled: enabled.clone(), + sender, + }); + logger.scope(emit); + assert!(receiver.try_recv().is_err()); + enabled.store(true, Ordering::Relaxed); + logger.scope(emit); + let (message, fields, level, target, line) = receiver.try_recv().unwrap(); + assert_eq!(message, "retry 3"); + assert_eq!( + fields, + json!({"attempt": 3, "elapsed": 1.5, "retry": true, "reason": "timeout"}) + ); + assert_eq!(level, Level::WARN); + assert_eq!(target, module_path!()); + assert!(line.is_some()); + enabled.store(false, Ordering::Relaxed); + logger.scope(emit); + assert!(receiver.try_recv().is_err()); +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn concurrent_futures_keep_their_sinks_across_suspension_and_spawn() { + let tasks = (0..2) + .map(|id| { + let (sender, receiver) = mpsc::channel(); + let logger = Logger::new(Output { + enabled: Arc::new(AtomicBool::new(true)), + sender, + }); + let task = tokio::spawn(logger.instrument(async move { + tokio::task::yield_now().await; + info!(id, "worker"); + })); + (id, task, receiver) + }) + .collect::>(); + for (id, task, receiver) in tasks { + task.await.unwrap(); + let (message, fields, level, _, _) = receiver.try_recv().unwrap(); + assert_eq!(message, "worker"); + assert_eq!(fields, json!({"id": id})); + assert_eq!(level, Level::INFO); + assert!(receiver.try_recv().is_err()); + } +} + +#[test] +fn nested_scopes_restore_the_previous_sink() { + let (outer_sender, outer) = mpsc::channel(); + let (inner_sender, inner) = mpsc::channel(); + let logger = |sender| { + Logger::new(Output { + enabled: Arc::new(AtomicBool::new(true)), + sender, + }) + }; + let outside = logger(outer_sender); + let inside = logger(inner_sender); + outside.scope(|| { + info!("before"); + inside.scope(|| info!("inside")); + info!("after"); + }); + assert_eq!( + outer.try_iter().map(|event| event.0).collect::>(), + ["before", "after"] + ); + assert_eq!( + inner.try_iter().map(|event| event.0).collect::>(), + ["inside"] + ); +} diff --git a/litellm/__init__.py b/litellm/__init__.py index a044676a843..c8df4394a06 100644 --- a/litellm/__init__.py +++ b/litellm/__init__.py @@ -381,6 +381,7 @@ enable_model_config_credential_overrides: bool = False enable_key_alias_format_validation: bool = ( False # opt-in validation of key_alias format on /key/generate and /key/update ) +key_alias_pattern: str | None = None enable_gemini_default_thinking_level_low: bool = ( False # opt-in: force thinkingLevel low/minimal for Gemini 3 thinking param mapping ) @@ -1401,6 +1402,7 @@ from .exceptions import ( JSONSchemaValidationError, LITELLM_EXCEPTION_TYPES, MockException, + ModelNotMappedError as ModelNotMappedError, ) from .budget_manager import BudgetManager from .proxy.proxy_cli import run_server diff --git a/litellm/_logging.py b/litellm/_logging.py index 644a79d8cbd..8bd7a86ecf5 100644 --- a/litellm/_logging.py +++ b/litellm/_logging.py @@ -1,11 +1,12 @@ import ast import contextvars import functools +import itertools import logging import os import re import sys -from collections.abc import Sequence +from collections.abc import Iterator from datetime import datetime from logging import Formatter from typing import Any, Final, TextIO @@ -22,10 +23,12 @@ from litellm.litellm_core_utils.env_utils import get_env_int from litellm.litellm_core_utils.safe_json_dumps import UNSERIALIZABLE_OBJECT, safe_dumps, safe_json_structure from litellm.litellm_core_utils.safe_json_loads import safe_json_loads from litellm.litellm_core_utils.secret_redaction import ( + _python_redact_string, + _python_redact_structured_value, redact_internal_details, redact_string, - redact_structured_value, ) +from litellm.rust_bridge import diagnostics set_verbose = False @@ -49,7 +52,7 @@ def _sanitize_correlation_id(value: str) -> str: pass through credential redaction. """ stripped: Final = "".join(ch for ch in value if ch.isprintable()) - return _redact_string(stripped[:_MAX_CORRELATION_ID_LENGTH]) + return _redact_string(stripped)[:_MAX_CORRELATION_ID_LENGTH] def set_session_id(session_id: str) -> "contextvars.Token[str]": @@ -74,12 +77,6 @@ def _redact_string(value: str) -> str: return redact_string(value) -def _redact_structured_value(key: str | None, value: str) -> str: - if not _ENABLE_SECRET_REDACTION: - return value - return redact_structured_value(key, value) - - _REDACTED_RECORD_ATTR: Final = "litellm_redacted" _REDACTED_STAMP: Final = object() _UNREDACTED_SCALAR_TYPES: Final = (bool, int, float, type(None)) @@ -103,14 +100,6 @@ def _plain_text(value: object) -> str: return UNSERIALIZABLE_OBJECT -def _redact_extra_value(key: str, value: object) -> object: - try: - scrubbed: Final = safe_json_structure(value, value_transform=_redact_structured_value, key=key) - except Exception: - return _redact_string(_plain_text(value)) - return value if _scrubbing_changed_nothing(scrubbed, value) else scrubbed - - def redact_secrets(value: str) -> str: """Public API: redact known secret/credential patterns from an arbitrary string. @@ -150,7 +139,7 @@ def _substituted_color_message(record: logging.LogRecord) -> str | None: return None try: return color_message % record.args - except TypeError: + except Exception: return color_message @@ -162,42 +151,7 @@ class SecretRedactionFilter(logging.Filter): def filter(self, record: logging.LogRecord) -> bool: if not _ENABLE_SECRET_REDACTION or _is_redacted(record): return True - - # Runs before args are cleared, and before the extra-field loop below - # that redacts the substituted result. - substituted_color_message: Final = _substituted_color_message(record) - if substituted_color_message is not None: - record.color_message = substituted_color_message # rebind-ok: a Filter scrubs records in place - - try: - record.msg = _redact_string(record.getMessage()) - record.args = None - except Exception: - if isinstance(record.msg, str): - record.msg = _redact_string(record.msg) - - # Redact exception tracebacks - if record.exc_info and record.exc_info[1] is not None: - try: - record.exc_text = _redact_string(record.exc_text or self._formatter.formatException(record.exc_info)) - except Exception: - pass - - if isinstance(record.stack_info, str): - record.stack_info = _redact_string(record.stack_info) # rebind-ok: a Filter scrubs records in place - - # Redact extra fields passed via logger.debug("msg", extra={...}) - record_items: Final[Sequence[tuple[str, object]]] = list(record.__dict__.items()) - for key, value in record_items: - if key in _STANDARD_RECORD_ATTRS: - continue - if isinstance(value, str): - setattr(record, key, _redact_structured_value(key, value)) - elif not isinstance(value, _UNREDACTED_SCALAR_TYPES): - setattr(record, key, _redact_extra_value(key, value)) - - setattr(record, _REDACTED_RECORD_ATTR, _REDACTED_STAMP) - return True + return _process_record(record, base64_limit=0, text_limit=0, redact=True) _secret_filter: Final = SecretRedactionFilter() @@ -211,7 +165,7 @@ _REDACTION_PLACEHOLDER: Final = "REDACTED" def _hides_a_credential(value: str) -> bool: """Whether *value* only looks clean until it is percent-decoded.""" decoded: Final = unquote(value) - return _redact_string(decoded) != decoded + return _python_redact_string(decoded) != decoded def _drop_encoded_credential(scrubbed: str) -> str: @@ -239,10 +193,10 @@ def _scrub_access_arg(value: str) -> str: pattern and would then be logged raw. """ if len(value) <= _MAX_SCRUBBED_ACCESS_ARG: - return _drop_encoded_credential(_redact_string(value)) + return _drop_encoded_credential(_python_redact_string(value)) head: Final = value[:_MAX_SCRUBBED_ACCESS_ARG] kept: Final = head[: max(head.rfind("?"), head.rfind("&"))] if "?" in head else head - scrubbed: Final = _drop_encoded_credential(_redact_string(kept)) + scrubbed: Final = _drop_encoded_credential(_python_redact_string(kept)) return f"{scrubbed}... ({len(value) - len(kept)} more chars truncated) ..." @@ -258,8 +212,17 @@ class AccessLogRedactionFilter(logging.Filter): if not _ENABLE_SECRET_REDACTION: return True if isinstance(record.args, tuple) and record.args: + strings: Final = tuple(arg for arg in record.args if isinstance(arg, str)) + candidate: Final = diagnostics.run( + lambda native: native.scrub_access_arguments(strings), + lambda: tuple(_scrub_access_arg(arg) for arg in strings), + ) + scrubbed: Final = ( + candidate if len(candidate) == len(strings) else tuple(_scrub_access_arg(arg) for arg in strings) + ) + values: Final = iter(scrubbed) record.args = tuple( # rebind-ok: a Filter scrubs records in place - _scrub_access_arg(arg) if isinstance(arg, str) else arg for arg in record.args + next(values) if isinstance(arg, str) else arg for arg in record.args ) return True # No positional args means everything is in msg, where collapsing is correct. @@ -365,6 +328,185 @@ def _collapse_base64_runs(text: str, limit: int) -> str: return _base64_run_pattern(limit + 1).sub(_replace_base64_run, text) +def _extra_structure(key: str, value: object) -> object: + if isinstance(value, str): + return value + try: + return safe_json_structure(value, key=key) + except Exception: + return _plain_text(value) + + +def _string_leaves(key: str | None, value: object) -> Iterator[tuple[str | None, str]]: + if isinstance(value, str): + yield key, value + elif isinstance(value, dict): + yield from itertools.chain.from_iterable( + _string_leaves(child_key, child) for child_key, child in value.items() if isinstance(child_key, str) + ) + elif isinstance(value, (list, tuple)): + yield from itertools.chain.from_iterable(_string_leaves(key, child) for child in value) + + +def _replace_string_leaves(value: object, values: Iterator[str]) -> object: + if isinstance(value, str): + return next(values) + if isinstance(value, dict): + return { # mutable-ok: LogRecord extras must keep JSON dict shape for handlers + key: _replace_string_leaves(child, values) for key, child in value.items() + } + if isinstance(value, list): + return [ # mutable-ok: LogRecord extras must keep JSON list shape for handlers + _replace_string_leaves(child, values) for child in value + ] + if isinstance(value, tuple): + return tuple(_replace_string_leaves(child, values) for child in value) + return value + + +def _sort_processed_sets(original: object, processed: object) -> object: + if isinstance(original, set) and isinstance(processed, list): + return sorted(processed) + if isinstance(original, dict) and isinstance(processed, dict): + return { # mutable-ok: sorting nested sets must preserve the surrounding JSON dict + key: _sort_processed_sets(original.get(key), value) for key, value in processed.items() + } + if isinstance(original, list) and isinstance(processed, list): + return [ # mutable-ok: sorting nested sets must preserve the surrounding JSON list + _sort_processed_sets(before, after) for before, after in zip(original, processed) + ] + if isinstance(original, tuple) and isinstance(processed, tuple): + return tuple(_sort_processed_sets(before, after) for before, after in zip(original, processed)) + return processed + + +def _python_process_diagnostic( + message: str, + exception: str | None, + stack: str | None, + leaves: tuple[tuple[str | None, str], ...], + redact: bool, + base64_limit: int, + text_limit: int, +) -> tuple[str, str | None, str | None, tuple[str, ...], bool]: + def process_text(text: str) -> str: + collapsed: Final = _collapse_base64_runs(text, base64_limit) if base64_limit > 0 else text + scrubbed: Final = _python_redact_string(collapsed) if redact else collapsed + return _truncate_for_stdout_log(scrubbed, text_limit) if 0 < text_limit < len(scrubbed) else scrubbed + + processed_message: Final = process_text(message) + processed_exception: Final = process_text(exception) if exception is not None else None + processed_stack: Final = _python_redact_string(stack) if redact and stack is not None else stack + processed_leaves: Final = tuple( + _python_redact_structured_value(key, text) if redact else text for key, text in leaves + ) + changed: Final = ( + processed_message != message + or processed_exception != exception + or processed_stack != stack + or any(processed != original for processed, (_, original) in zip(processed_leaves, leaves)) + ) + return processed_message, processed_exception, processed_stack, processed_leaves, changed + + +def _render_message(record: logging.LogRecord) -> str: + try: + return record.getMessage() + except Exception: + return record.msg if isinstance(record.msg, str) else UNSERIALIZABLE_OBJECT + + +def _render_exception(record: logging.LogRecord) -> str | None: + if not isinstance(record.exc_info, tuple) or len(record.exc_info) < 2 or record.exc_info[1] is None: + return None + try: + return record.exc_text or SecretRedactionFilter._formatter.formatException(record.exc_info) + except Exception: + return "REDACTED" + + +def _process_record(record: logging.LogRecord, *, base64_limit: int, text_limit: int, redact: bool) -> bool: + if _is_redacted(record): + return True + message: Final = _render_message(record) + exception: Final = _render_exception(record) + stack: Final = record.stack_info if isinstance(record.stack_info, str) else None + substituted_color: Final = _substituted_color_message(record) + extras: Final = ( + tuple( + ( + key, + value, + _extra_structure( + key, substituted_color if key == "color_message" and substituted_color is not None else value + ), + ) + for key, value in record.__dict__.items() + if key not in _STANDARD_RECORD_ATTRS + and key != _REDACTED_RECORD_ATTR + and not isinstance(value, _UNREDACTED_SCALAR_TYPES) + ) + if redact + else () + ) + extra_leaves: Final = tuple( + itertools.chain.from_iterable(_string_leaves(key, prepared) for key, _, prepared in extras) + ) + raw_template: Final = record.msg if redact and isinstance(record.msg, str) and record.args else None + color_template: Final = record.__dict__.get("color_message") + raw_color: Final = color_template if redact and isinstance(color_template, str) and record.args else None + leaves: Final = ( + extra_leaves + + (((None, raw_template),) if raw_template is not None else ()) + + (((None, raw_color),) if raw_color is not None else ()) + ) + candidate: Final = diagnostics.run( + lambda native: native.process_diagnostic(message, exception, stack, leaves, (redact, base64_limit, text_limit)), + lambda: _python_process_diagnostic(message, exception, stack, leaves, redact, base64_limit, text_limit), + ) + processed_message, processed_exception, processed_stack, processed_leaves, _ = ( + candidate + if len(candidate[3]) == len(leaves) + else _python_process_diagnostic(message, exception, stack, leaves, redact, base64_limit, text_limit) + ) + raw_template_changed: Final = raw_template is not None and processed_leaves[len(extra_leaves)] != raw_template + safe_message: Final = "REDACTED" if raw_template_changed and processed_message == message else processed_message + if redact or safe_message != message: + record.msg = safe_message # rebind-ok: the Filter interface mutates the record + record.args = None # rebind-ok: the rendered message replaces interpolation inputs + if processed_exception is not None: + record.exc_text = processed_exception # rebind-ok: the Filter interface mutates the record + if processed_stack is not None: + record.stack_info = processed_stack # rebind-ok: the Filter interface mutates the record + processed_values: Final = iter(processed_leaves[: len(extra_leaves)]) + for key, original, prepared in extras: + replacement: Final = _sort_processed_sets(original, _replace_string_leaves(prepared, processed_values)) + if not _scrubbing_changed_nothing(replacement, original): + setattr(record, key, replacement) + raw_color_changed: Final = ( + raw_color is not None and processed_leaves[len(extra_leaves) + int(raw_template is not None)] != raw_color + ) + if raw_color_changed and getattr(record, "color_message", None) == substituted_color: + setattr(record, "color_message", "REDACTED") + setattr(record, _REDACTED_RECORD_ATTR, _REDACTED_STAMP) + return True + + +def _redact_json_record(value: object) -> object: + prepared: Final = safe_json_structure(value) + leaves: Final = tuple(_string_leaves(None, prepared)) + candidate: Final = diagnostics.run( + lambda native: native.process_diagnostic("", None, None, leaves, (True, 0, 0))[3], + lambda: tuple(_python_redact_structured_value(key, text) for key, text in leaves), + ) + replacements: Final = ( + candidate + if len(candidate) == len(leaves) + else tuple(_python_redact_structured_value(key, text) for key, text in leaves) + ) + return _sort_processed_sets(value, _replace_string_leaves(prepared, iter(replacements))) + + class StdoutLogTruncationFilter(logging.Filter): """Bounds how much of an oversized log line reaches stdout. @@ -412,7 +554,17 @@ class StdoutLogTruncationFilter(logging.Filter): return True -_stdout_truncation_filter: Final = StdoutLogTruncationFilter() +class DiagnosticProcessingFilter(StdoutLogTruncationFilter): + def filter(self, record: logging.LogRecord) -> bool: + return _process_record( + record, + base64_limit=_get_max_base64_length_stdout_log(), + text_limit=_get_max_string_length_stdout_log() if record.levelno >= logging.INFO else 0, + redact=_ENABLE_SECRET_REDACTION, + ) + + +_diagnostic_filter: Final = DiagnosticProcessingFilter() class CorrelationContextFilter(logging.Filter): @@ -633,7 +785,9 @@ class JsonFormatter(Formatter): if record.exc_info: json_record["stacktrace"] = record.exc_text or self.formatException(record.exc_info) - return safe_dumps(json_record, value_transform=None if _is_redacted(record) else _redact_structured_value) + return safe_dumps( + json_record if _is_redacted(record) or not _ENABLE_SECRET_REDACTION else _redact_json_record(json_record) + ) class CorrelationPlainFormatter(logging.Formatter): @@ -663,7 +817,7 @@ def _setup_json_exception_handlers(formatter): # Create a handler with JSON formatting for exceptions error_handler: Final = logging.StreamHandler() error_handler.setFormatter(formatter) - error_handler.addFilter(_stdout_truncation_filter) + error_handler.addFilter(_diagnostic_filter) error_handler.addFilter(_secret_filter) error_handler.addFilter(_correlation_filter) @@ -734,10 +888,10 @@ verbose_logger.addHandler(handler) # Filters attached to the logger, not the handler, survive callers swapping in their own # handlers (JSON mode, uvicorn log config, a host app's root handler). -verbose_router_logger.addFilter(_stdout_truncation_filter) -verbose_proxy_logger.addFilter(_stdout_truncation_filter) -verbose_proxy_stdout_logger.addFilter(_stdout_truncation_filter) -verbose_logger.addFilter(_stdout_truncation_filter) +verbose_router_logger.addFilter(_diagnostic_filter) +verbose_proxy_logger.addFilter(_diagnostic_filter) +verbose_proxy_stdout_logger.addFilter(_diagnostic_filter) +verbose_logger.addFilter(_diagnostic_filter) def _suppress_loggers(): diff --git a/litellm/caching/caching.py b/litellm/caching/caching.py index 6a98b104221..a31cad4af29 100644 --- a/litellm/caching/caching.py +++ b/litellm/caching/caching.py @@ -15,7 +15,8 @@ import time import traceback from collections.abc import Mapping from enum import Enum -from typing import Any, Final +from types import MappingProxyType +from typing import TYPE_CHECKING, Any, Final from pydantic import BaseModel @@ -38,6 +39,25 @@ from .redis_cluster_cache import RedisClusterCache from .redis_semantic_cache import RedisSemanticCache from .s3_cache import S3Cache +if TYPE_CHECKING: + from litellm.rust_bridge.response_cache import NativeCacheRequest, ResponseCacheRuntime + + +def _native_response(result: object) -> object: + """The value Python's own reader would return for `result` once it is cached. + + Python stores a model as its JSON text and `json.loads` a string response on read, so the + native store receives the decoded value and writes the envelope shape Python reads. + """ + if isinstance(result, BaseModel): + return json.loads(result.model_dump_json()) + if isinstance(result, str): + try: + return json.loads(result) + except ValueError: + return result + return result + def print_verbose(print_statement): try: @@ -55,6 +75,8 @@ class CacheMode(str, Enum): #### LiteLLM.Completion / Embedding Cache #### class Cache: + _native_cache: "ResponseCacheRuntime | None" = None + def __init__( self, type: LiteLLMCacheType | None = LiteLLMCacheType.LOCAL, @@ -292,6 +314,12 @@ class Cache: if self.namespace is not None and isinstance(self.cache, RedisCache): self.cache.namespace = self.namespace + from litellm.rust_bridge.response_cache import resolve_response_cache + + # The Rust catalog picks the store per backend. When it selects Rust, the storage calls + # below go to the native runtime and the Python backend stays only for its direct API. + self._native_cache = resolve_response_cache(self) + # Params whose values carry prompt content. Excluded from semantic-cache # scope keys so differently worded prompts share a bucket and match via # vector similarity rather than being split into per-wording buckets. @@ -570,6 +598,13 @@ class Cache: if "semantic-similarity" in cache_lookup_metadata: original_metadata["semantic-similarity"] = cache_lookup_metadata["semantic-similarity"] + @staticmethod + def _stamp_semantic_similarity(kwargs: Mapping[str, object], similarity: float | None) -> None: + """Write a native semantic lookup's similarity where the Python backends put it.""" + metadata: Final = kwargs.get("metadata") + if similarity is not None and isinstance(metadata, dict): + metadata["semantic-similarity"] = similarity + def get_cache(self, dynamic_cache_object: BaseCache | None = None, **kwargs): """ Retrieves the cached result for the given arguments. @@ -588,6 +623,15 @@ class Cache: cache_key = kwargs["cache_key"] else: cache_key = self.get_cache_key(**kwargs) + if cache_key is not None and self._native_cache is not None: + request = self._native_cache.request(self, MappingProxyType({**kwargs, "cache_key": cache_key})) + if request is None: + return None + if not self._is_semantic_cache(): + return self._native_cache.lookup(request) + response, similarity = self._native_cache.lookup_semantic(request) + self._stamp_semantic_similarity(kwargs, similarity) + return response if cache_key is not None: cache_control_args: Final[DynamicCacheControl] = kwargs.get("cache", {}) max_age = cache_control_args.get("s-maxage") or cache_control_args.get("s-max-age") or float("inf") @@ -620,6 +664,15 @@ class Cache: cache_key = kwargs["cache_key"] else: cache_key = self.get_cache_key(**kwargs) + if cache_key is not None and self._native_cache is not None: + request = self._native_cache.request(self, MappingProxyType({**kwargs, "cache_key": cache_key})) + if request is None: + return None + if not self._is_semantic_cache(): + return await self._native_cache.async_lookup(request) + response, similarity = await self._native_cache.async_lookup_semantic(request) + self._stamp_semantic_similarity(kwargs, similarity) + return response if cache_key is not None: cache_control_args: Final = kwargs.get("cache", {}) max_age: Final = cache_control_args.get("s-max-age", cache_control_args.get("s-maxage", float("inf"))) @@ -676,6 +729,11 @@ class Cache: try: if self.should_use_cache(**kwargs) is not True: return + if self._native_cache is not None: + request = self._native_request(kwargs) + if request is not None: + self._native_cache.store(request, _native_response(result)) + return cache_key, cached_data, kwargs = self._add_cache_logic(result=result, **kwargs) self.cache.set_cache(cache_key, cached_data, **kwargs) except Exception as e: @@ -695,6 +753,11 @@ class Cache: try: if self.should_use_cache(**kwargs) is not True: return + if self._native_cache is not None: + request = self._native_request(kwargs) + if request is not None: + await self._native_cache.async_store(request, _native_response(result)) + return if self.type == "redis" and self.redis_flush_size is not None: # high traffic - fill in results in memory and then flush await self.batch_cache_write(result, **kwargs) @@ -718,35 +781,23 @@ class Cache: Convert any embedding response into the standardized CachedEmbedding TypedDict format. """ try: - if isinstance(embedding_response, dict): - return { - "embedding": embedding_response.get("embedding"), - "index": embedding_response.get("index"), - "object": embedding_response.get("object"), - "model": model, - "prompt_tokens": prompt_tokens, - "prompt_tokens_details": prompt_tokens_details, - } - elif hasattr(embedding_response, "model_dump"): - data = embedding_response.model_dump() - return { - "embedding": data.get("embedding"), - "index": data.get("index"), - "object": data.get("object"), - "model": model, - "prompt_tokens": prompt_tokens, - "prompt_tokens_details": prompt_tokens_details, - } - else: - data = vars(embedding_response) - return { - "embedding": data.get("embedding"), - "index": data.get("index"), - "object": data.get("object"), - "model": model, - "prompt_tokens": prompt_tokens, - "prompt_tokens_details": prompt_tokens_details, - } + data: Final = ( + embedding_response + if isinstance(embedding_response, dict) + else embedding_response.model_dump() + if hasattr(embedding_response, "model_dump") + else vars(embedding_response) + ) + cached: Final[CachedEmbedding] = { + "embedding": data.get("embedding"), + "index": data.get("index"), + "object": data.get("object"), + "model": model, + "prompt_tokens": prompt_tokens, + "prompt_tokens_details": prompt_tokens_details, + "format_version": EMBEDDING_CACHE_FORMAT_VERSION, + } + return cached except KeyError as e: raise ValueError(f"Missing expected key in embedding response: {e}") @@ -862,6 +913,15 @@ class Cache: if self.should_use_cache(**kwargs) is not True: return + input_count: Final = len(kwargs["input"]) if isinstance(kwargs["input"], list) else 1 + if len(result.data) != input_count: + verbose_logger.debug( + "LiteLLM Cache: skipping embedding cache write, %d inputs but %d embeddings in the response", + input_count, + len(result.data), + ) + return + # set default ttl if not set if self.ttl is not None: kwargs["ttl"] = self.ttl @@ -879,13 +939,35 @@ class Cache: cache_key, cached_data, kwargs = self.add_embedding_response_to_cache(result, kwargs["input"], kwargs) cache_list.append((cache_key, cached_data)) - if dynamic_cache_object is not None: + if self._native_cache is not None: + entries: Final = tuple( + (request, cached_data["response"]) + for cache_key, cached_data in cache_list + if (request := self._native_request(MappingProxyType({**kwargs, "cache_key": cache_key}))) + is not None + ) + await self._native_cache.async_store_batch( + tuple(request for request, _ in entries), + tuple(response for _, response in entries), + ) + elif dynamic_cache_object is not None: await dynamic_cache_object.async_set_cache_pipeline(cache_list=cache_list, **kwargs) else: await self.cache.async_set_cache_pipeline(cache_list=cache_list, **kwargs) except Exception as e: self._log_add_cache_failure(e) + def _native_request(self, kwargs: Mapping[str, object]) -> "NativeCacheRequest | None": + if self._native_cache is None: + return None + cache_key: Final = kwargs.get("cache_key") + return self._native_cache.request( + self, + kwargs + if isinstance(cache_key, str) + else MappingProxyType({**kwargs, "cache_key": self.get_cache_key(**kwargs)}), + ) + def should_use_cache(self, **kwargs): """ Returns true if we should use the cache for LLM API calls diff --git a/litellm/caching/caching_handler.py b/litellm/caching/caching_handler.py index 36c3b744a06..4afd0e7caaa 100644 --- a/litellm/caching/caching_handler.py +++ b/litellm/caching/caching_handler.py @@ -21,7 +21,7 @@ import time from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Generator, Mapping from typing import TYPE_CHECKING, Any, Final, Optional, TypeVar -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict, ValidationError import litellm from litellm._logging import print_verbose, verbose_logger @@ -34,7 +34,7 @@ from litellm.litellm_core_utils.llm_response_utils.response_metadata import ( from litellm.litellm_core_utils.logging_utils import ( _assemble_complete_response_from_streaming_chunks, ) -from litellm.types.caching import CachedEmbedding +from litellm.types.caching import EMBEDDING_CACHE_FORMAT_VERSION, CachedEmbedding from litellm.types.integrations.custom_logger import converted_stream_requested from litellm.types.llms.openai import ResponsesAPIResponse from litellm.types.rerank import RerankResponse @@ -77,6 +77,7 @@ class CachingHandlerResponse(BaseModel): cached_result: object | None = None final_embedding_cached_response: EmbeddingResponse | None = None embedding_all_elements_cache_hit: bool = False # this is set to True when all elements in the list have a cache hit in the embedding cache, if true return the final_embedding_cached_response no need to make an API call + embedding_uncached_input: list[str | list[int]] | None = None in_memory_cache_obj: Final = InMemoryCache() @@ -168,6 +169,37 @@ def _request_cache_key(request_kwargs: Mapping[str, Any]) -> str | None: return request_kwargs.get("cache_key", None) +class _CachedEmbeddingRecord(BaseModel): + model_config = ConfigDict(frozen=True) + + embedding: list[float] | str | None + index: int | None + object: str | None + model: str | None + prompt_tokens: int | None + prompt_tokens_details: dict | None + format_version: int + + +def _current_format_embedding_entry(entry: object) -> CachedEmbedding | None: + try: + record: Final = _CachedEmbeddingRecord.model_validate(entry) + except ValidationError: + return None + if record.format_version != EMBEDDING_CACHE_FORMAT_VERSION: + return None + cached: Final[CachedEmbedding] = { + "embedding": record.embedding, + "index": record.index, + "object": record.object, + "model": record.model, + "prompt_tokens": record.prompt_tokens, + "prompt_tokens_details": record.prompt_tokens_details, + "format_version": record.format_version, + } + return cached + + class LLMCachingHandler: def __init__( self, @@ -320,6 +352,7 @@ class LLMCachingHandler: return CachingHandlerResponse( final_embedding_cached_response=final_embedding_cached_response, embedding_all_elements_cache_hit=embedding_all_elements_cache_hit, + embedding_uncached_input=self.handle_kwargs_input_list_or_str(kwargs), ) verbose_logger.debug("CACHE RESULT: %s", cached_result) @@ -657,32 +690,30 @@ class LLMCachingHandler: if _caching_handler_response.final_embedding_cached_response is None: return embedding_response - idx = 0 - final_data_list: Final = [] - for item in _caching_handler_response.final_embedding_cached_response.data: - if item is None and embedding_response.data is not None: - final_data_list.append(embedding_response.data[idx]) - idx += 1 - else: - final_data_list.append(item) - - _caching_handler_response.final_embedding_cached_response.data = final_data_list - _caching_handler_response.final_embedding_cached_response._hidden_params["cache_hit"] = True - _caching_handler_response.final_embedding_cached_response._response_ms = ( - end_time - start_time - ).total_seconds() * 1000 - - ## USAGE - if ( - _caching_handler_response.final_embedding_cached_response.usage is not None - and embedding_response.usage is not None - ): - _caching_handler_response.final_embedding_cached_response.usage = self.combine_usage( - usage1=_caching_handler_response.final_embedding_cached_response.usage, - usage2=embedding_response.usage, - ) - - return _caching_handler_response.final_embedding_cached_response + cached: Final = _caching_handler_response.final_embedding_cached_response + fresh_items: Final = iter(embedding_response.data or ()) + merged_usage: Final = ( + self.combine_usage(usage1=cached.usage, usage2=embedding_response.usage) + if cached.usage is not None and embedding_response.usage is not None + else cached.usage + ) + merged: Final = EmbeddingResponse( + model=cached.model, + data=[ # mutable-ok: EmbeddingResponse.data is a pydantic list field + item + if item is not None + else Embedding(embedding=next(fresh_items)["embedding"], index=position, object="embedding") + for position, item in enumerate(cached.data) + ], + usage=merged_usage, + hidden_params={ # mutable-ok: EmbeddingResponse._hidden_params is a mutable dict field + **cached._hidden_params, + "cache_hit": True, + }, + _response_headers=cached._response_headers, + ) + merged._response_ms = (end_time - start_time).total_seconds() * 1000 + return merged def _async_log_cache_hit_on_callbacks( self, @@ -770,7 +801,7 @@ class LLMCachingHandler: dynamic_cache_object=self.dual_cache, ) ) - cached_result = await asyncio.gather(*tasks) + cached_result = [_current_format_embedding_entry(entry) for entry in await asyncio.gather(*tasks)] ## check if cached result is None ## if cached_result is not None and isinstance(cached_result, list): # set cached_result to None if all elements are None diff --git a/litellm/constants.py b/litellm/constants.py index 1012ca831f2..e5b662bd515 100644 --- a/litellm/constants.py +++ b/litellm/constants.py @@ -238,6 +238,9 @@ LOGS_GUARDRAIL_INFORMATION_MARKER: Final = "_litellm_logs_guardrail_information" # llm_provider stamped on proxy-side rate limit errors when the model resolves to no deployment PROXY_LLM_PROVIDER_FALLBACK: Final = "litellm_proxy" +# litellm_params flag on failure logs for requests the proxy rejected before routing to a deployment +PROXY_REJECTED_BEFORE_ROUTING_KEY: Final = "proxy_rejected_before_routing" + # Generic fallback for unknown models DEFAULT_REASONING_EFFORT_MINIMAL_THINKING_BUDGET: Final = int( os.getenv("DEFAULT_REASONING_EFFORT_MINIMAL_THINKING_BUDGET", 128) diff --git a/litellm/cost_calculator.py b/litellm/cost_calculator.py index ae54b91c5a0..7990832dc48 100644 --- a/litellm/cost_calculator.py +++ b/litellm/cost_calculator.py @@ -1532,6 +1532,7 @@ def completion_cost( size=size, optional_params=optional_params, call_type=call_type, + model_info=_deployment_model_info(litellm_logging_obj, custom_pricing, router_model_id), ) elif call_type in _VIDEO_CALL_TYPES: ### VIDEO GENERATION COST CALCULATION ### @@ -2011,13 +2012,9 @@ def _deployment_model_info( ) -> ModelInfo | None: if not custom_pricing: return None - registered_deployment_info: Final = ( - _cost_map_model_info(router_model_id, None) - if router_model_id is not None and router_model_id in litellm.model_cost - else None - ) + registered_deployment_info: Final = _raw_cost_map_entry(router_model_id) if router_model_id is not None else None if registered_deployment_info is not None: - return registered_deployment_info + return cast(ModelInfo, registered_deployment_info) # cast-ok: router registers deployment prices under its id if litellm_logging_obj is None: return None litellm_params: Final = getattr(litellm_logging_obj, "litellm_params", None) @@ -2085,8 +2082,7 @@ def pricing_entry_for_cost_calc( deployment_entry: Final = _deployment_model_info(litellm_logging_obj, custom_pricing, router_model_id) deployment_key: Final = router_model_id or model if deployment_entry is not None and deployment_key is not None: - registered_entry: Final = _raw_cost_map_entry(router_model_id) if router_model_id is not None else None - return deployment_key, registered_entry or deployment_entry + return deployment_key, deployment_entry selected_model: Final = _select_model_name_for_cost_calc( model=model, completion_response=completion_response, @@ -2346,6 +2342,7 @@ def default_image_cost_calculator( n: int | None = 1, # Default to 1 image size: str | None = "1024-x-1024", # OpenAI default optional_params: dict | None = None, + model_info: ModelInfo | None = None, ) -> float: """ Default image cost calculator for image generation @@ -2356,6 +2353,7 @@ def default_image_cost_calculator( quality (Optional[str]): Image quality setting n (Optional[int]): Number of images generated size (Optional[str]): Image size (e.g. "1024x1024" or "1024-x-1024") + model_info (Optional[ModelInfo]): The deployment's own prices, consulted before the cost map Returns: float: Cost in USD for the image generation @@ -2377,6 +2375,11 @@ def default_image_cost_calculator( model_name_without_custom_llm_provider = model.replace(f"{custom_llm_provider}/", "") base_model_name = f"{custom_llm_provider}/{size_str}/{model_name_without_custom_llm_provider}" model_name_with_quality: Final = f"{quality}/{base_model_name}" if quality else base_model_name + provider_first_model_name_with_quality: Final = ( + f"{custom_llm_provider}/{quality}/{size_str}/{model_name_without_custom_llm_provider or model}" + if quality and custom_llm_provider + else None + ) # gpt-image-1 models use low, medium, high quality. If user did not specify quality, use medium fot gpt-image-1 model family model_name_with_v2_quality: Final = f"{ImageGenerationRequestQuality.HIGH.value}/{base_model_name}" @@ -2386,32 +2389,42 @@ def default_image_cost_calculator( model_without_provider: Final = f"{size_str}/{model.split('/')[-1]}" model_with_quality_without_provider = f"{quality}/{model_without_provider}" if quality else model_without_provider - # Try model with quality first, fall back to base model name - cost_info: dict | None = None - models_to_check: Final[list[str | None]] = [ + models_to_check: Final = ( model_name_with_quality, + provider_first_model_name_with_quality, base_model_name, model_name_with_v2_quality, model_with_quality_without_provider, model_without_provider, model, model_name_without_custom_llm_provider, - ] - for _model in models_to_check: - if _model is not None and _model in litellm.model_cost: - cost_info = litellm.model_cost[_model] - break - if cost_info is None: + ) + matched_model: Final = next( + (_model for _model in models_to_check if _model is not None and _model in litellm.model_cost), None + ) + if matched_model is None and model_info is None: raise Exception(f"Model not found in cost map. Tried checking {models_to_check}") - # Priority 1: Use per-image pricing if available (for gpt-image-1 and similar models) - if "input_cost_per_image" in cost_info and cost_info["input_cost_per_image"] is not None: - return cost_info["input_cost_per_image"] * n - # Priority 2: Fall back to per-pixel pricing for backward compatibility - elif "input_cost_per_pixel" in cost_info and cost_info["input_cost_per_pixel"] is not None: - return cost_info["input_cost_per_pixel"] * height * width * n - else: + shared_cost_info: Final = litellm.model_cost[matched_model] if matched_model is not None else None + price_tables: Final = tuple(table for table in (model_info, shared_cost_info) if table is not None) + image_count: Final = n if n is not None else 1 + unit_counts: Final = ( + ("input_cost_per_image", image_count), + ("output_cost_per_image", image_count), + ("input_cost_per_pixel", height * width * image_count), + ) + cost: Final = next( + ( + price * units + for price_table in price_tables + for cost_key, units in unit_counts + if (price := price_table.get(cost_key)) is not None + ), + None, + ) + if cost is None: raise Exception(f"No pricing information found for model {model}. Tried checking {models_to_check}") + return cost def default_video_cost_calculator( diff --git a/litellm/exceptions.py b/litellm/exceptions.py index c8de2ab12ed..3bae8a95ef6 100644 --- a/litellm/exceptions.py +++ b/litellm/exceptions.py @@ -991,6 +991,10 @@ LITELLM_EXCEPTION_TYPES: Final = [ ] +class ModelNotMappedError(Exception): + pass + + class BudgetExceededError(Exception): def __init__( self, diff --git a/litellm/experimental_mcp_client/client.py b/litellm/experimental_mcp_client/client.py index 49434befd4e..1ccae8de35f 100644 --- a/litellm/experimental_mcp_client/client.py +++ b/litellm/experimental_mcp_client/client.py @@ -7,11 +7,11 @@ import base64 import hashlib import json import os -from collections.abc import Awaitable, Callable, Generator, Sequence +from collections.abc import AsyncIterator, Awaitable, Callable, Generator, Sequence from contextlib import AbstractAsyncContextManager from functools import partial from types import MappingProxyType -from typing import Any, Final, TypeAlias, TypeVar +from typing import Final, TypeAlias, TypeVar, cast import anyio import httpx2 @@ -121,14 +121,14 @@ def _strip_header_whitespace(headers: dict[str, str]) -> dict[str, str]: } -def _first_non_cancelled_cause(exc: BaseException) -> BaseException | None: +def _first_non_cancelled_cause(exc: BaseException, cleanup_errors: tuple[Exception, ...] = ()) -> BaseException | None: queue: Final[list[BaseException]] = [exc] while queue: current = queue.pop(0) nested = getattr(current, "exceptions", None) if nested: queue.extend(nested) - elif not isinstance(current, asyncio.CancelledError): + elif not isinstance(current, asyncio.CancelledError) and not any(current is error for error in cleanup_errors): return current return None @@ -159,7 +159,59 @@ _ListPage = TypeVar("_ListPage", bound=PaginatedResult) _ListItem = TypeVar("_ListItem") +async def _run_bounded_cleanup(operation: Callable[[], Awaitable[TSessionResult]], deadline: float) -> TSessionResult: + async def run() -> TSessionResult: + with anyio.fail_after(max(0, deadline - anyio.current_time()), shield=True): + return await operation() + + # A cancelled asyncio.gather repeatedly forwards Task.cancel, bypassing AnyIO shields. + # Isolate only cleanup, and drain it before propagating the caller's cancellation. + task: Final = asyncio.create_task(run()) + interrupted: asyncio.CancelledError | None = None + with anyio.CancelScope(shield=True): + while not task.done(): + try: + await asyncio.shield(task) + except asyncio.CancelledError as exc: + interrupted = exc + except Exception: + break + if interrupted is not None: + if not task.cancelled(): + task.exception() + raise interrupted + return task.result() + + +class _MCPResponseStream(httpx2.AsyncByteStream): + def __init__(self, stream: httpx2.AsyncByteStream, record_error: Callable[[Exception], None]) -> None: + self._stream: Final = stream + self._record_error: Final = record_error + + async def __aiter__(self) -> AsyncIterator[bytes]: + try: + async for chunk in self._stream: + yield chunk + except Exception as error: + self._record_error(error) + raise + + async def aclose(self) -> None: + try: + await self._stream.aclose() + except Exception as error: + self._record_error(error) + raise + + class _MCPHTTPClient(httpx2.AsyncClient): + cleanup_scope: anyio.CancelScope | None = None + cleanup_errors: tuple[Exception, ...] = () + + def _record_cleanup_error(self, error: Exception) -> None: + if self.cleanup_scope is not None and self.cleanup_scope.shield: + self.cleanup_errors += (error,) + async def send( self, request: httpx2.Request, @@ -168,11 +220,29 @@ class _MCPHTTPClient(httpx2.AsyncClient): auth: AuthTypes | UseClientDefault | None = httpx2.USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault = httpx2.USE_CLIENT_DEFAULT, ) -> httpx2.Response: - response: Final = await super().send(request, stream=stream, auth=auth, follow_redirects=follow_redirects) - if request.method == "POST" and response.is_error and response.status_code != 404: - await response.aclose() - response.raise_for_status() - return response + if request.method == "DELETE" and self.cleanup_scope is not None: + + async def terminate() -> httpx2.Response: + termination: Final = await super(_MCPHTTPClient, self).send( + request, stream=stream, auth=auth, follow_redirects=follow_redirects + ) + await termination.aread() + return termination + + return await _run_bounded_cleanup(terminate, self.cleanup_scope.deadline) + try: + response: Final = await super().send(request, stream=stream, auth=auth, follow_redirects=follow_redirects) + if request.method == "POST" and response.is_error and response.status_code != 404: + await response.aclose() + response.raise_for_status() + if stream: + response.stream = _MCPResponseStream( + cast(httpx2.AsyncByteStream, response.stream), self._record_cleanup_error + ) + return response + except Exception as error: + self._record_cleanup_error(error) + raise class MCPSigV4Auth(httpx2.Auth): @@ -458,6 +528,7 @@ class MCPClient: self, transport_ctx: _TransportContext, operation: Callable[[ClientSession], Awaitable[TSessionResult]], + http_client: httpx2.AsyncClient | None = None, ) -> TSessionResult: """ Execute an operation within a transport and session context. @@ -466,69 +537,97 @@ class MCPClient: so that upstream MCP servers can request LLM inference (sampling), user input (elicitation), or send log messages. """ - transport: Final = await transport_ctx.__aenter__() in_flight_error: BaseException | None = None - try: - read_stream: Final = transport[0] - write_stream: Final = transport[1] - stream_error: Final[asyncio.Future[Exception]] = asyncio.get_running_loop().create_future() - - async def receive_message( - message: ServerNotification | Exception, - ) -> None: - if not isinstance(message, (ValueError, httpx2.HTTPError, OSError)): - return - if not stream_error.done(): - stream_error.set_result(message) - # The SDK closes pending requests when its message handler raises. - raise RuntimeError("MCP response stream failed") - - # Build session kwargs with optional callbacks - session_kwargs: Final[dict[str, Any]] = {} - if self._sampling_callback is not None: - session_kwargs["sampling_callback"] = self._sampling_callback - if self._elicitation_callback is not None: - session_kwargs["elicitation_callback"] = self._elicitation_callback - if self._logging_callback is not None: - session_kwargs["logging_callback"] = self._logging_callback - # The SDK drops a response stream that ends without a JSON-RPC reply, so nothing else - # ever fails the request. - session_ctx: Final = ClientSession( - read_stream, - write_stream, - read_timeout_seconds=self.timeout, - message_handler=receive_message, - **session_kwargs, - ) - session: Final = await session_ctx.__aenter__() + with anyio.CancelScope() as cleanup_scope: + if isinstance(http_client, _MCPHTTPClient): + http_client.cleanup_scope = cleanup_scope try: - init_result: Final = await session.initialize() - self._last_initialize_instructions = None - if init_result is not None: - ins: Final = getattr(init_result, "instructions", None) - if isinstance(ins, str) and ins.strip(): - self._last_initialize_instructions = ins.strip() - return await operation(session) - except MCPError: - if stream_error.done(): - raise stream_error.result() - raise - finally: + transport: Final = await transport_ctx.__aenter__() try: - await session_ctx.__aexit__(None, None, None) + read_stream: Final = transport[0] + write_stream: Final = transport[1] + stream_error: Final[asyncio.Future[Exception]] = asyncio.get_running_loop().create_future() + + async def receive_message( + message: ServerNotification | Exception, + ) -> None: + if not isinstance(message, (ValueError, httpx2.HTTPError, OSError)): + return + if not stream_error.done(): + stream_error.set_result(message) + # The SDK closes pending requests when its message handler raises. + raise RuntimeError("MCP response stream failed") + + session_kwargs: Final = { + name: callback + for name, callback in ( + ("sampling_callback", self._sampling_callback), + ("elicitation_callback", self._elicitation_callback), + ("logging_callback", self._logging_callback), + ) + if callback is not None + } + # The SDK drops a response stream that ends without a JSON-RPC reply, so nothing else + # ever fails the request. + session_ctx: Final = ClientSession( + read_stream, + write_stream, + read_timeout_seconds=self.timeout, + message_handler=receive_message, + **session_kwargs, + ) + session: Final = await session_ctx.__aenter__() + try: + init_result: Final = await session.initialize() + instructions: Final = getattr(init_result, "instructions", None) + self._last_initialize_instructions = ( + instructions.strip() or None if isinstance(instructions, str) else None + ) + result: Final = await operation(session) + except BaseException as operation_error: + in_flight_error = operation_error + if isinstance(operation_error, MCPError) and stream_error.done(): + raise stream_error.result() + raise + finally: + cleanup_scope.shield = True + cleanup_scope.deadline = anyio.current_time() + 5 + try: + await session_ctx.__aexit__(None, None, None) + except (Exception, asyncio.CancelledError) as e: + verbose_logger.debug("Error during session context exit: %s", e) + if in_flight_error is None and isinstance(e, asyncio.CancelledError): + raise except BaseException as e: - verbose_logger.debug("Error during session context exit: %s", e) - except BaseException as e: - in_flight_error = e - raise - finally: - try: - await transport_ctx.__aexit__(None, None, None) - except BaseException as exit_error: - verbose_logger.debug("Error during transport context exit: %s", exit_error) - root_cause: Final = _first_non_cancelled_cause(exit_error) - if root_cause is not None and isinstance(in_flight_error, asyncio.CancelledError): - raise root_cause from in_flight_error + in_flight_error = e + raise + finally: + cleanup_scope.shield = True + cleanup_scope.deadline = min(cleanup_scope.deadline, anyio.current_time() + 5) + try: + await transport_ctx.__aexit__(None, None, None) + except (Exception, asyncio.CancelledError) as exit_error: + verbose_logger.debug("Error during transport context exit: %s", exit_error) + if in_flight_error is None and isinstance(exit_error, asyncio.CancelledError): + raise + root_cause: Final = _first_non_cancelled_cause( + exit_error, http_client.cleanup_errors if isinstance(http_client, _MCPHTTPClient) else () + ) + if root_cause is not None and isinstance(in_flight_error, asyncio.CancelledError): + raise root_cause from in_flight_error + finally: + cleanup_scope.shield = False + if isinstance(http_client, _MCPHTTPClient): + http_client.cleanup_errors = () + http_client.cleanup_scope = None + await anyio.lowlevel.checkpoint_if_cancelled() + if cleanup_scope.cancel_called: + raise ( + in_flight_error + if in_flight_error is not None + else asyncio.CancelledError("MCP session cleanup timed out") + ) + return result async def run_with_session( self, @@ -542,10 +641,11 @@ class MCPClient: (call_tool / list_tools under raise_on_error), so an expected pass-through re-auth does not emit a warning per call; every other caller keeps the operator-visible warning.""" http_client: httpx2.AsyncClient | None = None + close_cancellation: asyncio.CancelledError | None = None try: self._last_initialize_instructions = None transport_ctx, http_client = self._create_transport_context() - return await self._execute_session_operation(transport_ctx, operation) + result: Final = await self._execute_session_operation(transport_ctx, operation, http_client=http_client) except Exception as e: read_timeout: Final = as_mcp_read_timeout(e) if read_timeout is not None: @@ -561,9 +661,16 @@ class MCPClient: finally: if http_client is not None: try: - await http_client.aclose() - except BaseException as e: + await _run_bounded_cleanup(http_client.aclose, anyio.current_time() + 1) + except (Exception, asyncio.CancelledError) as e: verbose_logger.debug("Error during http_client cleanup: %s", e) + if isinstance(e, asyncio.CancelledError): + close_cancellation = e + + if close_cancellation is not None: + raise close_cancellation + await anyio.lowlevel.checkpoint_if_cancelled() + return result def update_auth_value(self, mcp_auth_value: str | dict[str, str]) -> None: """ diff --git a/litellm/integrations/custom_logger.py b/litellm/integrations/custom_logger.py index 5b5261fab6b..326abd5c6a3 100644 --- a/litellm/integrations/custom_logger.py +++ b/litellm/integrations/custom_logger.py @@ -574,11 +574,10 @@ class CustomLogger: # https://docs.litellm.ai/docs/observability/custom_callbac Useful if you want to modify the standard logging payload after the MCP tool call is made. - To change what the caller sends back to the MCP client, mutate ``response_obj`` - in place: every call site discards the returned object, because the - dispatcher unwraps it to ``mcp_tool_call_response`` (a raw content list, not - a ``CallToolResult``) which the tool-call paths cannot forward. Guardrails - that mask or reject tool output should use ``post_mcp_call`` instead. + Modify ``mcp_tool_call_response`` in place or return a replacement response + object to change what the caller sends back to the MCP client. Content rewrites + discard stale structured output and mark those results as tool errors. + Use ``post_mcp_call`` guardrails for schema-preserving structured redaction. """ return None diff --git a/litellm/integrations/langsmith.py b/litellm/integrations/langsmith.py index 352fcdf90f3..991b0411ee8 100644 --- a/litellm/integrations/langsmith.py +++ b/litellm/integrations/langsmith.py @@ -1,6 +1,7 @@ #### What this does #### # On success, logs events to Langsmith import asyncio +import json import os import random import traceback @@ -415,7 +416,7 @@ class LangsmithLogger(CustomBatchLogger): langsmith_api_key: Final = credentials["LANGSMITH_API_KEY"] langsmith_tenant_id: Final = credentials.get("LANGSMITH_TENANT_ID") url: Final = self._add_endpoint_to_url(langsmith_api_base, "runs/batch") - headers: Final = {"x-api-key": langsmith_api_key} + headers: Final = {"x-api-key": langsmith_api_key, "Content-Type": "application/json"} if langsmith_tenant_id: headers["x-tenant-id"] = langsmith_tenant_id elements_to_log: Final = [queue_object["data"] for queue_object in queue_objects] @@ -426,7 +427,7 @@ class LangsmithLogger(CustomBatchLogger): verbose_logger.debug("[LANGSMITH MOCK] Mock mode enabled - API calls will be intercepted") response: Final = await self.async_httpx_client.post( url=url, - json={"post": elements_to_log}, + content=json.dumps({"post": elements_to_log}, default=str, allow_nan=False), headers=headers, ) response.raise_for_status() diff --git a/litellm/integrations/opentelemetry.py b/litellm/integrations/opentelemetry.py index feaeaec27a3..749f0ce4fcb 100644 --- a/litellm/integrations/opentelemetry.py +++ b/litellm/integrations/opentelemetry.py @@ -26,6 +26,7 @@ from litellm.integrations.otel.model.baggage import promoted_metadata from litellm.integrations.otel.model.db_endpoint import db_span_attributes from litellm.integrations.otel.model.metadata import flatten_metadata from litellm.integrations.otel.model.semconv import Metric +from litellm.integrations.otel.plumbing.otlp_tls import resolve_otlp_http_tls from litellm.litellm_core_utils.internal_call_metadata import is_unbilled_non_inference_call_from_params from litellm.litellm_core_utils.safe_json_dumps import safe_dumps from litellm.litellm_core_utils.secret_redaction import redact_string @@ -99,6 +100,7 @@ _MAX_DYNAMIC_TRACER_PROVIDERS: Final = 256 # Dedicated so a slow exporter shutdown cannot starve the shared logging executor. _PROVIDER_SHUTDOWN_EXECUTOR: Final = ThreadPoolExecutor(max_workers=4, thread_name_prefix="OtelProviderShutdown") + LITELLM_TRACER_NAME: Final = os.getenv("OTEL_TRACER_NAME", "litellm") LITELLM_METER_NAME: Final = os.getenv("LITELLM_METER_NAME", "litellm") LITELLM_LOGGER_NAME: Final = os.getenv("LITELLM_LOGGER_NAME", "litellm") @@ -3090,8 +3092,14 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger): otel_exporter, ) normalized_endpoint = self._normalize_otel_endpoint(otel_endpoint, "traces") + tls: Final = resolve_otlp_http_tls("TRACES") return BatchSpanProcessor( - OTLPSpanExporterHTTP(endpoint=normalized_endpoint, headers=_split_otel_headers), + OTLPSpanExporterHTTP( + endpoint=normalized_endpoint, + headers=_split_otel_headers, + certificate_file=tls.certificate_file, + session=tls.session, + ), ) elif otel_exporter == "otlp_grpc" or otel_exporter == "grpc": try: @@ -3172,7 +3180,13 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger): self.OTEL_EXPORTER, normalized_endpoint, ) - return OTLPLogExporter(endpoint=normalized_endpoint, headers=_split_otel_headers) + tls: Final = resolve_otlp_http_tls("LOGS") + return OTLPLogExporter( + endpoint=normalized_endpoint, + headers=_split_otel_headers, + certificate_file=tls.certificate_file, + session=tls.session, + ) elif self.OTEL_EXPORTER == "otlp_grpc" or self.OTEL_EXPORTER == "grpc": try: from opentelemetry.exporter.otlp.proto.grpc._log_exporter import ( @@ -3235,9 +3249,12 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger): OTLPMetricExporter, ) + tls: Final = resolve_otlp_http_tls("METRICS") exporter = OTLPMetricExporter( endpoint=normalized_endpoint, headers=_split_otel_headers, + certificate_file=tls.certificate_file, + session=tls.session, ) return PeriodicExportingMetricReader(exporter, export_interval_millis=5000) diff --git a/litellm/integrations/otel/logger.py b/litellm/integrations/otel/logger.py index 6b673967427..20cdf9662e1 100644 --- a/litellm/integrations/otel/logger.py +++ b/litellm/integrations/otel/logger.py @@ -240,7 +240,7 @@ class OpenTelemetryV2(CustomLogger): provider: Final = resolve_logger_provider(self.config, logger_provider) if provider is None: return None - return GenAIEventRecorder(get_event_logger(provider, LITELLM_TRACER_NAME)) + return GenAIEventRecorder(get_event_logger(provider, LITELLM_TRACER_NAME), provider.resource) # ====================================================================== # # Proxy global registration diff --git a/litellm/integrations/otel/model/payloads.py b/litellm/integrations/otel/model/payloads.py index 240107251c5..2f337c59148 100644 --- a/litellm/integrations/otel/model/payloads.py +++ b/litellm/integrations/otel/model/payloads.py @@ -776,9 +776,15 @@ def _joined_choice(parts: tuple[str, ...]) -> tuple[_Choice, ...]: return (_text_choice("\n\n".join(parts)),) if parts else () +def _text_completion_choice(choice: Mapping[str, object], text: str) -> Mapping[str, object]: + synthesized: Final = _text_choice(text, as_str(choice.get("finish_reason"))) + merged: Final = (*choice.items(), *synthesized.items()) + return {k: v for k, v in merged if k != "text"} # mutable-ok: mappers json.dumps and isinstance(dict) it + + def _completion_choices(response: Mapping[str, object]) -> tuple[Mapping[str, object], ...]: return tuple( - _text_choice(text, as_str(choice.get("finish_reason"))) + _text_completion_choice(choice, text) if "message" not in choice and isinstance(text := choice.get("text"), str) else choice for choice in _dicts(response.get("choices")) diff --git a/litellm/integrations/otel/model/semconv.py b/litellm/integrations/otel/model/semconv.py index d3628005bac..f552ba37655 100644 --- a/litellm/integrations/otel/model/semconv.py +++ b/litellm/integrations/otel/model/semconv.py @@ -245,6 +245,7 @@ class GenAIEvent: details, unlike the deprecated ``error.message`` span attribute. """ + NAME_KEY: Final = "event.name" OPERATION_EXCEPTION: Final = "gen_ai.client.operation.exception" diff --git a/litellm/integrations/otel/plumbing/events.py b/litellm/integrations/otel/plumbing/events.py index e7b8e22ddcd..e95d31f886f 100644 --- a/litellm/integrations/otel/plumbing/events.py +++ b/litellm/integrations/otel/plumbing/events.py @@ -9,18 +9,28 @@ emitting that event; the exporter pipeline it rides is built in """ from dataclasses import dataclass +from time import time_ns from typing import Final -from opentelemetry._events import Event, EventLogger +from opentelemetry._logs import Logger, LogRecord from opentelemetry._logs.severity import SeverityNumber +from opentelemetry.sdk.resources import Resource from opentelemetry.trace import SpanContext from litellm.integrations.otel.model.semconv import ExceptionEvent, GenAIEvent +try: + from opentelemetry.sdk._logs import LogRecord as _SDKLogRecord +except ImportError: + _SDKLogRecord = None + +SDK_LOG_RECORD: Final[type[LogRecord] | None] = _SDKLogRecord + @dataclass(frozen=True, slots=True) class GenAIEventRecorder: - event_logger: EventLogger + event_logger: Logger + resource: Resource | None = None def record_operation_exception( self, @@ -30,24 +40,36 @@ class GenAIEventRecorder: stack_trace: str | None, timestamp_ns: int | None, ) -> None: - # ``exception.type`` and ``exception.message`` are the semconv-required - # pair and always ride the event; only the recommended stacktrace is - # conditional on the payload carrying one. stacktrace: Final = ((ExceptionEvent.STACKTRACE, stack_trace),) if stack_trace else () - self.event_logger.emit( - Event( - name=GenAIEvent.OPERATION_EXCEPTION, - timestamp=timestamp_ns, + attributes: Final = dict( + ( + (GenAIEvent.NAME_KEY, GenAIEvent.OPERATION_EXCEPTION), + (ExceptionEvent.TYPE, error_type), + (ExceptionEvent.MESSAGE, message), + *stacktrace, + ) + ) + record: Final[LogRecord] = ( + SDK_LOG_RECORD( + timestamp=timestamp_ns or time_ns(), trace_id=span_context.trace_id, span_id=span_context.span_id, trace_flags=span_context.trace_flags, severity_number=SeverityNumber.WARN, - attributes=dict( - ( - (ExceptionEvent.TYPE, error_type), - (ExceptionEvent.MESSAGE, message), - *stacktrace, - ) - ), + body=message, + attributes=attributes, + resource=self.resource, # pyright: ignore[reportCallIssue] # SDK-only kwarg absent from the API LogRecord signature on the pin + ) + if SDK_LOG_RECORD is not None + else LogRecord( + timestamp=timestamp_ns or time_ns(), + trace_id=span_context.trace_id, + span_id=span_context.span_id, + trace_flags=span_context.trace_flags, + severity_number=SeverityNumber.WARN, + body=message, + attributes=attributes, + event_name=GenAIEvent.OPERATION_EXCEPTION, # pyright: ignore[reportCallIssue] # kwarg exists only on OTel 1.38+, absent from the pinned API signature ) ) + self.event_logger.emit(record) diff --git a/litellm/integrations/otel/plumbing/otlp_json.py b/litellm/integrations/otel/plumbing/otlp_json.py index b4b659f1e01..bc6d7d435b0 100644 --- a/litellm/integrations/otel/plumbing/otlp_json.py +++ b/litellm/integrations/otel/plumbing/otlp_json.py @@ -10,6 +10,7 @@ from collections.abc import Mapping, Sequence from types import MappingProxyType from typing import Final, TypeAlias +import requests from google.protobuf.json_format import MessageToDict from opentelemetry.exporter.otlp.proto.common.trace_encoder import encode_spans from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter @@ -62,8 +63,14 @@ def encode_spans_json(spans: Sequence[ReadableSpan]) -> bytes: class OTLPJsonSpanExporter(OTLPSpanExporter): - def __init__(self, endpoint: str | None, headers: dict[str, str]) -> None: # mutable-ok: SDK __init__ takes Dict - super().__init__(endpoint=endpoint, headers=headers) + def __init__( + self, + endpoint: str | None, + headers: dict[str, str], # mutable-ok: SDK __init__ takes Dict + certificate_file: str | None = None, + session: "requests.Session | None" = None, + ) -> None: + super().__init__(endpoint=endpoint, headers=headers, certificate_file=certificate_file, session=session) self._session.headers["Content-Type"] = JSON_CONTENT_TYPE def _serialize_spans(self, spans: Sequence[ReadableSpan]) -> bytes: diff --git a/litellm/integrations/otel/plumbing/otlp_tls.py b/litellm/integrations/otel/plumbing/otlp_tls.py new file mode 100644 index 00000000000..9de97e0c77a --- /dev/null +++ b/litellm/integrations/otel/plumbing/otlp_tls.py @@ -0,0 +1,41 @@ +import os +from dataclasses import dataclass +from typing import Final, Literal + +import requests +from requests.adapters import HTTPAdapter + + +@dataclass(frozen=True, slots=True) +class OtlpHttpTls: + certificate_file: str | None + session: requests.Session | None + + +class _NoVerifyAdapter(HTTPAdapter): + def cert_verify( + self, + conn: object, + url: str, + verify: bool | str, + cert: str | tuple[str, str] | None, + ) -> None: + super().cert_verify( # pyright: ignore[reportUnknownMemberType] # requests stubs omit HTTPAdapter.cert_verify + conn, url, False, cert + ) + + +def resolve_otlp_http_tls(signal: Literal["TRACES", "METRICS", "LOGS"]) -> OtlpHttpTls: + if os.getenv(f"OTEL_EXPORTER_OTLP_{signal}_CERTIFICATE") or os.getenv("OTEL_EXPORTER_OTLP_CERTIFICATE"): + return OtlpHttpTls(certificate_file=None, session=None) + + from litellm.llms.custom_httpx.http_handler import get_ssl_verify + + verify: Final = get_ssl_verify() + if verify is False: + session: Final = requests.Session() + session.mount("https://", _NoVerifyAdapter()) + return OtlpHttpTls(certificate_file=None, session=session) + if isinstance(verify, str): + return OtlpHttpTls(certificate_file=verify, session=None) + return OtlpHttpTls(certificate_file=None, session=None) diff --git a/litellm/integrations/otel/plumbing/providers.py b/litellm/integrations/otel/plumbing/providers.py index 2c4375ce5f7..e3474edaf14 100644 --- a/litellm/integrations/otel/plumbing/providers.py +++ b/litellm/integrations/otel/plumbing/providers.py @@ -9,11 +9,9 @@ from types import MappingProxyType from typing import TYPE_CHECKING, Any, Final, Literal from opentelemetry import _logs, baggage, metrics, trace -from opentelemetry._events import EventLogger -from opentelemetry._logs import LoggerProvider, NoOpLoggerProvider +from opentelemetry._logs import Logger, LoggerProvider, NoOpLoggerProvider from opentelemetry.context import Context from opentelemetry.metrics import MeterProvider, NoOpMeterProvider -from opentelemetry.sdk._events import EventLoggerProvider from opentelemetry.sdk._logs import LoggerProvider as SDKLoggerProvider from opentelemetry.sdk._logs.export import ( BatchLogRecordProcessor, @@ -58,6 +56,7 @@ from litellm.integrations.otel.plumbing.context import ( request_destinations, suppressed_backends, ) +from litellm.integrations.otel.plumbing.otlp_tls import resolve_otlp_http_tls if TYPE_CHECKING: from opentelemetry.metrics import Meter @@ -193,18 +192,24 @@ def _exporter_from_spec(spec: ExporterSpec) -> SpanExporter: if kind in _OTLP_HTTP_JSON_KINDS: from litellm.integrations.otel.plumbing.otlp_json import OTLPJsonSpanExporter + tls: Final = resolve_otlp_http_tls("TRACES") return OTLPJsonSpanExporter( endpoint=spec.traces_endpoint or _otlp_traces_endpoint(spec.endpoint), headers=parse_headers(spec.headers), + certificate_file=tls.certificate_file, + session=tls.session, ) if kind in _OTLP_HTTP_KINDS: from opentelemetry.exporter.otlp.proto.http.trace_exporter import ( OTLPSpanExporter as HTTPExporter, ) + http_tls: Final = resolve_otlp_http_tls("TRACES") return HTTPExporter( endpoint=spec.traces_endpoint or _otlp_traces_endpoint(spec.endpoint), headers=parse_headers(spec.headers), + certificate_file=http_tls.certificate_file, + session=http_tls.session, ) if kind in _OTLP_GRPC_KINDS: from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import ( @@ -902,9 +907,12 @@ def build_metric_reader(config: OpenTelemetryV2Config) -> "MetricReader": OTLPMetricExporter as HTTPMetricExporter, ) + tls: Final = resolve_otlp_http_tls("METRICS") exporter: Any = HTTPMetricExporter( endpoint=_otlp_metrics_endpoint(config.endpoint), headers=parse_headers(config.headers), + certificate_file=tls.certificate_file, + session=tls.session, ) elif kind in ("otlp_grpc", "grpc"): try: @@ -962,9 +970,12 @@ def build_log_exporter(config: OpenTelemetryV2Config) -> LogExporter: OTLPLogExporter as HTTPLogExporter, ) + tls: Final = resolve_otlp_http_tls("LOGS") return HTTPLogExporter( endpoint=_otlp_logs_endpoint(config.endpoint), headers=parse_headers(config.headers), + certificate_file=tls.certificate_file, + session=tls.session, ) if kind in ("otlp_grpc", "grpc"): try: @@ -1029,8 +1040,8 @@ def resolve_logger_provider( return provider -def get_event_logger(provider: SDKLoggerProvider, name: str = "litellm") -> EventLogger: - return EventLoggerProvider(logger_provider=provider).get_event_logger(name, litellm_version) +def get_event_logger(provider: SDKLoggerProvider, name: str = "litellm") -> Logger: + return provider.get_logger(name, litellm_version) def build_meter_provider( diff --git a/litellm/integrations/prometheus.py b/litellm/integrations/prometheus.py index 28ac9f5cdae..d62a6c3427a 100644 --- a/litellm/integrations/prometheus.py +++ b/litellm/integrations/prometheus.py @@ -18,7 +18,7 @@ from typing_extensions import ReadOnly, TypedDict import litellm from litellm._logging import print_verbose, verbose_logger -from litellm.constants import PROXY_LLM_PROVIDER_FALLBACK +from litellm.constants import PROXY_LLM_PROVIDER_FALLBACK, PROXY_REJECTED_BEFORE_ROUTING_KEY from litellm.exceptions import ( validate_rate_limit_category, validate_rate_limit_type, @@ -214,17 +214,22 @@ def _get_proxy_llm_router() -> Router | None: return llm_router -def _bounded_requested_model_label(requested_model: str | None, router_originated: bool = False) -> str | None: +def _bounded_requested_model_label(requested_model: object, router_originated: bool = False) -> str | None: """ Bound ``requested_model`` label cardinality: names the router recognizes (model names, deployment ids, aliases, routing groups, team public model names) or matches via a global or team wildcard/pattern route keep their own label value; any other client-supplied string collapses into the - single ``other`` bucket. With no proxy router to vouch for the string, - client-supplied values collapse to ``other`` while ``router_originated`` - values (emitted by an SDK ``Router``'s own deployment failure and - fallback events, where the proxy router never exists) pass through. + single ``other`` bucket, as does any non-string request ``model`` value. + With no proxy router to vouch for the string, client-supplied values + collapse to ``other`` while ``router_originated`` values (emitted by an + SDK ``Router``'s own deployment failure and fallback events, where the + proxy router never exists) pass through. """ + if requested_model is None: + return None + if not isinstance(requested_model, str): + return UNRECOGNIZED_REQUESTED_MODEL_LABEL if not requested_model: return requested_model llm_router: Final = _get_proxy_llm_router() @@ -2832,7 +2837,7 @@ class PrometheusLogger(CustomLogger): # On LiteLLM-side rejects (no deployment picked), route request_kwargs["model"] # into requested_model and leave deployment-scoped labels empty. - deployment_selected: Final = bool(model_id) + deployment_selected: Final = bool(model_id) and not _litellm_params.get(PROXY_REJECTED_BEFORE_ROUTING_KEY) if deployment_selected: label_litellm_model_name = litellm_model_name label_model_id = model_id diff --git a/litellm/integrations/s3.py b/litellm/integrations/s3.py index 796784fb993..54ec876fd0d 100644 --- a/litellm/integrations/s3.py +++ b/litellm/integrations/s3.py @@ -277,7 +277,7 @@ def get_s3_object_key( start_time: datetime, s3_file_name: str, ) -> str: - sanitized_s3_file_name: Final = s3_file_name.replace("/", "_") + sanitized_s3_file_name: Final = s3_file_name.replace("/", "_").replace(":", "_") configured_prefix: Final = (s3_path.rstrip("/") + "/" if s3_path else "") + prefix date_segment: Final = start_time.strftime("%Y-%m-%d") + "/" # we need the s3 key to include the time, so we log cache hits too diff --git a/litellm/integrations/websearch_interception/handler.py b/litellm/integrations/websearch_interception/handler.py index 6a4c67c7db1..54578323fa4 100644 --- a/litellm/integrations/websearch_interception/handler.py +++ b/litellm/integrations/websearch_interception/handler.py @@ -10,6 +10,8 @@ import asyncio import math import uuid from collections.abc import AsyncIterator, Mapping, Sequence +from dataclasses import dataclass +from types import MappingProxyType from typing import TYPE_CHECKING, Any, Final, Literal, TypedDict, TypeVar, cast from typing_extensions import Never, ReadOnly @@ -196,6 +198,46 @@ class _AcompletionNamedParams(TypedDict, total=False): _NO_ACREATE_NAMED: Final[_AcreateNamedParams] = {} _NO_ASEARCH_NAMED: Final[_AsearchNamedParams] = {} + + +def _as_str_mapping(value: object) -> Mapping[str, object] | None: + return value if isinstance(value, Mapping) else None # pyright: ignore[reportUnknownVariableType] # str-keyed request metadata is not narrowable from object + + +@dataclass(frozen=True, slots=True) +class _ParentRequestCorrelation: + """Correlation ids of the LLM request that triggered an intercepted search, so the search's + own spend log row and traces land under the same session/trace instead of a fresh one.""" + + session_id: str | None + trace_id: str | None + parent_request_id: str | None + parent_otel_span: object | None + + def as_search_metadata(self) -> Mapping[str, object]: + return MappingProxyType( + { + key: value + for key, value in ( + ("session_id", self.session_id), + ("trace_id", self.trace_id), + ("parent_request_id", self.parent_request_id), + ("litellm_parent_otel_span", self.parent_otel_span), + ) + if value is not None + } + ) + + def as_search_kwargs(self) -> Mapping[str, str]: + return MappingProxyType( + { + key: value + for key, value in (("litellm_session_id", self.session_id), ("litellm_trace_id", self.trace_id)) + if value is not None + } + ) + + _NO_ACOMPLETION_NAMED: Final[_AcompletionNamedParams] = {} @@ -1527,15 +1569,17 @@ class WebSearchInterceptionLogger(CustomLogger): "WebSearchInterception: Executing search for '%s' using provider '%s'", query, search_provider ) user_api_key_auth: Final = self._get_user_api_key_auth_from_kwargs(kwargs) + parent_correlation: Final = self._get_parent_request_correlation(kwargs, user_api_key_auth) search_metadata: Final = ( None if user_api_key_auth is None else self._build_search_request_metadata( user_api_key_auth=user_api_key_auth, search_tool_name=search_tool_name, + parent_correlation=parent_correlation, ) ) - search_kwargs: Final = { + configured_search_kwargs: Final = { key: value for key, value in search_litellm_params.items() if key != "search_provider" and value is not None @@ -1549,8 +1593,11 @@ class WebSearchInterceptionLogger(CustomLogger): if rich_queries: query_arg = rich_queries rich_objective = rich.get("objective") - if rich_objective and "objective" not in search_kwargs: - search_kwargs["objective"] = rich_objective + if rich_objective and "objective" not in configured_search_kwargs: + configured_search_kwargs["objective"] = rich_objective + search_kwargs: Final = MappingProxyType( + {**configured_search_kwargs, **parent_correlation.as_search_kwargs()} + ) result: Final = ( await litellm.asearch( query=query_arg, search_provider=search_provider, **_NO_ASEARCH_NAMED, **search_kwargs @@ -1624,6 +1671,7 @@ class WebSearchInterceptionLogger(CustomLogger): def _build_search_request_metadata( user_api_key_auth: "UserAPIKeyAuth", search_tool_name: str | None, + parent_correlation: _ParentRequestCorrelation, ) -> Mapping[str, object]: """ Spend-tracking metadata for the intercepted search, so its provider cost is logged @@ -1637,11 +1685,50 @@ class WebSearchInterceptionLogger(CustomLogger): ) return { # mutable-ok: litellm's metadata channel is a plain dict its logging path reads and enriches **user_api_key_metadata, + **parent_correlation.as_search_metadata(), "model_group": search_tool_name, "user_api_key": user_api_key_auth.api_key, "user_api_key_auth": user_api_key_auth, } + @staticmethod + def _get_parent_request_correlation( + kwargs: Mapping[str, object] | None, + user_api_key_auth: "UserAPIKeyAuth | None", + ) -> _ParentRequestCorrelation: + """Read the originating request's ids from the hook kwargs, which are either the raw call + kwargs (metadata/litellm_metadata at top level) or a logging payload (under litellm_params).""" + if not kwargs: + return _ParentRequestCorrelation(None, None, None, None) + litellm_params: Final = _as_str_mapping(kwargs.get("litellm_params")) + scopes: Final[tuple[Mapping[str, object], ...]] = ( + (kwargs,) if litellm_params is None else (kwargs, litellm_params) + ) + metadatas: Final[tuple[Mapping[str, object], ...]] = tuple( + metadata + for scope in scopes + for metadata_key in ("metadata", "litellm_metadata") + if (metadata := _as_str_mapping(scope.get(metadata_key))) is not None + ) + + def first_str(scope_key: str | None, metadata_key: str | None) -> str | None: + candidates: Final[tuple[object, ...]] = ( + *(scope.get(scope_key) for scope in scopes if scope_key is not None), + *(metadata.get(metadata_key) for metadata in metadatas if metadata_key is not None), + ) + return next((value for value in candidates if isinstance(value, str) and value), None) + + parent_otel_span: Final[object | None] = next( + (span for metadata in metadatas if (span := metadata.get("litellm_parent_otel_span")) is not None), + None if user_api_key_auth is None else user_api_key_auth.parent_otel_span, + ) + return _ParentRequestCorrelation( + session_id=first_str("litellm_session_id", "session_id"), + trace_id=first_str("litellm_trace_id", "trace_id"), + parent_request_id=first_str("litellm_call_id", None), + parent_otel_span=parent_otel_span, + ) + @staticmethod def _selected_search_tool_name(search_tool: Mapping[str, object] | None) -> str | None: if search_tool is None: diff --git a/litellm/litellm_core_utils/bug_report.py b/litellm/litellm_core_utils/bug_report.py index 4a8f4bc65ad..25fddd6a10e 100644 --- a/litellm/litellm_core_utils/bug_report.py +++ b/litellm/litellm_core_utils/bug_report.py @@ -23,16 +23,22 @@ Surface = Literal["sdk", "proxy"] @dataclass(frozen=True, slots=True) -class BugReport: +class EnvironmentReport: surface: Surface - exception_type: str - litellm_frames: tuple[str, ...] litellm_version: str python_version: str + deployment: str | None + config_lines: tuple[str, ...] + + +@dataclass(frozen=True, slots=True) +class BugReport: + environment: EnvironmentReport + exception_type: str + litellm_frames: tuple[str, ...] call_type: str | None custom_llm_provider: str | None stream: bool | None - config_lines: tuple[str, ...] def bug_report_enabled() -> bool: @@ -69,6 +75,22 @@ def allowlisted(value: object, allowed: frozenset[str]) -> str | None: return value if isinstance(value, str) and value in allowed else None +def _deployment(surface: Surface) -> str | None: + if surface == "sdk": + return "pip / Python SDK" + return "Docker" if os.path.exists("/.dockerenv") else None + + +def build_environment_report(*, surface: Surface, config_lines: tuple[str, ...] = ()) -> EnvironmentReport: + return EnvironmentReport( + surface=surface, + litellm_version=litellm_version, + python_version=platform.python_version(), + deployment=_deployment(surface), + config_lines=config_lines, + ) + + def build_bug_report( exc: BaseException, *, @@ -79,20 +101,17 @@ def build_bug_report( config_lines: tuple[str, ...] = (), ) -> BugReport: return BugReport( - surface=surface, + environment=build_environment_report(surface=surface, config_lines=config_lines), exception_type=type(exc).__name__, litellm_frames=_get_litellm_frames(exc), - litellm_version=litellm_version, - python_version=platform.python_version(), call_type=call_type, custom_llm_provider=allowlisted(custom_llm_provider, KNOWN_PROVIDERS), stream=stream if isinstance(stream, bool) else None, - config_lines=config_lines, ) def _domain(report: BugReport) -> str: - if report.surface == "sdk": + if report.environment.surface == "sdk": return "Python SDK: the litellm package itself" if report.custom_llm_provider is not None: return "LLM translation: a specific provider's request or response" @@ -119,11 +138,11 @@ def _description(report: BugReport, frames: tuple[str, ...], config_lines: tuple "```\n\n```\n\n" f"Exception: `{report.exception_type}`\n\n" f"{frame_block}" - f"Surface: {report.surface}\n" + f"Surface: {report.environment.surface}\n" f"Endpoint / call: {report.call_type or 'unknown'}\n" f"Provider: {report.custom_llm_provider or 'unknown'}\n" - f"LiteLLM: {report.litellm_version}\n" - f"Python: {report.python_version}\n" + f"LiteLLM: {report.environment.litellm_version}\n" + f"Python: {report.environment.python_version}\n" f"{stream_line}" f"{config_block}" ) @@ -131,17 +150,13 @@ def _description(report: BugReport, frames: tuple[str, ...], config_lines: tuple def _issue_url(report: BugReport, frames: tuple[str, ...], config_lines: tuple[str, ...]) -> str: deployment: Final[tuple[tuple[str, str], ...]] = ( - (("deployment", "pip / Python SDK"),) - if report.surface == "sdk" - else (("deployment", "Docker"),) - if os.path.exists("/.dockerenv") - else () + () if report.environment.deployment is None else (("deployment", report.environment.deployment),) ) fields: Final = ( ("template", "bug_report.yml"), ("labels", "bug"), ("title", _title(report, frames)), - ("version", report.litellm_version), + ("version", report.environment.litellm_version), ("domain", _domain(report)), ("description", _description(report, frames, config_lines)), ) + deployment @@ -150,7 +165,7 @@ def _issue_url(report: BugReport, frames: tuple[str, ...], config_lines: tuple[s def bug_report_issue_url(report: BugReport) -> str: frames: Final = report.litellm_frames - config_lines: Final = report.config_lines + config_lines: Final = report.environment.config_lines candidates: Final = ( *((frames, config_lines[:count]) for count in range(len(config_lines), -1, -1)), *((frames[index:], ()) for index in range(1, len(frames) + 1)), diff --git a/litellm/litellm_core_utils/core_helpers.py b/litellm/litellm_core_utils/core_helpers.py index 5bcde688521..d7fbe9f7e09 100644 --- a/litellm/litellm_core_utils/core_helpers.py +++ b/litellm/litellm_core_utils/core_helpers.py @@ -3,7 +3,7 @@ import copy import logging import re -from collections.abc import Iterable, Mapping +from collections.abc import Collection, Iterable, Mapping from types import MappingProxyType from typing import TYPE_CHECKING, Any, Final, Literal, Protocol @@ -709,10 +709,11 @@ def filter_internal_params(data: dict, additional_internal_params: set | None = def redact_nested_match_and_regex_keys( payload: dict | list[Any] | str | None, + keys: Collection[str] = ("match", "regex"), ) -> dict | list[Any] | str | None: """ - Deep-copy `payload` and replace every `match` / `regex` string field with - "[REDACTED]" anywhere in nested dict/list structures. + Deep-copy `payload` and replace every configured string field with "[REDACTED]" + anywhere in nested dict/list structures. Used for guardrail spend/compliance logging so raw spans are not persisted. """ @@ -734,10 +735,9 @@ def redact_nested_match_and_regex_keys( continue seen.add(node_id) if isinstance(node, dict): - if "match" in node: - node["match"] = "[REDACTED]" - if "regex" in node: - node["regex"] = "[REDACTED]" + for key in keys: + if key in node: + node[key] = "[REDACTED]" stack.extend(node.values()) elif isinstance(node, list): stack.extend(node) diff --git a/litellm/litellm_core_utils/error_normalization.py b/litellm/litellm_core_utils/error_normalization.py new file mode 100644 index 00000000000..2a9ff748899 --- /dev/null +++ b/litellm/litellm_core_utils/error_normalization.py @@ -0,0 +1,195 @@ +""" +Map any exception litellm logs to one stable ``normalized_error`` code so dashboards can cluster +failures without parsing free-text messages that embed team names, token counts, model names, etc. +""" + +import re +from collections.abc import Mapping +from types import MappingProxyType +from typing import Final, Protocol, runtime_checkable + +from litellm.exceptions import ( + APIConnectionError, + AuthenticationError, + BadGatewayError, + BadRequestError, + BlockedPiiEntityError, + BudgetExceededError, + ContentPolicyViolationError, + ContextWindowExceededError, + GuardrailRaisedException, + InternalServerError, + MidStreamFallbackError, + NotFoundError, + PermissionDeniedError, + RateLimitError, + RateLimitType, + ServiceUnavailableError, + Timeout, + UnprocessableEntityError, + UnsupportedParamsError, +) + +RATE_LIMIT_EXCEEDED: Final = "429_RATE_LIMIT_EXCEEDED" +BUDGET_EXCEEDED: Final = "429_BUDGET_EXCEEDED" +NO_HEALTHY_DEPLOYMENTS: Final = "429_NO_HEALTHY_DEPLOYMENTS" +AUTHENTICATION_FAILED: Final = "401_AUTHENTICATION_FAILED" +MODEL_ACCESS_DENIED: Final = "403_MODEL_ACCESS_DENIED" +PERMISSION_DENIED: Final = "403_PERMISSION_DENIED" +MISSING_REQUIRED_PARAMETER: Final = "400_MISSING_REQUIRED_PARAMETER" +INVALID_PARAMETER_VALUE: Final = "400_INVALID_PARAMETER_VALUE" +CONTEXT_WINDOW_EXCEEDED: Final = "400_CONTEXT_WINDOW_EXCEEDED" +CONTENT_POLICY_VIOLATION: Final = "400_CONTENT_POLICY_VIOLATION" +INVALID_REQUEST: Final = "400_INVALID_REQUEST" +RESOURCE_NOT_FOUND: Final = "404_RESOURCE_NOT_FOUND" +UPSTREAM_TIMEOUT: Final = "408_UPSTREAM_TIMEOUT" +PROVIDER_CONNECTION_ERROR: Final = "500_PROVIDER_CONNECTION_ERROR" +PROVIDER_OVERLOADED: Final = "503_PROVIDER_OVERLOADED" +PROVIDER_INTERNAL_ERROR: Final = "500_PROVIDER_INTERNAL_ERROR" +ROUTER_NO_FALLBACK: Final = "500_ROUTER_NO_FALLBACK" +ROUTER_FALLBACK_FAILURE: Final = "500_ROUTER_FALLBACK_FAILURE" +UPSTREAM_PASSTHROUGH: Final = "500_UPSTREAM_PASSTHROUGH" +UNSUPPORTED_OPERATION: Final = "500_UNSUPPORTED_OPERATION" +INTERNAL_STATE_ERROR: Final = "500_INTERNAL_STATE_ERROR" +UNCLASSIFIED: Final = "UNCLASSIFIED" + + +@runtime_checkable +class _HasProxyErrorType(Protocol): + type: str + + +_MESSAGE_PATTERNS: Final[tuple[tuple[re.Pattern[str], str], ...]] = ( + ( + re.compile(r"budget has been exceeded|max budget|exceeded.*budget|crossed budget", re.IGNORECASE), + BUDGET_EXCEEDED, + ), + (re.compile(r"no healthy deployments?|no deployments available", re.IGNORECASE), NO_HEALTHY_DEPLOYMENTS), + (re.compile(r"not allowed to access model due to tags configuration", re.IGNORECASE), MODEL_ACCESS_DENIED), + (re.compile(r"upstream passthrough request failed", re.IGNORECASE), UPSTREAM_PASSTHROUGH), + (re.compile(r"is not supported for provider|not implemented", re.IGNORECASE), UNSUPPORTED_OPERATION), + ( + re.compile(r"context window|context length|(prompt|input) is too long|tokens? ?> ?\d+ ?maximum", re.IGNORECASE), + CONTEXT_WINDOW_EXCEEDED, + ), + (re.compile(r"missing required parameter|field required", re.IGNORECASE), MISSING_REQUIRED_PARAMETER), + (re.compile(r"overloaded|unable to process your request", re.IGNORECASE), PROVIDER_OVERLOADED), + ( + re.compile( + r"connection error|APIConnectionError|TransferEncodingError|payload is not completed|connection reset" + r"|peer closed connection|incomplete chunked read", + re.IGNORECASE, + ), + PROVIDER_CONNECTION_ERROR, + ), + (re.compile(r"timed? ?out", re.IGNORECASE), UPSTREAM_TIMEOUT), +) + +_ROUTER_WRAPPER_PATTERNS: Final[tuple[tuple[re.Pattern[str], str], ...]] = ( + (re.compile(r"no fallback model group found", re.IGNORECASE), ROUTER_NO_FALLBACK), + (re.compile(r"error doing the fallback|MidStreamFallbackError", re.IGNORECASE), ROUTER_FALLBACK_FAILURE), +) + +_PROXY_ERROR_TYPE_MAP: Final[Mapping[str, str]] = MappingProxyType( + { + "budget_exceeded": BUDGET_EXCEEDED, + "auth_error": AUTHENTICATION_FAILED, + "expired_key": AUTHENTICATION_FAILED, + "token_not_found_in_db": AUTHENTICATION_FAILED, + "auth_provider_unavailable": AUTHENTICATION_FAILED, + "key_model_access_denied": MODEL_ACCESS_DENIED, + "team_model_access_denied": MODEL_ACCESS_DENIED, + "user_model_access_denied": MODEL_ACCESS_DENIED, + "org_model_access_denied": MODEL_ACCESS_DENIED, + "project_model_access_denied": MODEL_ACCESS_DENIED, + "agent_model_access_denied": MODEL_ACCESS_DENIED, + "key_vector_store_access_denied": PERMISSION_DENIED, + "team_vector_store_access_denied": PERMISSION_DENIED, + "org_vector_store_access_denied": PERMISSION_DENIED, + "tool_access_denied": PERMISSION_DENIED, + "team_member_permission_error": PERMISSION_DENIED, + "not_found_error": RESOURCE_NOT_FOUND, + } +) + +_STATUS_CODE_MAP: Final[Mapping[str, str]] = MappingProxyType( + { + "400": INVALID_REQUEST, + "401": AUTHENTICATION_FAILED, + "403": PERMISSION_DENIED, + "404": RESOURCE_NOT_FOUND, + "408": UPSTREAM_TIMEOUT, + "422": INVALID_PARAMETER_VALUE, + "429": RATE_LIMIT_EXCEEDED, + "500": PROVIDER_INTERNAL_ERROR, + "502": PROVIDER_INTERNAL_ERROR, + "503": PROVIDER_OVERLOADED, + "504": UPSTREAM_TIMEOUT, + } +) + +_INTERNAL_STATE_EXCEPTIONS: Final[tuple[type[BaseException], ...]] = ( + TypeError, + KeyError, + AttributeError, + IndexError, + RuntimeError, + AssertionError, + ZeroDivisionError, +) + +_CLASS_CODE_TABLE: Final[tuple[tuple[tuple[type[BaseException], ...], str], ...]] = ( + ((AuthenticationError,), AUTHENTICATION_FAILED), + ((PermissionDeniedError,), PERMISSION_DENIED), + ((ContextWindowExceededError,), CONTEXT_WINDOW_EXCEEDED), + ((ContentPolicyViolationError, GuardrailRaisedException, BlockedPiiEntityError), CONTENT_POLICY_VIOLATION), + ((UnsupportedParamsError,), INVALID_PARAMETER_VALUE), + ((NotFoundError,), RESOURCE_NOT_FOUND), + ((Timeout,), UPSTREAM_TIMEOUT), + ((MidStreamFallbackError,), ROUTER_FALLBACK_FAILURE), + ((APIConnectionError,), PROVIDER_CONNECTION_ERROR), + ((ServiceUnavailableError,), PROVIDER_OVERLOADED), + ((InternalServerError, BadGatewayError), PROVIDER_INTERNAL_ERROR), + ((BadRequestError, UnprocessableEntityError), INVALID_REQUEST), + ((NotImplementedError,), UNSUPPORTED_OPERATION), +) + + +def _classify_by_message(message: str, patterns: tuple[tuple[re.Pattern[str], str], ...]) -> str | None: + return next((code for pattern, code in patterns if pattern.search(message)), None) + + +def _classify_by_class(exc: Exception) -> str | None: + if isinstance(exc, BudgetExceededError): + return BUDGET_EXCEEDED + if isinstance(exc, RateLimitError): + return BUDGET_EXCEEDED if exc.rate_limit_type == RateLimitType.BUDGET.value else RATE_LIMIT_EXCEEDED + for exc_types, code in _CLASS_CODE_TABLE: + if isinstance(exc, exc_types): + return code + if isinstance(exc, _INTERNAL_STATE_EXCEPTIONS): + return INTERNAL_STATE_ERROR + return None + + +def normalize_error(exc: Exception | None, status_code: str, message: str) -> str | None: + """ + Return a stable cluster key for ``exc``. ``status_code`` and ``message`` are the values + ``get_error_information`` already extracted, so the same exception always yields the same code. + """ + if exc is None: + return None + proxy_type: Final = exc.type if isinstance(exc, _HasProxyErrorType) else None + by_proxy_type: Final = _PROXY_ERROR_TYPE_MAP.get(proxy_type) if isinstance(proxy_type, str) else None + if by_proxy_type is not None: + return by_proxy_type + by_message: Final = _classify_by_message(message, _MESSAGE_PATTERNS) + if by_message is not None: + return by_message + by_class: Final = _classify_by_class(exc) + if by_class is not None: + return by_class + by_router_wrapper: Final = _classify_by_message(message, _ROUTER_WRAPPER_PATTERNS) + if by_router_wrapper is not None: + return by_router_wrapper + return _STATUS_CODE_MAP.get(status_code, UNCLASSIFIED) diff --git a/litellm/litellm_core_utils/get_litellm_params.py b/litellm/litellm_core_utils/get_litellm_params.py index 36fd7fa4e61..112d038039e 100644 --- a/litellm/litellm_core_utils/get_litellm_params.py +++ b/litellm/litellm_core_utils/get_litellm_params.py @@ -4,6 +4,7 @@ from typing import Final from litellm.litellm_core_utils.core_helpers import normalize_drop_params from litellm.llms.openai.data_residency import infer_openai_data_residency +from litellm.types.router import CustomPricingLiteLLMParams AWS_CREDENTIAL_KWARGS_KEYS: Final = frozenset( { @@ -23,10 +24,7 @@ AWS_CREDENTIAL_KWARGS_KEYS: Final = frozenset( } ) -# Keys `completion()` forwards from its own kwargs into `get_litellm_params`, -# which are otherwise invisible to it because that call site passes explicit -# named arguments rather than `**kwargs`. -FORWARDED_KWARGS_KEYS: Final = AWS_CREDENTIAL_KWARGS_KEYS +PROVIDER_AFFINITY_HEADER_KWARG_KEY: Final = "provider_affinity_header" # Pre-define optional kwargs keys as frozenset for O(1) lookups # These are extracted from kwargs only if present, avoiding unnecessary .get() calls @@ -62,9 +60,11 @@ OPTIONAL_KWARGS_KEYS: Final = ( "itpm", "otpm", "use_xai_oauth", + PROVIDER_AFFINITY_HEADER_KWARG_KEY, } ) | AWS_CREDENTIAL_KWARGS_KEYS + | frozenset(CustomPricingLiteLLMParams.model_fields) ) # Backward-compatible alias for existing imports/tests. diff --git a/litellm/litellm_core_utils/get_llm_provider_logic.py b/litellm/litellm_core_utils/get_llm_provider_logic.py index 192679957b1..f622098920c 100644 --- a/litellm/litellm_core_utils/get_llm_provider_logic.py +++ b/litellm/litellm_core_utils/get_llm_provider_logic.py @@ -860,7 +860,6 @@ def _get_openai_compatible_provider_info( api_base = litellm.EdenAIChatConfig.get_api_base(api_base) # rebind-ok: chain resolves in place dynamic_api_key = litellm.EdenAIChatConfig.get_api_key(api_key) # rebind-ok: chain resolves in place elif custom_llm_provider == "fal_ai": - api_base = litellm.FalAIChatConfig.get_api_base(api_base) # rebind-ok: chain resolves in place dynamic_api_key = litellm.FalAIChatConfig.get_api_key(api_key) # rebind-ok: chain resolves in place elif custom_llm_provider == "aiml": ( diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py index 357ee51a44a..8e28a0d543d 100644 --- a/litellm/litellm_core_utils/litellm_logging.py +++ b/litellm/litellm_core_utils/litellm_logging.py @@ -76,6 +76,7 @@ from litellm.litellm_core_utils.core_helpers import ( reconstruct_model_name, set_response_cost_in_hidden_params, ) +from litellm.litellm_core_utils.error_normalization import normalize_error from litellm.litellm_core_utils.get_litellm_params import get_litellm_params from litellm.litellm_core_utils.internal_call_metadata import ( MODEL_ACCESS_GROUP_METADATA_KEY, @@ -221,7 +222,7 @@ from .initialize_dynamic_callback_params import ( from .specialty_caches.dynamic_logging_cache import DynamicLoggingCache if TYPE_CHECKING: - from mcp.types import EmbeddedResource, ImageContent, TextContent + from mcp.types import CallToolResult, EmbeddedResource, ImageContent, TextContent from litellm.integrations.otel.logger import OpenTelemetryV2 from litellm.integrations.otel.model.config import ExporterSpec, OpenTelemetryV2Config @@ -1634,15 +1635,11 @@ class Logging(LiteLLMLoggingBaseClass): async def async_post_mcp_tool_call_hook( self, kwargs: dict, - response_obj: Any, + response_obj: "CallToolResult", start_time: datetime.datetime, end_time: datetime.datetime, - ): - """ - Post MCP Tool Call Hook - - Use this to modify the MCP tool call response before it is returned to the user. - """ + ) -> "CallToolResult": + """Apply ordered MCP content callbacks to the result returned to the caller.""" from litellm.types.llms.base import HiddenParams from litellm.types.mcp import MCPPostCallResponseObject @@ -1650,24 +1647,51 @@ class Logging(LiteLLMLoggingBaseClass): dynamic_success_callbacks=self.dynamic_success_callbacks, global_callbacks=litellm.success_callback, ) - post_mcp_tool_call_response_obj: Final[MCPPostCallResponseObject] = MCPPostCallResponseObject( - mcp_tool_call_response=response_obj, hidden_params=HiddenParams() - ) + hidden_params = HiddenParams() for callback in callbacks: try: if isinstance(callback, CustomLogger): - response: MCPPostCallResponseObject | None = await callback.async_post_mcp_tool_call_hook( - kwargs=kwargs, - response_obj=post_mcp_tool_call_response_obj, - start_time=start_time, - end_time=end_time, + original_content = copy.deepcopy(response_obj.content) + original_structured_content = copy.deepcopy(response_obj.structured_content) + callback_response = MCPPostCallResponseObject( + mcp_tool_call_response=copy.deepcopy(original_content), hidden_params=hidden_params ) - ###################################################################### - # if any of the callbacks modify the response, use the modified response - # current implementation returns the first modified response - ###################################################################### - if response is not None: - response_obj = self._parse_post_mcp_call_hook_response(response=response) + try: + response = await callback.async_post_mcp_tool_call_hook( + kwargs=kwargs, + response_obj=callback_response, + start_time=start_time, + end_time=end_time, + ) + hook_content = ( + self._parse_post_mcp_call_hook_response(response=response) + if response is not None + else callback_response.mcp_tool_call_response + ) + if response is not None: + hidden_params = response.hidden_params + except Exception as e: + verbose_logger.exception( + "LiteLLM.LoggingError: [Non-Blocking] Exception occurred while logging %s", e + ) + hook_content = None + structured_replacement_matches = ( + response_obj.structured_content != original_structured_content + and ( + hook_content is None + or hook_content == original_content + or response_obj.content == hook_content + ) + ) + if hook_content is not None and hook_content != original_content: + response_obj.content[:] = hook_content + if ( + response_obj.content != original_content + and response_obj.structured_content is not None + and not structured_replacement_matches + ): + response_obj.structured_content = None + response_obj.is_error = True except Exception as e: verbose_logger.exception("LiteLLM.LoggingError: [Non-Blocking] Exception occurred while logging %s", e) return response_obj @@ -6077,6 +6101,7 @@ class StandardLoggingPayloadSetup: error_budget_entity_id=budget_error.entity_id if budget_error else None, error_budget_limit=budget_error.max_budget if budget_error else None, error_budget_spend=budget_error.current_cost if budget_error else None, + normalized_error=normalize_error(original_exception, error_status, error_message), ) @staticmethod diff --git a/litellm/litellm_core_utils/llm_cost_calc/utils.py b/litellm/litellm_core_utils/llm_cost_calc/utils.py index 3845f50af79..46bf2ec2960 100644 --- a/litellm/litellm_core_utils/llm_cost_calc/utils.py +++ b/litellm/litellm_core_utils/llm_cost_calc/utils.py @@ -24,6 +24,7 @@ from litellm.types.utils import ( CallTypes, CompletionTokensDetailsWrapper, CostPerToken, + CustomPricingLiteLLMParams, DataResidency, ImageResponse, ModelInfo, @@ -49,6 +50,15 @@ _IMAGE_RESPONSE_CALL_TYPES: Final = frozenset( # Pre-resolved DataResidency enum values for fast membership checks _VALID_DATA_RESIDENCIES: Final = frozenset(r.value for r in DataResidency) +_DEPLOYMENT_PRICING_KEYS: Final[frozenset[str]] = frozenset(CustomPricingLiteLLMParams.model_fields) + +_IMAGE_TOKEN_RATE_KEYS: Final[tuple[str, ...]] = ( + "input_cost_per_token", + "output_cost_per_token", + "input_cost_per_image_token", + "output_cost_per_image_token", +) + # Pre-resolved service-tier cost-key suffixes (e.g. "_priority"). Used per # request in the cost-calc path, so the f-strings are built once here instead # of being rebuilt for every model_info key on every call. Longest-first so a @@ -826,6 +836,53 @@ def _get_cost_per_unit(model_info: ModelInfo, cost_key: str, default_value: floa return default_value +def deployment_pricing(model_info: ModelInfo | None) -> ModelInfo | None: + """The prices a deployment sets itself, as floats; None when it sets none that parse.""" + if model_info is None: + return None + priced_keys: Final = tuple(key for key in _DEPLOYMENT_PRICING_KEYS if model_info.get(key) is not None) + pricing: Final = MappingProxyType( + { + key: price + for key in priced_keys + if (price := _get_cost_per_unit(model_info, key, default_value=None)) is not None + } + ) + if not pricing: + return None + return cast(ModelInfo, pricing) # cast-ok: a read-only subset of ModelInfo pricing keys, values validated above + + +def prices_tokens(model_info: ModelInfo) -> bool: + """Whether the price table carries any token rate, so a token-priced calculator can bill from usage.""" + return any(model_info.get(key) is not None for key in _IMAGE_TOKEN_RATE_KEYS) + + +def flat_image_cost(model_info: ModelInfo | None, image_response: ImageResponse) -> float: + """The per-image price times the images returned; 0.0 when the table sets no per-image price.""" + if model_info is None: + return 0.0 + output_cost_per_image: Final = _get_cost_per_unit(model_info, "output_cost_per_image", default_value=None) or 0.0 + num_images: Final = len(image_response.data) if image_response.data else 0 + return output_cost_per_image * num_images + + +def resolve_image_model_info(model: str, custom_llm_provider: str, model_info: ModelInfo | None) -> ModelInfo: + """The price table an image cost calculator consults for ``model``. + + ``shared_backend_model_info`` keeps deployment prices off the shared ``{provider}/{model}`` key, so + a name lookup alone reads the public rate, and a model only the deployment prices has no entry at all. + """ + if model_info is None: + return get_model_info(model=model, custom_llm_provider=custom_llm_provider) + try: + shared_model_info: Final = get_model_info(model=model, custom_llm_provider=custom_llm_provider) + except Exception: # noqa: BLE001 # get_model_info raises a bare Exception for an unmapped model + return model_info + resolved: Final[ModelInfo] = {**shared_model_info, **model_info} + return resolved + + def calculate_cache_writing_cost( cache_creation_tokens: int, cache_creation_token_details: CacheCreationTokenDetails | None, @@ -1711,6 +1768,7 @@ def calculate_image_response_cost_from_usage( model: str, image_response: ImageResponse, custom_llm_provider: str, + model_info: ModelInfo | None = None, ) -> float | None: """ Calculate image generation cost from usage metadata when available. @@ -1735,6 +1793,9 @@ def calculate_image_response_cost_from_usage( if prompt_tokens == 0 and completion_tokens == 0 and total_tokens == 0: return None + if model_info is not None and not prices_tokens(model_info): + return None + input_tokens_details: Final[object] = getattr(usage, "input_tokens_details", None) prompt_tokens_details: PromptTokensDetailsWrapper | None = None if input_tokens_details is not None: @@ -1790,6 +1851,7 @@ def calculate_image_response_cost_from_usage( model=model, usage=normalized_usage, custom_llm_provider=custom_llm_provider, + model_info=model_info, ) return prompt_cost + completion_cost @@ -1850,9 +1912,15 @@ class CostCalculatorUtils: size: str | None = None, optional_params: dict | None = None, call_type: str | None = None, + model_info: ModelInfo | None = None, ) -> float: """ Route the image generation cost calculator based on the custom_llm_provider + + ``model_info`` is the deployment's own price table. Its valid prices are laid over the shared + cost-map entry and handed to the provider calculator, so per-image, per-pixel and per-token + deployment prices all apply while provider logic (token-first billing, grounding surcharges, + image counting) stays in one place. An unparseable price is logged and ignored. """ from litellm.cost_calculator import default_image_cost_calculator from litellm.llms.azure_ai.image_generation.cost_calculator import ( @@ -1878,12 +1946,14 @@ class CostCalculatorUtils: quality or completion_response.quality or _requested_image_param(optional_params, "quality") or "standard" ) resolved_n: Final = n if n is not None else (len(completion_response.data) if completion_response.data else 0) + pricing: Final = deployment_pricing(model_info) if custom_llm_provider == litellm.LlmProviders.VERTEX_AI.value: if isinstance(completion_response, ImageResponse): return vertex_ai_image_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.BEDROCK.value: if isinstance(completion_response, ImageResponse): @@ -1902,6 +1972,7 @@ class CostCalculatorUtils: return recraft_image_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.AIML.value: from litellm.llms.aiml.image_generation.cost_calculator import ( @@ -1911,6 +1982,7 @@ class CostCalculatorUtils: return aiml_image_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.COMETAPI.value: from litellm.llms.cometapi.image_generation.cost_calculator import ( @@ -1920,6 +1992,7 @@ class CostCalculatorUtils: return cometapi_image_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.GEMINI.value: if call_type in ( @@ -1933,6 +2006,7 @@ class CostCalculatorUtils: return gemini_image_edit_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) from litellm.llms.gemini.image_generation.cost_calculator import ( cost_calculator as gemini_image_cost_calculator, @@ -1941,6 +2015,7 @@ class CostCalculatorUtils: return gemini_image_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.AZURE_AI.value: return azure_ai_image_cost_calculator( @@ -1949,6 +2024,7 @@ class CostCalculatorUtils: size=resolved_size, n=resolved_n, optional_params=optional_params, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.FAL_AI.value: from litellm.llms.fal_ai.cost_calculator import ( @@ -1959,6 +2035,7 @@ class CostCalculatorUtils: model=model, image_response=completion_response, optional_params=optional_params, + model_info=pricing, ) elif custom_llm_provider == litellm.LlmProviders.RUNWAYML.value: from litellm.llms.runwayml.cost_calculator import ( @@ -1968,6 +2045,7 @@ class CostCalculatorUtils: return runwayml_image_cost_calculator( model=model, image_response=completion_response, + model_info=pricing, ) elif ( custom_llm_provider == litellm.LlmProviders.OPENAI.value @@ -1984,6 +2062,7 @@ class CostCalculatorUtils: model=model, image_response=completion_response, custom_llm_provider=custom_llm_provider, + model_info=pricing, ) # Fall through to default for DALL-E models return default_image_cost_calculator( @@ -1993,6 +2072,7 @@ class CostCalculatorUtils: n=resolved_n, size=resolved_size, optional_params=optional_params, + model_info=pricing, ) else: return default_image_cost_calculator( @@ -2002,5 +2082,6 @@ class CostCalculatorUtils: n=resolved_n, size=resolved_size, optional_params=optional_params, + model_info=pricing, ) return 0.0 diff --git a/litellm/litellm_core_utils/llm_response_utils/get_api_base.py b/litellm/litellm_core_utils/llm_response_utils/get_api_base.py index 26e79fa0ea8..3815ea91b51 100644 --- a/litellm/litellm_core_utils/llm_response_utils/get_api_base.py +++ b/litellm/litellm_core_utils/llm_response_utils/get_api_base.py @@ -3,10 +3,30 @@ from typing import Final import litellm from litellm import verbose_logger -from ...litellm_core_utils.get_llm_provider_logic import get_llm_provider +from ...litellm_core_utils.get_llm_provider_logic import ( + declared_authenticating_provider, + get_llm_provider, +) from ...types.router import LiteLLM_Params +def _api_base_without_login(provider: str) -> str | None: + if provider == "github_copilot": + return litellm.GithubCopilotConfig().api_base_without_login() + if provider == "chatgpt": + return litellm.ChatGPTConfig().api_base_without_login() + return None + + +def _provider_default_api_base(model: str, custom_llm_provider: str | None, stream: bool) -> str | None: + if custom_llm_provider == "gemini": + action: Final = "streamGenerateContent" if stream else "generateContent" + return f"https://generativelanguage.googleapis.com/v1beta/models/{model}:{action}" + if custom_llm_provider == "openai": + return "https://api.openai.com" + return None + + def get_api_base(model: str, optional_params: dict | LiteLLM_Params) -> str | None: """ Returns the api base used for calling the model. @@ -42,6 +62,9 @@ def get_api_base(model: str, optional_params: dict | LiteLLM_Params) -> str | No if litellm.model_alias_map and model in litellm.model_alias_map: model = litellm.model_alias_map[model] + declared: Final = declared_authenticating_provider(model, _optional_params.custom_llm_provider) + if declared is not None: + return _api_base_without_login(declared) try: ( model, @@ -83,16 +106,4 @@ def get_api_base(model: str, optional_params: dict | LiteLLM_Params) -> str | No _api_base = f"{_optional_params.vertex_location}-aiplatform.googleapis.com/v1/projects/{_optional_params.vertex_project}/locations/{_optional_params.vertex_location}/publishers/google/models/{model}:generateContent" return _api_base - if custom_llm_provider is None: - return None - - if custom_llm_provider == "gemini": - if stream: - _api_base = f"https://generativelanguage.googleapis.com/v1beta/models/{model}:streamGenerateContent" - else: - _api_base = f"https://generativelanguage.googleapis.com/v1beta/models/{model}:generateContent" - return _api_base - elif custom_llm_provider == "openai": - _api_base = "https://api.openai.com" - return _api_base - return None + return _provider_default_api_base(model, custom_llm_provider, stream) diff --git a/litellm/litellm_core_utils/prompt_templates/common_utils.py b/litellm/litellm_core_utils/prompt_templates/common_utils.py index 1e96e20a03b..6c45622649f 100644 --- a/litellm/litellm_core_utils/prompt_templates/common_utils.py +++ b/litellm/litellm_core_utils/prompt_templates/common_utils.py @@ -1657,7 +1657,7 @@ def get_file_ids_from_messages(messages: list[AllMessageValues]) -> list[str]: if isinstance(content, str): continue for c in content: - if c["type"] == "file": + if isinstance(c, dict) and c["type"] == "file": file_object = cast(ChatCompletionFileObject, c) file_object_file_field = file_object.get("file") if not isinstance(file_object_file_field, dict): diff --git a/litellm/litellm_core_utils/prompt_templates/image_handling.py b/litellm/litellm_core_utils/prompt_templates/image_handling.py index c9933422cc3..c44c80bc0a0 100644 --- a/litellm/litellm_core_utils/prompt_templates/image_handling.py +++ b/litellm/litellm_core_utils/prompt_templates/image_handling.py @@ -82,7 +82,7 @@ def _rejected_image_fetch(url: str, verdict: SSRFError) -> "litellm.ImageFetchEr verbose_logger.warning("Image fetch of %s rejected before any request went out: %s", url, verdict) return litellm.ImageFetchError( "Error: Unable to fetch image from URL. The proxy could not resolve this host or its URL policy rejected it; " - f"an admin can check the proxy log and `user_url_allowed_hosts` in general_settings. url={url}" + f"an admin can check the proxy log and `user_url_allowed_hosts` in litellm_settings. url={url}" ) diff --git a/litellm/litellm_core_utils/provider_affinity.py b/litellm/litellm_core_utils/provider_affinity.py new file mode 100644 index 00000000000..31cd9a7ff69 --- /dev/null +++ b/litellm/litellm_core_utils/provider_affinity.py @@ -0,0 +1,98 @@ +import re +from collections.abc import Mapping +from typing import Final + +from litellm.constants import SESSION_ID_GENERATED_METADATA_KEY + +_HTTP_HEADER_NAME_PATTERN: Final = re.compile(r"^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$") +_FORBIDDEN_AFFINITY_HEADERS: Final = frozenset( + { + "api-key", + "authorization", + "connection", + "content-length", + "content-type", + "cookie", + "host", + "keep-alive", + "proxy-authenticate", + "proxy-authorization", + "proxy-connection", + "set-cookie", + "te", + "trailer", + "transfer-encoding", + "upgrade", + "www-authenticate", + "x-api-key", + "x-goog-api-key", + } +) + + +def validate_provider_affinity_header_name(header: str) -> str: + if not _HTTP_HEADER_NAME_PATTERN.fullmatch(header): + raise ValueError("provider_affinity_header must be a valid HTTP header name") + if header.lower() in _FORBIDDEN_AFFINITY_HEADERS: + raise ValueError("provider_affinity_header cannot be an authentication, cookie, or transport header") + return header + + +def _get_value(value: object, key: str) -> object | None: + if isinstance(value, Mapping): + return value.get(key) + return getattr(value, key, None) + + +def _get_provider_affinity_header_name(litellm_params: object | None) -> str | None: + header: Final = _get_value(litellm_params, "provider_affinity_header") if litellm_params is not None else None + if header is None: + return None + if not isinstance(header, str): + raise TypeError("provider_affinity_header must be a string") + return validate_provider_affinity_header_name(header) + + +def get_stable_session_id(litellm_params: object | None) -> str | None: + if litellm_params is None: + return None + + direct_session_id: Final = _get_value(litellm_params, "session_id") + if direct_session_id: + return str(direct_session_id) + + metadata_values: Final[tuple[object, ...]] = tuple( + value for key in ("metadata", "litellm_metadata") if (value := _get_value(litellm_params, key)) is not None + ) + has_generated_session_id: Final = any( + isinstance(metadata, Mapping) and metadata.get(SESSION_ID_GENERATED_METADATA_KEY) + for metadata in metadata_values + ) + + litellm_session_id: Final = _get_value(litellm_params, "litellm_session_id") + if litellm_session_id and not has_generated_session_id: + return str(litellm_session_id) + + for metadata in metadata_values: + if ( + isinstance(metadata, Mapping) + and not metadata.get(SESSION_ID_GENERATED_METADATA_KEY) + and (value := metadata.get("session_id")) + ): + return str(value) + return None + + +def add_provider_affinity_header( # mutable-ok: downstream handlers add auth and signing headers + headers: Mapping[str, object], litellm_params: object | None +) -> dict[str, object]: # mutable-ok: downstream handlers add auth and signing headers + header_name: Final = _get_provider_affinity_header_name(litellm_params) + if header_name is None or any(key.lower() == header_name.lower() for key in headers): + return dict(headers) # mutable-ok: downstream handlers add auth and signing headers + + session_id: Final = get_stable_session_id(litellm_params) + if session_id is None: + return dict(headers) # mutable-ok: downstream handlers add auth and signing headers + if any(character in session_id for character in ("\r", "\n", "\0")): + raise ValueError("session_id cannot contain HTTP header control characters") + return {**headers, header_name: session_id} # mutable-ok: downstream handlers add auth and signing headers diff --git a/litellm/litellm_core_utils/realtime_errors.py b/litellm/litellm_core_utils/realtime_errors.py index 3c064728a66..07f7148815c 100644 --- a/litellm/litellm_core_utils/realtime_errors.py +++ b/litellm/litellm_core_utils/realtime_errors.py @@ -9,13 +9,20 @@ frame itself fail, which is how a loud failure turns back into a silent one. """ import json -from typing import Final +from types import MappingProxyType +from typing import Final, Protocol from litellm.types.realtime import RealtimeErrorDetail, RealtimeErrorEvent WEBSOCKET_CLOSE_REASON_MAX_BYTES: Final = 123 +class _ClientWebSocket(Protocol): + async def send_text(self, data: str) -> None: ... + + async def close(self, code: int = ..., reason: str | None = ...) -> None: ... + + def realtime_error_event(message: str, error_type: str) -> str: detail: Final[RealtimeErrorDetail] = {"type": error_type, "message": message} event: Final[RealtimeErrorEvent] = {"type": "error", "error": detail} @@ -37,3 +44,28 @@ def client_close_code(upstream_code: int) -> int: if upstream_code in EXTERNAL_CLOSE_CODES or 3000 <= upstream_code < 5000: return upstream_code return int(CloseCode.INTERNAL_ERROR) + + +def upstream_handshake_close_code(status_code: int) -> int: + from websockets.frames import CloseCode + + refusal_codes: Final = MappingProxyType( + { + 401: int(CloseCode.POLICY_VIOLATION), + 403: int(CloseCode.POLICY_VIOLATION), + 429: int(CloseCode.TRY_AGAIN_LATER), + } + ) + return refusal_codes.get(status_code, int(CloseCode.INTERNAL_ERROR)) + + +async def close_after_upstream_handshake_refusal(websocket: _ClientWebSocket, status_code: int) -> None: + message: Final = f"Upstream realtime handshake rejected with HTTP {status_code}" + try: + await websocket.send_text(realtime_error_event(message, error_type="server_error")) + except Exception: # noqa: BLE001 # best-effort notice: a dead client socket must not skip the close below + pass + await websocket.close( + code=upstream_handshake_close_code(status_code), + reason=websocket_close_reason(message, fallback="Upstream handshake rejected"), + ) diff --git a/litellm/litellm_core_utils/secret_redaction.py b/litellm/litellm_core_utils/secret_redaction.py index 70b2cd08b4c..89df5e500db 100644 --- a/litellm/litellm_core_utils/secret_redaction.py +++ b/litellm/litellm_core_utils/secret_redaction.py @@ -10,6 +10,7 @@ import re from typing import Final from litellm.constants import MINIMUM_CUSTOM_KEY_LENGTH +from litellm.rust_bridge import diagnostics REDACTED: Final = "REDACTED" @@ -87,9 +88,13 @@ def _build_secret_patterns() -> "re.Pattern[str]": _SECRET_RE: Final = _build_secret_patterns() +def _python_redact_string(value: str) -> str: + return _SECRET_RE.sub(REDACTED, value) + + def redact_string(value: str) -> str: """Scrub known secret/credential patterns from *value* and return the result.""" - return _SECRET_RE.sub(REDACTED, value) + return diagnostics.run(lambda native: native.redact_text(value), lambda: _python_redact_string(value)) _UNIX_SYSTEM_PATH: Final = r"/(?:etc|var|opt|usr|home|root|private|Users|tmp|mnt|srv)/[^\s'\"\)\]}>,]+" @@ -105,15 +110,21 @@ _INTERNAL_DETAIL_RE: Final = re.compile( _TRACEBACK_MARKER: Final = "Traceback (most recent call last):" -def redact_internal_details(value: str) -> str: +def _python_redact_internal_details(value: str) -> str: """Drop an embedded traceback and scrub filesystem paths and internal hostnames, on top of redact_string(). For client-facing messages only: server logs keep this detail.""" marker_index: Final = value.find(_TRACEBACK_MARKER) without_traceback: Final = value[:marker_index].rstrip() if marker_index != -1 else value - return _INTERNAL_DETAIL_RE.sub(REDACTED, redact_string(without_traceback)) + return _INTERNAL_DETAIL_RE.sub(REDACTED, _python_redact_string(without_traceback)) -def redact_structured_value(key: str | None, value: str) -> str: +def redact_internal_details(value: str) -> str: + return diagnostics.run( + lambda native: native.redact_client_message(value), lambda: _python_redact_internal_details(value) + ) + + +def _python_redact_structured_value(key: str | None, value: str) -> str: """Scrub *value* as it appeared under *key* inside a structured record. redact_string() replaces a whole ``key: value`` span with REDACTED, which is @@ -122,8 +133,15 @@ def redact_structured_value(key: str | None, value: str) -> str: repr would, so the key-name patterns still fire, but collapses only the value so the caller's structure survives. """ - scrubbed: Final = redact_string(value) + scrubbed: Final = _python_redact_string(value) if scrubbed != value or key is None: return scrubbed rendered: Final = f"'{key}': '{value}'" - return REDACTED if redact_string(rendered) != rendered else value + return REDACTED if _python_redact_string(rendered) != rendered else value + + +def redact_structured_value(key: str | None, value: str) -> str: + return diagnostics.run( + lambda native: native.redact_structured_text(key, value), + lambda: _python_redact_structured_value(key, value), + ) diff --git a/litellm/litellm_core_utils/streaming_chunk_builder_utils.py b/litellm/litellm_core_utils/streaming_chunk_builder_utils.py index 025db65a7ce..aa4e0cf5495 100644 --- a/litellm/litellm_core_utils/streaming_chunk_builder_utils.py +++ b/litellm/litellm_core_utils/streaming_chunk_builder_utils.py @@ -165,6 +165,14 @@ class _UsageSummary(TypedDict): cost: float | None +def _reports_prompt_side_usage(usage_summary: "_UsageSummary") -> bool: + return ( + (usage_summary["prompt_tokens"] or 0) > 0 + or (usage_summary["cache_creation_input_tokens"] or 0) > 0 + or (usage_summary["cache_read_input_tokens"] or 0) > 0 + ) + + def capture_cache_creation_token_details( prompt_tokens_details: PromptTokensDetailsWrapper | None, current: CacheCreationTokenDetails | None, @@ -888,11 +896,11 @@ class ChunkProcessor: if usage_chunk_dict["completion_tokens"] is not None and usage_chunk_dict["completion_tokens"] > 0: completion_usage_updates += 1 if usage_chunk_dict["cache_creation_input_tokens"] is not None and ( - usage_chunk_dict["cache_creation_input_tokens"] > 0 or cache_creation_input_tokens is None + _reports_prompt_side_usage(usage_chunk_dict) or cache_creation_input_tokens is None ): cache_creation_input_tokens = usage_chunk_dict["cache_creation_input_tokens"] if usage_chunk_dict["cache_read_input_tokens"] is not None and ( - usage_chunk_dict["cache_read_input_tokens"] > 0 or cache_read_input_tokens is None + _reports_prompt_side_usage(usage_chunk_dict) or cache_read_input_tokens is None ): cache_read_input_tokens = usage_chunk_dict["cache_read_input_tokens"] if usage_chunk_dict["completion_tokens_details"] is not None: diff --git a/litellm/litellm_core_utils/url_utils.py b/litellm/litellm_core_utils/url_utils.py index b94d5a6886d..6c87ef4a3de 100644 --- a/litellm/litellm_core_utils/url_utils.py +++ b/litellm/litellm_core_utils/url_utils.py @@ -336,7 +336,7 @@ def validate_url(url: str) -> tuple[str, str]: raise SSRFError( f"URL targets a blocked address ({resolved_ip}). " "If this is a legitimate internal service, add the host " - "to `user_url_allowed_hosts` in general_settings." + "to `user_url_allowed_hosts` in litellm_settings." ) # For HTTPS with SSL verification enabled, TLS certificate validation diff --git a/litellm/llms/aiml/image_generation/cost_calculator.py b/litellm/llms/aiml/image_generation/cost_calculator.py index 13427dcafc2..abf4216807a 100644 --- a/litellm/llms/aiml/image_generation/cost_calculator.py +++ b/litellm/llms/aiml/image_generation/cost_calculator.py @@ -1,19 +1,22 @@ from typing import Any, Final import litellm -from litellm.types.utils import ImageResponse +from litellm.litellm_core_utils.llm_cost_calc.utils import resolve_image_model_info +from litellm.types.utils import ImageResponse, ModelInfo def cost_calculator( model: str, image_response: Any, + model_info: ModelInfo | None = None, ) -> float: """ AI/ML flux image generation cost calculator """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider=litellm.LlmProviders.AIML.value, + model_info=model_info, ) output_cost_per_image: Final[float] = _model_info.get("output_cost_per_image") or 0.0 num_images: int = 0 diff --git a/litellm/llms/anthropic/common_utils.py b/litellm/llms/anthropic/common_utils.py index 0c3c8996789..c0e6006633e 100644 --- a/litellm/llms/anthropic/common_utils.py +++ b/litellm/llms/anthropic/common_utils.py @@ -314,7 +314,7 @@ class AnthropicModelInfo(BaseLLMModelInfo): _message_content = message.get("content") if _message_content is not None and isinstance(_message_content, list): for content in _message_content: - if "cache_control" in content: + if isinstance(content, dict) and "cache_control" in content: return True return False @@ -359,7 +359,7 @@ class AnthropicModelInfo(BaseLLMModelInfo): for message in messages: if "content" in message and message["content"] is not None and isinstance(message["content"], list): for content in message["content"]: - if "type" in content and content["type"] != "text": + if isinstance(content, dict) and "type" in content and content["type"] != "text": return True return False diff --git a/litellm/llms/azure/realtime/handler.py b/litellm/llms/azure/realtime/handler.py index 146915dd6fd..df74975ad0f 100644 --- a/litellm/llms/azure/realtime/handler.py +++ b/litellm/llms/azure/realtime/handler.py @@ -8,11 +8,15 @@ from collections.abc import Mapping from types import MappingProxyType from typing import Any, Final, Protocol, cast -from litellm._logging import _redact_string, verbose_proxy_logger +from litellm._logging import verbose_proxy_logger from litellm.constants import REALTIME_WEBSOCKET_MAX_MESSAGE_SIZE_BYTES from litellm.types.realtime import RealtimeQueryParams from ....litellm_core_utils.litellm_logging import Logging as LiteLLMLogging +from ....litellm_core_utils.realtime_errors import ( + close_after_upstream_handshake_refusal, + realtime_error_event, +) from ....litellm_core_utils.realtime_streaming import ( RealTimeStreaming, ScopedWebSocket, @@ -49,7 +53,9 @@ def azure_realtime_protocol_for_client( class _ProxyClientWebSocket(Protocol): - """Client-facing websocket handle: this path only closes it after a failed handshake.""" + """Client-facing websocket handle: this path only writes to it after a failed handshake.""" + + async def send_text(self, data: str) -> None: ... async def close(self, code: int = ..., reason: str | None = ...) -> None: ... @@ -181,7 +187,16 @@ class AzureOpenAIRealtime(AzureChatCompletion): ) await realtime_streaming.bidirectional_forward() - except websockets.exceptions.InvalidStatusCode as e: - await websocket.close(code=e.status_code, reason=_redact_string(str(e))) + except websockets.exceptions.InvalidStatus as e: + verbose_proxy_logger.exception("Error in AzureOpenAIRealtime.async_realtime") + await close_after_upstream_handshake_refusal(websocket, e.response.status_code) except Exception: verbose_proxy_logger.exception("Error in AzureOpenAIRealtime.async_realtime") + try: + await websocket.send_text(realtime_error_event("Internal server error", error_type="server_error")) + except Exception: # noqa: BLE001 # best-effort notice: a dead client socket must not skip the close below + pass + try: + await websocket.close(code=1011, reason="Internal server error") + except Exception: # noqa: BLE001 # the lower layer may have closed the socket already; closing twice is not an error + pass diff --git a/litellm/llms/azure_ai/image_generation/cost_calculator.py b/litellm/llms/azure_ai/image_generation/cost_calculator.py index 35d0f4fb6c3..08b732197f3 100644 --- a/litellm/llms/azure_ai/image_generation/cost_calculator.py +++ b/litellm/llms/azure_ai/image_generation/cost_calculator.py @@ -3,9 +3,22 @@ from typing import Any, Final import litellm from litellm.litellm_core_utils.llm_cost_calc.utils import ( + _get_cost_per_unit, calculate_image_response_cost_from_usage, + resolve_image_model_info, ) -from litellm.types.utils import ImageResponse +from litellm.types.utils import ImageResponse, ModelInfo + + +def _input_cost_per_pixel(resolved: ModelInfo) -> float: + deployment_price: Final = _get_cost_per_unit(resolved, "input_cost_per_pixel", default_value=None) + if deployment_price is not None: + return deployment_price + model_cost_key: Final = resolved.get("key") + shared_entry: Final = litellm.model_cost.get(model_cost_key) if model_cost_key is not None else None + if shared_entry is None: + return 0.0 + return shared_entry.get("input_cost_per_pixel") or 0.0 def cost_calculator( @@ -14,13 +27,15 @@ def cost_calculator( size: str | None = None, n: int | None = None, optional_params: Mapping[str, object] | None = None, + model_info: ModelInfo | None = None, ) -> float: """ Azure AI image generation cost calculator """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider=litellm.LlmProviders.AZURE_AI.value, + model_info=model_info, ) if isinstance(image_response, ImageResponse): @@ -28,6 +43,7 @@ def cost_calculator( model=model, image_response=image_response, custom_llm_provider=litellm.LlmProviders.AZURE_AI.value, + model_info=_model_info, ) if token_based_cost is not None: return token_based_cost @@ -37,9 +53,7 @@ def cost_calculator( if output_cost_per_image: return output_cost_per_image * num_images - model_cost: Final = litellm.model_cost[_model_info["key"]] - input_cost_per_pixel: Final[float] = model_cost.get("input_cost_per_pixel") or 0.0 - if input_cost_per_pixel: + if _input_cost_per_pixel(_model_info): from litellm.cost_calculator import default_image_cost_calculator width: Final = optional_params.get("width") if optional_params else None @@ -50,10 +64,11 @@ def cost_calculator( else size or image_response.size ) return default_image_cost_calculator( - model=_model_info["key"], + model=_model_info.get("key", model), custom_llm_provider=litellm.LlmProviders.AZURE_AI.value, size=pixel_size, n=num_images, + model_info=model_info, ) return 0.0 diff --git a/litellm/llms/base_llm/videos/transformation.py b/litellm/llms/base_llm/videos/transformation.py index 4f94cec0973..a4964de46b8 100644 --- a/litellm/llms/base_llm/videos/transformation.py +++ b/litellm/llms/base_llm/videos/transformation.py @@ -12,6 +12,7 @@ from litellm.types.videos.main import VideoCreateOptionalRequestParams if TYPE_CHECKING: from litellm.litellm_core_utils.litellm_logging import Logging as _LiteLLMLoggingObj + from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler from litellm.types.videos.main import CharacterObject as _CharacterObject from litellm.types.videos.main import VideoObject as _VideoObject @@ -269,6 +270,7 @@ class BaseVideoConfig(ABC): raw_response: httpx.Response, logging_obj: LiteLLMLoggingObj, custom_llm_provider: str | None = None, + client: "HTTPHandler | None" = None, ) -> VideoObject: pass @@ -277,6 +279,7 @@ class BaseVideoConfig(ABC): raw_response: httpx.Response, logging_obj: LiteLLMLoggingObj, custom_llm_provider: str | None = None, + client: "AsyncHTTPHandler | None" = None, ) -> VideoObject: """Async transform video status retrieve response.""" return self.transform_video_status_retrieve_response( diff --git a/litellm/llms/bedrock/chat/converse_transformation.py b/litellm/llms/bedrock/chat/converse_transformation.py index 21830eb0d8e..497020c2836 100644 --- a/litellm/llms/bedrock/chat/converse_transformation.py +++ b/litellm/llms/bedrock/chat/converse_transformation.py @@ -629,17 +629,34 @@ class AmazonConverseConfig(BaseConfig): """ return self._is_deepseek_r1_model(model=model, base_model=base_model) + @classmethod + def _supports_sampling_params(cls, model: str) -> bool: + from litellm.llms.anthropic.common_utils import AnthropicModelInfo + + base_model: Final = BedrockModelInfo.get_base_model(model) + if base_model.startswith("anthropic"): + return True + candidates: Final = (model, *(f"{prefix}{base_model}" for prefix in ("global.", "us.", "eu."))) + for candidate in candidates: + if ( + flag := AnthropicModelInfo._get_model_capability( # pyright: ignore[reportPrivateUsage] # Shared API + candidate, "supports_sampling_params" + ) + ) is not None: + return flag + return True + def get_supported_openai_params(self, model: str) -> list[str]: from litellm.utils import supports_function_calling + supports_sampling: Final = self._supports_sampling_params(model) supported_params: Final = [ "max_tokens", "max_completion_tokens", "stream", "stream_options", "stop", - "temperature", - "top_p", + *(("temperature", "top_p") if supports_sampling else ()), "extra_headers", "response_format", "requestMetadata", @@ -1019,14 +1036,26 @@ class AmazonConverseConfig(BaseConfig): value = [value] optional_params["stopSequences"] = value if param == "temperature" or param == "top_p": - AnthropicConfig._apply_sampling_param( - optional_params=optional_params, - model=model, - param=param, - value=value, - drop_params=drop_params, - output_key="topP" if param == "top_p" else param, - ) + if base_model.startswith("anthropic"): + AnthropicConfig._apply_sampling_param( + optional_params=optional_params, + model=model, + param=param, + value=value, + drop_params=drop_params, + output_key="topP" if param == "top_p" else param, + ) + elif not self._supports_sampling_params(model): + if not (litellm.drop_params or drop_params): + raise litellm.utils.UnsupportedParamsError( + message=( + f"{model} does not support {param}={value}. " + "To drop unsupported params, set `litellm.drop_params = True`." + ), + status_code=400, + ) + else: + optional_params["topP" if param == "top_p" else param] = value if param == "tools" and isinstance(value, list): self._apply_tool_call_transformation( tools=cast(list[OpenAIChatCompletionToolParam], value), diff --git a/litellm/llms/bedrock/chat/invoke_handler.py b/litellm/llms/bedrock/chat/invoke_handler.py index 09219b805a2..c7b4018b80b 100644 --- a/litellm/llms/bedrock/chat/invoke_handler.py +++ b/litellm/llms/bedrock/chat/invoke_handler.py @@ -231,6 +231,12 @@ async def make_call( sync_stream=False, ) completion_stream = decoder.aiter_bytes(response.aiter_bytes(chunk_size=stream_chunk_size)) + elif bedrock_invoke_provider == "moonshot": + decoder = AmazonOpenAICompatibleStreamDecoder( + model=model, + sync_stream=False, + ) + completion_stream = decoder.aiter_bytes(response.aiter_bytes(chunk_size=stream_chunk_size)) else: decoder = AWSEventStreamDecoder(model=model, json_mode=json_mode) completion_stream = decoder.aiter_bytes(response.aiter_bytes(chunk_size=stream_chunk_size)) @@ -329,6 +335,12 @@ def make_sync_call( sync_stream=True, ) completion_stream = decoder.iter_bytes(response.iter_bytes(chunk_size=stream_chunk_size)) + elif bedrock_invoke_provider == "moonshot": + decoder = AmazonOpenAICompatibleStreamDecoder( + model=model, + sync_stream=True, + ) + completion_stream = decoder.iter_bytes(response.iter_bytes(chunk_size=stream_chunk_size)) else: decoder = AWSEventStreamDecoder(model=model, json_mode=json_mode) completion_stream = decoder.iter_bytes(response.iter_bytes(chunk_size=stream_chunk_size)) @@ -795,6 +807,24 @@ class AmazonDeepSeekR1StreamDecoder(AWSEventStreamDecoder): return self.deepseek_model_response_iterator.chunk_parser(chunk=chunk_data) +class AmazonOpenAICompatibleStreamDecoder(AWSEventStreamDecoder): + def __init__( + self, + model: str, + sync_stream: bool, + ) -> None: + super().__init__(model=model) + from litellm.llms.openai.chat.gpt_transformation import OpenAIChatCompletionStreamingHandler + + self.openai_model_response_iterator = OpenAIChatCompletionStreamingHandler( + streaming_response=None, + sync_stream=sync_stream, + ) + + def _chunk_parser(self, chunk_data: dict[str, object]) -> ModelResponseStream: + return self.openai_model_response_iterator.chunk_parser(chunk=chunk_data) + + class MockResponseIterator: # for returning ai21 streaming responses def __init__(self, model_response, json_mode: bool | None = False): self.model_response = model_response diff --git a/litellm/llms/bedrock/common_utils.py b/litellm/llms/bedrock/common_utils.py index d9fc813a594..2e20aafffcb 100644 --- a/litellm/llms/bedrock/common_utils.py +++ b/litellm/llms/bedrock/common_utils.py @@ -1593,7 +1593,7 @@ def _resolve_s3_setting( source.get(param_name) for source in (litellm_params, optional_params) if source is not None ) explicit: Final = next((value for value in candidates if isinstance(value, str) and value), None) - return explicit or get_secret_str(env_var) + return explicit or get_secret_str(env_var) or None class CommonBatchFilesUtils: diff --git a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py index f46edc766c7..14bd2bee6cf 100644 --- a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py +++ b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py @@ -770,9 +770,7 @@ class AmazonAnthropicClaudeMessagesConfig( aws_decoder: Final = AmazonAnthropicClaudeMessagesStreamDecoder( model=model, ) - completion_stream: Final = aws_decoder.aiter_bytes( - httpx_response.aiter_bytes(chunk_size=aws_decoder.DEFAULT_CHUNK_SIZE) - ) + completion_stream: Final = aws_decoder.aiter_bytes(httpx_response.aiter_bytes()) # Convert decoded Bedrock events to Server-Sent Events expected by Anthropic clients. return self.bedrock_sse_wrapper( completion_stream=completion_stream, @@ -919,16 +917,6 @@ class AmazonAnthropicClaudeMessagesConfig( class AmazonAnthropicClaudeMessagesStreamDecoder(AWSEventStreamDecoder): - def __init__( - self, - model: str, - ) -> None: - """ - Iterator to return Bedrock invoke response in anthropic /messages format - """ - super().__init__(model=model) - self.DEFAULT_CHUNK_SIZE = 1024 - def _chunk_parser(self, chunk_data: dict) -> GChunk | ModelResponseStream | dict: """ Parse the chunk data into anthropic /messages format diff --git a/litellm/llms/chatgpt/chat/transformation.py b/litellm/llms/chatgpt/chat/transformation.py index e35408b0829..1b110704c8b 100644 --- a/litellm/llms/chatgpt/chat/transformation.py +++ b/litellm/llms/chatgpt/chat/transformation.py @@ -23,6 +23,9 @@ class ChatGPTConfig(OpenAIConfig): super().__init__() self.authenticator = Authenticator() + def api_base_without_login(self) -> str: + return self.authenticator.get_api_base() + def _get_openai_compatible_provider_info( self, model: str, @@ -30,7 +33,7 @@ class ChatGPTConfig(OpenAIConfig): api_key: str | None, custom_llm_provider: str, ) -> tuple[str | None, str | None, str]: - dynamic_api_base: Final = self.authenticator.get_api_base() + dynamic_api_base: Final = self.api_base_without_login() try: dynamic_api_key: Final = self.authenticator.get_access_token() except GetAccessTokenError as e: diff --git a/litellm/llms/cometapi/image_generation/cost_calculator.py b/litellm/llms/cometapi/image_generation/cost_calculator.py index 0ad9f75c45f..8f767cf311e 100644 --- a/litellm/llms/cometapi/image_generation/cost_calculator.py +++ b/litellm/llms/cometapi/image_generation/cost_calculator.py @@ -1,19 +1,22 @@ from typing import Any, Final import litellm -from litellm.types.utils import ImageResponse +from litellm.litellm_core_utils.llm_cost_calc.utils import resolve_image_model_info +from litellm.types.utils import ImageResponse, ModelInfo def cost_calculator( model: str, image_response: Any, + model_info: ModelInfo | None = None, ) -> float: """ CometAPI image generation cost calculator """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider=litellm.LlmProviders.COMETAPI.value, + model_info=model_info, ) output_cost_per_image: Final[float] = _model_info.get("output_cost_per_image") or 0.0 num_images: int = 0 diff --git a/litellm/llms/custom_httpx/http_handler.py b/litellm/llms/custom_httpx/http_handler.py index fcc05e54bc5..312f46bb021 100644 --- a/litellm/llms/custom_httpx/http_handler.py +++ b/litellm/llms/custom_httpx/http_handler.py @@ -845,6 +845,7 @@ class AsyncHTTPHandler: params=params, headers=headers, stream=stream, + content=content, ) finally: await new_client.aclose() @@ -985,6 +986,7 @@ class AsyncHTTPHandler: params=params, headers=headers, stream=stream, + content=content, ) finally: await new_client.aclose() @@ -1051,6 +1053,7 @@ class AsyncHTTPHandler: params=params, headers=headers, stream=stream, + content=content, ) finally: await new_client.aclose() @@ -1708,7 +1711,7 @@ class HTTPHandler: def get_async_httpx_client( - llm_provider: LlmProviders | httpxSpecialProvider, + llm_provider: LlmProviders | httpxSpecialProvider | str, params: dict | None = None, shared_session: Optional["ClientSession"] = None, ) -> AsyncHTTPHandler: diff --git a/litellm/llms/custom_httpx/llm_http_handler.py b/litellm/llms/custom_httpx/llm_http_handler.py index 333ce523e34..8cbc28362a8 100644 --- a/litellm/llms/custom_httpx/llm_http_handler.py +++ b/litellm/llms/custom_httpx/llm_http_handler.py @@ -45,7 +45,11 @@ from litellm.litellm_core_utils.audio_utils.subtitle_utils import ( ) from litellm.litellm_core_utils.get_litellm_params import AWS_CREDENTIAL_KWARGS_KEYS from litellm.litellm_core_utils.llm_request_utils import serialize_multipart_form_fields -from litellm.litellm_core_utils.realtime_errors import realtime_error_event, websocket_close_reason +from litellm.litellm_core_utils.realtime_errors import ( + close_after_upstream_handshake_refusal, + realtime_error_event, + websocket_close_reason, +) from litellm.litellm_core_utils.realtime_streaming import RealTimeStreaming from litellm.litellm_core_utils.url_utils import encode_url_path_segment from litellm.llms.base_llm.anthropic_messages.transformation import ( @@ -2853,7 +2857,7 @@ class BaseLLMHTTPHandler: id(shared_session) if shared_session else None, ) async_httpx_client = get_async_httpx_client( - llm_provider=litellm.LlmProviders(custom_llm_provider), + llm_provider=custom_llm_provider, params={"ssl_verify": litellm_params.get("ssl_verify", None)}, shared_session=shared_session, ) @@ -6384,9 +6388,9 @@ class BaseLLMHTTPHandler: await realtime_streaming.bidirectional_forward() - except websockets.exceptions.InvalidStatusCode as e: + except websockets.exceptions.InvalidStatus as e: verbose_logger.exception("Error connecting to backend: %s", e) - await websocket.close(code=e.status_code, reason=_redact_string(str(e))) + await close_after_upstream_handshake_refusal(websocket, e.response.status_code) except Exception as e: verbose_logger.exception("Error connecting to backend: %s", e) redacted_error: Final = _redact_string(str(e)) @@ -6799,9 +6803,9 @@ class BaseLLMHTTPHandler: ) return await streaming.bidirectional_forward() - except websockets.exceptions.InvalidStatusCode as e: + except websockets.exceptions.InvalidStatus as e: verbose_logger.exception("Error connecting to responses WS backend: %s", e) - await websocket.close(code=e.status_code, reason=_redact_string(str(e))) + await close_after_upstream_handshake_refusal(websocket, e.response.status_code) except Exception as e: verbose_logger.exception("Error in responses WS: %s", e) try: @@ -8808,6 +8812,7 @@ class BaseLLMHTTPHandler: raw_response=response, logging_obj=logging_obj, custom_llm_provider=custom_llm_provider, + client=sync_httpx_client, ) except Exception as e: @@ -8897,6 +8902,7 @@ class BaseLLMHTTPHandler: raw_response=response, logging_obj=logging_obj, custom_llm_provider=custom_llm_provider, + client=async_httpx_client, ) except Exception as e: diff --git a/litellm/llms/edenai/videos/transformation.py b/litellm/llms/edenai/videos/transformation.py index 25c7bcf24ea..31572e9e5fe 100644 --- a/litellm/llms/edenai/videos/transformation.py +++ b/litellm/llms/edenai/videos/transformation.py @@ -21,6 +21,7 @@ from ..common_utils import EdenAIException, authorized_headers, endpoint_url, re if TYPE_CHECKING: from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj + from litellm.llms.custom_httpx.http_handler import HTTPHandler def _usage_with_reported_cost( @@ -110,6 +111,7 @@ class EdenAIVideoConfig(OpenAIVideoConfig): raw_response: httpx.Response, logging_obj: "LiteLLMLoggingObj", custom_llm_provider: str | None = None, + client: "HTTPHandler | None" = None, ) -> VideoObject: raw_response.raise_for_status() # the shared GET helpers return error bodies instead of raising video: Final = super().transform_video_status_retrieve_response( diff --git a/litellm/llms/fal_ai/chat/transformation.py b/litellm/llms/fal_ai/chat/transformation.py index 2c5af6538ab..164b660b21a 100644 --- a/litellm/llms/fal_ai/chat/transformation.py +++ b/litellm/llms/fal_ai/chat/transformation.py @@ -115,13 +115,13 @@ class FalAIChatConfig(BaseConfig): return list(("reasoning_effort", "temperature", "top_p")) # mutable-ok: inherited contract returns a list def _map_reasoning_effort(self, value: object, model: str, drop_params: bool) -> bool | None: - if value in REASONING_DISABLED_EFFORTS: + if isinstance(value, str) and value in REASONING_DISABLED_EFFORTS: return False - if value in REASONING_ENABLED_EFFORTS: + if isinstance(value, str) and value in REASONING_ENABLED_EFFORTS: return True if drop_params: return None - raise FalAIError(status_code=400, message=f"Unsupported reasoning_effort '{value}' for {model}") + raise FalAIError(status_code=400, message=f"Unsupported reasoning_effort {value!r} for {model}") def _translate_param(self, param: str, value: object, model: str, drop_params: bool) -> tuple[str, object] | None: if param in ("temperature", "top_p"): diff --git a/litellm/llms/fal_ai/cost_calculator.py b/litellm/llms/fal_ai/cost_calculator.py index 31f0995bf9f..519a11de13c 100644 --- a/litellm/llms/fal_ai/cost_calculator.py +++ b/litellm/llms/fal_ai/cost_calculator.py @@ -7,7 +7,8 @@ from typing import Final from pydantic import TypeAdapter import litellm -from litellm.types.utils import ImageObject, ImageResponse +from litellm.litellm_core_utils.llm_cost_calc.utils import deployment_pricing, resolve_image_model_info +from litellm.types.utils import ImageObject, ImageResponse, ModelInfo FAL_KEYED_PRICING_DEFAULT_QUALITY: Final[str] = "high" _DEFAULT_KEYED_DIMENSIONS: Final[tuple[int, int]] = (1024, 768) @@ -135,12 +136,18 @@ def _entry(key: str) -> Mapping[str, object] | None: return _OBJECT_MAP.validate_python(raw_entry) +def _resolution_key(resolution: object) -> str | None: + if isinstance(resolution, bool) or not isinstance(resolution, (int, str)): + return None + return str(resolution) + + def fal_ai_passthrough_cost(model: str, request_body: Mapping[str, object]) -> float | None: entry: Final = _entry(f"{litellm.LlmProviders.FAL_AI.value}/{model}") if entry is None: return None - resolution: Final = request_body.get("resolution") - keyed_cost: Final = entry.get(f"output_cost_per_image_{resolution}") if isinstance(resolution, int) else None + resolution: Final = _resolution_key(request_body.get("resolution")) + keyed_cost: Final = entry.get(f"output_cost_per_image_{resolution}") if resolution is not None else None cost: Final = keyed_cost if isinstance(keyed_cost, (int, float)) else entry.get("output_cost_per_image") return float(cost) if isinstance(cost, (int, float)) else None @@ -149,6 +156,7 @@ def cost_calculator( model: str, image_response: object, optional_params: Mapping[str, object] | None = None, + model_info: ModelInfo | None = None, ) -> float: """ fal.ai image generation cost calculator @@ -156,8 +164,14 @@ def cost_calculator( if not isinstance(image_response, ImageResponse): raise ValueError(f"image_response must be of type ImageResponse got type={type(image_response)}") normalized_model: Final = model.removeprefix(f"{litellm.LlmProviders.FAL_AI.value}/") - params: Final[Mapping[str, object]] = optional_params or MappingProxyType({}) images: Final = tuple(image_response.data or ()) + deployment_prices: Final = deployment_pricing(model_info) + deployment_cost_per_image: Final = ( + None if deployment_prices is None else deployment_prices.get("output_cost_per_image") + ) + if deployment_cost_per_image is not None: + return deployment_cost_per_image * len(images) + params: Final[Mapping[str, object]] = optional_params or MappingProxyType({}) keyed_costs: Final = tuple( _keyed_cost_per_image( model=normalized_model, @@ -168,15 +182,16 @@ def cost_calculator( ) if not any(cost is None for cost in keyed_costs): return sum(cost for cost in keyed_costs if cost is not None) - model_info: Final = litellm.get_model_info( + resolved_model_info: Final = resolve_image_model_info( model=normalized_model, custom_llm_provider=litellm.LlmProviders.FAL_AI.value, + model_info=deployment_prices, ) - raw_output_cost_per_image: Final = model_info.get("output_cost_per_image") + raw_output_cost_per_image: Final = resolved_model_info.get("output_cost_per_image") output_cost_per_image: Final = ( float(raw_output_cost_per_image) if isinstance(raw_output_cost_per_image, (int, float)) else 0.0 ) - raw_output_cost_per_pixel: Final = model_info.get("output_cost_per_pixel") + raw_output_cost_per_pixel: Final = resolved_model_info.get("output_cost_per_pixel") output_cost_per_pixel: Final = ( float(raw_output_cost_per_pixel) if isinstance(raw_output_cost_per_pixel, (int, float)) else None ) diff --git a/litellm/llms/fal_ai/videos/transformation.py b/litellm/llms/fal_ai/videos/transformation.py index 51082a6773b..e46199dd89f 100644 --- a/litellm/llms/fal_ai/videos/transformation.py +++ b/litellm/llms/fal_ai/videos/transformation.py @@ -104,7 +104,10 @@ def _profile_for_model(model: str) -> _ModelProfile: def _resolution_for_short_side(short_side: int, profile: _ModelProfile) -> str: - return next(resolution for threshold, resolution in profile.resolution_tiers if short_side <= threshold) + return next( + (resolution for threshold, resolution in profile.resolution_tiers if short_side <= threshold), + profile.resolution_tiers[-1][1], + ) def _model_path_from_request_url(raw_response: httpx.Response) -> str | None: @@ -227,6 +230,9 @@ def _response_string(response_data: Mapping[str, object], key: str, default: str return value if isinstance(value, str) else default +_RESULT_HEADERS_NOT_FORWARDED: Final[frozenset[str]] = frozenset({"host", "content-length", "transfer-encoding"}) + + def _result_request( raw_response: httpx.Response, response_data: Mapping[str, object], @@ -234,14 +240,12 @@ def _result_request( if _response_string(response_data, "status", "IN_QUEUE") != "COMPLETED": return None result_url: Final[str] = str(raw_response.request.url).removesuffix("/status") + encoding: Final[str] = raw_response.request.headers.encoding result_headers: Final[Mapping[str, str]] = MappingProxyType( { - key: value - for key, value in ( - ("Authorization", raw_response.request.headers.get("Authorization")), - ("Content-Type", raw_response.request.headers.get("Content-Type")), - ) - if value is not None + key.decode(encoding): value.decode(encoding) + for key, value in raw_response.request.headers.raw + if key.decode(encoding).lower() not in _RESULT_HEADERS_NOT_FORWARDED } ) return result_url, result_headers @@ -351,6 +355,8 @@ class FalAIVideoConfig(BaseVideoConfig): duration: Final[str | None] = _duration_value(seconds) if duration is None: raise ValueError("fal.ai seconds must be a numeric value") + if duration == "auto": + return MappingProxyType({}) if profile.integer_duration else MappingProxyType({"duration": duration}) return MappingProxyType({"duration": int(duration) if profile.integer_duration else duration}) def validate_environment( @@ -458,9 +464,10 @@ class FalAIVideoConfig(BaseVideoConfig): raw_response: httpx.Response, logging_obj: object, custom_llm_provider: str | None = None, + client: HTTPHandler | None = None, ) -> VideoObject: response_data: Final[Mapping[str, object]] = _response_data(raw_response) - result_error: Final[str | None] = self._fetch_result_error(raw_response, response_data) + result_error: Final[str | None] = self._fetch_result_error(raw_response, response_data, client) return _status_video_object( response_data=response_data, raw_response=raw_response, @@ -472,15 +479,20 @@ class FalAIVideoConfig(BaseVideoConfig): self, raw_response: httpx.Response, response_data: Mapping[str, object], + client: HTTPHandler | None, ) -> str | None: result_request: Final[tuple[str, Mapping[str, str]] | None] = _result_request(raw_response, response_data) if result_request is None: return None result_url, result_headers = result_request - result_response: Final[httpx.Response] = self._sync_client_factory().get( - url=result_url, - headers=result_headers, - ) + result_client: Final[HTTPHandler] = client if client is not None else self._sync_client_factory() + try: + result_response: Final[httpx.Response] = result_client.get( + url=result_url, + headers=dict(result_headers), # mutable-ok: HTTPHandler.get only accepts a dict + ) + except httpx.TransportError: + return None return _terminal_result_error(result_response) async def async_transform_video_status_retrieve_response( @@ -488,9 +500,10 @@ class FalAIVideoConfig(BaseVideoConfig): raw_response: httpx.Response, logging_obj: object, custom_llm_provider: str | None = None, + client: AsyncHTTPHandler | None = None, ) -> VideoObject: response_data: Final[Mapping[str, object]] = _response_data(raw_response) - result_error: Final[str | None] = await self._fetch_result_error_async(raw_response, response_data) + result_error: Final[str | None] = await self._fetch_result_error_async(raw_response, response_data, client) return _status_video_object( response_data=response_data, raw_response=raw_response, @@ -502,15 +515,20 @@ class FalAIVideoConfig(BaseVideoConfig): self, raw_response: httpx.Response, response_data: Mapping[str, object], + client: AsyncHTTPHandler | None, ) -> str | None: result_request: Final[tuple[str, Mapping[str, str]] | None] = _result_request(raw_response, response_data) if result_request is None: return None result_url, result_headers = result_request - result_response: Final[httpx.Response] = await self._async_client_factory().get( - url=result_url, - headers=result_headers, - ) + result_client: Final[AsyncHTTPHandler] = client if client is not None else self._async_client_factory() + try: + result_response: Final[httpx.Response] = await result_client.get( + url=result_url, + headers=dict(result_headers), # mutable-ok: AsyncHTTPHandler.get only accepts a dict + ) + except httpx.TransportError: + return None return _terminal_result_error(result_response) @staticmethod diff --git a/litellm/llms/gemini/image_edit/cost_calculator.py b/litellm/llms/gemini/image_edit/cost_calculator.py index 956edb849a0..321fbbaeb37 100644 --- a/litellm/llms/gemini/image_edit/cost_calculator.py +++ b/litellm/llms/gemini/image_edit/cost_calculator.py @@ -7,11 +7,13 @@ from typing import Any from litellm.llms.gemini.image_generation.cost_calculator import ( cost_calculator as image_generation_cost_calculator, ) +from litellm.types.utils import ModelInfo def cost_calculator( model: str, image_response: Any, + model_info: ModelInfo | None = None, ) -> float: """ Gemini image edit cost calculator. @@ -22,4 +24,5 @@ def cost_calculator( return image_generation_cost_calculator( model=model, image_response=image_response, + model_info=model_info, ) diff --git a/litellm/llms/gemini/image_generation/cost_calculator.py b/litellm/llms/gemini/image_generation/cost_calculator.py index ea0e77e1b81..e3232f8fb7b 100644 --- a/litellm/llms/gemini/image_generation/cost_calculator.py +++ b/litellm/llms/gemini/image_generation/cost_calculator.py @@ -4,24 +4,26 @@ Google AI Image Generation Cost Calculator from typing import Any, Final -import litellm from litellm.litellm_core_utils.llm_cost_calc.utils import ( calculate_image_response_cost_from_usage, calculate_image_response_web_search_cost, + resolve_image_model_info, ) -from litellm.types.utils import ImageResponse +from litellm.types.utils import ImageResponse, ModelInfo def cost_calculator( model: str, image_response: Any, + model_info: ModelInfo | None = None, ) -> float: """ Google AI Image Generation Cost Calculator """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider="gemini", + model_info=model_info, ) if not isinstance(image_response, ImageResponse): @@ -37,6 +39,7 @@ def cost_calculator( model=model, image_response=image_response, custom_llm_provider="gemini", + model_info=_model_info, ) if token_based_cost is not None: return token_based_cost + web_search_cost diff --git a/litellm/llms/gemini/videos/transformation.py b/litellm/llms/gemini/videos/transformation.py index a44717eb659..8a3894cf7fb 100644 --- a/litellm/llms/gemini/videos/transformation.py +++ b/litellm/llms/gemini/videos/transformation.py @@ -26,6 +26,7 @@ from litellm.types.videos.utils import ( if TYPE_CHECKING: from litellm.litellm_core_utils.litellm_logging import Logging as _LiteLLMLoggingObj + from litellm.llms.custom_httpx.http_handler import HTTPHandler from ...base_llm.chat.transformation import BaseLLMException as _BaseLLMException @@ -386,6 +387,7 @@ class GeminiVideoConfig(BaseVideoConfig): raw_response: httpx.Response, logging_obj: LiteLLMLoggingObj, custom_llm_provider: str | None = None, + client: "HTTPHandler | None" = None, ) -> VideoObject: """ Transform the Veo operation status response. diff --git a/litellm/llms/github_copilot/chat/transformation.py b/litellm/llms/github_copilot/chat/transformation.py index 8634b374f1b..169b9a037a5 100644 --- a/litellm/llms/github_copilot/chat/transformation.py +++ b/litellm/llms/github_copilot/chat/transformation.py @@ -31,6 +31,14 @@ class GithubCopilotConfig(OpenAIConfig): super().__init__() self.authenticator = Authenticator() + def api_base_without_login(self, api_base: str | None = None) -> str: + return ( + api_base + or self.authenticator.get_api_base() + or os.getenv("GITHUB_COPILOT_API_BASE") + or DEFAULT_GITHUB_COPILOT_API_BASE + ) + def _get_openai_compatible_provider_info( self, model: str, @@ -38,12 +46,7 @@ class GithubCopilotConfig(OpenAIConfig): api_key: str | None, custom_llm_provider: str, ) -> tuple[str | None, str | None, str]: - dynamic_api_base: Final = ( - api_base - or self.authenticator.get_api_base() - or os.getenv("GITHUB_COPILOT_API_BASE") - or DEFAULT_GITHUB_COPILOT_API_BASE - ) + dynamic_api_base: Final = self.api_base_without_login(api_base) try: dynamic_api_key: Final = self.authenticator.get_api_key() except GetAPIKeyError as e: diff --git a/litellm/llms/ollama/common_utils.py b/litellm/llms/ollama/common_utils.py index ed4bab22a84..9f46cbc5cd5 100644 --- a/litellm/llms/ollama/common_utils.py +++ b/litellm/llms/ollama/common_utils.py @@ -1,3 +1,5 @@ +import base64 +import io from typing import Any, Final import httpx @@ -11,37 +13,35 @@ class OllamaError(BaseLLMException): super().__init__(status_code=status_code, message=message, headers=headers) -def _convert_image(image): - """ - Convert image to base64 encoded image if not already in base64 format +_JPEG_AND_PNG_SIGNATURES: Final = (b"\xff\xd8\xff", b"\x89PNG\r\n\x1a\n") - If image is already in base64 format AND is a jpeg/png, return it - - If image is not JPEG/PNG, convert it to JPEG base64 format - """ - import base64 - import io +def _reencode_as_jpeg(raw_image: bytes, original: str) -> str: try: from PIL import Image except Exception: raise Exception("ollama image conversion failed please run `pip install Pillow`") - orig: Final = image - if image.startswith("data:"): - image = image.split(",")[-1] try: - image_data: Final = Image.open(io.BytesIO(base64.b64decode(image))) - if image_data.format in ["JPEG", "PNG"]: - return image + picture: Final = Image.open(io.BytesIO(raw_image)) except Exception: - return orig + return original jpeg_image: Final = io.BytesIO() - image_data.convert("RGB").save(jpeg_image, "JPEG") - jpeg_image.seek(0) + picture.convert("RGB").save(jpeg_image, "JPEG") return base64.b64encode(jpeg_image.getvalue()).decode("utf-8") +def _convert_image(image: str) -> str: + payload: Final = image.split(",")[-1] if image.startswith("data:") else image + try: + raw_image: Final = base64.b64decode(payload) + except ValueError: + return image + if raw_image.startswith(_JPEG_AND_PNG_SIGNATURES): + return payload + return _reencode_as_jpeg(raw_image, original=image) + + from litellm.llms.base_llm.base_utils import BaseLLMModelInfo diff --git a/litellm/llms/openai/image_generation/cost_calculator.py b/litellm/llms/openai/image_generation/cost_calculator.py index 938a0a57f2a..350fdbaee2d 100644 --- a/litellm/llms/openai/image_generation/cost_calculator.py +++ b/litellm/llms/openai/image_generation/cost_calculator.py @@ -9,27 +9,37 @@ from typing import Final from litellm import verbose_logger from litellm.litellm_core_utils.llm_cost_calc.utils import ( calculate_image_response_cost_from_usage, + flat_image_cost, generic_cost_per_token, + resolve_image_model_info, ) -from litellm.types.utils import ImageResponse, Usage +from litellm.types.utils import ImageResponse, ModelInfo, Usage def cost_calculator( model: str, image_response: ImageResponse, custom_llm_provider: str | None = None, + model_info: ModelInfo | None = None, ) -> float: """Calculate cost for OpenAI gpt-image models (token-based pricing).""" + provider: Final = custom_llm_provider or "openai" + price_table: Final = ( + None + if model_info is None + else resolve_image_model_info(model=model, custom_llm_provider=provider, model_info=model_info) + ) + usage: Final = getattr(image_response, "usage", None) if usage is None: verbose_logger.debug("No usage data available for %s, cannot calculate token-based cost", model) - return 0.0 - - provider: Final = custom_llm_provider or "openai" + return flat_image_cost(price_table, image_response) # A chat Usage with an explicit output breakdown: cost via generic_cost_per_token. if isinstance(usage, Usage) and usage.completion_tokens_details is not None: - prompt_cost, completion_cost = generic_cost_per_token(model=model, usage=usage, custom_llm_provider=provider) + prompt_cost, completion_cost = generic_cost_per_token( + model=model, usage=usage, custom_llm_provider=provider, model_info=price_table + ) return prompt_cost + completion_cost # ImageUsage / ResponseAPIUsage: reuse the shared helper (same path as @@ -38,7 +48,7 @@ def cost_calculator( # does not itemize output and splitting text/image when it does. if getattr(usage, "input_tokens", None) is not None: token_based_cost: Final = calculate_image_response_cost_from_usage( - model=model, image_response=image_response, custom_llm_provider=provider + model=model, image_response=image_response, custom_llm_provider=provider, model_info=price_table ) if token_based_cost is not None: return token_based_cost @@ -46,7 +56,9 @@ def cost_calculator( # Fallback: a Usage with no output breakdown that the image helper can't read — # cost via generic_cost_per_token (text rate) instead of returning 0.0. if isinstance(usage, Usage): - prompt_cost, completion_cost = generic_cost_per_token(model=model, usage=usage, custom_llm_provider=provider) + prompt_cost, completion_cost = generic_cost_per_token( + model=model, usage=usage, custom_llm_provider=provider, model_info=price_table + ) return prompt_cost + completion_cost - return 0.0 + return flat_image_cost(price_table, image_response) diff --git a/litellm/llms/openai/realtime/handler.py b/litellm/llms/openai/realtime/handler.py index e3ecbac1a53..bdc3a6c7908 100644 --- a/litellm/llms/openai/realtime/handler.py +++ b/litellm/llms/openai/realtime/handler.py @@ -12,6 +12,7 @@ from litellm.constants import REALTIME_WEBSOCKET_MAX_MESSAGE_SIZE_BYTES from litellm.types.realtime import RealtimeQueryParams from ....litellm_core_utils.litellm_logging import Logging as LiteLLMLogging +from ....litellm_core_utils.realtime_errors import close_after_upstream_handshake_refusal from ....litellm_core_utils.realtime_streaming import ( RealtimeEventNormalizer, RealTimeStreaming, @@ -175,8 +176,8 @@ class OpenAIRealtime(OpenAIChatCompletion): ) await realtime_streaming.bidirectional_forward() - except websockets.exceptions.InvalidStatusCode as e: - await websocket.close(code=e.status_code, reason=_redact_string(str(e))) + except websockets.exceptions.InvalidStatus as e: + await close_after_upstream_handshake_refusal(websocket, e.response.status_code) except Exception as e: try: await websocket.close(code=1011, reason=_redact_string(f"Internal server error: {e}")) diff --git a/litellm/llms/openai/videos/transformation.py b/litellm/llms/openai/videos/transformation.py index 9a4b030993f..cfd4ca24ae7 100644 --- a/litellm/llms/openai/videos/transformation.py +++ b/litellm/llms/openai/videos/transformation.py @@ -28,6 +28,7 @@ from litellm.types.videos.utils import ( if TYPE_CHECKING: from litellm.litellm_core_utils.litellm_logging import Logging as _LiteLLMLoggingObj + from litellm.llms.custom_httpx.http_handler import HTTPHandler from ...base_llm.chat.transformation import BaseLLMException as _BaseLLMException @@ -437,6 +438,7 @@ class OpenAIVideoConfig(BaseVideoConfig): raw_response: httpx.Response, logging_obj: LiteLLMLoggingObj, custom_llm_provider: str | None = None, + client: "HTTPHandler | None" = None, ) -> VideoObject: """ Transform the OpenAI video retrieve response. diff --git a/litellm/llms/recraft/cost_calculator.py b/litellm/llms/recraft/cost_calculator.py index 2866d8e1d96..221d4a35913 100644 --- a/litellm/llms/recraft/cost_calculator.py +++ b/litellm/llms/recraft/cost_calculator.py @@ -1,19 +1,22 @@ from typing import Any, Final import litellm -from litellm.types.utils import ImageResponse +from litellm.litellm_core_utils.llm_cost_calc.utils import resolve_image_model_info +from litellm.types.utils import ImageResponse, ModelInfo def cost_calculator( model: str, image_response: Any, + model_info: ModelInfo | None = None, ) -> float: """ Recraft image generation cost calculator """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider=litellm.LlmProviders.RECRAFT.value, + model_info=model_info, ) output_cost_per_image: Final[float] = _model_info.get("output_cost_per_image") or 0.0 num_images: int = 0 diff --git a/litellm/llms/runwayml/cost_calculator.py b/litellm/llms/runwayml/cost_calculator.py index fdd4b904b60..07f7d564ac2 100644 --- a/litellm/llms/runwayml/cost_calculator.py +++ b/litellm/llms/runwayml/cost_calculator.py @@ -1,12 +1,14 @@ from typing import Any, Final import litellm -from litellm.types.utils import ImageResponse +from litellm.litellm_core_utils.llm_cost_calc.utils import resolve_image_model_info +from litellm.types.utils import ImageResponse, ModelInfo def cost_calculator( model: str, image_response: Any, + model_info: ModelInfo | None = None, ) -> float: """ RunwayML image generation cost calculator. @@ -14,9 +16,10 @@ def cost_calculator( RunwayML charges per image generated, not per pixel. Pricing is stored in model_prices_and_context_window.json with output_cost_per_image. """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider=litellm.LlmProviders.RUNWAYML.value, + model_info=model_info, ) output_cost_per_image: Final[float] = _model_info.get("output_cost_per_image") or 0.0 num_images: int = 0 diff --git a/litellm/llms/runwayml/videos/transformation.py b/litellm/llms/runwayml/videos/transformation.py index c7696a1cb29..1abdece44f2 100644 --- a/litellm/llms/runwayml/videos/transformation.py +++ b/litellm/llms/runwayml/videos/transformation.py @@ -616,6 +616,7 @@ class RunwayMLVideoConfig(BaseVideoConfig): raw_response: httpx.Response, logging_obj: LiteLLMLoggingObj, custom_llm_provider: str | None = None, + client: HTTPHandler | None = None, ) -> VideoObject: """ Transform the RunwayML video status retrieve response. diff --git a/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py b/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py index 204b1ddd5ea..a50665c71df 100644 --- a/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py +++ b/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py @@ -287,7 +287,10 @@ class VertexGeminiConfig(VertexAIBaseConfig, BaseConfig): Check if the model is Gemini 3 or newer. """ model_name = model.split("/")[-1].lower() - if not model_name: + is_vertex_fine_tuned_model: Final = model_name.isdigit() or ( + model.startswith("gemini/") and not model_name.startswith("gemini-") + ) + if not model_name or is_vertex_fine_tuned_model or model_name.startswith("gemma-"): return False # Pre-Gemini 3 models: gemini-1.x, gemini-2.x, gemini-pro, gemini-flash, gemini-exp if re.match(r"^gemini-(?:[12](?:\.\d+)?|exp|(?:pro|flash)(?!-(?:lite-)?latest$))(?:-|$)", model_name): diff --git a/litellm/llms/vertex_ai/image_generation/cost_calculator.py b/litellm/llms/vertex_ai/image_generation/cost_calculator.py index f3117e65681..6db4f02ee5a 100644 --- a/litellm/llms/vertex_ai/image_generation/cost_calculator.py +++ b/litellm/llms/vertex_ai/image_generation/cost_calculator.py @@ -4,24 +4,26 @@ Vertex AI Image Generation Cost Calculator from typing import Final -import litellm from litellm.litellm_core_utils.llm_cost_calc.utils import ( calculate_image_response_cost_from_usage, calculate_image_response_web_search_cost, + resolve_image_model_info, ) -from litellm.types.utils import ImageResponse +from litellm.types.utils import ImageResponse, ModelInfo def cost_calculator( model: str, image_response: ImageResponse, + model_info: ModelInfo | None = None, ) -> float: """ Vertex AI Image Generation Cost Calculator """ - _model_info: Final = litellm.get_model_info( + _model_info: Final = resolve_image_model_info( model=model, custom_llm_provider="vertex_ai", + model_info=model_info, ) web_search_cost: Final = calculate_image_response_web_search_cost( @@ -34,6 +36,7 @@ def cost_calculator( model=model, image_response=image_response, custom_llm_provider="vertex_ai", + model_info=_model_info, ) if token_based_cost is not None: return token_based_cost + web_search_cost diff --git a/litellm/llms/vertex_ai/videos/transformation.py b/litellm/llms/vertex_ai/videos/transformation.py index dc9caa13224..6c29059f0a9 100644 --- a/litellm/llms/vertex_ai/videos/transformation.py +++ b/litellm/llms/vertex_ai/videos/transformation.py @@ -36,6 +36,7 @@ if TYPE_CHECKING: from litellm.llms.base_llm.chat.transformation import ( BaseLLMException as _BaseLLMException, ) + from litellm.llms.custom_httpx.http_handler import HTTPHandler LiteLLMLoggingObj = _LiteLLMLoggingObj BaseLLMException = _BaseLLMException @@ -491,6 +492,7 @@ class VertexAIVideoConfig(BaseVideoConfig, VertexBase): raw_response: httpx.Response, logging_obj: LiteLLMLoggingObj, custom_llm_provider: str | None = None, + client: "HTTPHandler | None" = None, ) -> VideoObject: """ Transform the Veo operation status response. diff --git a/litellm/main.py b/litellm/main.py index 7d231a1bf7a..7f4b34d28a0 100644 --- a/litellm/main.py +++ b/litellm/main.py @@ -78,8 +78,9 @@ from litellm.litellm_core_utils.chat_completion_agentic_loop import ( from litellm.litellm_core_utils.completion_timeout import CompletionTimeout from litellm.litellm_core_utils.dd_tracing import tracer from litellm.litellm_core_utils.get_litellm_params import ( - FORWARDED_KWARGS_KEYS, + AWS_CREDENTIAL_KWARGS_KEYS, OPTIONAL_KWARGS_KEYS, + PROVIDER_AFFINITY_HEADER_KWARG_KEY, ) from litellm.litellm_core_utils.get_provider_specific_headers import ( ProviderSpecificHeaderUtils, @@ -96,6 +97,7 @@ from litellm.litellm_core_utils.mock_functions import ( from litellm.litellm_core_utils.prompt_templates.common_utils import ( get_content_from_model_response, ) +from litellm.litellm_core_utils.provider_affinity import add_provider_affinity_header from litellm.litellm_core_utils.request_timeout_resolver import ( get_configured_request_timeout, ) @@ -5644,8 +5646,30 @@ def completion( gigachat_scope=kwargs.get("gigachat_scope"), gigachat_auth_url=kwargs.get("gigachat_auth_url"), gigachat_access_token=kwargs.get("gigachat_access_token"), - **{key: kwargs[key] for key in FORWARDED_KWARGS_KEYS if key in kwargs}, + **{ + key: kwargs[key] + for key in (*AWS_CREDENTIAL_KWARGS_KEYS, PROVIDER_AFFINITY_HEADER_KWARG_KEY) + if key in kwargs + }, ) + if litellm_params.get("provider_affinity_header") is not None: + try: + headers = add_provider_affinity_header( + headers=headers or litellm.headers or MappingProxyType({}), + litellm_params=MappingProxyType( + { + "provider_affinity_header": litellm_params["provider_affinity_header"], + "litellm_session_id": kwargs.get("litellm_session_id"), + "session_id": kwargs.get("session_id"), + "metadata": metadata, + "litellm_metadata": kwargs.get("litellm_metadata"), + } + ), + ) + except ValueError as affinity_error: + raise litellm.BadRequestError( + message=str(affinity_error), model=model, llm_provider=custom_llm_provider + ) from affinity_error cast(LiteLLMLoggingObj, logging).update_environment_variables( model=model, user=user, diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json index 7cde9a1162e..ae02744b8e1 100644 --- a/litellm/model_prices_and_context_window_backup.json +++ b/litellm/model_prices_and_context_window_backup.json @@ -53,13 +53,6 @@ "mode": "image_generation", "output_cost_per_image": 0.04 }, - "1024-x-1024/dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 1.9e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "1024-x-1024/max-steps/stability.stable-diffusion-xl-v1": { "litellm_provider": "bedrock", "max_input_tokens": 77, @@ -67,13 +60,6 @@ "mode": "image_generation", "output_cost_per_image": 0.08 }, - "256-x-256/dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 2.4414e-07, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "512-x-512/50-steps/stability.stable-diffusion-xl-v0": { "litellm_provider": "bedrock", "max_input_tokens": 77, @@ -81,13 +67,6 @@ "mode": "image_generation", "output_cost_per_image": 0.018 }, - "512-x-512/dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 6.86e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "512-x-512/max-steps/stability.stable-diffusion-xl-v0": { "litellm_provider": "bedrock", "max_input_tokens": 77, @@ -102,7 +81,8 @@ "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 1.25e-05 + "output_cost_per_token": 1.25e-05, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.j2-ultra-v1": { "input_cost_per_token": 1.88e-05, @@ -111,7 +91,8 @@ "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 1.88e-05 + "output_cost_per_token": 1.88e-05, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.jamba-1-5-large-v1:0": { "deprecation_date": "2026-11-26", @@ -121,7 +102,8 @@ "max_output_tokens": 256000, "max_tokens": 256000, "mode": "chat", - "output_cost_per_token": 8e-06 + "output_cost_per_token": 8e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.jamba-1-5-mini-v1:0": { "deprecation_date": "2026-11-26", @@ -131,7 +113,8 @@ "max_output_tokens": 256000, "max_tokens": 256000, "mode": "chat", - "output_cost_per_token": 4e-07 + "output_cost_per_token": 4e-07, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.jamba-instruct-v1:0": { "input_cost_per_token": 5e-07, @@ -141,6 +124,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 7e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_system_messages": true }, "aiml/dall-e-2": { @@ -316,6 +300,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 1e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -327,6 +312,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 6e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -338,6 +324,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 1e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -349,6 +336,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 6e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -360,7 +348,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 6e-07, - "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-writer-palmyra-vision-7b.html", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_vision": true }, "amazon.nova-lite-v1:0": { @@ -578,17 +566,6 @@ "supports_vision": true, "supports_tool_choice": true }, - "amazon.nova-sonic-v1:0": { - "deprecation_date": "2026-09-14", - "input_cost_per_audio_token": 3.4e-06, - "input_cost_per_token": 6e-08, - "litellm_provider": "bedrock", - "mode": "realtime", - "output_cost_per_audio_token": 1.36e-05, - "output_cost_per_token": 2.4e-07, - "supports_audio_input": true, - "supports_audio_output": true - }, "amazon.nova-2-sonic-v1:0": { "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 3.3e-07, @@ -846,7 +823,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -972,23 +949,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "anthropic.claude-3-opus-20240229-v1:0": { "input_cost_per_token": 1.5e-05, "litellm_provider": "bedrock", @@ -1004,23 +964,6 @@ "cache_read_input_token_cost": 1.5e-06, "cache_creation_input_token_cost": 1.875e-05 }, - "anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "anthropic.claude-instant-v1": { "input_cost_per_token": 8e-07, "litellm_provider": "bedrock", @@ -1114,7 +1057,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1149,7 +1093,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1184,7 +1129,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1219,7 +1165,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1254,7 +1201,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1289,7 +1237,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-opus-4-7": { "bedrock_converse_supports_strict_tools": false, @@ -1321,7 +1270,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -1375,7 +1324,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -1413,7 +1362,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -1451,12 +1400,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-4-7": { "bedrock_converse_supports_strict_tools": false, @@ -1488,12 +1438,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-fable-5": { "cache_creation_input_token_cost": 1.25e-05, @@ -1761,7 +1712,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.375e-05, @@ -1839,6 +1791,46 @@ "prompt_cache_min_tokens": 512, "source": "https://aws.amazon.com/bedrock/pricing/" }, + "anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "global.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, "supports_adaptive_thinking": true, @@ -1877,6 +1869,46 @@ "prompt_cache_min_tokens": 512, "source": "https://aws.amazon.com/bedrock/pricing/" }, + "global.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "us.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, "supports_adaptive_thinking": true, @@ -1915,6 +1947,46 @@ "prompt_cache_min_tokens": 512, "source": "https://aws.amazon.com/bedrock/pricing/" }, + "us.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "eu.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, "supports_adaptive_thinking": true, @@ -1950,7 +2022,48 @@ "supports_max_reasoning_effort": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, + "eu.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, @@ -1987,7 +2100,48 @@ "supports_max_reasoning_effort": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, + "au.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, @@ -2024,7 +2178,48 @@ "supports_max_reasoning_effort": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, + "jp.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-opus-4-8": { "bedrock_converse_supports_strict_tools": false, @@ -2057,7 +2252,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -2096,7 +2291,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -2135,7 +2330,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -2174,12 +2369,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-4-8": { "bedrock_converse_supports_strict_tools": false, @@ -2212,12 +2408,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-opus-4-8": { "bedrock_converse_supports_strict_tools": false, @@ -2250,16 +2447,18 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-opus-4-7": { "bedrock_converse_supports_strict_tools": false, "cache_creation_input_token_cost": 6.875e-06, + "cache_creation_input_token_cost_above_1hr": 1.1e-05, "cache_read_input_token_cost": 5.5e-07, "input_cost_per_token": 5.5e-06, "litellm_provider": "bedrock_converse", @@ -2286,11 +2485,12 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_minimal_reasoning_effort": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -2445,7 +2645,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -2483,7 +2684,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -2521,7 +2723,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-4-6": { "supports_adaptive_thinking": true, @@ -2660,7 +2863,8 @@ "supports_native_structured_output": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-sonnet-4-6": { "supports_adaptive_thinking": true, @@ -2694,7 +2898,8 @@ "supports_native_structured_output": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-sonnet-4-6": { "supports_adaptive_thinking": true, @@ -2728,7 +2933,8 @@ "supports_native_structured_output": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -2760,7 +2966,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -2797,7 +3004,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.5e-06, - "output_cost_per_token_batches": 7.5e-06 + "output_cost_per_token_batches": 7.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-v1": { "input_cost_per_token": 8e-06, @@ -2982,60 +3190,6 @@ "supports_vision": true, "supports_tool_choice": true }, - "apac.anthropic.claude-3-5-sonnet-20240620-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, - "apac.anthropic.claude-3-5-sonnet-20241022-v2:0": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "apac.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "apac.anthropic.claude-haiku-4-5-20251001-v1:0": { "cache_creation_input_token_cost": 1.375e-06, "cache_read_input_token_cost": 1.1e-07, @@ -3063,23 +3217,6 @@ "input_cost_per_token_batches": 5.5e-07, "output_cost_per_token_batches": 2.75e-06 }, - "apac.anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "apac.anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, "cache_read_input_token_cost": 3e-07, @@ -3110,7 +3247,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "assemblyai/best": { "input_cost_per_second": 3.333e-05, @@ -3159,7 +3297,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "azure/ada": { "input_cost_per_token": 1e-07, @@ -3424,6 +3563,41 @@ "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 512 }, + "azure_ai/claude-opus-5-5": { + "supports_mid_conversation_system": true, + "input_cost_per_token": 4e-06, + "output_cost_per_token": 2e-05, + "litellm_provider": "azure_ai", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "supports_adaptive_thinking": true, + "thinking_always_on": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_forced_tool_use": false, + "supports_function_calling": true, + "supports_native_structured_output": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_max_reasoning_effort": true, + "prompt_cache_min_tokens": 512 + }, "azure_ai/claude-opus-4-8": { "deprecation_date": "2027-09-01", "supports_mid_conversation_system": true, @@ -3457,29 +3631,6 @@ "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 1024 }, - "azure_ai/claude-opus-4-1": { - "deprecation_date": "2026-08-05", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "azure_ai", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, "azure_ai/claude-sonnet-4-5": { "deprecation_date": "2026-10-19", "cache_creation_input_token_cost": 3.75e-06, @@ -4428,7 +4579,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 6.875e-08 }, "azure/eu/gpt-5-mini-2025-08-07": { "cache_read_input_token_cost": 2.75e-08, @@ -4467,11 +4619,13 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 1.375e-08 }, "azure/eu/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "litellm_provider": "azure", @@ -4511,43 +4665,6 @@ "output_cost_per_token_priority": 2.2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.375e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.375e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1.1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, @@ -4646,7 +4763,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 2.75e-09 }, "azure/eu/o1-2024-12-17": { "cache_read_input_token_cost": 8.25e-06, @@ -4684,21 +4802,6 @@ "supports_prompt_caching": true, "supports_vision": false }, - "azure/eu/o1-preview-2024-09-12": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_vision": false - }, "azure/eu/o3-mini-2025-01-31": { "cache_read_input_token_cost": 6.05e-07, "deprecation_date": "2026-11-19", @@ -4814,6 +4917,7 @@ "azure/global/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, "litellm_provider": "azure", @@ -4853,43 +4957,6 @@ "output_cost_per_token_priority": 2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/global/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/global/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, @@ -4965,19 +5032,6 @@ "supports_function_calling": true, "supports_tool_choice": true }, - "azure/gpt-3.5-turbo-0125": { - "deprecation_date": "2025-03-31", - "input_cost_per_token": 5e-07, - "litellm_provider": "azure", - "max_input_tokens": 16384, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, "azure/gpt-3.5-turbo-instruct-0914": { "input_cost_per_token": 1.5e-06, "litellm_provider": "azure_text", @@ -4997,32 +5051,6 @@ "supports_function_calling": true, "supports_tool_choice": true }, - "azure/gpt-35-turbo-0125": { - "deprecation_date": "2025-05-31", - "input_cost_per_token": 5e-07, - "litellm_provider": "azure", - "max_input_tokens": 16384, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, - "azure/gpt-35-turbo-1106": { - "deprecation_date": "2025-03-31", - "input_cost_per_token": 1e-06, - "litellm_provider": "azure", - "max_input_tokens": 16384, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 2e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, "azure/gpt-35-turbo-16k": { "input_cost_per_token": 3e-06, "litellm_provider": "azure", @@ -5790,40 +5818,6 @@ "supports_system_messages": true, "supports_tool_choice": true }, - "azure/gpt-realtime-2": { - "cache_read_input_audio_token_cost": 4e-07, - "cache_read_input_token_cost": 4e-07, - "deprecation_date": "2026-08-31", - "input_cost_per_audio_token": 3.2e-05, - "input_cost_per_image_token": 5e-06, - "input_cost_per_token": 4e-06, - "litellm_provider": "azure", - "max_input_tokens": 32000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 6.4e-05, - "output_cost_per_token": 2.4e-05, - "source": "https://learn.microsoft.com/en-us/azure/foundry/foundry-models/concepts/models-sold-directly-by-azure", - "supported_endpoints": [ - "/v1/realtime" - ], - "supported_modalities": [ - "text", - "image", - "audio" - ], - "supported_output_modalities": [ - "text", - "audio" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "azure/gpt-realtime-2.1": { "cache_creation_input_audio_token_cost": 4e-07, "cache_read_input_audio_token_cost": 4e-07, @@ -6118,46 +6112,8 @@ "input_cost_per_token_batches": 6.25e-07, "output_cost_per_token_batches": 5e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_minimal_reasoning_effort": true - }, - "azure/gpt-5.1-chat-2025-11-13": { - "cache_read_input_token_cost": 1.25e-07, - "cache_read_input_token_cost_priority": 2.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "input_cost_per_token_priority": 2.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "output_cost_per_token_priority": 2e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_native_streaming": true, - "supports_parallel_function_calling": false, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": false, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_batches": 6.25e-08 }, "azure/gpt-5.1-codex-2025-11-13": { "cache_read_input_token_cost": 1.25e-07, @@ -6232,6 +6188,7 @@ "azure/gpt-5": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, "input_cost_per_token_batches": 6.25e-07, @@ -6305,74 +6262,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5-chat": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5-chat-latest": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 6.25e-08 }, "azure/gpt-5-codex": { "cache_read_input_token_cost": 1.25e-07, @@ -6409,6 +6300,7 @@ "azure/gpt-5-mini": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_token": 2.5e-07, "input_cost_per_token_batches": 1.25e-07, @@ -6482,11 +6374,13 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 1.25e-08 }, "azure/gpt-5-nano": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 5e-09, + "cache_read_input_token_cost_batches": 2.5e-09, "input_cost_per_token": 5e-08, "input_cost_per_token_batches": 2.5e-08, "litellm_provider": "azure", @@ -6554,7 +6448,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 2.5e-09 }, "azure/gpt-5-pro": { "deprecation_date": "2027-04-07", @@ -6591,6 +6486,7 @@ "azure/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, "litellm_provider": "azure", @@ -6630,43 +6526,6 @@ "output_cost_per_token_priority": 2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, @@ -6766,6 +6625,7 @@ "azure/gpt-5.2": { "deprecation_date": "2027-06-08", "cache_read_input_token_cost": 1.75e-07, + "cache_read_input_token_cost_batches": 8.75e-08, "cache_read_input_token_cost_priority": 3.5e-07, "input_cost_per_token": 1.75e-06, "input_cost_per_token_batches": 8.75e-07, @@ -6841,79 +6701,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5.2-chat": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5.2-chat-2025-12-11": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-05-13", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 8.75e-08 }, "azure/gpt-5.2-codex": { "cache_read_input_token_cost": 1.75e-07, @@ -6947,42 +6736,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "azure/gpt-5.3-chat": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "azure/gpt-5.3-codex": { "cache_read_input_token_cost": 1.75e-07, "cache_read_input_token_cost_priority": 3.5e-07, @@ -7100,9 +6853,11 @@ "deprecation_date": "2027-09-02", "cache_read_input_token_cost": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens": 5e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens_flex": 2.5e-07, "cache_read_input_token_cost_priority": 5e-07, "cache_read_input_token_cost_above_272k_tokens_priority": 1e-06, + "cache_read_input_token_cost_batches": 1.3e-07, "input_cost_per_token": 2.5e-06, "input_cost_per_token_above_272k_tokens": 5e-06, "input_cost_per_token_priority": 5e-06, @@ -7140,9 +6895,11 @@ "supports_vision": true, "supports_none_reasoning_effort": true, "default_reasoning_effort": "none", + "input_cost_per_token_above_272k_tokens_batches": 2.5e-06, "input_cost_per_token_above_272k_tokens_flex": 2.5e-06, "input_cost_per_token_batches": 1.25e-06, "input_cost_per_token_flex": 1.25e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.125e-05, "output_cost_per_token_above_272k_tokens_flex": 1.125e-05, "output_cost_per_token_batches": 7.5e-06, "output_cost_per_token_flex": 7.5e-06, @@ -7154,6 +6911,8 @@ "deprecation_date": "2027-09-02", "cache_read_input_token_cost": 2.75e-07, "cache_read_input_token_cost_above_272k_tokens": 5.5e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, "cache_read_input_token_cost_priority": 5.5e-07, "input_cost_per_token": 2.75e-06, "input_cost_per_token_priority": 5.5e-06, @@ -7189,8 +6948,10 @@ "supports_none_reasoning_effort": true, "default_reasoning_effort": "none", "input_cost_per_token_above_272k_tokens": 5.5e-06, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, "input_cost_per_token_batches": 1.375e-06, "output_cost_per_token_above_272k_tokens": 2.475e-05, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05, "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, @@ -7200,6 +6961,8 @@ "deprecation_date": "2027-09-02", "cache_read_input_token_cost": 2.75e-07, "cache_read_input_token_cost_above_272k_tokens": 5.5e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, "cache_read_input_token_cost_priority": 5.5e-07, "input_cost_per_token": 2.75e-06, "input_cost_per_token_priority": 5.5e-06, @@ -7235,8 +6998,10 @@ "supports_none_reasoning_effort": true, "default_reasoning_effort": "none", "input_cost_per_token_above_272k_tokens": 5.5e-06, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, "input_cost_per_token_batches": 1.375e-06, "output_cost_per_token_above_272k_tokens": 2.475e-05, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05, "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, @@ -7294,7 +7059,11 @@ "output_cost_per_token_flex": 7.5e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, + "cache_read_input_token_cost_batches": 1.3e-07, + "input_cost_per_token_above_272k_tokens_batches": 2.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.125e-05 }, "azure/us/gpt-5.4-2026-03-05": { "cache_read_input_token_cost": 2.75e-07, @@ -7340,7 +7109,11 @@ "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05 }, "azure/eu/gpt-5.4-2026-03-05": { "cache_read_input_token_cost": 2.75e-07, @@ -7386,7 +7159,11 @@ "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05 }, "azure/gpt-5.4-pro": { "deprecation_date": "2027-09-07", @@ -7394,6 +7171,7 @@ "cache_read_input_token_cost_above_272k_tokens": 6e-06, "input_cost_per_token": 3e-05, "input_cost_per_token_above_272k_tokens": 6e-05, + "input_cost_per_token_above_272k_tokens_batches": 3e-05, "input_cost_per_token_above_272k_tokens_flex": 3e-05, "input_cost_per_token_batches": 1.5e-05, "input_cost_per_token_flex": 1.5e-05, @@ -7404,6 +7182,7 @@ "mode": "responses", "output_cost_per_token": 0.00018, "output_cost_per_token_above_272k_tokens": 0.00027, + "output_cost_per_token_above_272k_tokens_batches": 0.000135, "output_cost_per_token_above_272k_tokens_flex": 0.000135, "output_cost_per_token_batches": 9e-05, "output_cost_per_token_flex": 9e-05, @@ -7482,7 +7261,9 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, - "supports_web_search": true + "supports_web_search": true, + "input_cost_per_token_above_272k_tokens_batches": 3e-05, + "output_cost_per_token_above_272k_tokens_batches": 0.000135 }, "azure/gpt-5.6": { "cache_creation_input_token_cost": 6.25e-06, @@ -8625,11 +8406,14 @@ "deprecation_date": "2027-10-26", "cache_read_input_token_cost": 5e-07, "cache_read_input_token_cost_above_272k_tokens": 1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5e-07, "cache_read_input_token_cost_priority": 1.25e-06, "cache_read_input_token_cost_above_272k_tokens_priority": 2e-06, + "cache_read_input_token_cost_batches": 2.5e-07, "cache_read_input_token_cost_flex": 2.5e-07, "input_cost_per_token": 5e-06, "input_cost_per_token_above_272k_tokens": 1e-05, + "input_cost_per_token_above_272k_tokens_batches": 5e-06, "input_cost_per_token_above_272k_tokens_flex": 5e-06, "input_cost_per_token_priority": 1.25e-05, "input_cost_per_token_above_272k_tokens_priority": 2e-05, @@ -8642,6 +8426,7 @@ "mode": "chat", "output_cost_per_token": 3e-05, "output_cost_per_token_above_272k_tokens": 4.5e-05, + "output_cost_per_token_above_272k_tokens_batches": 2.25e-05, "output_cost_per_token_priority": 7.5e-05, "output_cost_per_token_above_272k_tokens_priority": 9e-05, "output_cost_per_token_batches": 1.5e-05, @@ -8682,9 +8467,12 @@ "deprecation_date": "2027-10-26", "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, "input_cost_per_token_priority": 1.375e-05, "output_cost_per_token": 3.3e-05, @@ -8695,6 +8483,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -8733,9 +8522,12 @@ "deprecation_date": "2027-10-26", "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, "input_cost_per_token_priority": 1.375e-05, "output_cost_per_token": 3.3e-05, @@ -8746,6 +8538,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -8783,8 +8576,10 @@ "azure/gpt-5.5-2026-04-23": { "cache_read_input_token_cost": 5e-07, "cache_read_input_token_cost_above_272k_tokens": 1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5e-07, "cache_read_input_token_cost_priority": 1.25e-06, "cache_read_input_token_cost_above_272k_tokens_priority": 2e-06, + "cache_read_input_token_cost_batches": 2.5e-07, "cache_read_input_token_cost_flex": 2.5e-07, "input_cost_per_token": 5e-06, "input_cost_per_token_above_272k_tokens": 1e-05, @@ -8828,9 +8623,11 @@ "supports_vision": true, "supports_web_search": true, "deprecation_date": "2027-10-26", + "input_cost_per_token_above_272k_tokens_batches": 5e-06, "input_cost_per_token_above_272k_tokens_flex": 5e-06, "input_cost_per_token_batches": 2.5e-06, "input_cost_per_token_flex": 2.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.25e-05, "output_cost_per_token_batches": 1.5e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -8889,11 +8686,17 @@ "supports_none_reasoning_effort": true, "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", + "cache_read_input_token_cost_above_272k_tokens_batches": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, + "input_cost_per_token_above_272k_tokens_batches": 5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.25e-05 }, "azure/us/gpt-5.5-2026-04-23": { "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, @@ -8935,7 +8738,9 @@ "supports_vision": true, "supports_web_search": true, "deprecation_date": "2027-10-26", + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -8988,11 +8793,17 @@ "supports_none_reasoning_effort": true, "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05 }, "azure/eu/gpt-5.5-2026-04-23": { "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, @@ -9034,7 +8845,9 @@ "supports_vision": true, "supports_web_search": true, "deprecation_date": "2027-10-26", + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -9087,7 +8900,11 @@ "supports_none_reasoning_effort": true, "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05 }, "azure/gpt-5.5-pro": { "cache_read_input_token_cost": 3e-06, @@ -9176,6 +8993,7 @@ "azure/gpt-5.4-mini": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "cache_read_input_token_cost_priority": 1.5e-07, "input_cost_per_token": 7.5e-07, @@ -9273,11 +9091,13 @@ "output_cost_per_token_flex": 2.25e-06, "output_cost_per_token_priority": 9e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_xhigh_reasoning_effort": true + "supports_xhigh_reasoning_effort": true, + "cache_read_input_token_cost_batches": 3.75e-08 }, "azure/gpt-5.4-nano": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 2e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "input_cost_per_token": 2e-07, "litellm_provider": "azure", @@ -9369,7 +9189,8 @@ "output_cost_per_token_batches": 6.25e-07, "output_cost_per_token_flex": 6.25e-07, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_xhigh_reasoning_effort": true + "supports_xhigh_reasoning_effort": true, + "cache_read_input_token_cost_batches": 1e-08 }, "azure/gpt-image-1": { "cache_read_input_token_cost": 1.25e-06, @@ -9772,39 +9593,6 @@ "supports_reasoning": true, "supports_vision": false }, - "azure/o1-preview": { - "cache_read_input_token_cost": 7.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_vision": false - }, - "azure/o1-preview-2024-09-12": { - "cache_read_input_token_cost": 7.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_vision": false - }, "azure/o3": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 5e-07, @@ -10416,7 +10204,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 6.875e-08 }, "azure/us/gpt-5-mini-2025-08-07": { "cache_read_input_token_cost": 2.75e-08, @@ -10455,7 +10244,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 1.375e-08 }, "azure/us/gpt-5-nano-2025-08-07": { "cache_read_input_token_cost": 5.5e-09, @@ -10491,11 +10281,13 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 2.75e-09 }, "azure/us/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "litellm_provider": "azure", @@ -10535,43 +10327,6 @@ "output_cost_per_token_priority": 2.2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.375e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.375e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1.1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, @@ -10672,21 +10427,6 @@ "supports_prompt_caching": true, "supports_vision": false }, - "azure/us/o1-preview-2024-09-12": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_vision": false - }, "azure/us/o3-2025-04-16": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 5.5e-07, @@ -11188,18 +10928,6 @@ "/v1/images/edits" ] }, - "azure_ai/MAI-Image-2e": { - "deprecation_date": "2026-08-15", - "input_cost_per_token": 5e-06, - "litellm_provider": "azure_ai", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "output_cost_per_image_token": 1.95e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/images/generations" - ] - }, "azure_ai/MAI-Thinking-1": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, @@ -11224,34 +10952,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "azure_ai/Llama-3.2-11B-Vision-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 3.7e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 3.7e-07, - "source": "https://marketplace.microsoft.com/en/marketplace/apps/metagenai.meta-llama-3-2-11b-vision-instruct-offer?tab=Overview", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "azure_ai/Llama-3.2-90B-Vision-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 2.04e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 2.04e-06, - "source": "https://marketplace.microsoft.com/en/marketplace/apps/metagenai.meta-llama-3-2-90b-vision-instruct-offer?tab=Overview", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, "azure_ai/Llama-3.3-70B-Instruct": { "input_cost_per_token": 7.1e-07, "litellm_provider": "azure_ai", @@ -11300,18 +11000,6 @@ "output_cost_per_token": 3.7e-07, "supports_tool_choice": true }, - "azure_ai/Meta-Llama-3.1-405B-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 5.33e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 1.6e-05, - "source": "https://marketplace.microsoft.com/en-us/marketplace/apps/metagenai.meta-llama-3-1-405b-instruct-offer?tab=PlansAndPrice", - "supports_tool_choice": true - }, "azure_ai/Meta-Llama-3.1-70B-Instruct": { "input_cost_per_token": 2.68e-06, "litellm_provider": "azure_ai", @@ -11323,18 +11011,6 @@ "source": "https://marketplace.microsoft.com/en-us/marketplace/apps/metagenai.meta-llama-3-1-70b-instruct-offer?tab=PlansAndPrice", "supports_tool_choice": true }, - "azure_ai/Meta-Llama-3.1-8B-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 3e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 6.1e-07, - "source": "https://marketplace.microsoft.com/en-us/marketplace/apps/metagenai.meta-llama-3-1-8b-instruct-offer?tab=PlansAndPrice", - "supports_tool_choice": true - }, "azure_ai/Phi-3-medium-128k-instruct": { "input_cost_per_token": 1.7e-07, "litellm_provider": "azure_ai", @@ -11505,16 +11181,6 @@ "supports_tool_choice": true, "supports_reasoning": true }, - "azure_ai/mistral-document-ai-2505": { - "deprecation_date": "2026-07-20", - "litellm_provider": "azure_ai", - "ocr_cost_per_page": 0.003, - "mode": "ocr", - "supported_endpoints": [ - "/v1/ocr" - ], - "source": "https://devblogs.microsoft.com/foundry/whats-new-in-azure-ai-foundry-august-2025/#mistral-document-ai-(ocr)-%E2%80%94-serverless-in-foundry" - }, "azure_ai/mistral-document-ai-2512": { "litellm_provider": "azure_ai", "ocr_cost_per_page": 0.003, @@ -11615,17 +11281,6 @@ "mode": "rerank", "output_cost_per_token": 0.0 }, - "azure_ai/cohere-rerank-v3.5": { - "deprecation_date": "2026-05-14", - "input_cost_per_query": 0.002, - "input_cost_per_token": 0.0, - "litellm_provider": "azure_ai", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "rerank", - "output_cost_per_token": 0.0 - }, "azure_ai/cohere-rerank-v4.0-pro": { "input_cost_per_query": 0.0025, "input_cost_per_token": 0.0, @@ -11678,19 +11333,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "azure_ai/deepseek-r1": { - "deprecation_date": "2026-08-13", - "input_cost_per_token": 1.35e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 5.4e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_reasoning": true, - "supports_tool_choice": true - }, "azure_ai/deepseek-v3": { "input_cost_per_token": 1.14e-06, "litellm_provider": "azure_ai", @@ -11702,33 +11344,6 @@ "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_tool_choice": true }, - "azure_ai/deepseek-v3-0324": { - "deprecation_date": "2026-07-13", - "input_cost_per_token": 1.14e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4.56e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_tool_choice": true - }, - "azure_ai/deepseek-v3.1": { - "deprecation_date": "2026-07-13", - "input_cost_per_token": 1.23e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 4.94e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "azure_ai/deepseek-v4-pro": { "deprecation_date": "2028-02-20", "input_cost_per_token": 1.74e-06, @@ -11795,68 +11410,6 @@ ], "supports_embedding_image_input": true }, - "azure_ai/global/grok-3": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 3e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/global/grok-3-mini": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.27e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/grok-3": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 3e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/grok-3-mini": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.27e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, "azure_ai/grok-4": { "input_cost_per_token": 3e-06, "litellm_provider": "azure_ai", @@ -11950,36 +11503,6 @@ "supports_vision": true, "supports_web_search": true }, - "azure_ai/grok-4-fast-non-reasoning": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2e-07, - "output_cost_per_token": 5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/grok-4-fast-reasoning": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2e-07, - "output_cost_per_token": 5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "azure_ai/grok-4-1-fast-non-reasoning": { "input_cost_per_token": 2e-07, "output_cost_per_token": 5e-07, @@ -12358,6 +11881,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-northeast-1/minimax.minimax-m2.1": { @@ -12371,6 +11897,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-northeast-1/minimax.minimax-m2.5": { @@ -12385,6 +11914,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/ap-northeast-1/moonshotai.kimi-k2-thinking": { @@ -12410,6 +11942,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-northeast-1/qwen.qwen3-coder-next": { @@ -12423,6 +11957,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/moonshotai.kimi-k2-thinking": { @@ -12450,7 +11987,9 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_video_input": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true }, "bedrock/ap-south-1/meta.llama3-70b-instruct-v1:0": { "input_cost_per_token": 3.18e-06, @@ -12482,6 +12021,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-south-1/minimax.minimax-m2.1": { @@ -12495,6 +12037,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-south-1/minimax.minimax-m2.5": { @@ -12509,6 +12054,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/ap-south-1/moonshotai.kimi-k2-thinking": { @@ -12534,6 +12082,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-south-1/qwen.qwen3-coder-next": { @@ -12547,6 +12097,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-2/minimax.minimax-m2.5": { @@ -12561,6 +12114,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.236e-06 }, "bedrock/ap-southeast-3/deepseek.v3.2": { @@ -12575,6 +12131,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-3/minimax.minimax-m2.1": { @@ -12588,6 +12147,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-3/minimax.minimax-m2.5": { @@ -12602,6 +12164,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/ap-southeast-3/moonshotai.kimi-k2.5": { @@ -12616,6 +12181,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-3/qwen.qwen3-coder-next": { @@ -12629,6 +12196,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ca-central-1/meta.llama3-70b-instruct-v1:0": { @@ -12661,6 +12231,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-north-1/minimax.minimax-m2.1": { @@ -12674,6 +12247,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-north-1/minimax.minimax-m2.5": { @@ -12688,6 +12264,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-north-1/moonshotai.kimi-k2.5": { @@ -12702,6 +12281,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-central-1/1-month-commitment/anthropic.claude-instant-v1": { @@ -12802,6 +12383,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-central-1/minimax.minimax-m2.5": { @@ -12816,6 +12400,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-central-1/qwen.qwen3-coder-next": { @@ -12829,6 +12416,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-1/meta.llama3-70b-instruct-v1:0": { @@ -12860,6 +12450,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-1/minimax.minimax-m2.5": { @@ -12874,6 +12467,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-west-1/qwen.qwen3-coder-next": { @@ -12887,6 +12483,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-2/meta.llama3-70b-instruct-v1:0": { @@ -12918,6 +12517,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-2/minimax.minimax-m2.5": { @@ -12932,8 +12534,28 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.86e-06 }, + "bedrock/eu-west-2/nvidia.nemotron-super-3-120b": { + "input_cost_per_token": 2.3e-07, + "litellm_provider": "bedrock", + "max_input_tokens": 256000, + "max_output_tokens": 32000, + "max_tokens": 32000, + "mode": "chat", + "output_cost_per_token": 1.01e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_system_messages": true, + "supports_tool_choice": true, + "supports_vision": false + }, "bedrock/eu-west-2/qwen.qwen3-coder-next": { "input_cost_per_token": 7.8e-07, "litellm_provider": "bedrock", @@ -12945,6 +12567,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-3/mistral.mistral-7b-instruct-v0:2": { @@ -12958,13 +12583,14 @@ "supports_tool_choice": true }, "bedrock/eu-west-3/mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 1.04e-05, + "input_cost_per_token": 5.2e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 3.12e-05, + "output_cost_per_token": 1.56e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "bedrock/eu-west-3/mistral.mixtral-8x7b-instruct-v0:1": { @@ -12988,6 +12614,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-south-1/minimax.minimax-m2.5": { @@ -13002,6 +12631,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-south-1/qwen.qwen3-coder-next": { @@ -13015,6 +12647,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/invoke/anthropic.claude-3-5-sonnet-20240620-v1:0": { @@ -13065,6 +12700,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/sa-east-1/minimax.minimax-m2.1": { @@ -13078,6 +12716,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/sa-east-1/minimax.minimax-m2.5": { @@ -13092,6 +12733,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/sa-east-1/moonshotai.kimi-k2-thinking": { @@ -13117,6 +12761,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/sa-east-1/qwen.qwen3-coder-next": { @@ -13130,6 +12776,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/1-month-commitment/anthropic.claude-instant-v1": { @@ -13249,13 +12898,14 @@ "supports_tool_choice": true }, "bedrock/us-east-1/mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 8e-06, + "input_cost_per_token": 4e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 2.4e-05, + "output_cost_per_token": 1.2e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "bedrock/us-east-1/mistral.mixtral-8x7b-instruct-v0:1": { @@ -13280,6 +12930,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/minimax.minimax-m2.1": { @@ -13293,6 +12946,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/minimax.minimax-m2.5": { @@ -13306,6 +12962,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/moonshotai.kimi-k2-thinking": { @@ -13331,6 +12990,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/qwen.qwen3-coder-next": { @@ -13344,6 +13005,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/deepseek.v3.2": { @@ -13358,6 +13022,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/minimax.minimax-m2.1": { @@ -13371,6 +13038,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/minimax.minimax-m2.5": { @@ -13385,6 +13055,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.2e-06 }, "bedrock/us-east-2/moonshotai.kimi-k2-thinking": { @@ -13410,6 +13083,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/qwen.qwen3-coder-next": { @@ -13423,6 +13098,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-gov-east-1/amazon.nova-pro-v1:0": { @@ -13486,40 +13164,6 @@ "mode": "chat", "output_cost_per_token": 1.5e-06 }, - "bedrock/us-gov-east-1/anthropic.claude-3-5-sonnet-20240620-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3.6e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.8e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3.6e-07, - "cache_creation_input_token_cost": 4.5e-06 - }, - "bedrock/us-gov-east-1/anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 3e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-08, - "cache_creation_input_token_cost": 3.75e-07 - }, "bedrock/us-gov-east-1/anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.5e-06, "cache_creation_input_token_cost_above_1hr": 7.2e-06, @@ -13697,61 +13341,6 @@ "mode": "chat", "output_cost_per_token": 1.5e-06 }, - "bedrock/us-gov-west-1/anthropic.claude-3-7-sonnet-20250219-v1:0": { - "cache_creation_input_token_cost": 4.5e-06, - "cache_read_input_token_cost": 3.6e-07, - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3.6e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.8e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "bedrock/us-gov-west-1/anthropic.claude-3-5-sonnet-20240620-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3.6e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.8e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3.6e-07, - "cache_creation_input_token_cost": 4.5e-06 - }, - "bedrock/us-gov-west-1/anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 3e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-08, - "cache_creation_input_token_cost": 3.75e-07 - }, "bedrock/us-gov-west-1/anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.5e-06, "cache_creation_input_token_cost_above_1hr": 7.2e-06, @@ -13939,13 +13528,14 @@ "supports_tool_choice": true }, "bedrock/us-west-2/mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 8e-06, + "input_cost_per_token": 4e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 2.4e-05, + "output_cost_per_token": 1.2e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "bedrock/us-west-2/mistral.mixtral-8x7b-instruct-v0:1": { @@ -13970,6 +13560,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/minimax.minimax-m2.1": { @@ -13983,6 +13576,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/minimax.minimax-m2.5": { @@ -13996,6 +13592,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/moonshotai.kimi-k2-thinking": { @@ -14021,6 +13620,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/qwen.qwen3-coder-next": { @@ -14034,6 +13635,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us.anthropic.claude-3-5-haiku-20241022-v1:0": { @@ -14189,34 +13793,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "cerebras/zai-glm-4.6": { - "deprecation_date": "2026-01-20", - "input_cost_per_token": 2.25e-06, - "litellm_provider": "cerebras", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2.75e-06, - "source": "https://www.cerebras.ai/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, - "cerebras/zai-glm-4.7": { - "deprecation_date": "2026-08-17", - "input_cost_per_token": 2.25e-06, - "litellm_provider": "cerebras", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2.75e-06, - "source": "https://www.cerebras.ai/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "cerebras/qwen-3.8-27b": { "input_cost_per_token": 9.9e-07, "litellm_provider": "cerebras", @@ -14242,23 +13818,6 @@ "mode": "chat", "output_cost_per_token": 5e-07 }, - "chatgpt-4o-latest": { - "deprecation_date": "2026-02-17", - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "gpt-4o-transcribe-diarize": { "input_cost_per_audio_token": 2.5e-06, "input_cost_per_token": 2.5e-06, @@ -14321,131 +13880,6 @@ "prompt_cache_min_tokens": 4096, "source": "https://platform.claude.com/docs/en/about-claude/pricing" }, - "claude-3-7-sonnet-20250219": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-02-19", - "input_cost_per_token": 3e-06, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, - "claude-3-haiku-20240307": { - "cache_creation_input_token_cost": 3e-07, - "cache_creation_input_token_cost_above_1hr": 5e-07, - "cache_read_input_token_cost": 3e-08, - "deprecation_date": "2026-04-20", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "claude-3-opus-20240229": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "deprecation_date": "2026-01-05", - "input_cost_per_token": 1.5e-05, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "claude-4-opus-20250514": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_read_input_token_cost": 1.5e-06, - "deprecation_date": "2026-06-15", - "input_cost_per_token": 1.5e-05, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "claude-4-sonnet-20250514": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost": 3e-07, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "deprecation_date": "2026-06-15", - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "litellm_provider": "anthropic", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "prompt_cache_min_tokens": 1024 - }, "claude-sonnet-4-5": { "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, @@ -14624,92 +14058,6 @@ "input_cost_per_token_batches": 1.5e-06, "output_cost_per_token_batches": 7.5e-06 }, - "claude-opus-4-1": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_native_structured_output": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024, - "deprecation_date": "2026-08-05" - }, - "claude-opus-4-1-20250805": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "deprecation_date": "2026-08-05", - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_native_structured_output": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "claude-opus-4-20250514": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "deprecation_date": "2026-06-15", - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, "claude-opus-4-5-20251101": { "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, @@ -15137,38 +14485,6 @@ "prompt_cache_min_tokens": 1024, "source": "https://platform.claude.com/docs/en/about-claude/pricing" }, - "claude-sonnet-4-20250514": { - "deprecation_date": "2026-06-15", - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "litellm_provider": "anthropic", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, "cloudflare/@cf/meta/llama-2-7b-chat-fp16": { "input_cost_per_token": 1.923e-06, "litellm_provider": "cloudflare", @@ -15521,36 +14837,6 @@ "supports_assistant_prefill": true, "supports_tool_choice": true }, - "codex-mini-latest": { - "cache_read_input_token_cost": 3.75e-07, - "deprecation_date": "2026-02-12", - "input_cost_per_token": 1.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 6e-06, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "cohere.command-light-text-v14": { "input_cost_per_token": 3e-07, "litellm_provider": "bedrock", @@ -15559,38 +14845,18 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 6e-07, - "supports_tool_choice": true - }, - "cohere.command-r-plus-v1:0": { - "deprecation_date": "2026-08-19", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_tool_choice": true - }, - "cohere.command-r-v1:0": { - "deprecation_date": "2026-08-19", - "input_cost_per_token": 5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "cohere.command-text-v14": { - "input_cost_per_token": 1.5e-06, + "input_cost_per_token": 1e-06, "litellm_provider": "bedrock", "max_input_tokens": 4096, "max_output_tokens": 4096, "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "cohere.embed-english-v3": { @@ -15600,6 +14866,7 @@ "max_tokens": 512, "mode": "embedding", "output_cost_per_token": 0.0, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_embedding_image_input": true }, "cohere.embed-multilingual-v3": { @@ -15609,6 +14876,7 @@ "max_tokens": 512, "mode": "embedding", "output_cost_per_token": 0.0, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_embedding_image_input": true }, "cohere.embed-v4:0": { @@ -15619,6 +14887,7 @@ "mode": "embedding", "output_cost_per_token": 0.0, "output_vector_size": 1536, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_embedding_image_input": true }, "us.cohere.embed-v4:0": { @@ -15672,16 +14941,6 @@ "mode": "rerank", "output_cost_per_token": 0.0 }, - "command": { - "input_cost_per_token": 1e-06, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "completion", - "output_cost_per_token": 2e-06, - "deprecation_date": "2025-09-15" - }, "command-a-03-2025": { "input_cost_per_token": 2.5e-06, "litellm_provider": "cohere_chat", @@ -15708,17 +14967,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "command-light": { - "input_cost_per_token": 3e-07, - "litellm_provider": "cohere_chat", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_tool_choice": true, - "deprecation_date": "2025-09-15" - }, "command-nightly": { "input_cost_per_token": 1e-06, "litellm_provider": "cohere", @@ -15728,18 +14976,6 @@ "mode": "completion", "output_cost_per_token": 2e-06 }, - "command-r": { - "input_cost_per_token": 1.5e-07, - "litellm_provider": "cohere_chat", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_function_calling": true, - "supports_tool_choice": true, - "deprecation_date": "2025-09-15" - }, "command-r-08-2024": { "input_cost_per_token": 1.5e-07, "litellm_provider": "cohere_chat", @@ -15751,18 +14987,6 @@ "supports_function_calling": true, "supports_tool_choice": true }, - "command-r-plus": { - "input_cost_per_token": 2.5e-06, - "litellm_provider": "cohere_chat", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supports_function_calling": true, - "supports_tool_choice": true, - "deprecation_date": "2025-09-15" - }, "command-r-plus-08-2024": { "input_cost_per_token": 2.5e-06, "litellm_provider": "cohere_chat", @@ -15815,26 +15039,6 @@ "supports_vision": true, "source": "https://platform.openai.com/docs/models/computer-use-preview" }, - "dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_image": 0.02, - "litellm_provider": "openai", - "mode": "image_generation", - "supported_endpoints": [ - "/v1/images/generations", - "/v1/images/edits", - "/v1/images/variations" - ] - }, - "dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_image": 0.04, - "litellm_provider": "openai", - "mode": "image_generation", - "supported_endpoints": [ - "/v1/images/generations" - ] - }, "deepseek-chat": { "cache_read_input_token_cost": 2.8e-08, "input_cost_per_token": 2.8e-07, @@ -18831,30 +18035,6 @@ "output_vector_size": 1024, "source": "https://www.databricks.com/product/pricing/foundation-model-serving" }, - "databricks/databricks-claude-3-7-sonnet": { - "cache_creation_input_token_cost": 3.74997e-06, - "cache_read_input_token_cost": 3.0002e-07, - "deprecation_date": "2026-04-12", - "input_cost_per_token": 2.9999900000000002e-06, - "input_dbu_cost_per_token": 4.2857e-05, - "litellm_provider": "databricks", - "max_input_tokens": 200000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.5000020000000002e-05, - "output_dbu_cost_per_token": 0.000214286, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_anthropic_thinking_payload": true, - "supports_tool_choice": true - }, "databricks/databricks-claude-fable-5": { "cache_creation_input_token_cost": 1.250004e-05, "cache_read_input_token_cost": 1.00002e-06, @@ -19817,44 +18997,6 @@ "supports_prompt_caching": true, "supports_tool_choice": true }, - "databricks/databricks-gpt-5-1-codex-max": { - "cache_creation_input_token_cost": 1.24999e-06, - "cache_read_input_token_cost": 1.2502e-07, - "deprecation_date": "2026-07-16", - "input_cost_per_token": 1.24999e-06, - "input_dbu_cost_per_token": 1.7857e-05, - "litellm_provider": "databricks", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 9.999990000000002e-06, - "output_dbu_cost_per_token": 0.000142857, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_prompt_caching": true - }, - "databricks/databricks-gpt-5-1-codex-mini": { - "cache_creation_input_token_cost": 2.4997e-07, - "cache_read_input_token_cost": 2.499e-08, - "deprecation_date": "2026-07-16", - "input_cost_per_token": 2.4997e-07, - "input_dbu_cost_per_token": 3.571e-06, - "litellm_provider": "databricks", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.99997e-06, - "output_dbu_cost_per_token": 2.8571e-05, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_prompt_caching": true - }, "databricks/databricks-gpt-5-2": { "cache_creation_input_token_cost": 1.75e-06, "cache_read_input_token_cost": 1.75e-07, @@ -19875,25 +19017,6 @@ "supports_prompt_caching": true, "supports_tool_choice": true }, - "databricks/databricks-gpt-5-2-codex": { - "cache_creation_input_token_cost": 1.75e-06, - "cache_read_input_token_cost": 1.75e-07, - "deprecation_date": "2026-07-16", - "input_cost_per_token": 1.75e-06, - "input_dbu_cost_per_token": 2.5e-05, - "litellm_provider": "databricks", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_dbu_cost_per_token": 0.0002, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_prompt_caching": true - }, "databricks/databricks-gpt-5-3-codex": { "cache_creation_input_token_cost": 1.75e-06, "cache_read_input_token_cost": 1.75e-07, @@ -20320,25 +19443,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "databricks/databricks-llama-2-70b-chat": { - "cache_creation_input_token_cost": 5.0001e-07, - "cache_read_input_token_cost": 5.0001e-07, - "deprecation_date": "2024-10-30", - "input_cost_per_token": 5.0001e-07, - "input_dbu_cost_per_token": 7.143e-06, - "litellm_provider": "databricks", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.5000300000000002e-06, - "output_dbu_cost_per_token": 2.1429e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, "databricks/databricks-llama-4-maverick": { "cache_creation_input_token_cost": 5.0001e-07, "cache_read_input_token_cost": 5.0001e-07, @@ -20357,25 +19461,6 @@ "source": "https://www.databricks.com/product/pricing/foundation-model-serving", "supports_tool_choice": true }, - "databricks/databricks-meta-llama-3-1-405b-instruct": { - "cache_creation_input_token_cost": 5.00003e-06, - "cache_read_input_token_cost": 5.00003e-06, - "deprecation_date": "2026-02-15", - "input_cost_per_token": 5.00003e-06, - "input_dbu_cost_per_token": 7.1429e-05, - "litellm_provider": "databricks", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.5000020000000002e-05, - "output_dbu_cost_per_token": 0.000214286, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, "databricks/databricks-meta-llama-3-1-8b-instruct": { "cache_creation_input_token_cost": 1.5001e-07, "cache_read_input_token_cost": 1.5001e-07, @@ -20411,82 +19496,6 @@ "source": "https://www.databricks.com/product/pricing/foundation-model-serving", "supports_tool_choice": true }, - "databricks/databricks-meta-llama-3-70b-instruct": { - "cache_creation_input_token_cost": 1.00002e-06, - "cache_read_input_token_cost": 1.00002e-06, - "deprecation_date": "2024-07-23", - "input_cost_per_token": 1.00002e-06, - "input_dbu_cost_per_token": 1.4286e-05, - "litellm_provider": "databricks", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 2.9999900000000002e-06, - "output_dbu_cost_per_token": 4.2857e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, - "databricks/databricks-mixtral-8x7b-instruct": { - "cache_creation_input_token_cost": 5.0001e-07, - "cache_read_input_token_cost": 5.0001e-07, - "deprecation_date": "2025-04-30", - "input_cost_per_token": 5.0001e-07, - "input_dbu_cost_per_token": 7.143e-06, - "litellm_provider": "databricks", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.00002e-06, - "output_dbu_cost_per_token": 1.4286e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, - "databricks/databricks-mpt-30b-instruct": { - "cache_creation_input_token_cost": 1.00002e-06, - "cache_read_input_token_cost": 1.00002e-06, - "deprecation_date": "2024-08-30", - "input_cost_per_token": 1.00002e-06, - "input_dbu_cost_per_token": 1.4286e-05, - "litellm_provider": "databricks", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.00002e-06, - "output_dbu_cost_per_token": 1.4286e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, - "databricks/databricks-mpt-7b-instruct": { - "cache_creation_input_token_cost": 5.0001e-07, - "cache_read_input_token_cost": 5.0001e-07, - "deprecation_date": "2024-08-30", - "input_cost_per_token": 5.0001e-07, - "input_dbu_cost_per_token": 7.143e-06, - "litellm_provider": "databricks", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 0.0, - "output_dbu_cost_per_token": 0.0, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, "databricks/databricks-qwen35-122b-a10b": { "cache_creation_input_token_cost": 2.2001e-07, "cache_read_input_token_cost": 2.2001e-07, @@ -21551,18 +20560,6 @@ "supports_tool_choice": true, "supports_function_calling": true }, - "deepinfra/google/gemini-2.0-flash-001": { - "deprecation_date": "2026-06-01", - "max_tokens": 1000000, - "max_input_tokens": 1000000, - "max_output_tokens": 1000000, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 4e-07, - "litellm_provider": "deepinfra", - "mode": "chat", - "supports_tool_choice": true, - "supports_function_calling": true - }, "deepinfra/google/gemini-2.5-flash": { "max_tokens": 1000000, "max_input_tokens": 1000000, @@ -22064,6 +21061,7 @@ "max_tokens": 81920, "mode": "chat", "output_cost_per_token": 1.68e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_reasoning": true, "supports_tool_choice": true, @@ -22421,15 +21419,6 @@ "/v1/audio/speech" ] }, - "embed-english-light-v2.0": { - "deprecation_date": "2026-04-04", - "input_cost_per_token": 1e-07, - "litellm_provider": "cohere", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "embedding", - "output_cost_per_token": 0.0 - }, "embed-english-light-v3.0": { "input_cost_per_token": 1e-07, "litellm_provider": "cohere", @@ -22438,15 +21427,6 @@ "mode": "embedding", "output_cost_per_token": 0.0 }, - "embed-english-v2.0": { - "deprecation_date": "2026-04-04", - "input_cost_per_token": 1e-07, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_tokens": 4096, - "mode": "embedding", - "output_cost_per_token": 0.0 - }, "embed-english-v3.0": { "input_cost_per_image": 0.0001, "input_cost_per_token": 1e-07, @@ -22461,15 +21441,6 @@ "supports_embedding_image_input": true, "supports_image_input": true }, - "embed-multilingual-v2.0": { - "deprecation_date": "2026-04-04", - "input_cost_per_token": 1e-07, - "litellm_provider": "cohere", - "max_input_tokens": 768, - "max_tokens": 768, - "mode": "embedding", - "output_cost_per_token": 0.0 - }, "embed-multilingual-v3.0": { "input_cost_per_token": 1e-07, "litellm_provider": "cohere", @@ -22566,7 +21537,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5.5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -22637,23 +21608,6 @@ "cache_read_input_token_cost": 3e-07, "cache_creation_input_token_cost": 3.75e-06 }, - "eu.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "eu.anthropic.claude-3-opus-20240229-v1:0": { "input_cost_per_token": 1.5e-05, "litellm_provider": "bedrock", @@ -22669,23 +21623,6 @@ "cache_read_input_token_cost": 1.5e-06, "cache_creation_input_token_cost": 1.875e-05 }, - "eu.anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "eu.anthropic.claude-opus-4-1-20250805-v1:0": { "cache_creation_input_token_cost": 1.875e-05, "cache_read_input_token_cost": 1.5e-06, @@ -22769,7 +21706,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.125e-06, @@ -22806,7 +21744,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.meta.llama3-2-1b-instruct-v1:0": { "input_cost_per_token": 1.3e-07, @@ -25257,26 +24196,6 @@ "supports_tool_choice": true, "supports_vision": false }, - "fireworks_ai/accounts/fireworks/models/deepseek-v4-pro": { - "cache_read_input_token_cost": 6e-07, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 1.2e-06, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/accounts/fireworks/models/deepseek-v4-pro-0813": { "cache_read_input_token_cost": 4.4e-08, "cache_read_input_token_cost_priority": 5.5e-08, @@ -25664,26 +24583,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "fireworks_ai/accounts/fireworks/models/minimax-m2p7": { - "cache_read_input_token_cost": 6e-08, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 3e-07, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 196608, - "max_output_tokens": 196608, - "max_tokens": 196608, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/accounts/fireworks/models/minimax-m3": { "cache_read_input_token_cost": 6e-08, "cache_read_input_token_cost_priority": 9e-08, @@ -25771,26 +24670,6 @@ "supports_tool_choice": true, "supports_vision": false }, - "fireworks_ai/deepseek-v4-pro": { - "cache_read_input_token_cost": 6e-07, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 1.2e-06, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/glm-4p7": { "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 6e-07, @@ -25990,26 +24869,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "fireworks_ai/minimax-m2p7": { - "cache_read_input_token_cost": 6e-08, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 3e-07, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 196608, - "max_output_tokens": 196608, - "max_tokens": 196608, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/minimax-m3": { "cache_read_input_token_cost": 6e-08, "cache_read_input_token_cost_priority": 9e-08, @@ -26187,31 +25046,6 @@ "comment": "Open flagship GLM for long-horizon coding agents and million-token context work", "source": "https://api.friendli.ai/serverless/v1/models" }, - "friendliai/LGAI-EXAONE/K-EXAONE-2.0-750B-A37B": { - "litellm_provider": "friendliai", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "input_cost_per_token": 6e-07, - "output_cost_per_token": 2.4e-06, - "cache_read_input_token_cost": 1.2e-07, - "supports_prompt_caching": true, - "supports_reasoning": true, - "reasoning_effort_levels": [], - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_native_structured_output": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_image_input": false, - "supports_video_input": false, - "mode": "chat", - "comment": "Frontier-scale multilingual language model developed by LG AI Research", - "deprecation_date": "2026-09-06", - "source": "https://api.friendli.ai/serverless/v1/models" - }, "friendliai/deepseek-ai/DeepSeek-V3.2": { "litellm_provider": "friendliai", "max_input_tokens": 163840, @@ -26377,6 +25211,7 @@ }, "ft:gpt-4o-2024-08-06": { "cache_read_input_token_cost": 1.875e-06, + "cache_read_input_token_cost_batches": 9e-07, "input_cost_per_token": 3.75e-06, "input_cost_per_token_batches": 2.225e-06, "litellm_provider": "openai", @@ -26415,6 +25250,7 @@ }, "ft:gpt-4o-mini-2024-07-18": { "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_token": 3e-07, "input_cost_per_token_batches": 1.5e-07, "litellm_provider": "openai", @@ -26435,6 +25271,7 @@ }, "ft:gpt-4.1-2025-04-14": { "cache_read_input_token_cost": 7.5e-07, + "cache_read_input_token_cost_batches": 5e-07, "input_cost_per_token": 3e-06, "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "openai", @@ -26454,6 +25291,7 @@ }, "ft:gpt-4.1-mini-2025-04-14": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "input_cost_per_token": 8e-07, "input_cost_per_token_batches": 4e-07, "litellm_provider": "openai", @@ -26473,6 +25311,7 @@ }, "ft:gpt-4.1-nano-2025-04-14": { "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 2.5e-08, "deprecation_date": "2026-10-23", "input_cost_per_token": 2e-07, "input_cost_per_token_batches": 1e-07, @@ -26493,6 +25332,7 @@ }, "ft:o4-mini-2025-04-16": { "cache_read_input_token_cost": 1e-06, + "cache_read_input_token_cost_batches": 5e-07, "deprecation_date": "2026-10-23", "input_cost_per_token": 4e-06, "input_cost_per_token_batches": 2e-06, @@ -26511,160 +25351,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "gemini-2.0-flash": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 1e-06, - "input_cost_per_audio_token_batches": 5e-07, - "input_cost_per_character": 3.75e-08, - "input_cost_per_token": 1.5e-07, - "input_cost_per_token_batches": 7.5e-08, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "output_cost_per_token_batches": 3e-07, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini-2.0-flash-001": { - "cache_read_input_token_cost": 3.75e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 1e-06, - "input_cost_per_token": 1.5e-07, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini-2.0-flash-lite": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_audio_token_batches": 3.75e-08, - "input_cost_per_character": 1.875e-08, - "input_cost_per_token": 7.5e-08, - "input_cost_per_token_batches": 3.75e-08, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "output_cost_per_token_batches": 1.5e-07, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini-2.0-flash-lite-001": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_token": 7.5e-08, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models#gemini-2.0-flash", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini-2.5-flash": { "cache_read_input_audio_token_cost": 1e-07, "deprecation_date": "2026-10-20", @@ -26776,6 +25462,7 @@ "cache_read_input_token_cost": 2e-07, "cache_read_input_token_cost_above_200k_tokens": 4e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 1e-07, "cache_read_input_token_cost_flex": 1e-07, "cache_read_input_token_cost_priority": 3.6e-07, "deprecation_date": "2027-05-28", @@ -26868,6 +25555,7 @@ }, "gemini-3.1-flash-image": { "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 2.5e-08, "cache_read_input_token_cost_flex": 2.5e-08, "deprecation_date": "2027-05-28", "input_cost_per_image": 0.00056, @@ -26951,6 +25639,7 @@ }, "gemini-3.1-flash-lite-image": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "input_cost_per_image": 0.00028, "input_cost_per_token": 2.5e-07, @@ -27043,6 +25732,7 @@ "cache_read_input_audio_token_cost": 5e-08, "deprecation_date": "2027-05-07", "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_audio_token": 5e-07, @@ -27102,6 +25792,7 @@ "gemini-3.5-flash-lite": { "deprecation_date": "2027-07-21", "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 1.5e-08, "cache_read_input_token_cost_flex": 1.5e-08, "cache_read_input_token_cost_priority": 5.4e-08, "input_cost_per_token": 3e-07, @@ -27158,6 +25849,7 @@ }, "deep-research-pro-preview-12-2025": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "input_cost_per_image": 0.0011, "input_cost_per_token": 2e-06, "input_cost_per_token_batches": 1e-06, @@ -27351,7 +26043,7 @@ "mode": "realtime", "output_cost_per_audio_token": 1.2e-05, "output_cost_per_token": 2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_endpoints": [ "/vertex_ai/live", "/v1/realtime" @@ -27387,7 +26079,6 @@ "input_cost_per_image_token": 3e-06 }, "gemini-live-2.5-flash-preview-native-audio-09-2025": { - "cache_read_input_token_cost": 7.5e-08, "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, "litellm_provider": "vertex_ai-language-models", @@ -27416,7 +26107,7 @@ "supports_function_calling": true, "supports_parallel_function_calling": true, "supports_pdf_input": true, - "supports_prompt_caching": true, + "supports_prompt_caching": false, "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, @@ -27432,7 +26123,6 @@ "input_cost_per_image_token": 3e-06 }, "gemini/gemini-live-2.5-flash-preview-native-audio-09-2025": { - "cache_read_input_token_cost": 7.5e-08, "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, "litellm_provider": "gemini", @@ -27462,7 +26152,7 @@ "supports_function_calling": true, "supports_parallel_function_calling": true, "supports_pdf_input": true, - "supports_prompt_caching": true, + "supports_prompt_caching": false, "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, @@ -27477,53 +26167,6 @@ }, "gemini_native_audio": true }, - "gemini-2.5-flash-lite-preview-06-17": { - "deprecation_date": "2025-11-18", - "cache_read_input_token_cost": 1e-08, - "input_cost_per_audio_token": 5e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 4e-07, - "output_cost_per_token": 4e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, "gemini-2.5-pro": { "deprecation_date": "2026-10-20", "cache_read_input_token_cost": 1.25e-07, @@ -27582,62 +26225,6 @@ "output_cost_per_token_flex": 5e-06, "output_cost_per_token_priority": 1.8e-05 }, - "gemini-3-pro-preview": { - "deprecation_date": "2026-03-26", - "cache_read_input_token_cost": 2e-07, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07, - "input_cost_per_token": 2e-06, - "input_cost_per_token_above_200k_tokens": 4e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_token": 1.2e-05, - "output_cost_per_token_above_200k_tokens": 1.8e-05, - "output_cost_per_token_batches": 6e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "supports_native_streaming": true, - "input_cost_per_token_priority": 3.6e-06, - "input_cost_per_token_above_200k_tokens_priority": 7.2e-06, - "output_cost_per_token_priority": 2.16e-05, - "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, - "cache_read_input_token_cost_priority": 3.6e-07, - "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, "gemini-3.1-pro-preview": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 2e-07, @@ -27868,6 +26455,7 @@ "prompt_cache_min_tokens": 4096, "deprecation_date": "2027-05-19", "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_token": 1.5e-06, "input_cost_per_audio_token": 1.5e-06, "litellm_provider": "vertex_ai", @@ -27927,6 +26515,7 @@ "vertex_ai/gemini-3.6-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -27984,6 +26573,7 @@ "vertex_ai/gemini-3.7-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -28042,6 +26632,7 @@ "vertex_ai/gemini-3.8-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -28288,53 +26879,9 @@ "supports_url_context": true, "supports_vision": true }, - "gemini/gemini-robotics-er-1.5-preview": { - "cache_read_input_token_cost": 0, - "deprecation_date": "2026-04-30", - "input_cost_per_token": 3e-07, - "input_cost_per_audio_token": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "output_cost_per_reasoning_token": 2.5e-06, - "source": "https://ai.google.dev/gemini-api/docs/models#gemini-robotics-er-1-5-preview", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions" - ], - "supported_modalities": [ - "text", - "image", - "video", - "audio" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": false, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "rpm": 10, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini/gemini-robotics-er-2-preview": { "cache_read_input_token_cost": 1e-07, + "cache_read_input_token_cost_batches": 5e-08, "input_cost_per_audio_token": 2e-06, "input_cost_per_token": 1e-06, "input_cost_per_token_batches": 5e-07, @@ -28382,53 +26929,6 @@ "supports_web_search": true, "web_search_billing_unit": "per_query" }, - "gemini/gemini-robotics-er-1.6-preview": { - "deprecation_date": "2026-08-31", - "input_cost_per_audio_token": 2e-06, - "input_cost_per_token": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 131072, - "max_output_tokens": 65536, - "max_tokens": 65536, - "mode": "chat", - "output_cost_per_reasoning_token": 5e-06, - "output_cost_per_token": 5e-06, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-robotics-er", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "web_search_billing_unit": "per_query" - }, "gemini-2.5-computer-use-preview-10-2025": { "input_cost_per_token": 1.25e-06, "input_cost_per_token_above_200k_tokens": 2.5e-06, @@ -28565,27 +27065,6 @@ "source": "https://ai.google.dev/gemini-api/docs/embeddings#model-versions", "tpm": 10000000 }, - "gemini/gemini-embedding-2-preview": { - "deprecation_date": "2026-08-10", - "input_cost_per_audio_token": 6.5e-06, - "input_cost_per_audio_token_batches": 3.25e-06, - "input_cost_per_image_token": 4.5e-07, - "input_cost_per_image_token_batches": 2.25e-07, - "input_cost_per_token": 2e-07, - "input_cost_per_token_batches": 1e-07, - "input_cost_per_video_token": 1.2e-05, - "input_cost_per_video_token_batches": 6e-06, - "litellm_provider": "gemini", - "max_input_tokens": 8192, - "max_tokens": 8192, - "mode": "embedding", - "output_cost_per_token": 0, - "output_vector_size": 3072, - "rpm": 10000, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supports_multimodal": true, - "tpm": 10000000 - }, "gemini/gemini-embedding-2": { "input_cost_per_audio_token": 6.5e-06, "input_cost_per_audio_token_batches": 3.25e-06, @@ -28608,138 +27087,10 @@ "supports_vision": true, "tpm": 10000000 }, - "gemini/gemini-1.5-flash": { - "deprecation_date": "2025-09-29", - "input_cost_per_token": 7.5e-08, - "input_cost_per_token_above_128k_tokens": 1.5e-07, - "litellm_provider": "gemini", - "max_input_tokens": 8192, - "max_tokens": 8192, - "mode": "embedding", - "output_cost_per_token": 0, - "output_vector_size": 3072, - "rpm": 10000, - "source": "https://ai.google.dev/gemini-api/docs/embeddings#multimodal", - "supports_multimodal": true, - "tpm": 10000000 - }, - "gemini/gemini-2.0-flash": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4e-07, - "rpm": 10000, - "source": "https://ai.google.dev/pricing#2_0flash", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 10000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini/gemini-2.0-flash-001": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4e-07, - "rpm": 10000, - "source": "https://ai.google.dev/pricing#2_0flash", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 10000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini/gemini-2.0-flash-lite": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_token": 7.5e-08, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "rpm": 4000, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.0-flash-lite", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 4000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini/gemini-2.5-flash": { "cache_read_input_audio_token_cost": 1e-07, "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 3e-08, "cache_read_input_token_cost_flex": 3e-08, "cache_read_input_token_cost_priority": 5.4e-08, "input_cost_per_audio_token": 1e-06, @@ -28898,50 +27249,6 @@ "web_search_billing_unit": "per_query", "supports_reasoning": false }, - "gemini/gemini-3-pro-image-preview": { - "deprecation_date": "2026-06-25", - "input_cost_per_image": 0.0011, - "input_cost_per_token": 2e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 65536, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "image_generation", - "output_cost_per_image": 0.134, - "output_cost_per_image_token": 0.00012, - "output_cost_per_token": 1.2e-05, - "rpm": 1000, - "tpm": 4000000, - "output_cost_per_token_batches": 6e-06, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, "gemini/nano-banana-pro-preview": { "input_cost_per_image": 0.0011, "input_cost_per_token": 2e-06, @@ -29027,49 +27334,6 @@ }, "web_search_billing_unit": "per_query" }, - "gemini/gemini-3.1-flash-image-preview": { - "deprecation_date": "2026-06-25", - "input_cost_per_token": 5e-07, - "input_cost_per_token_batches": 2.5e-07, - "litellm_provider": "gemini", - "max_input_tokens": 65536, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "image_generation", - "output_cost_per_image": 0.045, - "output_cost_per_image_token": 6e-05, - "output_cost_per_token": 3e-06, - "output_cost_per_token_batches": 1.5e-06, - "rpm": 1000, - "tpm": 4000000, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-3.1-flash-image-preview", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, "gemini/gemini-3.1-flash-lite-image": { "input_cost_per_image": 0.00028, "input_cost_per_token": 2.5e-07, @@ -29151,6 +27415,7 @@ "gemini/gemini-2.5-flash-lite": { "cache_read_input_audio_token_cost": 3e-08, "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "cache_read_input_token_cost_priority": 1.8e-08, "input_cost_per_audio_token": 3e-07, @@ -29207,104 +27472,6 @@ "supports_audio_input": true, "supports_image_size": false }, - "gemini/gemini-2.5-flash-lite-preview-09-2025": { - "cache_read_input_token_cost": 1e-08, - "deprecation_date": "2026-03-31", - "input_cost_per_audio_token": 3e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 4e-07, - "output_cost_per_token": 4e-07, - "rpm": 15, - "source": "https://developers.googleblog.com/en/continuing-to-bring-you-our-latest-models-with-an-improved-gemini-2-5-flash-and-flash-lite-release/", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, - "gemini/gemini-2.5-flash-preview-09-2025": { - "cache_read_input_token_cost": 3e-08, - "deprecation_date": "2026-02-17", - "input_cost_per_audio_token": 1e-06, - "input_cost_per_token": 3e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 2.5e-06, - "output_cost_per_token": 2.5e-06, - "rpm": 15, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, "gemini/gemini-flash-latest": { "cache_read_input_token_cost": 7.5e-08, "input_cost_per_token": 7.5e-07, @@ -29422,55 +27589,6 @@ "supports_video_input": true, "web_search_billing_unit": "per_query" }, - "gemini/gemini-2.5-flash-lite-preview-06-17": { - "deprecation_date": "2025-11-18", - "cache_read_input_token_cost": 1e-08, - "input_cost_per_audio_token": 5e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 4e-07, - "output_cost_per_token": 4e-07, - "rpm": 15, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, "gemini/gemini-2.5-flash-preview-tts": { "input_cost_per_token": 5e-07, "input_cost_per_token_batches": 2.5e-07, @@ -29496,6 +27614,7 @@ "cache_read_input_token_cost": 1.25e-07, "cache_read_input_token_cost_above_200k_tokens": 2.5e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 4.5e-07, + "cache_read_input_token_cost_batches": 1.25e-07, "cache_read_input_token_cost_flex": 1.25e-07, "cache_read_input_token_cost_priority": 2.25e-07, "input_cost_per_token": 1.25e-06, @@ -29580,117 +27699,10 @@ "supports_vision": true, "tpm": 800000 }, - "gemini/gemini-3-pro-preview": { - "deprecation_date": "2026-03-09", - "cache_read_input_token_cost": 2e-07, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "input_cost_per_token": 2e-06, - "input_cost_per_token_above_200k_tokens": 4e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_token": 1.2e-05, - "output_cost_per_token_above_200k_tokens": 1.8e-05, - "output_cost_per_token_batches": 6e-06, - "rpm": 2000, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 800000, - "input_cost_per_token_priority": 3.6e-06, - "input_cost_per_token_above_200k_tokens_priority": 7.2e-06, - "output_cost_per_token_priority": 2.16e-05, - "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, - "cache_read_input_token_cost_priority": 3.6e-07, - "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, - "gemini/gemini-3.1-flash-lite-preview": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-05-25", - "input_cost_per_audio_token": 5e-07, - "input_cost_per_token": 2.5e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65536, - "max_tokens": 65536, - "mode": "chat", - "output_cost_per_reasoning_token": 1.5e-06, - "output_cost_per_token": 1.5e-06, - "rpm": 15, - "source": "https://ai.google.dev/gemini-api/docs/models", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "supports_native_streaming": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query", - "google_maps_grounding_cost_per_query": 0.014 - }, "gemini/gemini-3.1-flash-lite": { "cache_read_input_audio_token_cost": 5e-08, "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "deprecation_date": "2027-05-07", @@ -29752,6 +27764,7 @@ }, "gemini/gemini-3.5-flash-lite": { "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 2e-08, "cache_read_input_token_cost_flex": 2e-08, "cache_read_input_token_cost_priority": 5e-08, "input_cost_per_token": 3e-07, @@ -29811,6 +27824,7 @@ "gemini/gemini-3-flash-preview": { "cache_read_input_audio_token_cost": 1e-07, "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 5e-08, "cache_read_input_token_cost_flex": 5e-08, "input_cost_per_audio_token": 1e-06, "input_cost_per_token": 5e-07, @@ -29872,6 +27886,7 @@ "gemini/gemini-3.5-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_audio_token": 1.5e-06, "input_cost_per_token": 1.5e-06, "litellm_provider": "gemini", @@ -29933,6 +27948,7 @@ "gemini/gemini-3.6-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -29992,6 +28008,7 @@ "gemini/gemini-3.7-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30052,6 +28069,7 @@ "gemini/gemini-3.8-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30194,6 +28212,7 @@ "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, "cache_read_input_token_cost_priority": 3.6e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 2e-07, "cache_read_input_token_cost_flex": 2e-07, "search_context_cost_per_query": { "search_context_size_low": 0.014, @@ -30256,6 +28275,7 @@ "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, "cache_read_input_token_cost_priority": 3.6e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 2e-07, "cache_read_input_token_cost_flex": 2e-07, "search_context_cost_per_query": { "search_context_size_low": 0.014, @@ -30360,6 +28380,7 @@ "prompt_cache_min_tokens": 4096, "deprecation_date": "2027-05-19", "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_audio_token": 1.5e-06, "input_cost_per_token": 1.5e-06, "litellm_provider": "vertex_ai-language-models", @@ -30419,6 +28440,7 @@ "gemini-3.6-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30476,6 +28498,7 @@ "gemini-3.7-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30534,6 +28557,7 @@ "gemini-3.8-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30771,34 +28795,6 @@ "output_cost_per_image": 0.04, "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" }, - "gemini/imagen-3.0-generate-002": { - "deprecation_date": "2025-11-10", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "gemini/imagen-4.0-fast-generate-001": { - "deprecation_date": "2026-08-17", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "gemini/imagen-4.0-generate-001": { - "deprecation_date": "2026-08-17", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "gemini/imagen-4.0-ultra-generate-001": { - "deprecation_date": "2026-08-17", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, "gemini/learnlm-1.5-pro-experimental": { "input_cost_per_audio_per_second": 0, "input_cost_per_audio_per_second_above_128k_tokens": 0, @@ -30877,21 +28873,6 @@ "supports_web_search": false, "output_cost_per_image": 0.08 }, - "gemini/veo-2.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "gemini", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.35, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, "gemini/veo-3.1-fast-generate-preview": { "litellm_provider": "gemini", "max_input_tokens": 1024, @@ -31751,10 +29732,21 @@ "output_cost_per_token": 3.15e-06 }, "baseten/zai-org/GLM-4.7": { + "cache_read_input_token_cost": 1.2e-07, "input_cost_per_token": 6e-07, "litellm_provider": "baseten", + "max_input_tokens": 200000, + "max_output_tokens": 200000, + "max_tokens": 200000, "mode": "chat", - "output_cost_per_token": 2.2e-06 + "output_cost_per_token": 2.2e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": false, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false }, "baseten/zai-org/GLM-4.6": { "input_cost_per_token": 6e-07, @@ -31781,10 +29773,21 @@ "output_cost_per_token": 2.5e-06 }, "baseten/openai/gpt-oss-120b": { + "cache_read_input_token_cost": 1e-07, "input_cost_per_token": 1e-07, "litellm_provider": "baseten", + "max_input_tokens": 128072, + "max_output_tokens": 128072, + "max_tokens": 128072, "mode": "chat", - "output_cost_per_token": 5e-07 + "output_cost_per_token": 5e-07, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false }, "baseten/deepseek-ai/DeepSeek-V3.1": { "input_cost_per_token": 5e-07, @@ -31901,7 +29904,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.5e-06, - "output_cost_per_token_batches": 7.5e-06 + "output_cost_per_token_batches": 7.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -31933,7 +29937,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-haiku-4-5-20251001-v1:0": { "cache_creation_input_token_cost": 1.25e-06, @@ -31947,7 +29952,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -32079,33 +30084,6 @@ "supports_system_messages": true, "supports_tool_choice": true }, - "gpt-4-0125-preview": { - "deprecation_date": "2026-03-26", - "input_cost_per_token": 1e-05, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 3e-05, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, - "gpt-4-0314": { - "deprecation_date": "2026-03-26", - "input_cost_per_token": 3e-05, - "litellm_provider": "openai", - "max_input_tokens": 8192, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 6e-05, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4-0613": { "deprecation_date": "2026-10-23", "input_cost_per_token": 3e-05, @@ -32175,22 +30153,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "gpt-4-turbo-preview": { - "deprecation_date": "2026-03-26", - "input_cost_per_token": 1e-05, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 3e-05, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4.1": { "cache_read_input_token_cost": 5e-07, "cache_read_input_token_cost_priority": 8.75e-07, @@ -32533,24 +30495,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "gpt-4o-audio-preview": { - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 2.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 1e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-audio-preview-2024-12-17": { "deprecation_date": "2027-01-20", "input_cost_per_audio_token": 4e-05, @@ -32735,44 +30679,6 @@ "supports_tool_choice": true, "supports_vision": false }, - "gpt-audio-mini-2025-10-06": { - "deprecation_date": "2026-07-23", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 2.4e-06, - "source": "https://developers.openai.com/api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses", - "/v1/realtime", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "audio" - ], - "supported_output_modalities": [ - "text", - "audio" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": false, - "supports_reasoning": false, - "supports_response_schema": false, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": false - }, "gpt-audio-mini-2025-12-15": { "input_cost_per_audio_token": 1e-05, "input_cost_per_token": 6e-07, @@ -32869,24 +30775,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "gpt-4o-mini-audio-preview": { - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_token": 1.5e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 6e-07, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-mini-audio-preview-2024-12-17": { "deprecation_date": "2027-01-20", "input_cost_per_audio_token": 1e-05, @@ -32905,26 +30793,6 @@ "supports_system_messages": true, "supports_tool_choice": true }, - "gpt-4o-mini-realtime-preview": { - "cache_creation_input_audio_token_cost": 3e-07, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 2.4e-06, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-mini-realtime-preview-2024-12-17": { "cache_creation_input_audio_token_cost": 3e-07, "cache_read_input_token_cost": 3e-07, @@ -32971,32 +30839,6 @@ "supports_vision": true, "supports_web_search": true }, - "gpt-4o-mini-search-preview-2025-03-11": { - "cache_read_input_token_cost": 7.5e-08, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.5e-07, - "input_cost_per_token_batches": 7.5e-08, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 6e-07, - "output_cost_per_token_batches": 3e-07, - "search_context_cost_per_query": { - "search_context_size_high": 0.025, - "search_context_size_low": 0.025, - "search_context_size_medium": 0.025 - }, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "gpt-4o-mini-transcribe": { "input_cost_per_audio_token": 1.25e-06, "input_cost_per_token": 1.25e-06, @@ -33031,63 +30873,6 @@ "audio" ] }, - "gpt-4o-realtime-preview": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 2e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, - "gpt-4o-realtime-preview-2024-12-17": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 2e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, - "gpt-4o-realtime-preview-2025-06-03": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 2e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-search-preview": { "cache_read_input_token_cost": 1.25e-06, "input_cost_per_token": 2.5e-06, @@ -33114,32 +30899,6 @@ "supports_vision": true, "supports_web_search": true }, - "gpt-4o-search-preview-2025-03-11": { - "cache_read_input_token_cost": 1.25e-06, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2.5e-06, - "input_cost_per_token_batches": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "output_cost_per_token_batches": 5e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.025, - "search_context_size_low": 0.025, - "search_context_size_medium": 0.025 - }, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "gpt-4o-transcribe": { "input_cost_per_audio_token": 2.5e-06, "input_cost_per_token": 2.5e-06, @@ -33157,6 +30916,7 @@ }, "gpt-image-1.5": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-12-01", "input_cost_per_token": 5e-06, "litellm_provider": "openai", @@ -33176,6 +30936,7 @@ }, "gpt-image-1.5-2025-12-16": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-12-01", "input_cost_per_token": 5e-06, "litellm_provider": "openai", @@ -33195,6 +30956,7 @@ }, "gpt-image-2": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.25e-07, "input_cost_per_token": 5e-06, "litellm_provider": "openai", "mode": "image_generation", @@ -33646,6 +31408,7 @@ }, "gpt-5": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, @@ -33696,6 +31459,7 @@ }, "gpt-5.1": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, @@ -33747,6 +31511,7 @@ }, "gpt-5.1-2025-11-13": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, @@ -33796,54 +31561,9 @@ "supports_xhigh_reasoning_effort": false, "supports_minimal_reasoning_effort": false }, - "gpt-5.1-chat-latest": { - "cache_read_input_token_cost": 1.25e-07, - "cache_read_input_token_cost_priority": 2.5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "input_cost_per_token_priority": 2.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "output_cost_per_token_priority": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_native_streaming": true, - "supports_parallel_function_calling": false, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": false, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, "gpt-5.2": { "cache_read_input_token_cost": 1.75e-07, + "cache_read_input_token_cost_batches": 8.75e-08, "cache_read_input_token_cost_flex": 8.75e-08, "cache_read_input_token_cost_priority": 3.5e-07, "input_cost_per_token": 1.75e-06, @@ -33896,6 +31616,7 @@ }, "gpt-5.2-2025-12-11": { "cache_read_input_token_cost": 1.75e-07, + "cache_read_input_token_cost_batches": 8.75e-08, "cache_read_input_token_cost_flex": 8.75e-08, "cache_read_input_token_cost_priority": 3.5e-07, "input_cost_per_token": 1.75e-06, @@ -33946,94 +31667,6 @@ "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false }, - "gpt-5.2-chat-latest": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-08-10", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.3-chat-latest": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-08-10", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, "gpt-5.2-pro": { "input_cost_per_token": 2.1e-05, "input_cost_per_token_batches": 1.05e-05, @@ -34194,6 +31827,158 @@ "supports_web_search": true, "supports_xhigh_reasoning_effort": true }, + "gpt-6-sol": { + "cache_creation_input_token_cost": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 5e-06, + "cache_creation_input_token_cost_above_272k_tokens_flex": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens_priority": 1e-05, + "cache_creation_input_token_cost_flex": 1.25e-06, + "cache_creation_input_token_cost_priority": 5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_272k_tokens": 4e-07, + "cache_read_input_token_cost_above_272k_tokens_flex": 2e-07, + "cache_read_input_token_cost_above_272k_tokens_priority": 8e-07, + "cache_read_input_token_cost_batches": 1e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2e-07, + "cache_creation_input_token_cost_batches": 1.25e-06, + "cache_creation_input_token_cost_above_272k_tokens_batches": 2.5e-06, + "cache_read_input_token_cost_flex": 1e-07, + "cache_read_input_token_cost_priority": 4e-07, + "input_cost_per_token": 2e-06, + "input_cost_per_token_above_272k_tokens": 4e-06, + "input_cost_per_token_above_272k_tokens_flex": 2e-06, + "input_cost_per_token_above_272k_tokens_priority": 8e-06, + "input_cost_per_token_batches": 1e-06, + "input_cost_per_token_above_272k_tokens_batches": 2e-06, + "input_cost_per_token_flex": 1e-06, + "input_cost_per_token_priority": 4e-06, + "litellm_provider": "openai", + "max_input_tokens": 922000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 1e-05, + "output_cost_per_token_above_272k_tokens": 1.5e-05, + "output_cost_per_token_above_272k_tokens_flex": 7.5e-06, + "output_cost_per_token_above_272k_tokens_priority": 3e-05, + "output_cost_per_token_batches": 5e-06, + "output_cost_per_token_above_272k_tokens_batches": 7.5e-06, + "output_cost_per_token_flex": 5e-06, + "output_cost_per_token_priority": 2e-05, + "regional_processing_uplift_multiplier_eu": 1.1, + "regional_processing_uplift_multiplier_us": 1.1, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "source": "https://developers.openai.com/api/docs/pricing", + "supported_endpoints": [ + "/v1/chat/completions", + "/v1/batch", + "/v1/responses" + ], + "supported_modalities": [ + "text", + "image" + ], + "supported_output_modalities": [ + "text" + ], + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_minimal_reasoning_effort": false, + "supports_native_streaming": true, + "supports_none_reasoning_effort": true, + "supports_parallel_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_cache_breakpoint": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_system_messages": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true, + "supports_xhigh_reasoning_effort": true + }, + "gpt-6-luna": { + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_creation_input_token_cost_above_272k_tokens_flex": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens_priority": 5e-07, + "cache_creation_input_token_cost_flex": 6.25e-08, + "cache_creation_input_token_cost_priority": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "cache_read_input_token_cost_above_272k_tokens_flex": 1e-08, + "cache_read_input_token_cost_above_272k_tokens_priority": 4e-08, + "cache_read_input_token_cost_batches": 5e-09, + "cache_read_input_token_cost_above_272k_tokens_batches": 1e-08, + "cache_creation_input_token_cost_batches": 6.25e-08, + "cache_creation_input_token_cost_above_272k_tokens_batches": 1.25e-07, + "cache_read_input_token_cost_flex": 5e-09, + "cache_read_input_token_cost_priority": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, + "input_cost_per_token_above_272k_tokens_flex": 1e-07, + "input_cost_per_token_above_272k_tokens_priority": 4e-07, + "input_cost_per_token_batches": 5e-08, + "input_cost_per_token_above_272k_tokens_batches": 1e-07, + "input_cost_per_token_flex": 5e-08, + "input_cost_per_token_priority": 2e-07, + "litellm_provider": "openai", + "max_input_tokens": 922000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, + "output_cost_per_token_above_272k_tokens_flex": 3.75e-07, + "output_cost_per_token_above_272k_tokens_priority": 1.5e-06, + "output_cost_per_token_batches": 2.5e-07, + "output_cost_per_token_above_272k_tokens_batches": 3.75e-07, + "output_cost_per_token_flex": 2.5e-07, + "output_cost_per_token_priority": 1e-06, + "regional_processing_uplift_multiplier_eu": 1.1, + "regional_processing_uplift_multiplier_us": 1.1, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "source": "https://developers.openai.com/api/docs/pricing", + "supported_endpoints": [ + "/v1/chat/completions", + "/v1/batch", + "/v1/responses" + ], + "supported_modalities": [ + "text", + "image" + ], + "supported_output_modalities": [ + "text" + ], + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_minimal_reasoning_effort": false, + "supports_native_streaming": true, + "supports_none_reasoning_effort": true, + "supports_parallel_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_cache_breakpoint": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_system_messages": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true, + "supports_xhigh_reasoning_effort": true + }, "gpt-5.6": { "cache_creation_input_token_cost": 5e-06, "cache_creation_input_token_cost_above_272k_tokens": 1e-05, @@ -34948,7 +32733,7 @@ "gpt-5.4": { "cache_read_input_token_cost": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens": 5e-07, - "cache_read_input_token_cost_batches": 1.25e-07, + "cache_read_input_token_cost_batches": 1.3e-07, "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, "cache_read_input_token_cost_flex": 1.3e-07, "cache_read_input_token_cost_priority": 5e-07, @@ -35005,7 +32790,7 @@ "gpt-5.4-2026-03-05": { "cache_read_input_token_cost": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens": 5e-07, - "cache_read_input_token_cost_batches": 1.25e-07, + "cache_read_input_token_cost_batches": 1.3e-07, "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, "cache_read_input_token_cost_flex": 1.3e-07, "cache_read_input_token_cost_priority": 5e-07, @@ -35165,6 +32950,7 @@ }, "gpt-5.4-mini": { "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "cache_read_input_token_cost_priority": 1.5e-07, "input_cost_per_token": 7.5e-07, @@ -35218,6 +33004,7 @@ }, "gpt-5.4-mini-2026-03-17": { "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "cache_read_input_token_cost_priority": 1.5e-07, "input_cost_per_token": 7.5e-07, @@ -35271,6 +33058,7 @@ }, "gpt-5.4-nano": { "cache_read_input_token_cost": 2e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "input_cost_per_token": 2e-07, "input_cost_per_token_flex": 1e-07, @@ -35321,6 +33109,7 @@ }, "gpt-5.4-nano-2026-03-17": { "cache_read_input_token_cost": 2e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "input_cost_per_token": 2e-07, "input_cost_per_token_flex": 1e-07, @@ -35456,6 +33245,7 @@ }, "gpt-5-2025-08-07": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "deprecation_date": "2026-12-11", @@ -35540,251 +33330,6 @@ "supports_xhigh_reasoning_effort": false, "supports_minimal_reasoning_effort": true }, - "gpt-5-chat-latest": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": false, - "supports_native_streaming": true, - "supports_parallel_function_calling": false, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": false, - "supports_vision": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5-codex": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.1-codex": { - "cache_read_input_token_cost": 1.25e-07, - "cache_read_input_token_cost_priority": 2.5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "input_cost_per_token_priority": 2.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1e-05, - "output_cost_per_token_priority": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.1-codex-max": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.1-codex-mini": { - "cache_read_input_token_cost": 2.5e-08, - "cache_read_input_token_cost_priority": 4.5e-08, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2.5e-07, - "input_cost_per_token_priority": 4.5e-07, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 2e-06, - "output_cost_per_token_priority": 3.6e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.2-codex": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true - }, "gpt-5.3-codex": { "cache_read_input_token_cost": 1.75e-07, "cache_read_input_token_cost_priority": 3.5e-07, @@ -35830,6 +33375,7 @@ }, "gpt-5-mini": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_token": 2.5e-07, @@ -35880,6 +33426,7 @@ }, "gpt-5-mini-2025-08-07": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "deprecation_date": "2026-12-11", @@ -35931,6 +33478,7 @@ }, "gpt-5-nano": { "cache_read_input_token_cost": 5e-09, + "cache_read_input_token_cost_batches": 2.5e-09, "cache_read_input_token_cost_flex": 2.5e-09, "input_cost_per_token": 5e-08, "input_cost_per_token_batches": 2.5e-08, @@ -35979,6 +33527,7 @@ }, "gpt-5-nano-2025-08-07": { "cache_read_input_token_cost": 5e-09, + "cache_read_input_token_cost_batches": 2.5e-09, "cache_read_input_token_cost_flex": 2.5e-09, "deprecation_date": "2026-12-11", "input_cost_per_token": 5e-08, @@ -36028,6 +33577,7 @@ }, "gpt-image-1": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-10-23", "input_cost_per_image_token": 1e-05, "input_cost_per_image_token_batches": 5e-06, @@ -36044,6 +33594,7 @@ }, "gpt-image-1-mini": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "deprecation_date": "2026-12-01", "input_cost_per_image_token": 2.5e-06, "input_cost_per_image_token_batches": 1.25e-06, @@ -36619,44 +34170,14 @@ "supports_response_schema": true, "supports_vision": true }, - "groq/llama-3.1-8b-instant": { - "deprecation_date": "2026-08-16", - "input_cost_per_token": 5e-08, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 8e-08, - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true - }, - "groq/llama-3.3-70b-versatile": { - "deprecation_date": "2026-08-16", - "input_cost_per_token": 5.9e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 7.9e-07, - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true - }, - "groq/gemma-7b-it": { - "deprecation_date": "2024-12-18", - "input_cost_per_token": 5e-08, + "groq/llama-guard-3-8b": { + "input_cost_per_token": 2e-07, "litellm_provider": "groq", "max_input_tokens": 8192, - "max_output_tokens": 8192, "max_tokens": 8192, "mode": "chat", - "output_cost_per_token": 8e-08, - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true + "output_cost_per_token": 2e-07, + "source": "https://console.groq.com/docs/model/llama-guard-3-8b" }, "groq/meta-llama/llama-prompt-guard-2-22m": { "input_cost_per_token": 3e-08, @@ -36678,58 +34199,6 @@ "output_cost_per_token": 4e-08, "source": "https://console.groq.com/docs/model/meta-llama/llama-prompt-guard-2-86m" }, - "groq/meta-llama/llama-guard-4-12b": { - "deprecation_date": "2026-03-05", - "input_cost_per_token": 2e-07, - "litellm_provider": "groq", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 2e-07 - }, - "groq/meta-llama/llama-4-maverick-17b-128e-instruct": { - "deprecation_date": "2026-03-09", - "input_cost_per_token": 2e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "groq/meta-llama/llama-4-scout-17b-16e-instruct": { - "deprecation_date": "2026-07-17", - "input_cost_per_token": 1.1e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3.4e-07, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "groq/moonshotai/kimi-k2-instruct-0905": { - "deprecation_date": "2026-04-15", - "input_cost_per_token": 1e-06, - "output_cost_per_token": 3e-06, - "cache_read_input_token_cost": 5e-07, - "litellm_provider": "groq", - "max_input_tokens": 262144, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "groq/openai/gpt-oss-120b": { "cache_read_input_token_cost": 7.5e-08, "input_cost_per_token": 1.5e-07, @@ -36810,45 +34279,6 @@ "mode": "audio_speech", "source": "https://console.groq.com/docs/models" }, - "groq/playai-tts": { - "deprecation_date": "2025-12-31", - "input_cost_per_character": 5e-05, - "litellm_provider": "groq", - "max_input_tokens": 10000, - "max_output_tokens": 10000, - "max_tokens": 10000, - "mode": "audio_speech" - }, - "groq/qwen/qwen3.6-27b": { - "input_cost_per_token": 6e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://console.groq.com/docs/model/qwen/qwen3.6-27b", - "deprecation_date": "2026-09-14", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_vision": true - }, - "groq/qwen/qwen3-32b": { - "deprecation_date": "2026-07-17", - "input_cost_per_token": 2.9e-07, - "litellm_provider": "groq", - "max_input_tokens": 131000, - "max_output_tokens": 131000, - "max_tokens": 131000, - "mode": "chat", - "output_cost_per_token": 5.9e-07, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true - }, "groq/whisper-large-v3": { "input_cost_per_second": 3.083e-05, "litellm_provider": "groq", @@ -36861,27 +34291,6 @@ "mode": "audio_transcription", "output_cost_per_second": 0.0 }, - "hd/1024-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 7.629e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "hd/1024-x-1792/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 6.539e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "hd/1792-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 6.539e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "heroku/claude-3-5-haiku": { "litellm_provider": "heroku", "max_tokens": 8192, @@ -37325,7 +34734,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-haiku-4-5-20251001-v1:0": { "cache_creation_input_token_cost": 1.375e-06, @@ -37339,7 +34749,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5.5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -37916,7 +35326,8 @@ "max_output_tokens": 4096, "max_tokens": 4096, "mode": "chat", - "output_cost_per_token": 1e-06 + "output_cost_per_token": 1e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "meta.llama2-70b-chat-v1": { "input_cost_per_token": 1.95e-06, @@ -37925,7 +35336,8 @@ "max_output_tokens": 4096, "max_tokens": 4096, "mode": "chat", - "output_cost_per_token": 2.56e-06 + "output_cost_per_token": 2.56e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "meta.llama3-1-405b-instruct-v1:0": { "input_cost_per_token": 5.32e-06, @@ -38625,16 +36037,18 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 8e-06, + "input_cost_per_token": 4e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 2.4e-05, + "output_cost_per_token": 1.2e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "mistral.mistral-large-2407-v1:0": { @@ -38666,12 +36080,15 @@ }, "mistral.mistral-small-2402-v1:0": { "input_cost_per_token": 1e-06, + "input_cost_per_token_batches": 5e-07, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 3e-06, + "output_cost_per_token_batches": 1.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "mistral.mixtral-8x7b-instruct-v0:1": { @@ -38682,6 +36099,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 7e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "mistral.voxtral-mini-3b-2507": { @@ -38692,6 +36110,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 4e-08, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_audio_input": true, "supports_system_messages": true, "supports_native_structured_output": true @@ -38704,23 +36123,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 3e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_audio_input": true, "supports_system_messages": true, "supports_native_structured_output": true }, - "mistral/codestral-2405": { - "deprecation_date": "2025-06-16", - "input_cost_per_token": 1e-06, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 3e-06, - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/codestral-2508": { "cache_read_input_token_cost": 3e-08, "input_cost_per_token": 3e-07, @@ -38764,51 +36171,6 @@ "supports_assistant_prefill": true, "supports_tool_choice": true }, - "mistral/devstral-medium-2507": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/devstral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/devstral-small-2505": { - "deprecation_date": "2025-11-30", - "input_cost_per_token": 1e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://mistral.ai/news/devstral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/devstral-small-2507": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 1e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://mistral.ai/news/devstral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/devstral-small-latest": { "cache_read_input_token_cost": 1e-08, "input_cost_per_token": 1e-07, @@ -38824,21 +36186,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/labs-devstral-small-2512": { - "deprecation_date": "2026-03-31", - "input_cost_per_token": 1e-07, - "litellm_provider": "mistral", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://docs.mistral.ai/models/devstral-small-2-25-12", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/devstral-latest": { "cache_read_input_token_cost": 4e-08, "input_cost_per_token": 4e-07, @@ -38869,21 +36216,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/devstral-2512": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/devstral-2-vibe-cli", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/ministral-14b-2512": { "input_cost_per_token": 2e-07, "litellm_provider": "mistral", @@ -39159,54 +36491,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/magistral-medium-2506": { - "deprecation_date": "2025-11-30", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://mistral.ai/news/magistral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/magistral-medium-2509": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://mistral.ai/news/magistral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/magistral-medium-1-2-2509": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://mistral.ai/news/magistral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/mistral-ocr-latest": { "litellm_provider": "mistral", "ocr_cost_per_page": 0.004, @@ -39246,20 +36530,6 @@ "/v1/batch" ] }, - "mistral/mistral-ocr-2505-completion": { - "deprecation_date": "2026-05-31", - "litellm_provider": "mistral", - "ocr_cost_per_page": 0.001, - "ocr_cost_per_page_batches": 0.0005, - "annotation_cost_per_page": 0.003, - "annotation_cost_per_page_batches": 0.0015, - "mode": "ocr", - "supported_endpoints": [ - "/v1/ocr", - "/v1/batch" - ], - "source": "https://mistral.ai/pricing#api-pricing" - }, "mistral/mistral-ocr-2512": { "litellm_provider": "mistral", "ocr_cost_per_page": 0.002, @@ -39290,22 +36560,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/magistral-small-2506": { - "deprecation_date": "2025-11-30", - "input_cost_per_token": 5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://mistral.ai/pricing#api-pricing", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/magistral-small-latest": { "cache_read_input_token_cost": 1.5e-08, "input_cost_per_token": 1.5e-07, @@ -39323,22 +36577,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/magistral-small-1-2-2509": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://mistral.ai/pricing#api-pricing", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/mistral-embed": { "input_cost_per_token": 1e-07, "litellm_provider": "mistral", @@ -39362,48 +36600,6 @@ "max_tokens": 8192, "mode": "embedding" }, - "mistral/mistral-large-2402": { - "deprecation_date": "2025-06-16", - "input_cost_per_token": 4e-06, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 1.2e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-large-2407": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 9e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-large-2411": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/mistral-large-latest": { "cache_read_input_token_cost": 5e-08, "input_cost_per_token": 5e-07, @@ -39473,49 +36669,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/mistral-medium-2312": { - "deprecation_date": "2025-06-16", - "input_cost_per_token": 2.7e-06, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 8.1e-06, - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-medium-2505": { - "deprecation_date": "2026-08-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 2e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-medium-2508": { - "deprecation_date": "2026-08-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/mistral-medium-3", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/mistral-medium-2604": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 1.5e-06, @@ -39558,22 +36711,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/mistral-medium-3-1-2508": { - "deprecation_date": "2026-08-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/mistral-medium-3", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/mistral-medium-3-5": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 1.5e-06, @@ -39630,22 +36767,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/mistral-small-3-2-2506": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 6e-08, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.8e-07, - "source": "https://mistral.ai/pricing", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/ministral-3-3b-2512": { "cache_read_input_token_cost": 1e-08, "input_cost_per_token": 1e-07, @@ -39739,32 +36860,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/open-codestral-mamba": { - "deprecation_date": "2025-06-06", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-07, - "source": "https://mistral.ai/technology/", - "supports_assistant_prefill": true, - "supports_tool_choice": true - }, - "mistral/open-mistral-7b": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 2.5e-07, - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/open-mistral-nemo": { "cache_read_input_token_cost": 3e-08, "input_cost_per_token": 3e-07, @@ -39779,78 +36874,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/open-mistral-nemo-2407": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 3e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://mistral.ai/technology/", - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/open-mixtral-8x22b": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 65336, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 6e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/open-mixtral-8x7b": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 7e-07, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 7e-07, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/pixtral-12b-2409": { - "deprecation_date": "2025-12-31", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1.5e-07, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "mistral/pixtral-large-2411": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/pixtral-large-latest": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, @@ -39899,36 +36922,6 @@ "supports_audio_input": false, "supports_response_schema": true }, - "moonshot/kimi-k2-0711-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_web_search": true - }, - "moonshot/kimi-k2-0905-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "moonshot/kimi-k2.7-code": { "cache_read_input_token_cost": 1.9e-07, "input_cost_per_token": 9.5e-07, @@ -39947,21 +36940,6 @@ "supports_video_input": true, "supports_vision": true }, - "moonshot/kimi-k2-turbo-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 1.15e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 8e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "moonshot/kimi-k2.5": { "cache_read_input_token_cost": 1e-07, "input_cost_per_token": 6e-07, @@ -40018,111 +36996,6 @@ "supports_video_input": true, "supports_vision": true }, - "moonshot/kimi-latest": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 2e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-latest-128k": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 2e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-latest-32k": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 1e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 32768, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-latest-8k": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 2e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-thinking-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2025-11-11", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_vision": true - }, - "moonshot/kimi-k2-thinking": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "supports_web_search": true - }, - "moonshot/kimi-k2-thinking-turbo": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 1.15e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 8e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "moonshot/moonshot-v1-128k": { "input_cost_per_token": 2e-06, "litellm_provider": "moonshot", @@ -40136,19 +37009,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "moonshot/moonshot-v1-128k-0430": { - "deprecation_date": "2024-04-30", - "input_cost_per_token": 2e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true - }, "moonshot/moonshot-v1-128k-vision-preview": { "input_cost_per_token": 2e-06, "litellm_provider": "moonshot", @@ -40176,19 +37036,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "moonshot/moonshot-v1-32k-0430": { - "deprecation_date": "2024-04-30", - "input_cost_per_token": 1e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 32768, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true - }, "moonshot/moonshot-v1-32k-vision-preview": { "input_cost_per_token": 1e-06, "litellm_provider": "moonshot", @@ -40216,19 +37063,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "moonshot/moonshot-v1-8k-0430": { - "deprecation_date": "2024-04-30", - "input_cost_per_token": 2e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true - }, "moonshot/moonshot-v1-8k-vision-preview": { "input_cost_per_token": 2e-07, "litellm_provider": "moonshot", @@ -41419,88 +38253,6 @@ "supports_vision": true, "supports_web_search": true }, - "o3-deep-research": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1e-05, - "input_cost_per_token_batches": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 4e-05, - "output_cost_per_token_batches": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, - "o3-deep-research-2025-06-26": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1e-05, - "input_cost_per_token_batches": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 4e-05, - "output_cost_per_token_batches": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, "o3-mini": { "cache_read_input_token_cost": 5.5e-07, "deprecation_date": "2026-10-23", @@ -41686,88 +38438,6 @@ "supports_vision": true, "supports_web_search": true }, - "o4-mini-deep-research": { - "cache_read_input_token_cost": 5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 8e-06, - "output_cost_per_token_batches": 4e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, - "o4-mini-deep-research-2025-06-26": { - "cache_read_input_token_cost": 5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 8e-06, - "output_cost_per_token_batches": 4e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, "oci/meta.llama-3.1-8b-instruct": { "input_cost_per_token": 7.2e-07, "litellm_provider": "oci", @@ -42639,6 +39309,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 6e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_reasoning": true, "supports_response_schema": true, @@ -42652,6 +39323,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 3e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_reasoning": true, "supports_response_schema": true, @@ -42740,32 +39412,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "openrouter/anthropic/claude-opus-4": { - "input_cost_per_image": 0.0048, - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "openrouter", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_pdf_input": true, - "supports_response_schema": false, - "supports_web_search": true - }, "openrouter/anthropic/claude-opus-4.1": { "input_cost_per_image": 0.0048, "cache_creation_input_token_cost": 1.875e-05, @@ -43019,6 +39665,28 @@ "supports_web_search": true, "supports_xhigh_reasoning_effort": true }, + "openrouter/anthropic/claude-opus-5.5": { + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true + }, "openrouter/bytedance/ui-tars-1.5-7b": { "cache_read_input_token_cost": 1e-07, "input_cost_per_token": 1e-07, @@ -43190,21 +39858,21 @@ "supports_web_search": false }, "openrouter/deepseek/deepseek-v4-pro": { - "input_cost_per_token": 9.31074e-07, + "input_cost_per_token": 8.92272e-07, "input_cost_per_token_cache_hit": 4.4e-08, "litellm_provider": "openrouter", "max_input_tokens": 1048576, "max_output_tokens": 384000, "max_tokens": 384000, "mode": "chat", - "output_cost_per_token": 1.862148e-06, + "output_cost_per_token": 1.784544e-06, "source": "https://openrouter.ai/api/v1/models", "supports_function_calling": true, "supports_prompt_caching": true, "supports_reasoning": true, "supports_response_schema": true, "supports_tool_choice": true, - "cache_read_input_token_cost": 7.75895e-08, + "cache_read_input_token_cost": 7.4356e-08, "supports_audio_input": false, "supports_pdf_input": false, "supports_vision": false, @@ -43253,23 +39921,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/google/gemini-2.0-flash-001": { - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4e-07, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "openrouter/google/gemini-2.5-flash": { "cache_creation_input_token_cost": 8.33333333333333e-08, "cache_read_input_audio_token_cost": 1e-07, @@ -43693,27 +40344,6 @@ "supports_vision": true, "supports_web_search": false }, - "openrouter/mistralai/mistral-large-2512": { - "cache_read_input_token_cost": 5.5e-08, - "input_cost_per_image": 0, - "input_cost_per_token": 5.5e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 262144, - "max_output_tokens": 209715, - "max_tokens": 209715, - "mode": "chat", - "output_cost_per_token": 1.65e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/mistralai/mistral-7b-instruct": { "input_cost_per_token": 1.3e-07, "litellm_provider": "openrouter", @@ -45895,7 +42525,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/ap-south-1/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.8e-07, @@ -45908,7 +42541,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/ap-southeast-2/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.545e-07, @@ -45921,7 +42557,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/eu-west-1/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.8e-07, @@ -45934,7 +42573,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/eu-west-2/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 2.3e-07, @@ -45947,7 +42589,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/sa-east-1/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.8e-07, @@ -45960,7 +42605,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "qwen.qwen3-vl-235b-a22b": { "input_cost_per_token": 5.3e-07, @@ -46464,17 +43112,6 @@ "supports_reasoning": true, "supports_system_messages": true }, - "rerank-english-v2.0": { - "input_cost_per_query": 0.002, - "input_cost_per_token": 0.0, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "rerank", - "output_cost_per_token": 0.0, - "deprecation_date": "2025-04-30" - }, "rerank-english-v3.0": { "input_cost_per_query": 0.002, "input_cost_per_token": 0.0, @@ -46485,17 +43122,6 @@ "mode": "rerank", "output_cost_per_token": 0.0 }, - "rerank-multilingual-v2.0": { - "input_cost_per_query": 0.002, - "input_cost_per_token": 0.0, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "rerank", - "output_cost_per_token": 0.0, - "deprecation_date": "2025-04-30" - }, "rerank-multilingual-v3.0": { "input_cost_per_query": 0.002, "input_cost_per_token": 0.0, @@ -46636,31 +43262,6 @@ "output_cost_per_token": 7e-06, "source": "https://cloud.sambanova.ai/plans/pricing" }, - "sambanova/DeepSeek-R1-Distill-Llama-70B": { - "deprecation_date": "2026-03-20", - "input_cost_per_token": 7e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.4e-06, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/DeepSeek-V3-0324": { - "deprecation_date": "2026-04-14", - "input_cost_per_token": 3e-06, - "litellm_provider": "sambanova", - "max_input_tokens": 32768, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 4.5e-06, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "sambanova/Llama-4-Maverick-17B-128E-Instruct": { "input_cost_per_token": 6.3e-07, "litellm_provider": "sambanova", @@ -46678,73 +43279,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "sambanova/Llama-4-Scout-17B-16E-Instruct": { - "deprecation_date": "2025-06-19", - "input_cost_per_token": 4e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "metadata": { - "notes": "For vision models, images are converted to 6432 input tokens and are billed at that amount" - }, - "mode": "chat", - "output_cost_per_token": 7e-07, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "sambanova/Meta-Llama-3.1-405B-Instruct": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 5e-06, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "sambanova/Meta-Llama-3.1-8B-Instruct": { - "deprecation_date": "2026-04-14", - "input_cost_per_token": 1e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "sambanova/Meta-Llama-3.2-1B-Instruct": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 4e-08, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 8e-08, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/Meta-Llama-3.2-3B-Instruct": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 8e-08, - "litellm_provider": "sambanova", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.6e-07, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, "sambanova/Meta-Llama-3.3-70B-Instruct": { "input_cost_per_token": 6e-07, "litellm_provider": "sambanova", @@ -46758,54 +43292,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "sambanova/Meta-Llama-Guard-3-8B": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 3e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/QwQ-32B": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 5e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-06, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/Qwen2-Audio-7B-Instruct": { - "deprecation_date": "2025-06-19", - "input_cost_per_token": 5e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 0.0001, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_audio_input": true - }, - "sambanova/Qwen3-32B": { - "deprecation_date": "2026-04-06", - "input_cost_per_token": 4e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "sambanova/DeepSeek-V3.1": { "max_tokens": 131072, "max_input_tokens": 131072, @@ -47398,27 +43884,6 @@ "mode": "image_generation", "output_cost_per_image": 0.14 }, - "standard/1024-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 3.81469e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "standard/1024-x-1792/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 4.359e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "standard/1792-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 4.359e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "linkup/search": { "input_cost_per_query": 0.00587, "litellm_provider": "linkup", @@ -47553,36 +44018,6 @@ "output_vector_size": 768, "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" }, - "text-moderation-007": { - "deprecation_date": "2025-10-27", - "input_cost_per_token": 0.0, - "litellm_provider": "openai", - "max_input_tokens": 32768, - "max_output_tokens": 0, - "max_tokens": 0, - "mode": "moderation", - "output_cost_per_token": 0.0 - }, - "text-moderation-latest": { - "deprecation_date": "2025-10-27", - "input_cost_per_token": 0.0, - "litellm_provider": "openai", - "max_input_tokens": 32768, - "max_output_tokens": 0, - "max_tokens": 0, - "mode": "moderation", - "output_cost_per_token": 0.0 - }, - "text-moderation-stable": { - "deprecation_date": "2025-10-27", - "input_cost_per_token": 0.0, - "litellm_provider": "openai", - "max_input_tokens": 32768, - "max_output_tokens": 0, - "max_tokens": 0, - "mode": "moderation", - "output_cost_per_token": 0.0 - }, "text-multilingual-embedding-002": { "deprecation_date": "2027-04-01", "input_cost_per_character": 2.5e-08, @@ -47680,19 +44115,6 @@ "mode": "chat", "output_cost_per_token": 1e-07 }, - "together_ai/Qwen/Qwen2.5-72B-Instruct-Turbo": { - "deprecation_date": "2026-02-06", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "input_cost_per_token": 1.2e-06, - "output_cost_per_token": 1.2e-06, - "max_input_tokens": 131072, - "source": "https://api.together.ai/v1/models" - }, "together_ai/Qwen/Qwen2.5-7B-Instruct-Turbo": { "litellm_provider": "together_ai", "mode": "chat", @@ -47705,87 +44127,6 @@ "max_input_tokens": 32768, "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen3-235B-A22B-Instruct-2507-tput": { - "deprecation_date": "2026-07-10", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "source": "https://www.together.ai/models/qwen3-235b-a22b-instruct-2507-fp8", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-235B-A22B-Thinking-2507": { - "deprecation_date": "2026-04-16", - "input_cost_per_token": 6.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://www.together.ai/models/qwen3-235b-a22b-thinking-2507", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-235B-A22B-fp8-tput": { - "deprecation_date": "2026-02-06", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://www.together.ai/models/qwen3-235b-a22b-fp8-tput", - "supports_function_calling": false, - "supports_parallel_function_calling": false, - "supports_tool_choice": false - }, - "together_ai/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": { - "deprecation_date": "2026-06-04", - "input_cost_per_token": 2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/deepseek-ai/DeepSeek-R1": { - "deprecation_date": "2026-05-14", - "input_cost_per_token": 3e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 128000, - "max_output_tokens": 20480, - "max_tokens": 20480, - "metadata": { - "successor": "together_ai/deepseek-ai/DeepSeek-V4-Pro-0813" - }, - "mode": "chat", - "output_cost_per_token": 7e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/deepseek-ai/DeepSeek-R1-0528-tput": { - "deprecation_date": "2026-02-03", - "input_cost_per_token": 5.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2.19e-06, - "source": "https://www.together.ai/models/deepseek-r1-0528-throughput", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/deepseek-ai/DeepSeek-V3": { "input_cost_per_token": 1.25e-06, "litellm_provider": "together_ai", @@ -47802,33 +44143,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/deepseek-ai/DeepSeek-V3.1": { - "deprecation_date": "2026-05-14", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "max_tokens": 16384, - "metadata": { - "successor": "together_ai/deepseek-ai/DeepSeek-V4-Pro-0813" - }, - "mode": "chat", - "output_cost_per_token": 1.7e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "max_input_tokens": 131072, - "max_output_tokens": 16384 - }, - "together_ai/meta-llama/Llama-3.2-3B-Instruct-Turbo": { - "deprecation_date": "2026-03-06", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/meta-llama/Llama-3.3-70B-Instruct-Turbo": { "input_cost_per_token": 1.04e-06, "litellm_provider": "together_ai", @@ -47842,112 +44156,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/meta-llama/Llama-3.3-70B-Instruct-Turbo-Free": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 0, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 0, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8": { - "deprecation_date": "2026-03-31", - "input_cost_per_token": 2.7e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.5e-07, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Llama-4-Scout-17B-16E-Instruct": { - "deprecation_date": "2026-02-06", - "input_cost_per_token": 1.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 5.9e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo": { - "deprecation_date": "2026-02-06", - "input_cost_per_token": 3.5e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 3.5e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo": { - "deprecation_date": "2026-02-25", - "input_cost_per_token": 8.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.8e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo": { - "deprecation_date": "2026-03-06", - "input_cost_per_token": 1.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.8e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/mistralai/Mistral-7B-Instruct-v0.1": { - "deprecation_date": "2025-11-13", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "input_cost_per_token": 2e-07, - "output_cost_per_token": 2e-07, - "max_input_tokens": 32768, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/mistralai/Mistral-Small-24B-Instruct-2501": { - "deprecation_date": "2026-04-02", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 3e-07, - "max_input_tokens": 32768, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/mistralai/Mixtral-8x7B-Instruct-v0.1": { - "deprecation_date": "2026-04-16", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/moonshotai/Kimi-K2-Instruct": { "input_cost_per_token": 1e-06, "litellm_provider": "together_ai", @@ -47976,19 +44184,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/openai/gpt-oss-20b": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 5e-08, - "litellm_provider": "together_ai", - "max_input_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/togethercomputer/CodeLlama-34b-Instruct": { "litellm_provider": "together_ai", "mode": "chat", @@ -47996,19 +44191,6 @@ "supports_parallel_function_calling": true, "supports_tool_choice": true }, - "together_ai/zai-org/GLM-4.5-Air-FP8": { - "deprecation_date": "2026-04-02", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.1e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/zai-org/GLM-4.6": { "input_cost_per_token": 6e-07, "litellm_provider": "together_ai", @@ -48025,102 +44207,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "together_ai/zai-org/GLM-4.7": { - "deprecation_date": "2026-04-02", - "input_cost_per_token": 4.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 202752, - "max_tokens": 202752, - "metadata": { - "successor": "together_ai/zai-org/GLM-5.2" - }, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, - "together_ai/moonshotai/Kimi-K2.5": { - "deprecation_date": "2026-05-21", - "input_cost_per_token": 5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 256000, - "max_tokens": 256000, - "metadata": { - "successor": "together_ai/moonshotai/Kimi-K3" - }, - "mode": "chat", - "output_cost_per_token": 2.8e-06, - "source": "https://www.together.ai/models/kimi-k2-5", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_reasoning": true - }, - "together_ai/moonshotai/Kimi-K2-Instruct-0905": { - "deprecation_date": "2026-03-06", - "input_cost_per_token": 1e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "metadata": { - "successor": "together_ai/moonshotai/Kimi-K3" - }, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://www.together.ai/models/kimi-k2-0905", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-Next-80B-A3B-Instruct": { - "deprecation_date": "2026-04-02", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "metadata": { - "successor": "together_ai/Qwen/Qwen3.7-Plus" - }, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-Next-80B-A3B-Thinking": { - "deprecation_date": "2026-02-25", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "metadata": { - "successor": "together_ai/Qwen/Qwen3.6-Plus" - }, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3.5-397B-A17B": { - "cache_read_input_token_cost": 3.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 3.6e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/MiniMaxAI/MiniMax-M3": { "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 3e-07, @@ -48242,23 +44328,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/deepseek-ai/DeepSeek-V4-Pro": { - "deprecation_date": "2026-08-27", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.74e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 512000, - "max_tokens": 512000, - "mode": "chat", - "output_cost_per_token": 3.48e-06, - "source": "https://docs.together.ai/docs/serverless-models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/deepseek-ai/DeepSeek-V4-Pro-0813": { "cache_read_input_token_cost": 1.3e-07, "deprecation_date": "2026-09-29", @@ -48275,52 +44344,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/google/gemma-3n-E4B-it": { - "deprecation_date": "2026-08-25", - "input_cost_per_token": 6e-08, - "litellm_provider": "together_ai", - "max_input_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 1.2e-07, - "source": "https://docs.together.ai/docs/serverless-models" - }, - "together_ai/google/gemma-4-31B-it": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 3.9e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 9.7e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "together_ai/intfloat/multilingual-e5-large-instruct": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 2e-08, - "litellm_provider": "together_ai", - "max_input_tokens": 514, - "max_tokens": 514, - "mode": "embedding", - "output_cost_per_token": 2e-08, - "output_vector_size": 1024, - "source": "https://docs.together.ai/docs/serverless-models" - }, - "together_ai/meta-llama/Llama-Guard-4-12B": { - "deprecation_date": "2026-08-25", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 1048576, - "max_tokens": 1048576, - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://docs.together.ai/docs/serverless-models" - }, "together_ai/meta-models/Muse-Glimmer-30B": { "cache_read_input_token_cost": 4e-08, "input_cost_per_token": 3.5e-07, @@ -48332,23 +44355,6 @@ "source": "https://api.together.ai/v1/models", "supports_prompt_caching": true }, - "together_ai/moonshotai/Kimi-K2.7-Code": { - "deprecation_date": "2026-08-27", - "cache_read_input_token_cost": 1.9e-07, - "input_cost_per_token": 9.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 4e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "together_ai/moonshotai/Kimi-K3": { "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 3e-06, @@ -48371,33 +44377,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "together_ai/nvidia/nemotron-3-ultra-550b-a55b": { - "deprecation_date": "2026-08-27", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 512288, - "max_tokens": 512288, - "mode": "chat", - "output_cost_per_token": 3.6e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/pearl-ai/gemma-4-31b-it": { - "deprecation_date": "2026-08-27", - "input_cost_per_token": 2.8e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 8.6e-07, - "source": "https://docs.together.ai/docs/serverless-models" - }, "together_ai/thinkingmachines/Inkling": { "cache_read_input_token_cost": 1.7e-07, "input_cost_per_token": 1e-06, @@ -48413,18 +44392,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/thinkingmachines/Inkling-Small": { - "deprecation_date": "2026-09-14", - "cache_read_input_token_cost": 1e-07, - "input_cost_per_token": 5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 524288, - "max_tokens": 524288, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://api.together.ai/v1/models", - "supports_prompt_caching": true - }, "together_ai/zai-org/GLM-5.2": { "cache_read_input_token_cost": 2.6e-07, "input_cost_per_token": 1.4e-06, @@ -48571,22 +44538,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "us.amazon.nova-premier-v1:0": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 2.5e-06, - "litellm_provider": "bedrock_converse", - "max_input_tokens": 1000000, - "max_output_tokens": 10000, - "max_tokens": 10000, - "mode": "chat", - "output_cost_per_token": 1.25e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_vision": true, - "cache_read_input_token_cost": 6.25e-07 - }, "us.amazon.nova-pro-v1:0": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 8e-07, @@ -48633,7 +44584,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5.5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -48704,23 +44655,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "us.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "us.anthropic.claude-3-opus-20240229-v1:0": { "input_cost_per_token": 1.5e-05, "litellm_provider": "bedrock", @@ -48736,23 +44670,6 @@ "cache_read_input_token_cost": 1.5e-06, "cache_creation_input_token_cost": 1.875e-05 }, - "us.anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "us.anthropic.claude-opus-4-1-20250805-v1:0": { "cache_creation_input_token_cost": 1.875e-05, "cache_read_input_token_cost": 1.5e-06, @@ -48778,7 +44695,8 @@ "supports_response_schema": true, "supports_tool_choice": true, "supports_vision": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.125e-06, @@ -48815,24 +44733,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 - }, - "us-gov.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 3e-07, - "litellm_provider": "bedrock_converse", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-08, - "cache_creation_input_token_cost": 3.75e-07 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.5e-06, @@ -48862,7 +44764,8 @@ "supports_vision": true, "supports_native_structured_output": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us-gov.anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -48920,7 +44823,7 @@ "supports_function_calling": true, "supports_max_reasoning_effort": true, "supports_mid_conversation_system": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_output_config": true, "supports_parallel_tool_use_config": true, "supports_pdf_input": true, @@ -48965,6 +44868,41 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true }, + "us-gov.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "cache_creation_input_token_cost": 6e-06, + "cache_creation_input_token_cost_above_1hr": 9.6e-06, + "cache_read_input_token_cost": 2.4e-07, + "input_cost_per_token": 4.8e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.4e-05, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "supports_adaptive_thinking": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_mid_conversation_system": true, + "supports_native_structured_output": false, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "us-gov.anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.5e-05, "cache_creation_input_token_cost_above_1hr": 2.4e-05, @@ -49011,7 +44949,10 @@ "supports_function_calling": true, "supports_native_structured_output": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "us-gov.nvidia.nemotron-nano-12b-v2": { "input_cost_per_token": 2.4e-07, @@ -49022,7 +44963,10 @@ "mode": "chat", "output_cost_per_token": 7.2e-07, "supports_system_messages": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true }, "us-gov.nvidia.nemotron-nano-9b-v2": { "input_cost_per_token": 7.2e-08, @@ -49032,7 +44976,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 2.76e-07, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true, + "supports_vision": false }, "us-gov.nvidia.nemotron-super-3-120b": { "input_cost_per_token": 1.8e-07, @@ -49046,7 +44994,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "us-gov.openai.gpt-oss-20b-1:0": { "input_cost_per_token": 8.4e-08, @@ -49114,7 +45065,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 4096, "input_cost_per_token_batches": 5.5e-07, - "output_cost_per_token_batches": 2.75e-06 + "output_cost_per_token_batches": 2.75e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-opus-4-20250514-v1:0": { "cache_creation_input_token_cost": 1.875e-05, @@ -49172,7 +45124,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-opus-4-5-20251101-v1:0": { "cache_creation_input_token_cost": 6.25e-06, @@ -49204,19 +45157,21 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-opus-4-5-20251101-v1:0": { - "cache_creation_input_token_cost": 6.25e-06, - "cache_read_input_token_cost": 5e-07, - "input_cost_per_token": 5e-06, + "cache_creation_input_token_cost": 6.875e-06, + "cache_creation_input_token_cost_above_1hr": 1.1e-05, + "cache_read_input_token_cost": 5.5e-07, + "input_cost_per_token": 5.5e-06, "litellm_provider": "bedrock_converse", "supports_tool_search": true, "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", - "output_cost_per_token": 2.5e-05, + "output_cost_per_token": 2.75e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -49235,7 +45190,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -49267,7 +45223,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.deepseek.r1-v1:0": { "input_cost_per_token": 1.35e-06, @@ -49277,6 +45234,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 5.4e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": false, "supports_reasoning": true, "supports_tool_choice": false @@ -49292,7 +45250,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_native_structured_output": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "eu.deepseek.v3.2": { "input_cost_per_token": 7.4e-07, @@ -49305,7 +45266,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_native_structured_output": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "us.meta.llama3-1-405b-instruct-v1:0": { "input_cost_per_token": 5.32e-06, @@ -49447,6 +45411,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 6e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_tool_choice": false }, @@ -49961,34 +45926,6 @@ "output_cost_per_token": 9e-07, "supports_tool_choice": true }, - "vercel_ai_gateway/google/gemini-2.0-flash": { - "deprecation_date": "2026-06-01", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "vercel_ai_gateway", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_vision": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_response_schema": true - }, - "vercel_ai_gateway/google/gemini-2.0-flash-lite": { - "deprecation_date": "2026-06-01", - "input_cost_per_token": 7.5e-08, - "litellm_provider": "vercel_ai_gateway", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "supports_vision": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_response_schema": true - }, "vercel_ai_gateway/google/gemini-2.5-flash": { "input_cost_per_token": 3e-07, "litellm_provider": "vercel_ai_gateway", @@ -50797,16 +46734,20 @@ "deprecation_date": "2026-10-15", "cache_creation_input_token_cost": 1.25e-06, "cache_creation_input_token_cost_above_1hr": 2e-06, + "cache_creation_input_token_cost_batches": 6.25e-07, "cache_read_input_token_cost": 1e-07, + "cache_read_input_token_cost_batches": 5e-08, "input_cost_per_token": 1e-06, + "input_cost_per_token_batches": 5e-07, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, + "output_cost_per_token_batches": 2.5e-06, "regional_endpoint_uplift_multiplier": 1.1, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_assistant_prefill": true, "supports_function_calling": true, "supports_pdf_input": true, @@ -50822,16 +46763,20 @@ "deprecation_date": "2026-10-15", "cache_creation_input_token_cost": 1.25e-06, "cache_creation_input_token_cost_above_1hr": 2e-06, + "cache_creation_input_token_cost_batches": 6.25e-07, "cache_read_input_token_cost": 1e-07, + "cache_read_input_token_cost_batches": 5e-08, "input_cost_per_token": 1e-06, + "input_cost_per_token_batches": 5e-07, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, + "output_cost_per_token_batches": 2.5e-06, "regional_endpoint_uplift_multiplier": 1.1, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_assistant_prefill": true, "supports_function_calling": true, "supports_pdf_input": true, @@ -50872,28 +46817,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "vertex_ai/claude-3-7-sonnet@20250219": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-05-11", - "input_cost_per_token": 3e-06, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "vertex_ai/claude-3-haiku": { "input_cost_per_token": 2.5e-07, "litellm_provider": "vertex_ai-anthropic_models", @@ -50972,84 +46895,22 @@ "supports_tool_choice": true, "supports_vision": true }, - "vertex_ai/claude-opus-4": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-opus-4-1": { - "deprecation_date": "2026-08-05", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "input_cost_per_token_batches": 7.5e-06, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "output_cost_per_token_batches": 3.75e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "vertex_ai/claude-opus-4-1@20250805": { - "deprecation_date": "2026-08-05", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "input_cost_per_token_batches": 7.5e-06, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "output_cost_per_token_batches": 3.75e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, "vertex_ai/claude-opus-4-5": { "deprecation_date": "2026-11-24", "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "regional_endpoint_uplift_multiplier": 1.1, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -51066,20 +46927,25 @@ "supports_tool_choice": true, "supports_vision": true, "supports_output_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-5@20251101": { "deprecation_date": "2026-11-24", "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "regional_endpoint_uplift_multiplier": 1.1, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -51097,7 +46963,8 @@ "supports_vision": true, "supports_native_streaming": true, "supports_output_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-6": { "deprecation_date": "2027-02-05", @@ -51106,14 +46973,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51130,7 +47001,8 @@ "supports_vision": true, "supports_output_config": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-6@default": { "deprecation_date": "2027-02-05", @@ -51139,14 +47011,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51163,7 +47039,8 @@ "supports_vision": true, "supports_output_config": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-7": { "deprecation_date": "2027-04-16", @@ -51171,14 +47048,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51196,7 +47077,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-7@default": { "deprecation_date": "2027-04-16", @@ -51204,14 +47086,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51229,7 +47115,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5": { "deprecation_date": "2027-06-08", @@ -51237,14 +47124,18 @@ "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 1e-06, + "cache_read_input_token_cost_batches": 5e-07, "input_cost_per_token": 1e-05, + "input_cost_per_token_batches": 5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-05, + "output_cost_per_token_batches": 2.5e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51264,14 +47155,17 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5-1": { "regional_endpoint_uplift_multiplier": 1.1, "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 2.5e-07, + "cache_read_input_token_cost_batches": 1.25e-07, "input_cost_per_token": 1e-05, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, @@ -51301,7 +47195,10 @@ "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 512, - "deprecation_date": "2027-03-01" + "deprecation_date": "2027-03-01", + "input_cost_per_token_batches": 5e-06, + "output_cost_per_token_batches": 2.5e-05, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5@default": { "deprecation_date": "2027-06-08", @@ -51309,14 +47206,18 @@ "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 1e-06, + "cache_read_input_token_cost_batches": 5e-07, "input_cost_per_token": 1e-05, + "input_cost_per_token_batches": 5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-05, + "output_cost_per_token_batches": 2.5e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51336,14 +47237,17 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5-1@default": { "regional_endpoint_uplift_multiplier": 1.1, "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 2.5e-07, + "cache_read_input_token_cost_batches": 1.25e-07, "input_cost_per_token": 1e-05, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, @@ -51373,7 +47277,10 @@ "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 512, - "deprecation_date": "2027-03-01" + "deprecation_date": "2027-03-01", + "input_cost_per_token_batches": 5e-06, + "output_cost_per_token_batches": 2.5e-05, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-5": { "deprecation_date": "2027-01-24", @@ -51382,14 +47289,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51407,7 +47318,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-5@default": { "deprecation_date": "2027-01-24", @@ -51416,14 +47328,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51441,7 +47357,90 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/claude-opus-5-5": { + "regional_endpoint_uplift_multiplier": 1.1, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_creation_input_token_cost_batches": 2.5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, + "input_cost_per_token": 4e-06, + "input_cost_per_token_batches": 2.5e-06, + "litellm_provider": "vertex_ai-anthropic_models", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "output_cost_per_token_batches": 1.25e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_adaptive_thinking": true, + "thinking_always_on": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_forced_tool_use": false, + "supports_function_calling": true, + "supports_native_structured_output": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_max_reasoning_effort": true, + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/claude-opus-5-5@default": { + "regional_endpoint_uplift_multiplier": 1.1, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_creation_input_token_cost_batches": 2.5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, + "input_cost_per_token": 4e-06, + "input_cost_per_token_batches": 2.5e-06, + "litellm_provider": "vertex_ai-anthropic_models", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "output_cost_per_token_batches": 1.25e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_adaptive_thinking": true, + "thinking_always_on": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_forced_tool_use": false, + "supports_function_calling": true, + "supports_native_structured_output": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_max_reasoning_effort": true, + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-8": { "deprecation_date": "2027-05-28", @@ -51450,14 +47449,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51475,7 +47478,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-8@default": { "deprecation_date": "2027-05-28", @@ -51484,14 +47488,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51509,18 +47517,21 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-5": { "deprecation_date": "2026-09-29", "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05, "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 3e-06, "input_cost_per_token_above_200k_tokens": 6e-06, "output_cost_per_token_above_200k_tokens": 2.25e-05, "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, "cache_read_input_token_cost_above_200k_tokens": 6e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, @@ -51539,7 +47550,8 @@ "supports_response_schema": true, "supports_tool_choice": true, "supports_vision": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-5": { "deprecation_date": "2026-12-24", @@ -51549,12 +47561,14 @@ "cache_creation_input_token_cost_above_1hr": 4e-06, "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, + "input_cost_per_token_batches": 1e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 1e-05, + "output_cost_per_token_batches": 5e-06, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51573,7 +47587,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-6": { "regional_endpoint_uplift_multiplier": 1.1, @@ -51581,14 +47596,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_batches": 1.88e-06, "cache_read_input_token_cost": 3e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token": 3e-06, + "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 1.5e-05, + "output_cost_per_token_batches": 7.5e-06, "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -51605,18 +47624,21 @@ "search_context_size_medium": 0.01 }, "supports_output_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-5@20250929": { "deprecation_date": "2026-09-29", "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05, "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 3e-06, "input_cost_per_token_above_200k_tokens": 6e-06, "output_cost_per_token_above_200k_tokens": 2.25e-05, "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, "cache_read_input_token_cost_above_200k_tokens": 6e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, @@ -51636,99 +47658,8 @@ "supports_tool_choice": true, "supports_vision": true, "supports_native_streaming": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-opus-4@20250514": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-sonnet-4": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-sonnet-4@20250514": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/mistralai/codestral-2@001": { "input_cost_per_token": 3e-07, @@ -51738,6 +47669,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51749,6 +47681,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51760,6 +47693,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51771,6 +47705,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51808,14 +47743,17 @@ "supports_tool_choice": true }, "vertex_ai/deepseek-ai/deepseek-v3.1-maas": { + "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 6e-07, + "input_cost_per_token_batches": 3e-07, "litellm_provider": "vertex_ai-deepseek_models", "max_input_tokens": 163840, "max_output_tokens": 32768, "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 1.7e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 8.5e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "us-central1" ], @@ -51826,6 +47764,7 @@ "supports_tool_choice": true }, "vertex_ai/deepseek-ai/deepseek-v3.2-maas": { + "cache_read_input_token_cost": 5.6e-08, "input_cost_per_token": 5.6e-07, "input_cost_per_token_batches": 2.8e-07, "litellm_provider": "vertex_ai-deepseek_models", @@ -51835,7 +47774,7 @@ "mode": "chat", "output_cost_per_token": 1.68e-06, "output_cost_per_token_batches": 8.4e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -51847,13 +47786,15 @@ }, "vertex_ai/deepseek-ai/deepseek-r1-0528-maas": { "input_cost_per_token": 1.35e-06, + "input_cost_per_token_batches": 6.75e-07, "litellm_provider": "vertex_ai-deepseek_models", "max_input_tokens": 65336, "max_output_tokens": 8192, "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 5.4e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 2.7e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "us-central1" ], @@ -51918,6 +47859,7 @@ "cache_read_input_token_cost": 2e-07, "cache_read_input_token_cost_above_200k_tokens": 4e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 1e-07, "cache_read_input_token_cost_flex": 1e-07, "cache_read_input_token_cost_priority": 3.6e-07, "deprecation_date": "2027-05-28", @@ -51962,6 +47904,7 @@ }, "vertex_ai/gemini-3.1-flash-image": { "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 2.5e-08, "cache_read_input_token_cost_flex": 2.5e-08, "deprecation_date": "2027-05-28", "input_cost_per_image": 0.00056, @@ -51997,6 +47940,7 @@ }, "vertex_ai/gemini-3.1-flash-lite-image": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "input_cost_per_image": 0.00028, "input_cost_per_token": 2.5e-07, @@ -52089,6 +48033,7 @@ "cache_read_input_audio_token_cost": 5e-08, "deprecation_date": "2027-05-07", "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_audio_token": 5e-07, @@ -52149,6 +48094,7 @@ "vertex_ai/gemini-3.5-flash-lite": { "deprecation_date": "2027-07-21", "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 1.5e-08, "cache_read_input_token_cost_flex": 1.5e-08, "cache_read_input_token_cost_priority": 5.4e-08, "input_cost_per_token": 3e-07, @@ -52206,6 +48152,7 @@ }, "vertex_ai/deep-research-pro-preview-12-2025": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "input_cost_per_image": 0.0011, "input_cost_per_token": 2e-06, "input_cost_per_token_batches": 1e-06, @@ -52220,62 +48167,6 @@ "output_cost_per_token_batches": 6e-06, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "vertex_ai/imagegeneration@006": { - "deprecation_date": "2025-09-24", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-fast-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-generate-002": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-capability-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/image/edit-insert-objects" - }, - "vertex_ai/imagen-4.0-fast-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-4.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-4.0-ultra-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, "vertex_ai/jamba-1.5": { "input_cost_per_token": 2e-07, "litellm_provider": "vertex_ai-ai21_models", @@ -52479,13 +48370,15 @@ }, "vertex_ai/meta/llama-4-maverick-17b-128e-instruct-maas": { "input_cost_per_token": 3.5e-07, + "input_cost_per_token_batches": 1.75e-07, "litellm_provider": "vertex_ai-llama_models", "max_input_tokens": 1000000, "max_output_tokens": 1000000, "max_tokens": 1000000, "mode": "chat", "output_cost_per_token": 1.15e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 5.75e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_modalities": [ "text", "image" @@ -52539,13 +48432,15 @@ }, "vertex_ai/meta/llama-4-scout-17b-16e-instruct-maas": { "input_cost_per_token": 2.5e-07, + "input_cost_per_token_batches": 1.25e-07, "litellm_provider": "vertex_ai-llama_models", "max_input_tokens": 10000000, "max_output_tokens": 10000000, "max_tokens": 10000000, "mode": "chat", "output_cost_per_token": 7e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 3.5e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_modalities": [ "text", "image" @@ -52591,6 +48486,7 @@ "supports_tool_choice": true }, "vertex_ai/minimaxai/minimax-m2-maas": { + "cache_read_input_token_cost": 3e-08, "input_cost_per_token": 3e-07, "litellm_provider": "vertex_ai-minimax_models", "max_input_tokens": 196608, @@ -52598,11 +48494,12 @@ "max_tokens": 196608, "mode": "chat", "output_cost_per_token": 1.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, "vertex_ai/moonshotai/kimi-k2-thinking-maas": { + "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 6e-07, "litellm_provider": "vertex_ai-moonshot_models", "max_input_tokens": 256000, @@ -52610,12 +48507,13 @@ "max_tokens": 256000, "mode": "chat", "output_cost_per_token": 2.5e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true, "supports_web_search": true }, "vertex_ai/zai-org/glm-4.7-maas": { + "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 6e-07, "litellm_provider": "vertex_ai-zai_models", "max_input_tokens": 200000, @@ -52623,7 +48521,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -52640,7 +48538,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 3.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#glm-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -52657,6 +48555,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52668,6 +48567,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52679,6 +48579,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52690,6 +48591,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52770,7 +48672,7 @@ "supports_function_calling": true, "supports_tool_choice": true, "supports_vision": true, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/mistral-small-2503@001": { "input_cost_per_token": 1e-07, @@ -52782,7 +48684,7 @@ "output_cost_per_token": 3e-07, "supports_function_calling": true, "supports_tool_choice": true, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/mistral-ocr-2505": { "litellm_provider": "vertex_ai", @@ -52799,7 +48701,7 @@ "input_cost_per_token": 3e-07, "output_cost_per_token": 1.2e-06, "ocr_cost_per_page": 0.0003, - "source": "https://cloud.google.com/vertex-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "us-central1" ] @@ -52822,13 +48724,15 @@ }, "vertex_ai/openai/gpt-oss-120b-maas": { "input_cost_per_token": 9e-08, + "input_cost_per_token_batches": 4.5e-08, "litellm_provider": "vertex_ai-openai_models", "max_input_tokens": 131072, "max_output_tokens": 32768, "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 3.6e-07, - "source": "https://console.cloud.google.com/vertex-ai/publishers/openai/model-garden/gpt-oss-120b-maas", + "output_cost_per_token_batches": 1.8e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_reasoning": true }, "vertex_ai/openai/gpt-oss-20b-maas": { @@ -52839,9 +48743,11 @@ "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 2.5e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_reasoning": true, - "cache_read_input_token_cost": 7e-09 + "cache_read_input_token_cost": 7e-09, + "input_cost_per_token_batches": 3.5e-08, + "output_cost_per_token_batches": 1.25e-07 }, "vertex_ai/xai/grok-4.1-fast-non-reasoning": { "cache_read_input_token_cost": 5e-08, @@ -52852,7 +48758,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-07, - "source": "https://docs.x.ai/developers/models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_prompt_caching": true, "supports_response_schema": true, @@ -52869,7 +48775,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-07, - "source": "https://docs.x.ai/developers/models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_prompt_caching": true, "supports_reasoning": true, @@ -52961,13 +48867,15 @@ }, "vertex_ai/qwen/qwen3-235b-a22b-instruct-2507-maas": { "input_cost_per_token": 2.2e-07, + "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "vertex_ai-qwen_models", "max_input_tokens": 262144, "max_output_tokens": 16384, "max_tokens": 16384, "mode": "chat", "output_cost_per_token": 8.8e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "output_cost_per_token_batches": 4.4e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global", "us-south1" @@ -52976,14 +48884,17 @@ "supports_tool_choice": true }, "vertex_ai/qwen/qwen3-coder-480b-a35b-instruct-maas": { + "cache_read_input_token_cost": 2.2e-08, "input_cost_per_token": 2.2e-07, + "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "vertex_ai-qwen_models", "max_input_tokens": 262144, "max_output_tokens": 32768, "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 1.8e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "output_cost_per_token_batches": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -52998,7 +48909,7 @@ "max_tokens": 262144, "mode": "chat", "output_cost_per_token": 1.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -53013,58 +48924,13 @@ "max_tokens": 262144, "mode": "chat", "output_cost_per_token": 1.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], "supports_function_calling": true, "supports_tool_choice": true }, - "vertex_ai/veo-2.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-video-models", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.35, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, - "vertex_ai/veo-3.0-fast-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-video-models", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.15, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, - "vertex_ai/veo-3.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-video-models", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.4, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, "vertex_ai/veo-3.1-generate-preview": { "litellm_provider": "vertex_ai-video-models", "max_input_tokens": 1024, @@ -53353,59 +49219,6 @@ "mode": "chat", "source": "https://wandb.ai/site/pricing/tokens/" }, - "wandb/zai-org/GLM-4.5": { - "deprecation_date": "2026-03-04", - "supports_reasoning": true, - "max_tokens": 131072, - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "input_cost_per_token": 0.055, - "output_cost_per_token": 0.2, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/Qwen/Qwen3-235B-A22B-Instruct-2507": { - "deprecation_date": "2026-08-04", - "max_tokens": 262144, - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 1e-07, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/Qwen/Qwen3-Coder-480B-A35B-Instruct": { - "deprecation_date": "2026-08-25", - "max_tokens": 262144, - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "input_cost_per_token": 1e-06, - "output_cost_per_token": 1.5e-06, - "litellm_provider": "wandb", - "mode": "chat", - "source": "https://wandb.ai/site/pricing/tokens/" - }, - "wandb/Qwen/Qwen3-235B-A22B-Thinking-2507": { - "deprecation_date": "2026-08-04", - "supports_reasoning": true, - "max_tokens": 262144, - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 1e-07, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/moonshotai/Kimi-K2-Instruct": { - "deprecation_date": "2026-03-04", - "max_tokens": 128000, - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "input_cost_per_token": 6e-07, - "output_cost_per_token": 2.5e-06, - "litellm_provider": "wandb", - "mode": "chat" - }, "wandb/moonshotai/Kimi-K2.5": { "max_tokens": 262144, "max_input_tokens": 262144, @@ -53421,20 +49234,6 @@ "supports_response_schema": true, "supports_vision": true }, - "wandb/MiniMaxAI/MiniMax-M2.5": { - "deprecation_date": "2026-08-25", - "max_tokens": 197000, - "max_input_tokens": 197000, - "max_output_tokens": 197000, - "input_cost_per_token": 3e-07, - "output_cost_per_token": 1.2e-06, - "litellm_provider": "wandb", - "mode": "chat", - "source": "https://wandb.ai/inference/coreweave/cw_MiniMaxAI_MiniMax-M2.5", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true - }, "wandb/meta-llama/Llama-3.1-8B-Instruct": { "max_tokens": 128000, "max_input_tokens": 131000, @@ -53456,27 +49255,6 @@ "mode": "chat", "source": "https://wandb.ai/site/pricing/tokens/" }, - "wandb/deepseek-ai/DeepSeek-R1-0528": { - "deprecation_date": "2026-03-04", - "supports_reasoning": true, - "max_tokens": 161000, - "max_input_tokens": 161000, - "max_output_tokens": 161000, - "input_cost_per_token": 1.35e-06, - "output_cost_per_token": 5.4e-06, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/deepseek-ai/DeepSeek-V3-0324": { - "deprecation_date": "2026-03-04", - "max_tokens": 161000, - "max_input_tokens": 161000, - "max_output_tokens": 161000, - "input_cost_per_token": 1.14e-06, - "output_cost_per_token": 2.75e-06, - "litellm_provider": "wandb", - "mode": "chat" - }, "wandb/meta-llama/Llama-3.3-70B-Instruct": { "max_tokens": 128000, "max_input_tokens": 128000, @@ -53487,26 +49265,6 @@ "mode": "chat", "source": "https://wandb.ai/site/pricing/tokens/" }, - "wandb/meta-llama/Llama-4-Scout-17B-16E-Instruct": { - "deprecation_date": "2026-04-21", - "max_tokens": 64000, - "max_input_tokens": 64000, - "max_output_tokens": 64000, - "input_cost_per_token": 1.7e-07, - "output_cost_per_token": 6.6e-07, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/microsoft/Phi-4-mini-instruct": { - "deprecation_date": "2026-08-04", - "max_tokens": 128000, - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "input_cost_per_token": 0.008, - "output_cost_per_token": 0.035, - "litellm_provider": "wandb", - "mode": "chat" - }, "watsonx/ibm/granite-3-8b-instruct": { "input_cost_per_token": 2e-07, "litellm_provider": "watsonx", @@ -53907,440 +49665,6 @@ "deprecation_date": "2027-02-26", "source": "https://developers.openai.com/api/docs/pricing" }, - "xai/grok-3": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-beta": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-fast-beta": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-fast-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini": { - "cache_read_input_token_cost": 2e-07, - "deprecation_date": "2026-02-28", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-beta": { - "cache_read_input_token_cost": 2e-07, - "deprecation_date": "2026-02-28", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-fast": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-fast-beta": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-fast-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4": { - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-fast-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-fast-non-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-0709": { - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-latest": { - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-reasoning-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-non-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-non-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-non-reasoning-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-non-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, "xai/grok-4.20-multi-agent-beta-0309": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 1.25e-06, @@ -54585,72 +49909,6 @@ "supports_vision": true, "supports_web_search": true }, - "xai/grok-code-fast": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.x.ai/v1/language-models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "input_cost_per_token_above_200k_tokens": 2e-06, - "output_cost_per_token_above_200k_tokens": 4e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "supports_response_schema": true, - "supports_vision": true, - "deprecation_date": "2026-05-15", - "input_cost_per_image_token": 1e-06 - }, - "xai/grok-code-fast-1": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.x.ai/v1/language-models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "input_cost_per_token_above_200k_tokens": 2e-06, - "output_cost_per_token_above_200k_tokens": 4e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "supports_response_schema": true, - "supports_vision": true, - "deprecation_date": "2026-05-15", - "input_cost_per_image_token": 1e-06 - }, - "xai/grok-code-fast-1-0825": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.x.ai/v1/language-models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "input_cost_per_token_above_200k_tokens": 2e-06, - "output_cost_per_token_above_200k_tokens": 4e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "supports_response_schema": true, - "supports_vision": true, - "deprecation_date": "2026-05-15", - "input_cost_per_image_token": 1e-06 - }, "zai.glm-4.7": { "input_cost_per_token": 6e-07, "litellm_provider": "bedrock_converse", @@ -57393,30 +52651,6 @@ "supports_reasoning": true, "supports_vision": true }, - "scaleway/google/gemma-3-27b-it": { - "input_cost_per_token": 2.5e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 40000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 5e-07, - "supports_function_calling": true, - "supports_vision": true, - "deprecation_date": "2026-08-01" - }, - "scaleway/hcompany/holo2-30b-a3b": { - "input_cost_per_token": 3e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 22000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 7e-07, - "supports_reasoning": true, - "supports_vision": true, - "deprecation_date": "2026-08-09" - }, "scaleway/mistralai/mistral-medium-3.5-128b": { "input_cost_per_token": 1.5e-06, "litellm_provider": "scaleway", @@ -57430,29 +52664,6 @@ "supports_vision": true, "supports_tool_choice": true }, - "scaleway/mistralai/devstral-2-123b-instruct-2512": { - "input_cost_per_token": 4e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 200000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 2e-06, - "supports_function_calling": true, - "deprecation_date": "2026-08-01" - }, - "scaleway/mistralai/voxtral-small-24b-2507": { - "input_cost_per_audio_token": 1.5e-07, - "input_cost_per_token": 1.5e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 32000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 3.5e-07, - "supports_audio_input": true, - "deprecation_date": "2026-08-01" - }, "scaleway/mistralai/mistral-small-3.2-24b-instruct-2506": { "input_cost_per_token": 1.5e-07, "litellm_provider": "scaleway", @@ -59012,26 +54223,6 @@ "/v1/audio/speech" ] }, - "gpt-4o-mini-tts-2025-03-20": { - "deprecation_date": "2026-07-23", - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "mode": "audio_speech", - "output_cost_per_audio_token": 1.2e-05, - "output_cost_per_second": 0.00025, - "output_cost_per_token": 1e-05, - "source": "https://developers.openai.com/api/docs/pricing", - "supported_endpoints": [ - "/v1/audio/speech" - ], - "supported_modalities": [ - "text", - "audio" - ], - "supported_output_modalities": [ - "audio" - ] - }, "gpt-4o-mini-tts-2025-12-15": { "input_cost_per_token": 6e-07, "litellm_provider": "openai", @@ -59135,41 +54326,6 @@ "supports_none_reasoning_effort": false, "supports_xhigh_reasoning_effort": false }, - "gpt-realtime-mini-2025-10-06": { - "cache_creation_input_audio_token_cost": 3e-07, - "cache_read_input_audio_token_cost": 3e-07, - "cache_read_input_token_cost": 6e-08, - "deprecation_date": "2026-07-23", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_image_token": 8e-07, - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 2.4e-06, - "source": "https://developers.openai.com/api/docs/pricing", - "supported_endpoints": [ - "/v1/realtime" - ], - "supported_modalities": [ - "text", - "image", - "audio" - ], - "supported_output_modalities": [ - "text", - "audio" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-realtime-mini-2025-12-15": { "cache_creation_input_audio_token_cost": 3e-07, "cache_read_input_audio_token_cost": 3e-07, @@ -59254,7 +54410,7 @@ "litellm_provider": "openai", "mode": "video_generation", "output_cost_per_video_per_second": 0.5, - "source": "https://platform.openai.com/docs/api-reference/videos", + "source": "https://developers.openai.com/api/docs/pricing", "supported_modalities": [ "text", "image" @@ -59265,6 +54421,7 @@ }, "chatgpt-image-latest": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-12-01", "input_cost_per_image_token": 8e-06, "input_cost_per_image_token_batches": 4e-06, @@ -59323,42 +54480,6 @@ "tpm": 250000, "rpm": 10 }, - "gemini/gemini-2.0-flash-lite-001": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_token": 7.5e-08, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "rpm": 4000, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.0-flash-lite", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 4000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini-2.5-flash-native-audio-latest": { "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, @@ -60004,12 +55125,14 @@ "cache_creation_input_token_cost_above_1hr": 4e-06, "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, + "input_cost_per_token_batches": 1e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 1e-05, + "output_cost_per_token_batches": 5e-06, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -60028,7 +55151,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-6@default": { "regional_endpoint_uplift_multiplier": 1.1, @@ -60036,14 +55160,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_batches": 1.88e-06, "cache_read_input_token_cost": 3e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token": 3e-06, + "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 1.5e-05, + "output_cost_per_token_batches": 7.5e-06, "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -60060,7 +55188,8 @@ "search_context_size_medium": 0.01 }, "supports_output_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "duckduckgo/search": { "litellm_provider": "duckduckgo", @@ -60253,14 +55382,14 @@ "supports_vision": true }, "bedrock_mantle/openai.gpt-daybreak-blue-5.6-sol": { - "input_cost_per_token": 5.5e-06, - "input_cost_per_token_above_272k_tokens": 1.1e-05, - "cache_creation_input_token_cost": 6.875e-06, - "cache_creation_input_token_cost_above_272k_tokens": 1.375e-05, - "cache_read_input_token_cost": 5.5e-07, - "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, - "output_cost_per_token": 3.3e-05, - "output_cost_per_token_above_272k_tokens": 4.95e-05, + "input_cost_per_token": 4.4e-06, + "input_cost_per_token_above_272k_tokens": 8.8e-06, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 1.1e-05, + "cache_read_input_token_cost": 4.4e-07, + "cache_read_input_token_cost_above_272k_tokens": 8.8e-07, + "output_cost_per_token": 2.2e-05, + "output_cost_per_token_above_272k_tokens": 3.3e-05, "litellm_provider": "bedrock_mantle", "max_input_tokens": 1050000, "max_output_tokens": 128000, @@ -60343,6 +55472,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60356,7 +55486,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "global.openai.gpt-5.6-sol": { "input_cost_per_token": 4e-06, @@ -60372,6 +55503,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60385,7 +55517,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "us.openai.gpt-5.6-terra": { "input_cost_per_token": 2.2e-06, @@ -60401,6 +55534,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60414,7 +55548,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "global.openai.gpt-5.6-terra": { "input_cost_per_token": 2e-06, @@ -60430,6 +55565,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60443,7 +55579,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "us.openai.gpt-5.6-luna": { "input_cost_per_token": 2.2e-07, @@ -60459,6 +55596,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60472,7 +55610,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "global.openai.gpt-5.6-luna": { "input_cost_per_token": 2e-07, @@ -60488,6 +55627,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60501,7 +55641,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "bedrock_mantle/openai.gpt-6-astra": { "input_cost_per_token": 1.1e-05, @@ -60571,7 +55712,7 @@ "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, "supports_vision": true, - "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html" + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.openai.gpt-6-astra": { "input_cost_per_token": 1e-05, @@ -60603,7 +55744,7 @@ "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, "supports_vision": true, - "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html" + "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock_mantle/openai.gpt-5.5": { "input_cost_per_token": 5.5e-06, @@ -60817,6 +55958,7 @@ "max_output_tokens": 500000, "max_tokens": 500000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_prompt_caching": false, "supports_reasoning": true, @@ -60832,6 +55974,7 @@ "max_output_tokens": 500000, "max_tokens": 500000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_prompt_caching": false, "supports_reasoning": true, @@ -61035,6 +56178,9 @@ "supports_system_messages": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/zai.glm-5": { @@ -61050,6 +56196,9 @@ "supports_system_messages": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-gov-east-1/anthropic.claude-haiku-4-5-20251001-v1:0": { @@ -62376,10 +57525,10 @@ }, "gemini/gemini-robotics-er-2-streaming-preview": { "input_cost_per_audio_token": 2e-06, - "input_cost_per_token": 2e-06, + "input_cost_per_token": 1e-06, "litellm_provider": "gemini", "mode": "chat", - "output_cost_per_token": 1e-05, + "output_cost_per_token": 5e-06, "search_context_cost_per_query": { "search_context_size_high": 0.014, "search_context_size_low": 0.014, @@ -65518,23 +60667,6 @@ "image" ] }, - "xai/grok-imagine-image-pro": { - "input_cost_per_image": 0.05, - "litellm_provider": "xai", - "mode": "image_generation", - "source": "https://docs.x.ai/docs/models", - "supported_endpoints": [ - "/v1/images/generations" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "image" - ], - "deprecation_date": "2026-05-15" - }, "xai/grok-imagine-image-2.0": { "input_cost_per_image": 0.06, "litellm_provider": "xai", @@ -66152,16 +61284,6 @@ "output_cost_per_token": 2.82e-07, "source": "https://api.together.ai/v1/models" }, - "together_ai/moonshotai/Kimi-K2.6": { - "deprecation_date": "2026-08-19", - "input_cost_per_token": 1.2e-06, - "output_cost_per_token": 4.5e-06, - "cache_read_input_token_cost": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "together_ai/moonshotai/Kimi-K2.5-fp4": { "input_cost_per_token": 5e-07, "output_cost_per_token": 2.8e-06, @@ -66179,25 +61301,6 @@ "mode": "chat", "source": "https://api.together.ai/v1/models" }, - "together_ai/zai-org/GLM-5": { - "deprecation_date": "2026-06-22", - "input_cost_per_token": 1e-06, - "output_cost_per_token": 3.2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 202752, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, - "together_ai/zai-org/GLM-5.1": { - "deprecation_date": "2026-07-10", - "input_cost_per_token": 1.4e-06, - "output_cost_per_token": 4.4e-06, - "cache_read_input_token_cost": 2.6e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 202752, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "together_ai/deepseek-ai/DeepSeek-R1-0528": { "input_cost_per_token": 3e-06, "output_cost_per_token": 7e-06, @@ -66206,33 +61309,6 @@ "mode": "chat", "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen3-Coder-Next-FP8": { - "deprecation_date": "2026-05-14", - "input_cost_per_token": 5e-07, - "output_cost_per_token": 1.2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen3-VL-32B-Instruct": { - "deprecation_date": "2026-02-25", - "input_cost_per_token": 5e-07, - "output_cost_per_token": 1.5e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen3-VL-8B-Instruct": { - "deprecation_date": "2026-04-16", - "input_cost_per_token": 1.8e-07, - "output_cost_per_token": 6.8e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "together_ai/mistralai/Ministral-3-14B-Instruct-2512": { "input_cost_per_token": 2e-07, "output_cost_per_token": 2e-07, @@ -66257,15 +61333,6 @@ "mode": "chat", "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/QwQ-32B": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 1.2e-06, - "output_cost_per_token": 1.2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 131072, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "cerebras/gemma-4-31b": { "input_cost_per_token": 9.9e-07, "litellm_provider": "cerebras", @@ -66356,7 +61423,10 @@ "supports_function_calling": true, "supports_native_structured_output": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-west-1/nvidia.nemotron-nano-12b-v2": { "input_cost_per_token": 2.4e-07, @@ -66367,7 +61437,10 @@ "mode": "chat", "output_cost_per_token": 7.2e-07, "supports_system_messages": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true }, "bedrock/us-gov-west-1/nvidia.nemotron-nano-9b-v2": { "input_cost_per_token": 7.2e-08, @@ -66377,7 +61450,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 2.76e-07, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-west-1/nvidia.nemotron-super-3-120b": { "input_cost_per_token": 1.8e-07, @@ -66391,7 +61468,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-west-1/openai.gpt-oss-20b-1:0": { "input_cost_per_token": 8.4e-08, @@ -66473,7 +61553,7 @@ "supports_function_calling": true, "supports_max_reasoning_effort": true, "supports_mid_conversation_system": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_output_config": true, "supports_parallel_tool_use_config": true, "supports_pdf_input": true, @@ -66517,6 +61597,41 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true }, + "bedrock/us-gov-west-1/anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "cache_creation_input_token_cost": 6e-06, + "cache_creation_input_token_cost_above_1hr": 9.6e-06, + "cache_read_input_token_cost": 2.4e-07, + "input_cost_per_token": 4.8e-06, + "litellm_provider": "bedrock", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.4e-05, + "prompt_cache_min_tokens": 512, + "supports_adaptive_thinking": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_mid_conversation_system": true, + "supports_native_structured_output": false, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, "bedrock/us-gov-west-1/anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.5e-05, "cache_creation_input_token_cost_above_1hr": 2.4e-05, @@ -66562,7 +61677,10 @@ "supports_function_calling": true, "supports_native_structured_output": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-east-1/nvidia.nemotron-nano-12b-v2": { "input_cost_per_token": 2.4e-07, @@ -66573,7 +61691,10 @@ "mode": "chat", "output_cost_per_token": 7.2e-07, "supports_system_messages": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true }, "bedrock/us-gov-east-1/nvidia.nemotron-nano-9b-v2": { "input_cost_per_token": 7.2e-08, @@ -66583,7 +61704,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 2.76e-07, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-east-1/nvidia.nemotron-super-3-120b": { "input_cost_per_token": 1.8e-07, @@ -66597,7 +61722,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-east-1/openai.gpt-oss-20b-1:0": { "input_cost_per_token": 8.4e-08, @@ -66679,7 +61807,7 @@ "supports_function_calling": true, "supports_max_reasoning_effort": true, "supports_mid_conversation_system": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_output_config": true, "supports_parallel_tool_use_config": true, "supports_pdf_input": true, @@ -66723,6 +61851,41 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true }, + "bedrock/us-gov-east-1/anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "cache_creation_input_token_cost": 6e-06, + "cache_creation_input_token_cost_above_1hr": 9.6e-06, + "cache_read_input_token_cost": 2.4e-07, + "input_cost_per_token": 4.8e-06, + "litellm_provider": "bedrock", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.4e-05, + "prompt_cache_min_tokens": 512, + "supports_adaptive_thinking": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_mid_conversation_system": true, + "supports_native_structured_output": false, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, "bedrock/us-gov-east-1/anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.5e-05, "cache_creation_input_token_cost_above_1hr": 2.4e-05, @@ -68245,7 +63408,7 @@ "max_tokens": 262144, "mode": "chat", "output_cost_per_token": 4.4e-06, - "source": "https://www.baseten.co/pricing/", + "source": "https://inference.baseten.co/v1/models", "supported_modalities": [ "text", "image" @@ -68255,6 +63418,7 @@ ], "supports_function_calling": true, "supports_prompt_caching": true, + "supports_reasoning": true, "supports_response_schema": true, "supports_tool_choice": true, "supports_vision": true @@ -69040,13 +64204,13 @@ "supports_web_search": false }, "openrouter/qwen/qwen3.6-27b": { - "input_cost_per_token": 3e-07, - "output_cost_per_token": 2e-06, - "cache_read_input_token_cost": 3e-08, + "input_cost_per_token": 3.2e-07, + "output_cost_per_token": 2.7e-06, + "cache_read_input_token_cost": 1.5e-07, "litellm_provider": "openrouter", "max_input_tokens": 262144, - "max_output_tokens": 65536, - "max_tokens": 65536, + "max_output_tokens": 262140, + "max_tokens": 262140, "mode": "chat", "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, @@ -71007,38 +66171,6 @@ "output_cost_per_token": 1.5e-07, "source": "https://api.together.ai/v1/models" }, - "together_ai/deepseek-ai/deepseek-coder-33b-instruct": { - "deprecation_date": "2024-08-22", - "input_cost_per_token": 8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/deepseek-ai/DeepSeek-R1-Distill-Llama-70B": { - "deprecation_date": "2025-12-23", - "input_cost_per_token": 2e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 1.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-14B": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 1.6e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.6e-06, - "source": "https://api.together.ai/v1/models" - }, "vertex_ai/gemini-2.5-flash-native-audio": { "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, @@ -71057,16 +66189,6 @@ "output_cost_per_token": 1e-05, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "vertex_ai/gemini-3.1-flash-live-preview": { - "input_cost_per_audio_token": 3e-06, - "input_cost_per_second": 8.33333333333e-05, - "input_cost_per_token": 7.5e-07, - "litellm_provider": "vertex_ai", - "mode": "realtime", - "output_cost_per_audio_token": 1.2e-05, - "output_cost_per_token": 4.5e-06, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" - }, "vertex_ai/gemini-3.1-flash-tts-preview": { "input_cost_per_token": 1e-06, "input_cost_per_token_batches": 5e-07, @@ -71099,15 +66221,31 @@ "output_cost_per_token": 9e-06, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "vertex_ai/gemini-robotics-er-2": { - "cache_read_input_token_cost": 1e-07, - "input_cost_per_token": 1e-06, - "input_cost_per_token_batches": 5e-07, + "vertex_ai/gemini-omni-1.1-flash-preview": { + "input_cost_per_token": 1.5e-06, "litellm_provider": "vertex_ai", + "max_output_tokens": 57920, + "max_tokens": 57920, "mode": "chat", - "output_cost_per_token": 5e-06, - "output_cost_per_token_batches": 2.5e-06, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + "output_cost_per_reasoning_token": 9e-06, + "output_cost_per_token": 9e-06, + "output_cost_per_video_token": 1.75e-05, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", + "supported_endpoints": [ + "/v1beta/interactions" + ], + "supported_modalities": [ + "text", + "image", + "video" + ], + "supported_output_modalities": [ + "text", + "video" + ], + "supports_reasoning": true, + "supports_video_input": true, + "supports_vision": true }, "vertex_ai/gemma-4-26b-a4b-it": { "cache_read_input_token_cost": 1.5e-08, @@ -71117,14 +66255,6 @@ "output_cost_per_token": 6e-07, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "together_ai/google/gemma-2-27b-it": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://api.together.ai/v1/models" - }, "gpt-5.5-cyber": { "cache_read_input_token_cost": 1.25e-06, "input_cost_per_token": 1.25e-05, @@ -71142,14 +66272,6 @@ "output_cost_per_token": 2.5e-05, "source": "https://developers.openai.com/api/docs/pricing" }, - "together_ai/meta-llama/Llama-3-8b-chat-hf": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://api.together.ai/v1/models" - }, "together_ai/meta-llama/Llama-3.1-405B-Instruct": { "input_cost_per_token": 3.5e-06, "litellm_provider": "together_ai", @@ -71171,38 +66293,6 @@ "output_cost_per_token": 6e-08, "source": "https://api.together.ai/v1/models" }, - "together_ai/meta-llama/Meta-Llama-3-70B-Instruct-Turbo": { - "deprecation_date": "2025-12-23", - "input_cost_per_token": 8.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/meta-llama/Meta-Llama-3-8B-Instruct": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/nvidia/Llama-3.1-Nemotron-70B-Instruct-HF": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 8.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.8e-07, - "source": "https://api.together.ai/v1/models" - }, "together_ai/Qwen/Qwen2-1.5B-Instruct": { "input_cost_per_token": 2e-08, "litellm_provider": "together_ai", @@ -71210,22 +66300,6 @@ "output_cost_per_token": 2e-08, "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen2-72B-Instruct": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 9e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 9e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen2-VL-72B-Instruct": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 1.2e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://api.together.ai/v1/models" - }, "together_ai/Qwen/Qwen2.5-14B-Instruct": { "input_cost_per_token": 8e-07, "litellm_provider": "together_ai", @@ -71240,22 +66314,6 @@ "output_cost_per_token": 1.2e-06, "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen2.5-Coder-32B-Instruct": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen2.5-VL-72B-Instruct": { - "deprecation_date": "2026-01-05", - "input_cost_per_token": 1.95e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-06, - "source": "https://api.together.ai/v1/models" - }, "azure/eu/codex-mini": { "deprecation_date": "2026-11-15", "cache_read_input_token_cost": 4.13e-07, @@ -71324,6 +66382,7 @@ "azure/eu/gpt-5": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "input_cost_per_token_batches": 6.875e-07, @@ -71347,6 +66406,7 @@ "azure/eu/gpt-5-mini": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 2.75e-08, + "cache_read_input_token_cost_batches": 1.375e-08, "cache_read_input_token_cost_priority": 4.95e-08, "input_cost_per_token": 2.75e-07, "input_cost_per_token_batches": 1.375e-07, @@ -71361,6 +66421,7 @@ "azure/eu/gpt-5-nano": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 5.5e-09, + "cache_read_input_token_cost_batches": 2.75e-09, "input_cost_per_token": 5.5e-08, "input_cost_per_token_batches": 2.75e-08, "litellm_provider": "azure", @@ -71391,6 +66452,7 @@ "azure/eu/gpt-5.2": { "deprecation_date": "2027-06-08", "cache_read_input_token_cost": 1.925e-07, + "cache_read_input_token_cost_batches": 9.625e-08, "cache_read_input_token_cost_priority": 3.85e-07, "input_cost_per_token": 1.925e-06, "input_cost_per_token_batches": 9.625e-07, @@ -71402,15 +66464,6 @@ "output_cost_per_token_priority": 3.08e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/gpt-5.2-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/gpt-5.2-codex": { "deprecation_date": "2027-07-13", "cache_read_input_token_cost": 1.925e-07, @@ -71429,15 +66482,6 @@ "output_cost_per_token_batches": 9.24e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/gpt-5.3-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/gpt-5.3-codex": { "deprecation_date": "2027-08-24", "cache_read_input_token_cost": 1.925e-07, @@ -71453,6 +66497,7 @@ "azure/eu/gpt-5.4-mini": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 8.25e-08, + "cache_read_input_token_cost_batches": 4.125e-08, "cache_read_input_token_cost_priority": 1.65e-07, "input_cost_per_token": 8.25e-07, "input_cost_per_token_batches": 4.125e-07, @@ -71467,6 +66512,7 @@ "azure/eu/gpt-5.4-nano": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 2.2e-08, + "cache_read_input_token_cost_batches": 1.1e-08, "input_cost_per_token": 2.2e-07, "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "azure", @@ -71479,11 +66525,13 @@ "deprecation_date": "2027-09-07", "input_cost_per_token": 3.3e-05, "input_cost_per_token_above_272k_tokens": 6.6e-05, + "input_cost_per_token_above_272k_tokens_batches": 3.3e-05, "input_cost_per_token_batches": 1.65e-05, "litellm_provider": "azure", "mode": "chat", "output_cost_per_token": 0.000198, "output_cost_per_token_above_272k_tokens": 0.000297, + "output_cost_per_token_above_272k_tokens_batches": 0.0001485, "output_cost_per_token_batches": 9.9e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -71510,14 +66558,6 @@ "output_cost_per_token_batches": 2.42e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/o1-preview": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/o3-2025-04-16": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 5.5e-07, @@ -71678,6 +66718,7 @@ "azure/us/gpt-5": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "input_cost_per_token_batches": 6.875e-07, @@ -71701,6 +66742,7 @@ "azure/us/gpt-5-mini": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 2.75e-08, + "cache_read_input_token_cost_batches": 1.375e-08, "cache_read_input_token_cost_priority": 4.95e-08, "input_cost_per_token": 2.75e-07, "input_cost_per_token_batches": 1.375e-07, @@ -71715,6 +66757,7 @@ "azure/us/gpt-5-nano": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 5.5e-09, + "cache_read_input_token_cost_batches": 2.75e-09, "input_cost_per_token": 5.5e-08, "input_cost_per_token_batches": 2.75e-08, "litellm_provider": "azure", @@ -71745,6 +66788,7 @@ "azure/us/gpt-5.2": { "deprecation_date": "2027-06-08", "cache_read_input_token_cost": 1.925e-07, + "cache_read_input_token_cost_batches": 9.625e-08, "cache_read_input_token_cost_priority": 3.85e-07, "input_cost_per_token": 1.925e-06, "input_cost_per_token_batches": 9.625e-07, @@ -71756,15 +66800,6 @@ "output_cost_per_token_priority": 3.08e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/gpt-5.2-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/gpt-5.2-codex": { "deprecation_date": "2027-07-13", "cache_read_input_token_cost": 1.925e-07, @@ -71783,15 +66818,6 @@ "output_cost_per_token_batches": 9.24e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/gpt-5.3-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/gpt-5.3-codex": { "deprecation_date": "2027-08-24", "cache_read_input_token_cost": 1.925e-07, @@ -71807,6 +66833,7 @@ "azure/us/gpt-5.4-mini": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 8.25e-08, + "cache_read_input_token_cost_batches": 4.125e-08, "cache_read_input_token_cost_priority": 1.65e-07, "input_cost_per_token": 8.25e-07, "input_cost_per_token_batches": 4.125e-07, @@ -71821,6 +66848,7 @@ "azure/us/gpt-5.4-nano": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 2.2e-08, + "cache_read_input_token_cost_batches": 1.1e-08, "input_cost_per_token": 2.2e-07, "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "azure", @@ -71833,11 +66861,13 @@ "deprecation_date": "2027-09-07", "input_cost_per_token": 3.3e-05, "input_cost_per_token_above_272k_tokens": 6.6e-05, + "input_cost_per_token_above_272k_tokens_batches": 3.3e-05, "input_cost_per_token_batches": 1.65e-05, "litellm_provider": "azure", "mode": "chat", "output_cost_per_token": 0.000198, "output_cost_per_token_above_272k_tokens": 0.000297, + "output_cost_per_token_above_272k_tokens_batches": 0.0001485, "output_cost_per_token_batches": 9.9e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -71851,14 +66881,6 @@ "output_cost_per_token_batches": 2.42e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/o1-preview": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/o3-deep-research": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 2.75e-06, @@ -73104,16 +68126,16 @@ "supports_web_search": true }, "openrouter/~anthropic/claude-opus-latest": { - "cache_creation_input_token_cost": 6.25e-06, - "cache_creation_input_token_cost_above_1hr": 1e-05, - "cache_read_input_token_cost": 5e-07, - "input_cost_per_token": 5e-06, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, "litellm_provider": "openrouter", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", - "output_cost_per_token": 2.5e-05, + "output_cost_per_token": 2e-05, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73148,15 +68170,14 @@ "supports_web_search": true }, "openrouter/~deepseek/deepseek-flash-latest": { - "cache_read_input_token_cost": 6e-09, - "input_cost_per_token": 3e-07, + "cache_read_input_token_cost": 3.6e-09, + "input_cost_per_token": 1.2e-07, "litellm_provider": "openrouter", "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, + "max_output_tokens": 943718, + "max_tokens": 943718, "mode": "chat", - "off_peak_pricing": {"windows":[{"weekdays":["saturday","sunday"],"hours_utc":"00:00-00:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"00:00-01:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"04:00-06:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"10:00-00:00"}],"input_cost_per_token":1.5e-7,"output_cost_per_token":6e-7,"cache_read_input_token_cost":3e-9}, - "output_cost_per_token": 1.2e-06, + "output_cost_per_token": 4.8e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73169,15 +68190,14 @@ "supports_web_search": false }, "openrouter/~deepseek/deepseek-pro-latest": { - "cache_read_input_token_cost": 4.4e-08, - "input_cost_per_token": 1.32e-06, + "cache_read_input_token_cost": 1.2726e-08, + "input_cost_per_token": 3.9996e-07, "litellm_provider": "openrouter", "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, + "max_output_tokens": 393216, + "max_tokens": 393216, "mode": "chat", - "off_peak_pricing": {"windows":[{"weekdays":["saturday","sunday"],"hours_utc":"00:00-00:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"00:00-01:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"04:00-06:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"10:00-00:00"}],"input_cost_per_token":6.6e-7,"output_cost_per_token":0.00000198,"cache_read_input_token_cost":2.2e-8}, - "output_cost_per_token": 3.96e-06, + "output_cost_per_token": 1.19988e-06, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73190,14 +68210,14 @@ "supports_web_search": false }, "openrouter/~deepseek/deepseek-v4-flash-latest": { - "cache_read_input_token_cost": 1.6e-08, - "input_cost_per_token": 4e-08, + "cache_read_input_token_cost": 8e-09, + "input_cost_per_token": 3e-08, "litellm_provider": "openrouter", "max_input_tokens": 1310720, "max_output_tokens": 943718, "max_tokens": 943718, "mode": "chat", - "output_cost_per_token": 6.4e-07, + "output_cost_per_token": 8e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73260,13 +68280,13 @@ }, "openrouter/~moonshotai/kimi-latest": { "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, + "input_cost_per_token": 1.4989e-06, "litellm_provider": "openrouter", "max_input_tokens": 1048576, "max_output_tokens": 943718, "max_tokens": 943718, "mode": "chat", - "output_cost_per_token": 1.5e-05, + "output_cost_per_token": 1.0758e-05, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73304,19 +68324,19 @@ "supports_web_search": true }, "openrouter/~openai/gpt-luna-latest": { - "cache_creation_input_token_cost": 2.5e-07, - "cache_creation_input_token_cost_above_272k_tokens": 5e-07, - "cache_read_input_token_cost": 2e-08, - "cache_read_input_token_cost_above_272k_tokens": 4e-08, - "input_cost_per_token": 2e-07, - "input_cost_per_token_above_272k_tokens": 4e-07, + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, "litellm_provider": "openrouter", "max_input_tokens": 1050000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_above_272k_tokens": 1.8e-06, + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73422,14 +68442,14 @@ "supports_web_search": true }, "openrouter/~z-ai/glm-flash-latest": { - "cache_read_input_token_cost": 5e-08, - "input_cost_per_token": 1.5e-07, + "cache_read_input_token_cost": 1.5e-08, + "input_cost_per_token": 7.5e-08, "litellm_provider": "openrouter", "max_input_tokens": 1310720, "max_output_tokens": 943718, "max_tokens": 943718, "mode": "chat", - "output_cost_per_token": 5e-07, + "output_cost_per_token": 2.5e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -74204,85 +69224,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/deepseek/deepseek-v4-flash-0731:batch": { - "cache_read_input_token_cost": 3.5e-09, - "input_cost_per_token": 1.1e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 3.3e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, - "openrouter/deepseek/deepseek-v4-flash-0731:free": { - "input_cost_per_token": 0.0, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 393216, - "max_tokens": 393216, - "mode": "chat", - "output_cost_per_token": 0.0, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": false, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, - "openrouter/deepseek/deepseek-v4-flash-vision-exp:batch": { - "cache_read_input_token_cost": 3.5e-09, - "input_cost_per_token": 1.1e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 3.3e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, - "openrouter/deepseek/deepseek-v4-pro-0813:batch": { - "cache_read_input_token_cost": 2.2e-08, - "input_cost_per_token": 6.6e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 1.98e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/dots-studio/dots-3-note-preview:free": { "deprecation_date": "2026-12-31", "input_cost_per_token": 0.0, @@ -74798,26 +69739,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/kwaipilot/kat-coder-pro-v2": { - "cache_read_input_token_cost": 6e-08, - "input_cost_per_token": 3e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 262144, - "max_output_tokens": 144000, - "max_tokens": 144000, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/kwaipilot/kat-coder-pro-v2.5": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 7.4e-07, @@ -74897,26 +69818,6 @@ "supports_vision": true, "supports_web_search": false }, - "openrouter/meta/muse-glimmer-30b:batch": { - "cache_read_input_token_cost": 2e-08, - "input_cost_per_token": 1.75e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 131072, - "max_output_tokens": 117964, - "max_tokens": 117964, - "mode": "chat", - "output_cost_per_token": 7.5e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/meta/muse-spark-1.1": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 1.25e-06, @@ -75055,26 +69956,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/minimax/minimax-m3:batch": { - "cache_read_input_token_cost": 6e-08, - "input_cost_per_token": 3e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 524288, - "max_output_tokens": 471859, - "max_tokens": 471859, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/mistralai/codestral-2508:batch": { "cache_read_input_token_cost": 1.5e-08, "input_cost_per_token": 1.5e-07, @@ -76024,24 +70905,105 @@ "supports_vision": true, "supports_web_search": true }, - "openrouter/openai/gpt-oss-120b:batch": { - "input_cost_per_token": 1.5e-07, + "openrouter/openai/gpt-6-luna": { + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, "litellm_provider": "openrouter", - "max_input_tokens": 131072, - "max_output_tokens": 117964, - "max_tokens": 117964, + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, "mode": "chat", - "output_cost_per_token": 6e-07, + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": false, + "supports_pdf_input": true, + "supports_prompt_caching": true, "supports_reasoning": true, "supports_response_schema": true, "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false + "supports_vision": true, + "supports_web_search": true + }, + "openrouter/openai/gpt-6-luna-pro": { + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, + "litellm_provider": "openrouter", + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true + }, + "openrouter/openai/gpt-6-sol": { + "cache_creation_input_token_cost": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_272k_tokens": 4e-07, + "input_cost_per_token": 2e-06, + "input_cost_per_token_above_272k_tokens": 4e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 1e-05, + "output_cost_per_token_above_272k_tokens": 1.5e-05, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true + }, + "openrouter/openai/gpt-6-sol-pro": { + "cache_creation_input_token_cost": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_272k_tokens": 4e-07, + "input_cost_per_token": 2e-06, + "input_cost_per_token_above_272k_tokens": 4e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 1e-05, + "output_cost_per_token_above_272k_tokens": 1.5e-05, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true }, "openrouter/openai/o3-mini:batch": { "cache_read_input_token_cost": 2.75e-07, @@ -76217,45 +71179,6 @@ "supports_vision": true, "supports_web_search": true }, - "openrouter/qwen/qwen3.5-9b:batch": { - "input_cost_per_token": 1.7e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 262144, - "max_output_tokens": 235929, - "max_tokens": 235929, - "mode": "chat", - "output_cost_per_token": 2.5e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": false, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, - "openrouter/qwen/qwen3.8-2.4t-a95b:batch": { - "cache_read_input_token_cost": 2.5e-07, - "input_cost_per_token": 2e-06, - "litellm_provider": "openrouter", - "max_input_tokens": 1010000, - "max_output_tokens": 909000, - "max_tokens": 909000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/qwen/qwen3.8-27b:free": { "input_cost_per_token": 0.0, "litellm_provider": "openrouter", @@ -76788,26 +71711,6 @@ "supports_vision": true, "supports_web_search": false }, - "openrouter/thinkingmachines/inkling:batch": { - "cache_read_input_token_cost": 1.7e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "openrouter", - "max_input_tokens": 524288, - "max_output_tokens": 471859, - "max_tokens": 471859, - "mode": "chat", - "output_cost_per_token": 4.05e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/thinkingmachines/inkling:free": { "input_cost_per_token": 0.0, "litellm_provider": "openrouter", @@ -76929,26 +71832,6 @@ "supports_vision": true, "supports_web_search": true }, - "openrouter/z-ai/glm-5.2:batch": { - "cache_read_input_token_cost": 7e-08, - "input_cost_per_token": 7e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 2.2e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/z-ai/glm-5.3-flash:batch": { "cache_read_input_token_cost": 1.2e-08, "input_cost_per_token": 6e-08, @@ -77678,5 +72561,330 @@ "supports_tool_choice": true, "supports_vision": true, "supports_web_search": false + }, + "baseten/deepseek-ai/DeepSeek-V4.1-Flash": { + "cache_read_input_token_cost": 7e-09, + "input_cost_per_token": 3e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 32768, + "max_tokens": 32768, + "mode": "chat", + "output_cost_per_token": 1.2e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/moonshotai/Kimi-K2.6": { + "cache_read_input_token_cost": 1.6e-07, + "input_cost_per_token": 9.5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 262000, + "max_output_tokens": 262000, + "max_tokens": 262000, + "mode": "chat", + "output_cost_per_token": 4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/moonshotai/Kimi-K2.7-Code": { + "cache_read_input_token_cost": 1.6e-07, + "input_cost_per_token": 9.5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 262000, + "max_output_tokens": 262000, + "max_tokens": 262000, + "mode": "chat", + "output_cost_per_token": 4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/moonshotai/Kimi-K3": { + "cache_read_input_token_cost": 3e-07, + "input_cost_per_token": 3e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 1.5e-05, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/nvidia/NVIDIA-Nemotron-3-Ultra-550B-A55B": { + "cache_read_input_token_cost": 1.2e-07, + "input_cost_per_token": 6e-07, + "litellm_provider": "baseten", + "max_input_tokens": 202800, + "max_output_tokens": 202800, + "max_tokens": 202800, + "mode": "chat", + "output_cost_per_token": 2.4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/thinkingmachines/inkling": { + "cache_read_input_token_cost": 1.7e-07, + "input_cost_per_token": 1e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 32768, + "max_tokens": 32768, + "mode": "chat", + "output_cost_per_token": 4.05e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/thinkingmachines/inkling-small": { + "cache_read_input_token_cost": 1e-07, + "input_cost_per_token": 5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 32768, + "max_tokens": 32768, + "mode": "chat", + "output_cost_per_token": 1.2e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/zai-org/GLM-5.2": { + "cache_read_input_token_cost": 1.4e-07, + "input_cost_per_token": 1.4e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 4.4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/zai-org/GLM-5.3-Flash": { + "cache_read_input_token_cost": 3e-08, + "input_cost_per_token": 1.5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 131072, + "max_tokens": 131072, + "mode": "chat", + "output_cost_per_token": 5e-07, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/deepseek-ai/DeepSeek-V4-Flash-0731": { + "cache_read_input_token_cost": 2.8e-08, + "input_cost_per_token": 1.3e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 384000, + "max_tokens": 384000, + "mode": "chat", + "output_cost_per_token": 2.6e-07, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/deepseek-ai/DeepSeek-V4-Pro": { + "cache_read_input_token_cost": 1.45e-07, + "input_cost_per_token": 1.74e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 3.48e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/deepseek-ai/DeepSeek-V4-Pro-0813": { + "cache_read_input_token_cost": 1.32e-07, + "input_cost_per_token": 1.32e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 3.96e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/zai-org/GLM-5.2-Fast": { + "cache_read_input_token_cost": 2.1e-07, + "input_cost_per_token": 2.1e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 6.6e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "xai/grok-code-fast": { + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_200k_tokens": 4e-07, + "input_cost_per_image_token": 1e-06, + "input_cost_per_token": 1e-06, + "input_cost_per_token_above_200k_tokens": 2e-06, + "litellm_provider": "xai", + "max_input_tokens": 256000, + "max_output_tokens": 256000, + "max_tokens": 256000, + "mode": "chat", + "output_cost_per_token": 2e-06, + "output_cost_per_token_above_200k_tokens": 4e-06, + "source": "https://api.x.ai/v1/language-models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "xai/grok-code-fast-1": { + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_200k_tokens": 4e-07, + "input_cost_per_image_token": 1e-06, + "input_cost_per_token": 1e-06, + "input_cost_per_token_above_200k_tokens": 2e-06, + "litellm_provider": "xai", + "max_input_tokens": 256000, + "max_output_tokens": 256000, + "max_tokens": 256000, + "mode": "chat", + "output_cost_per_token": 2e-06, + "output_cost_per_token_above_200k_tokens": 4e-06, + "source": "https://api.x.ai/v1/language-models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "xai/grok-code-fast-1-0825": { + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_200k_tokens": 4e-07, + "input_cost_per_image_token": 1e-06, + "input_cost_per_token": 1e-06, + "input_cost_per_token_above_200k_tokens": 2e-06, + "litellm_provider": "xai", + "max_input_tokens": 256000, + "max_output_tokens": 256000, + "max_tokens": 256000, + "mode": "chat", + "output_cost_per_token": 2e-06, + "output_cost_per_token_above_200k_tokens": 4e-06, + "source": "https://api.x.ai/v1/language-models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "vertex_ai/gemini-2.0-flash": { + "input_cost_per_audio_token": 1e-06, + "input_cost_per_audio_token_batches": 5e-07, + "input_cost_per_character": 3.75e-08, + "input_cost_per_token": 1.5e-07, + "input_cost_per_token_batches": 7.5e-08, + "litellm_provider": "vertex_ai", + "mode": "chat", + "output_cost_per_token": 6e-07, + "output_cost_per_token_batches": 3e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/gemini-2.0-flash-lite": { + "input_cost_per_audio_token": 7.5e-08, + "input_cost_per_audio_token_batches": 3.75e-08, + "input_cost_per_character": 1.875e-08, + "input_cost_per_token": 7.5e-08, + "input_cost_per_token_batches": 3.75e-08, + "litellm_provider": "vertex_ai", + "mode": "chat", + "output_cost_per_token": 3e-07, + "output_cost_per_token_batches": 1.5e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/zai-org/glm-5.2-maas": { + "cache_read_input_token_cost": 1.4e-07, + "input_cost_per_token": 1.4e-06, + "litellm_provider": "vertex_ai-zai_models", + "max_input_tokens": 1000000, + "max_output_tokens": 64000, + "max_tokens": 64000, + "mode": "chat", + "output_cost_per_token": 4.4e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", + "supported_regions": ["global"], + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true } } diff --git a/litellm/models/managed_files.py b/litellm/models/managed_files.py index c90f9b535ea..435db632026 100644 --- a/litellm/models/managed_files.py +++ b/litellm/models/managed_files.py @@ -61,3 +61,4 @@ class LiteLLM_ManagedVectorStoresTable(LiteLLMPydanticObjectBase): litellm_params: dict[str, Any] | None = None team_id: str | None = None user_id: str | None = None + is_config: bool = False diff --git a/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py b/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py index 60dc91a69cc..43d62ba8b22 100644 --- a/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py +++ b/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py @@ -42,6 +42,7 @@ from litellm.proxy._types import ( SpecialMCPServerName, SpecialMCPServerNames, UserAPIKeyAuth, + hash_token, user_api_key_has_admin_view, ) from litellm.proxy.agent_endpoints.auth.agent_access_groups import ( @@ -182,6 +183,20 @@ def _is_litellm_auth_admission_error(exc: Exception) -> bool: return False +def _explicit_credential_matches_envelope( + explicit_auth: UserAPIKeyAuth, + presented_token: str, + identity: EnvelopeIdentity, +) -> bool: + """Match the stored key hash or user ID, including token-only mapped JWT keys.""" + match identity.subject_type: + case "key_hash": + return identity.subject in (hash_token(presented_token), explicit_auth.token) + case "user_id": + return explicit_auth.user_id is not None and explicit_auth.user_id == identity.subject + return assert_never(identity.subject_type) + + def _has_client_supplied_mcp_auth( mcp_auth_header: str | None, mcp_server_auth_headers: dict[str, dict[str, str]] | None, @@ -475,6 +490,31 @@ class MCPRequestHandler: # Only OAuth metadata routes registered under /.well-known/ are public. if request_route.startswith("/.well-known/"): validated_user_api_key_auth = UserAPIKeyAuth() + elif ( + has_explicit_litellm_key + and oauth2_headers + and is_bridge_envelope_shaped(oauth2_headers["Authorization"]) + and ( + dual_bridge_target := MCPRequestHandler._single_dcr_bridge_delegate_target( + path=request_route, + mcp_servers=mcp_servers, + client_ip=IPAddressUtils.get_mcp_client_ip(request), + ) + ) + is not None + ): + ( + validated_user_api_key_auth, + mcp_server_auth_headers, + ) = await MCPRequestHandler._admit_dcr_bridge_dual_credential( + server=dual_bridge_target.server, + requested_name=dual_bridge_target.requested_name, + authorization_value=oauth2_headers["Authorization"], + litellm_api_key=litellm_api_key, + mcp_server_auth_headers=mcp_server_auth_headers, + request=request, + route=request_route, + ) elif has_explicit_litellm_key: # An explicit x-litellm-api-key is always a LiteLLM credential, even # for a delegated server, so validate it: identity / spend / rate @@ -663,6 +703,8 @@ class MCPRequestHandler: # with ``server.py::_get_mcp_servers_in_path``, which also accepts the # un-rewritten form (some entry points may skip the # ``dynamic_mcp_route`` rewrite). + if path.rstrip("/") in ("/mcp/sse", "/mcp/sse/messages"): + return [] segments: Final = [s for s in path.split("/") if s] if len(segments) >= 2 and segments[1] == "mcp" and segments[0] != "mcp": return [segments[0]] @@ -780,6 +822,45 @@ class MCPRequestHandler: higher-priority alias slot, pairing the admitted identity with an attacker's upstream credential; the alias-keyed injection overwrites any such caller value. """ + result: Final = await MCPRequestHandler._open_dcr_bridge_envelope( + server=server, + requested_name=requested_name, + authorization_value=authorization_value, + request=request, + route=route, + ) + header_key: Final = server.alias or server.server_name + if header_key is None: + raise HTTPException(status_code=500, detail="Server misconfigured: MCP server has no routable name") + admitted: Final = await MCPRequestHandler._reload_admitted_principal(result.identity) + await MCPRequestHandler._enforce_admitted_live_policy(admitted=admitted, request=request, route=route) + injected: Final = { # mutable-ok: mcp_server_auth_headers contract requires concrete dicts + header_key: { # mutable-ok: concrete dict header payload + "Authorization": result.upstream_authorization.get_secret_value() + } + } + new_headers: Final = { # mutable-ok: merged header map must stay a concrete dict + **(mcp_server_auth_headers or {}), # mutable-ok: empty-dict fallback for the merge + **injected, + } + return admitted, new_headers + + @staticmethod + async def _open_dcr_bridge_envelope( + server: MCPServer, + requested_name: str, + authorization_value: str, + request: Request, + route: str, + ) -> BridgeEnvelopeAdmitted: + """Open a bridge envelope after the pre-DB gates, or fail closed with the scope's challenge. + + Shared by the envelope-only arm (:meth:`_admit_dcr_bridge_delegate`) and the dual-credential + arm (:meth:`_admit_dcr_bridge_dual_credential`): both require master_key, run the same + proxy-wide pre-DB checks the standard pipeline applies before any key lookup, and resolve + the envelope's crypto. Returns only the ``BridgeEnvelopeAdmitted`` result; an invalid, + expired, tampered, or non-envelope value raises the requested scope's ``invalid_token`` + challenge instead.""" from litellm.proxy.proxy_server import master_key if not master_key: @@ -791,20 +872,67 @@ class MCPRequestHandler: result: Final = resolve_bridge_envelope(authorization_value, keys, datetime.now(timezone.utc), server.server_id) match result: case BridgeEnvelopeAdmitted(): - header_key: Final = server.alias or server.server_name - if header_key is None: - raise HTTPException(status_code=500, detail="Server misconfigured: MCP server has no routable name") - admitted: Final = await MCPRequestHandler._reload_admitted_principal(result.identity) - await MCPRequestHandler._enforce_admitted_live_policy(admitted=admitted, request=request, route=route) - injected: Final = {header_key: {"Authorization": result.upstream_authorization.get_secret_value()}} - new_headers: Final = {**(mcp_server_auth_headers or {}), **injected} - return admitted, new_headers + return result case BridgeEnvelopeInvalid() | NotBridgeEnvelope(): raise MCPRequestHandler._dcr_bridge_invalid_token_challenge( requested_name=requested_name, request=request ) - case _: - assert_never(result) + return assert_never(result) + + @staticmethod + async def _admit_dcr_bridge_dual_credential( + server: MCPServer, + requested_name: str, + authorization_value: str, + litellm_api_key: str, + mcp_server_auth_headers: dict[str, dict[str, str]] | None, + request: Request, + route: str, + ) -> tuple[UserAPIKeyAuth, dict[str, dict[str, str]] | None]: + """Admit a request carrying BOTH an explicit litellm credential and a bridge envelope. + + MCP clients send ``x-litellm-api-key`` on every request, including the ``tools/list`` that + follows the ``/{server}/token`` mint, so the envelope arrives alongside the key rather than + alone. The explicit credential is validated first (its own pipeline, so a bad key keeps the + normal 401/403), then the envelope is opened and its sealed identity must match the explicit + credential's principal — a mismatch is a 403, never a fallback onto either credential alone. + On a match the explicit credential's ``UserAPIKeyAuth`` is the admission context (key + permissions, budgets, rate limits) and the sealed upstream token is injected under the + server's per-server auth-header key, while the leak-defense chokepoint strips the envelope + ``Authorization`` itself from egress.""" + presented_token: Final = _get_bearer_token_or_received_api_key(litellm_api_key) + explicit_auth: Final = await user_api_key_auth(api_key=f"Bearer {presented_token}", request=request) + result: Final = await MCPRequestHandler._open_dcr_bridge_envelope( + server=server, + requested_name=requested_name, + authorization_value=authorization_value, + request=request, + route=route, + ) + if not _explicit_credential_matches_envelope( + explicit_auth=explicit_auth, + presented_token=presented_token, + identity=result.identity, + ): + raise HTTPException( + status_code=403, + detail={ # mutable-ok: HTTPException detail payload requires a concrete dict + "error": "oauth_principal_mismatch" + }, + ) + header_key: Final = server.alias or server.server_name + if header_key is None: + raise HTTPException(status_code=500, detail="Server misconfigured: MCP server has no routable name") + injected: Final = { # mutable-ok: mcp_server_auth_headers contract requires concrete dicts + header_key: { # mutable-ok: concrete dict header payload + "Authorization": result.upstream_authorization.get_secret_value() + } + } + new_headers: Final = { # mutable-ok: merged header map must stay a concrete dict + **(mcp_server_auth_headers or {}), # mutable-ok: empty-dict fallback for the merge + **injected, + } + return explicit_auth, new_headers @staticmethod async def _admit_dcr_bridge_authorization( @@ -1089,9 +1217,15 @@ class MCPRequestHandler: project, org, and budget state are NOT re-checked here; the caller runs the admitted identity through ``_enforce_admitted_live_policy`` for those. """ + from litellm.proxy._experimental.mcp_server.bridge_token_flow import ( + master_key_admin_auth, # noqa: PLC0415 # inline import avoids a module-load circular import + ) from litellm.proxy.auth.auth_checks import get_key_object from litellm.proxy.proxy_server import prisma_client, user_api_key_cache + admin: Final = master_key_admin_auth(key_hash) + if admin is not None: + return admin if prisma_client is None: raise HTTPException(status_code=500, detail="Server misconfigured: no database connection") try: diff --git a/litellm/proxy/_experimental/mcp_server/bridge_token_flow.py b/litellm/proxy/_experimental/mcp_server/bridge_token_flow.py index 6ae33cc1629..e5d11271c67 100644 --- a/litellm/proxy/_experimental/mcp_server/bridge_token_flow.py +++ b/litellm/proxy/_experimental/mcp_server/bridge_token_flow.py @@ -209,6 +209,31 @@ async def _resolve_active_litellm_key(request: Request) -> "_ResolvedKey | _KeyR return await _reload_active_key_by_hash(hash_token(token)) +def master_key_admin_auth(key_hash: str) -> "UserAPIKeyAuth | None": + from litellm.constants import ( # noqa: PLC0415 # inline import avoids a module-load circular import + LITELLM_PROXY_MASTER_KEY_ALIAS, + ) + from litellm.proxy._types import ( # noqa: PLC0415 # inline import avoids a module-load circular import + LitellmUserRoles, + UserAPIKeyAuth, + hash_token, + ) + from litellm.proxy.proxy_server import ( # noqa: PLC0415 # inline import avoids a module-load circular import + litellm_proxy_admin_name, + master_key, + ) + + if not master_key or not secrets.compare_digest(key_hash, hash_token(master_key)): + return None + auth: Final = UserAPIKeyAuth( + api_key=LITELLM_PROXY_MASTER_KEY_ALIAS, + user_role=LitellmUserRoles.PROXY_ADMIN, + user_id=litellm_proxy_admin_name, + ) + auth.via_virtual_key = True + return auth + + async def _reload_active_key_by_hash(key_hash: str) -> "_ResolvedKey | _KeyResolutionFailure": """Reload the live key record for ``key_hash`` (cache first, then DB) and gate it on active state, returning the resolved key or a precise failure. Shared by the token request's presented-key @@ -233,6 +258,8 @@ async def _reload_active_key_by_hash(key_hash: str) -> "_ResolvedKey | _KeyResol user_api_key_cache, ) + if (admin := master_key_admin_auth(key_hash)) is not None: + return _ResolvedKey(key_hash=key_hash, key=admin) if prisma_client is None: return "unresolvable" try: @@ -475,7 +502,7 @@ async def _resolve_jwt_auth( proxy_logging_obj=proxy_logging_obj, ) if isinstance(mapped, UserAPIKeyAuth): - return None if await _key_owner_scim_deactivated(mapped) or not _active_key_user_id(mapped) else mapped + return None if await _key_owner_scim_deactivated(mapped) or not _key_is_active(mapped) else mapped if mapped is not None: return None if write_route is None: @@ -593,6 +620,7 @@ def _bridge_grant_from_token_response(token_response: object) -> "UpstreamTokenG _BridgeMintError = Literal[ "no_identity", + "jwt_client_policy_unsupported", "invalid_refresh", "identity_unavailable", "identity_faulted", @@ -633,6 +661,13 @@ def _bridge_mint_error_response(error: _BridgeMintError) -> JSONResponse: "this server issues a gateway-bound credential; complete the interactive sign-in, or " "send a litellm credential (x-litellm-api-key or Authorization) on the token request", ) + case "jwt_client_policy_unsupported": + status, code, desc = ( + 400, + "invalid_request", + "JWT bridge minting is not supported with a claim-based MCP client allowlist; " + "the bridge credential cannot preserve the signed client identity", + ) case "invalid_refresh": status, code, desc = ( 400, @@ -736,11 +771,18 @@ async def _prepare_bridge_mint( Two identity sources, one envelope. The interactive DCR client authenticates via SSO at the bridged authorize, so its identity arrives as ``bridge_identity`` (the user recovered from the gateway - authorization code) and mints a user subject. The scripted two-header client presents a litellm key - on the token request instead, so its identity is the active key's hash and mints a key_hash subject. - A missing or invalid presented key keeps its resolution origin so the mapper statuses it truthfully; - neither source present is ``no_identity``. The refresh_token grant has its own phase-1 + authorization code) and mints a user subject. The scripted two-header client presents a litellm + credential (a virtual key or a JWT) on the token request instead: a key mints a key_hash subject, + while a JWT resolves through the same auth path as admission and mints a key_hash subject when it + maps to a virtual key. An unmapped JWT is rejected because a user subject cannot preserve its + JWT-specific authorization restrictions. A JWT client-claim allowlist also prevents JWT minting: + the envelope cannot retain the signed client identity for subsequent allowlist checks. A missing or invalid + presented key keeps its resolution origin so the mapper statuses it truthfully; neither source + present is ``no_identity``. The refresh_token grant has its own phase-1 (:func:`_prepare_bridge_refresh`), which recovers identity from the presented refresh envelope.""" + from litellm.proxy._experimental.mcp_server.client_allowlist import ( # noqa: PLC0415 # keep mint policy dependencies local + load_mcp_client_allowlist, + ) from litellm.proxy._experimental.mcp_server.outbound_credentials.bridge_credentials import ( # noqa: PLC0415 # inline import avoids a module-load circular import envelope_keys_from_master_key, ) @@ -748,7 +790,10 @@ async def _prepare_bridge_mint( key_hash_identity, user_identity, ) + from litellm.proxy._types import UserAPIKeyAuth # noqa: PLC0415 # proxy import cycle + from litellm.proxy.auth.handle_jwt import JWTHandler # noqa: PLC0415 # proxy import cycle from litellm.proxy.proxy_server import ( # noqa: PLC0415 # inline import avoids a module-load circular import + general_settings, master_key, ) @@ -758,6 +803,16 @@ async def _prepare_bridge_mint( if bridge_identity is not None: identity = user_identity(server_id=mcp_server.server_id, user_id=bridge_identity.litellm_user_id) return _BridgeMintReady(identity=identity, keys=keys) + presented_token: Final = _litellm_key_from_request(request) + if presented_token is not None and JWTHandler.is_jwt(presented_token): + client_allowlist: Final = load_mcp_client_allowlist(general_settings) + if client_allowlist is not None and client_allowlist.jwt_field is not None: + return "jwt_client_policy_unsupported" + resolved_jwt: Final = await _resolve_jwt_auth(request, presented_token, None) + if isinstance(resolved_jwt, UserAPIKeyAuth) and resolved_jwt.token: + identity = key_hash_identity(server_id=mcp_server.server_id, key_hash=resolved_jwt.token) + return _BridgeMintReady(identity=identity, keys=keys) + return "no_identity" resolved: Final = await _resolve_active_litellm_key(request) if not isinstance(resolved, _ResolvedKey): return _key_resolution_failure_to_mint_error(resolved) diff --git a/litellm/proxy/_experimental/mcp_server/operations.py b/litellm/proxy/_experimental/mcp_server/operations.py index fcee3483e15..2bd6d186f24 100644 --- a/litellm/proxy/_experimental/mcp_server/operations.py +++ b/litellm/proxy/_experimental/mcp_server/operations.py @@ -2198,7 +2198,7 @@ async def _fire_mcp_tool_call_logging( from litellm.proxy.proxy_server import proxy_logging_obj logging_obj.post_call(original_response=result) - await logging_obj.async_post_mcp_tool_call_hook( + result = await logging_obj.async_post_mcp_tool_call_hook( kwargs=logging_obj.model_call_details, response_obj=result, start_time=start_time, diff --git a/litellm/proxy/_experimental/mcp_server/server.py b/litellm/proxy/_experimental/mcp_server/server.py index 433b693fcae..fe508fc22c7 100644 --- a/litellm/proxy/_experimental/mcp_server/server.py +++ b/litellm/proxy/_experimental/mcp_server/server.py @@ -21,6 +21,7 @@ from fastapi import FastAPI, HTTPException from pydantic import ConfigDict, TypeAdapter, ValidationError from starlette.requests import Request as StarletteRequest from starlette.responses import JSONResponse +from starlette.routing import Route from starlette.types import Message, Receive, Scope, Send from litellm._logging import verbose_logger @@ -474,6 +475,8 @@ if MCP_AVAILABLE: AuthContextMiddleware, auth_context_var, ) + from mcp.server.auth.middleware.bearer_auth import AuthenticatedUser + from mcp.server.auth.provider import AccessToken from mcp.server.context import ServerRequestContext from mcp.server.lowlevel.server import NotificationOptions from mcp.server.models import InitializationOptions @@ -573,7 +576,7 @@ if MCP_AVAILABLE: version=LITELLM_MCP_SERVER_VERSION, ) server.create_initialization_options = types.MethodType(_gateway_create_initialization_options, server) - sse: Final[SseServerTransport] = SseServerTransport("/mcp/sse/messages") + sse: Final[SseServerTransport] = SseServerTransport("/sse/messages") # Create session managers session_manager_stateless: Final = StreamableHTTPSessionManager( @@ -629,18 +632,9 @@ if MCP_AVAILABLE: # Keep this alias so existing references to session_manager still work session_manager: Final = session_manager_stateless - # Create SSE session manager - sse_session_manager: Final = StreamableHTTPSessionManager( - app=server, - event_store=None, - json_response=False, # Use SSE responses for this endpoint - stateless=True, - ) - # Context managers for proper lifecycle management _session_manager_cm = None _session_manager_stateful_cm = None - _sse_session_manager_cm = None _stateful_auth_context_cleanup_task: asyncio.Task | None = None async def _purge_expired_stateful_session_auth_contexts( @@ -732,7 +726,6 @@ if MCP_AVAILABLE: _SESSION_MANAGERS_INITIALIZED, \ _session_manager_cm, \ _session_manager_stateful_cm, \ - _sse_session_manager_cm, \ _stateful_auth_context_cleanup_task # Use async lock to prevent concurrent initialization @@ -745,12 +738,10 @@ if MCP_AVAILABLE: # Start the session managers with context managers _session_manager_cm = session_manager_stateless.run() _session_manager_stateful_cm = session_manager_stateful.run() - _sse_session_manager_cm = sse_session_manager.run() # Enter the context managers await _session_manager_cm.__aenter__() await _session_manager_stateful_cm.__aenter__() - await _sse_session_manager_cm.__aenter__() _stateful_auth_context_cleanup_task = asyncio.create_task(_cleanup_expired_stateful_session_auth_contexts()) _SESSION_MANAGERS_INITIALIZED = True @@ -762,7 +753,6 @@ if MCP_AVAILABLE: _SESSION_MANAGERS_INITIALIZED, \ _session_manager_cm, \ _session_manager_stateful_cm, \ - _sse_session_manager_cm, \ _stateful_auth_context_cleanup_task if _SESSION_MANAGERS_INITIALIZED: @@ -773,8 +763,6 @@ if MCP_AVAILABLE: _stateful_auth_context_cleanup_task.cancel() with contextlib.suppress(asyncio.CancelledError): await _stateful_auth_context_cleanup_task - if _sse_session_manager_cm: - await _sse_session_manager_cm.__aexit__(None, None, None) if _session_manager_stateful_cm: await _session_manager_stateful_cm.__aexit__(None, None, None) if _session_manager_cm: @@ -784,7 +772,6 @@ if MCP_AVAILABLE: _session_manager_cm = None _session_manager_stateful_cm = None - _sse_session_manager_cm = None _stateful_auth_context_cleanup_task = None _SESSION_MANAGERS_INITIALIZED = False @@ -1054,6 +1041,8 @@ if MCP_AVAILABLE: """ import re + if path.rstrip("/") in ("/mcp/sse", "/mcp/sse/messages"): + return None mcp_servers_from_path: list[str] | None = None segments: Final = [s for s in path.split("/") if s] if len(segments) >= 2 and segments[1] == "mcp" and segments[0] != "mcp": @@ -2286,7 +2275,24 @@ if MCP_AVAILABLE: async def handle_sse_mcp(scope: Scope, receive: Receive, send: Send) -> None: """Handle MCP requests through SSE.""" try: - path: Final[str] = scope.get("path", "") + bad_version: Final = unsupported_protocol_version(scope) + if bad_version is not None: + supported: Final = ", ".join(sorted(HANDSHAKE_PROTOCOL_VERSIONS)) + await JSONResponse( + status_code=400, + content={ # mutable-ok: JSON-RPC error payload + "jsonrpc": "2.0", + "id": None, + "error": { + "code": INVALID_REQUEST, + "message": f"Unsupported MCP-Protocol-Version {bad_version}; supported: {supported}", + }, + }, + )(scope, receive, send) + return + from litellm.proxy.auth.auth_utils import get_request_route + + path: Final = get_request_route(StarletteRequest(scope)) ( user_api_key_auth, mcp_auth_header, @@ -2353,9 +2359,14 @@ if MCP_AVAILABLE: client_ip=_sse_client_ip, ) - if not _SESSION_MANAGERS_INITIALIZED: - await initialize_session_managers() - await asyncio.sleep(0.1) + owner: Final = _owner_fingerprint_for(user_api_key_auth, oauth2_headers, _sse_client_ip) + transport_scope: Final[Scope] = { + **scope, + "user": AuthenticatedUser(AccessToken(token=owner, client_id=owner, scopes=[])), + } + if scope["method"] == "POST": + await sse.handle_post_message(transport_scope, receive, send) + return async with _gateway_initialize_instructions_request_scope( user_api_key_auth, @@ -2364,7 +2375,8 @@ if MCP_AVAILABLE: scoped_server_endpoint=scoped_server_endpoint, is_initialize=scope.get("method") == "GET", ): - await sse_session_manager.handle_request(scope, receive, send) + async with sse.connect_sse(transport_scope, receive, send) as (read_stream, write_stream): + await server.run(read_stream, write_stream, server.create_initialization_options()) except MCPUpstreamAuthError as e: # Upstream delegated auth returned 401; surface it to the client so # standards-compliant MCP clients trigger the upstream OAuth flow. @@ -2387,7 +2399,6 @@ if MCP_AVAILABLE: # Try to send a graceful error response for non-HTTP exceptions try: # Send a proper HTTP error response instead of letting the exception bubble up - from starlette.responses import JSONResponse from starlette.status import HTTP_500_INTERNAL_SERVER_ERROR error_response: Final = JSONResponse( @@ -2418,11 +2429,22 @@ if MCP_AVAILABLE: """ return {"enabled": MCP_AVAILABLE} + class _LegacySseEndpoint: + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + await handle_sse_mcp(scope, receive, send) + + for sse_path, sse_method in ( + ("/sse", "GET"), + ("/sse/", "GET"), + ("/sse/messages", "POST"), + ("/sse/messages/", "POST"), + ): + app.router.routes.append(Route(sse_path, endpoint=_LegacySseEndpoint(), methods=[sse_method])) + # Mount the MCP handlers app.mount("/", handle_streamable_http_mcp) app.mount("/mcp", handle_streamable_http_mcp) app.mount("/{mcp_server_name}/mcp", handle_streamable_http_mcp) - app.mount("/sse", handle_sse_mcp) app.add_middleware(AuthContextMiddleware) ######################################################## diff --git a/litellm/proxy/_experimental/mcp_server/sse_transport.py b/litellm/proxy/_experimental/mcp_server/sse_transport.py index 2a08a5f8f7a..839d2eebbbe 100644 --- a/litellm/proxy/_experimental/mcp_server/sse_transport.py +++ b/litellm/proxy/_experimental/mcp_server/sse_transport.py @@ -1,138 +1,3 @@ -""" -This is a modification of code from: https://github.com/SecretiveShell/MCP-Bridge/blob/master/mcp_bridge/mcp_server/sse_transport.py +from mcp.server.sse import SseServerTransport -Credit to the maintainers of SecretiveShell for their SSE Transport implementation - -""" - -from contextlib import asynccontextmanager -from typing import Any, Final -from urllib.parse import quote -from uuid import UUID, uuid4 - -import anyio -from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream -from fastapi.requests import Request -from fastapi.responses import Response -from mcp import types -from pydantic import ValidationError -from sse_starlette import EventSourceResponse -from starlette.types import Receive, Scope, Send - -from litellm._logging import verbose_logger - - -class SseServerTransport: - """ - SSE server transport for MCP. This class provides _two_ ASGI applications, - suitable to be used with a framework like Starlette and a server like Hypercorn: - - 1. connect_sse() is an ASGI application which receives incoming GET requests, - and sets up a new SSE stream to send server messages to the client. - 2. handle_post_message() is an ASGI application which receives incoming POST - requests, which should contain client messages that link to a - previously-established SSE session. - """ - - _endpoint: str - _read_stream_writers: dict[UUID, MemoryObjectSendStream[types.JSONRPCMessage | Exception]] - - def __init__(self, endpoint: str) -> None: - """ - Creates a new SSE server transport, which will direct the client to POST - messages to the relative or absolute URL given. - """ - - super().__init__() - self._endpoint = endpoint - self._read_stream_writers = {} - verbose_logger.debug("SseServerTransport initialized with endpoint: %s", endpoint) - - @asynccontextmanager - async def connect_sse(self, request: Request): - if request.scope["type"] != "http": - verbose_logger.error("connect_sse received non-HTTP request") - raise ValueError("connect_sse can only handle HTTP requests") - - verbose_logger.debug("Setting up SSE connection") - read_stream: MemoryObjectReceiveStream[types.JSONRPCMessage | Exception] - read_stream_writer: MemoryObjectSendStream[types.JSONRPCMessage | Exception] - - write_stream: MemoryObjectSendStream[types.JSONRPCMessage] - write_stream_reader: MemoryObjectReceiveStream[types.JSONRPCMessage] - - read_stream_writer, read_stream = anyio.create_memory_object_stream(0) - write_stream, write_stream_reader = anyio.create_memory_object_stream(0) - - session_id: Final = uuid4() - session_uri: Final = f"{quote(self._endpoint)}?session_id={session_id.hex}" - self._read_stream_writers[session_id] = read_stream_writer - verbose_logger.debug("Created new session with ID: %s", session_id) - - sse_stream_writer: MemoryObjectSendStream[dict[str, Any]] - sse_stream_reader: MemoryObjectReceiveStream[dict[str, Any]] - sse_stream_writer, sse_stream_reader = anyio.create_memory_object_stream(0, dict[str, Any]) - - async def sse_writer(): - verbose_logger.debug("Starting SSE writer") - async with sse_stream_writer, write_stream_reader: - await sse_stream_writer.send({"event": "endpoint", "data": session_uri}) - verbose_logger.debug("Sent endpoint event: %s", session_uri) - - async for message in write_stream_reader: - verbose_logger.debug("Sending message via SSE: %s", message) - await sse_stream_writer.send( - { - "event": "message", - "data": message.model_dump_json(by_alias=True, exclude_none=True), - } - ) - - async with anyio.create_task_group() as tg: - response: Final = EventSourceResponse(content=sse_stream_reader, data_sender_callable=sse_writer) - verbose_logger.debug("Starting SSE response task") - tg.start_soon(response, request.scope, request.receive, request._send) - - verbose_logger.debug("Yielding read and write streams") - yield (read_stream, write_stream) - - async def handle_post_message(self, scope: Scope, receive: Receive, send: Send) -> Response: - verbose_logger.debug("Handling POST message") - request: Final = Request(scope, receive) - - session_id_param: Final = request.query_params.get("session_id") - if session_id_param is None: - verbose_logger.warning("Received request without session_id") - response = Response("session_id is required", status_code=400) - return response - - try: - session_id: Final = UUID(hex=session_id_param) - verbose_logger.debug("Parsed session ID: %s", session_id) - except ValueError: - verbose_logger.warning("Received invalid session ID: %s", session_id_param) - response = Response("Invalid session ID", status_code=400) - return response - - writer: Final = self._read_stream_writers.get(session_id) - if not writer: - verbose_logger.warning("Could not find session for ID: %s", session_id) - response = Response("Could not find session", status_code=404) - return response - - json: Final = await request.json() - verbose_logger.debug("Received JSON: %s", json) - - try: - message: Final = types.JSONRPCMessage.model_validate(json) - verbose_logger.debug("Validated client message: %s", message) - except ValidationError as err: - verbose_logger.error("Failed to parse message: %s", err) - response = Response("Could not parse message", status_code=400) - await writer.send(err) - return response - - verbose_logger.debug("Sending message to writer: %s", message) - response = Response("Accepted", status_code=202) - await writer.send(message) - return response +__all__ = ("SseServerTransport",) diff --git a/litellm/proxy/_experimental/mcp_server/utils.py b/litellm/proxy/_experimental/mcp_server/utils.py index 6bd080f5216..7411dc5c4f0 100644 --- a/litellm/proxy/_experimental/mcp_server/utils.py +++ b/litellm/proxy/_experimental/mcp_server/utils.py @@ -986,7 +986,7 @@ def _forwarded_upstream_header_names() -> frozenset[str]: ) -def _upstream_credential_headers(header_names: Iterable[str]) -> frozenset[str]: +def upstream_credential_headers(header_names: Iterable[str]) -> frozenset[str]: """Lowercased names of the headers in ``header_names`` that carry an upstream MCP credential rather than request context: the configured client side auth header, any header name a configured server forwards upstream via ``extra_headers``, and the @@ -1038,7 +1038,7 @@ def build_synthetic_mcp_request( custom_key_header: Final = _custom_litellm_key_header_name() excluded: Final = ( _SYNTHETIC_REQUEST_EXCLUDED_HEADERS - | _upstream_credential_headers(raw_headers.keys() if raw_headers else ()) + | upstream_credential_headers(raw_headers.keys() if raw_headers else ()) | (frozenset({custom_key_header.lower()}) if custom_key_header else frozenset()) ) forwarded: Final = tuple( @@ -1086,7 +1086,7 @@ def logging_safe_mcp_headers(raw_headers: Mapping[str, str] | None) -> Mapping[s ) excluded: Final = ( - _upstream_credential_headers(raw_headers.keys() if raw_headers else ()) + upstream_credential_headers(raw_headers.keys() if raw_headers else ()) | UNTRUSTED_REQUEST_HEADER_CONTROL_FIELDS | frozenset({"host"}) ) diff --git a/litellm/proxy/_lazy_openapi_snapshot.json b/litellm/proxy/_lazy_openapi_snapshot.json index 4dbca14b917..71dbf0da239 100644 --- a/litellm/proxy/_lazy_openapi_snapshot.json +++ b/litellm/proxy/_lazy_openapi_snapshot.json @@ -19919,7 +19919,7 @@ } } }, - "description": "\n Unified rate-limit error.\n\n Every rate-limit condition surfaced by litellm \u2014 whether it originated from\n an upstream LLM provider, a vendor batch endpoint, or one of litellm's own\n proxy-side limiters (parallel-requests, dynamic-rate, batch-rate, budget,\n max-iterations, etc.) \u2014 is raised as an instance of this class.\n\n The :attr:`category` attribute lets callers distinguish the source. See\n :class:`RateLimitErrorCategory` for the available values.\n " + "description": "Unified rate-limit error.\n\nEvery rate-limit condition surfaced by litellm \u2014 whether it originated from\nan upstream LLM provider, a vendor batch endpoint, or one of litellm's own\nproxy-side limiters (parallel-requests, dynamic-rate, batch-rate, budget,\nmax-iterations, etc.) \u2014 is raised as an instance of this class.\n\nThe :attr:`category` attribute lets callers distinguish the source. See\n:class:`RateLimitErrorCategory` for the available values." }, "500": { "content": { @@ -45790,6 +45790,10 @@ "title": "Custom Llm Provider", "type": "string" }, + "is_config": { + "title": "Is Config", + "type": "boolean" + }, "litellm_credential_name": { "anyOf": [ { @@ -45962,6 +45966,11 @@ "title": "Custom Llm Provider", "type": "string" }, + "is_config": { + "default": false, + "title": "Is Config", + "type": "boolean" + }, "litellm_credential_name": { "anyOf": [ { @@ -46203,7 +46212,7 @@ "paths": { "/v1/vector_store/list": { "get": { - "description": "List all available vector stores with optional filtering and pagination.\nCombines both in-memory vector stores and those stored in the database.\nDatabase is the source of truth - deleted stores are removed from memory, updated stores sync to memory.\n\nParameters:\n- page: int - Page number for pagination (default: 1)\n- page_size: int - Number of items per page (default: 100)", + "description": "List all available vector stores with optional filtering and pagination.\nCombines both in-memory vector stores and those stored in the database.\nDatabase is the source of truth for stores it owns: deleted stores are removed from memory, updated stores\nsync to memory. Stores declared in the config file are owned by the config file, are always listed, and are\nnever overwritten by database rows.\n\nParameters:\n- page: int - Page number for pagination (default: 1)\n- page_size: int - Number of items per page (default: 100)", "operationId": "list_vector_stores_v1_vector_store_list_get", "parameters": [ { @@ -46354,7 +46363,7 @@ }, "/vector_store/list": { "get": { - "description": "List all available vector stores with optional filtering and pagination.\nCombines both in-memory vector stores and those stored in the database.\nDatabase is the source of truth - deleted stores are removed from memory, updated stores sync to memory.\n\nParameters:\n- page: int - Page number for pagination (default: 1)\n- page_size: int - Number of items per page (default: 100)", + "description": "List all available vector stores with optional filtering and pagination.\nCombines both in-memory vector stores and those stored in the database.\nDatabase is the source of truth for stores it owns: deleted stores are removed from memory, updated stores\nsync to memory. Stores declared in the config file are owned by the config file, are always listed, and are\nnever overwritten by database rows.\n\nParameters:\n- page: int - Page number for pagination (default: 1)\n- page_size: int - Number of items per page (default: 100)", "operationId": "list_vector_stores_vector_store_list_get", "parameters": [ { diff --git a/litellm/proxy/_types.py b/litellm/proxy/_types.py index 8b2c81fea77..c7273738fd0 100644 --- a/litellm/proxy/_types.py +++ b/litellm/proxy/_types.py @@ -533,6 +533,9 @@ class LiteLLMRoutes(enum.Enum): mcp_inference_routes = [ "/mcp", "/mcp/", + "/mcp/sse/", + "/mcp/sse/messages", + "/mcp/sse/messages/", "/mcp/proxy", "/mcp/{subpath}", "/mcp/tools", @@ -934,6 +937,7 @@ class LiteLLMRoutes(enum.Enum): # proxy admin, or team admin naming their own team via team_id "/auto_router/test_routing", "/auto_router/validate_complexity_router_config", + "/auto_router/availability", # Per-session auto-router read - the endpoint scopes the row to the caller's own key hash "/auto_router/session", "/cost/predict-cache", diff --git a/litellm/proxy/auth/handle_jwt.py b/litellm/proxy/auth/handle_jwt.py index 63bbaae862e..e07b20fd5d5 100644 --- a/litellm/proxy/auth/handle_jwt.py +++ b/litellm/proxy/auth/handle_jwt.py @@ -1888,7 +1888,10 @@ class JWTAuthManager: def _raise_header_team_not_allowed(header_value: str, allowed_team_ids: set[str]) -> NoReturn: raise HTTPException( status_code=403, - detail=f"Team '{header_value}' from x-litellm-team-id header is not in your JWT's allowed teams. Allowed teams: {list(allowed_team_ids)}", + detail=( + f"x-litellm-team-id '{header_value}' does not resolve to a team id or a unique team alias in your " + f"JWT's allowed teams. Allowed team ids: {sorted(allowed_team_ids)}" + ), ) @staticmethod @@ -1937,8 +1940,9 @@ class JWTAuthManager: Raises: HTTPException: 403 when neither the value nor the team it aliases is an allowed team, or the DB fallback's membership denial when the - value names no team at all; a 5xx from the alias lookup itself - is re-raised rather than reported as a denial + value names no team at all; an alias several teams share resolves + to no team and is denied like an unknown value; a 5xx from the + alias lookup itself is re-raised rather than reported as a denial """ header_value: Final = JWTAuthManager._team_header_value(request_headers) if not header_value: @@ -2336,7 +2340,10 @@ class JWTAuthManager: """ raise HTTPException( status_code=403, - detail=(f"Team '{header_value}' (from x-litellm-team-id header) is not in your team memberships."), + detail=( + f"x-litellm-team-id '{header_value}' does not resolve to a team id or a unique team alias among your " + "team memberships." + ), ) @staticmethod diff --git a/litellm/proxy/bug_report_config.py b/litellm/proxy/bug_report_config.py index 527be65c9a7..d7b920de4d5 100644 --- a/litellm/proxy/bug_report_config.py +++ b/litellm/proxy/bug_report_config.py @@ -11,7 +11,14 @@ from typing import Final from pydantic import JsonValue, TypeAdapter, ValidationError import litellm -from litellm.litellm_core_utils.bug_report import KNOWN_PROVIDERS, BugReport, allowlisted, build_bug_report +from litellm.litellm_core_utils.bug_report import ( + KNOWN_PROVIDERS, + BugReport, + EnvironmentReport, + allowlisted, + build_bug_report, + build_environment_report, +) from litellm.proxy._types import ConfigGeneralSettings from litellm.router_utils.routing_groups import VALID_ROUTING_STRATEGIES from litellm.types.caching import LiteLLMCacheType @@ -191,6 +198,19 @@ def safe_config_lines(config: Mapping[str, object], general_settings: Mapping[st ) +def _proxy_config_lines() -> tuple[str, ...]: + from litellm.proxy import proxy_server + + return safe_config_lines( + proxy_server.proxy_config.config, + _object_map(proxy_server.general_settings), # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType] # bare dict global, validated by _object_map + ) + + +def build_proxy_environment_report() -> EnvironmentReport: + return build_environment_report(surface="proxy", config_lines=_proxy_config_lines()) + + def build_proxy_bug_report( exc: BaseException, *, @@ -198,16 +218,11 @@ def build_proxy_bug_report( custom_llm_provider: object = None, stream: object = None, ) -> BugReport: - from litellm.proxy import proxy_server - return build_bug_report( exc, surface="proxy", call_type=call_type, custom_llm_provider=custom_llm_provider, stream=stream, - config_lines=safe_config_lines( - proxy_server.proxy_config.config, - _object_map(proxy_server.general_settings), # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType] # bare dict global, validated by _object_map - ), + config_lines=_proxy_config_lines(), ) diff --git a/litellm/proxy/common_request_processing.py b/litellm/proxy/common_request_processing.py index 6a7b6970bb8..c40090233be 100644 --- a/litellm/proxy/common_request_processing.py +++ b/litellm/proxy/common_request_processing.py @@ -26,7 +26,7 @@ import httpx import orjson from fastapi import HTTPException, Request, status from fastapi.responses import JSONResponse, Response, StreamingResponse -from pydantic import TypeAdapter, ValidationError +from pydantic import BaseModel, TypeAdapter, ValidationError from starlette.types import Receive, Scope, Send import litellm @@ -56,6 +56,7 @@ from litellm.litellm_core_utils.core_helpers import ( get_or_create_metadata_bucket, independent_snapshot, is_expected_client_error, + redact_nested_match_and_regex_keys, ) from litellm.litellm_core_utils.dd_tracing import NullTracer, tracer from litellm.litellm_core_utils.get_supported_openai_params import ( @@ -1401,6 +1402,42 @@ def _override_openai_response_model( ) +_METADATA_BUCKET_KEYS: Final = ("metadata", "litellm_metadata") +_RESPONSE_REDACTED_KEYS: Final = ("keyword", "snippet", "match", "regex") + + +def _request_metadata_buckets(request_data: Mapping[str, object]) -> tuple[Mapping[str, object], ...]: + return tuple(bucket for key in _METADATA_BUCKET_KEYS if isinstance(bucket := request_data.get(key), Mapping)) + + +def include_guardrail_response_requested(request_data: Mapping[str, object]) -> bool: + return any(bucket.get("include_guardrail_response") is True for bucket in _request_metadata_buckets(request_data)) + + +def attach_guardrail_information(response: object, request_data: Mapping[str, object]) -> object: + recorded: Final[Sequence[object]] = next( + ( + entries + for bucket in _request_metadata_buckets(request_data) + if isinstance( + entries := bucket.get("standard_logging_guardrail_information"), + list, + ) + ), + (), + ) + guardrail_information: Final = [ # mutable-ok: response list contract + redact_nested_match_and_regex_keys(entry, keys=_RESPONSE_REDACTED_KEYS) + for entry in recorded + if isinstance(entry, dict) + ] + if isinstance(response, dict): + return response | MappingProxyType({"guardrail_information": guardrail_information}) + if isinstance(response, BaseModel) and response.model_config.get("extra") == "allow": + return response.model_copy(update=MappingProxyType({"guardrail_information": guardrail_information})) + return response + + class CostBreakdownHeaderValues(NamedTuple): original_cost: float | None = None discount_amount: float | None = None @@ -2898,6 +2935,11 @@ class ProxyBaseLLMRequestProcessing: if isinstance(response, dict): response.pop("_hidden_params", None) + if include_guardrail_response_requested(self.data): + response = attach_guardrail_information( # rebind-ok: response tail rebinds the copied response + response=response, request_data=self.data + ) + # Call response headers hook for non-streaming success callback_headers = await proxy_logging_obj.post_call_response_headers_hook( data=self.data, diff --git a/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py b/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py index dbe11882b3c..2bb53c7723d 100644 --- a/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py +++ b/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py @@ -18,6 +18,10 @@ if TYPE_CHECKING: AUTH_CACHE_INVALIDATION_CHANNEL: Final = "litellm_proxy.auth_cache_invalidation" _POLL_TIMEOUT_SECONDS: Final = 1.0 +_MAX_PENDING_PUBLISHES: Final = 1024 +_MAX_IN_FLIGHT_PUBLISHES: Final = 16 +_pending_publishes: Final[set[asyncio.Task[None]]] = set() # mutable-ok: strong refs keep background publishes alive +_in_flight_publishes: Final = asyncio.Semaphore(_MAX_IN_FLIGHT_PUBLISHES) _BACKOFF_INITIAL_SECONDS: Final = 5.0 _BACKOFF_MAX_SECONDS: Final = 60.0 @@ -67,6 +71,21 @@ def _message_from_data(data: object) -> _CacheInvalidationMessage | None: ) +async def _publish_to_redis(redis_cache: "RedisCache", cache_key: str, message: str) -> None: + try: + client: Final = _pubsub_capable_client(redis_cache) + if client is None: + verbose_proxy_logger.debug( + "auth cache invalidation publish for %s skipped: cluster redis client has no pub/sub support", + cache_key, + ) + return + async with _in_flight_publishes: + await client.publish(auth_cache_invalidation_channel(redis_cache), message) + except Exception as e: # noqa: BLE001 # best-effort publish; mutations must never fail on redis errors + verbose_proxy_logger.warning("auth cache invalidation publish for %s failed: %s", cache_key, e) + + async def publish_auth_cache_invalidation( cache_key: str, new_value: float | None = None, ttl: float | None = None ) -> None: @@ -80,24 +99,34 @@ async def publish_auth_cache_invalidation( writes the value into its additional in-memory caches rather than deleting the key. A spend reset uses this so the handler's self-delivered message cannot erase the freshly-written post-reset counter or floor marker. + + The Redis round trip runs as a background task: this call returns once the + publish has been handed to the event loop, so a Redis that accepts + connections but never replies costs the caller nothing. The DB write has + already committed and the local eviction already happened, so the caller + has nothing to do with the publish result. At most 16 publishes hold a + Redis connection at once; the rest wait in the task set, so a wedge cannot + drain the shared connection pool. """ redis_cache: Final = coordination_redis_cache() if redis_cache is None: return - try: - client: Final = _pubsub_capable_client(redis_cache) - if client is None: - verbose_proxy_logger.debug( - "auth cache invalidation publish for %s skipped: cluster redis client has no pub/sub support", - cache_key, - ) - return - await client.publish( - auth_cache_invalidation_channel(redis_cache), - _cache_invalidation_message_json(cache_key, new_value=new_value, ttl=ttl), + _pending_publishes.difference_update({task for task in _pending_publishes if task.done()}) + if len(_pending_publishes) >= _MAX_PENDING_PUBLISHES: + verbose_proxy_logger.warning( + "auth cache invalidation publish for %s dropped: %d publishes already waiting on redis; " + "other workers keep their cached copy until its TTL expires", + cache_key, + len(_pending_publishes), ) - except Exception as e: # noqa: BLE001 # best-effort publish; mutations must never fail on redis errors - verbose_proxy_logger.warning("auth cache invalidation publish for %s failed: %s", cache_key, e) + return + task: Final = asyncio.create_task( + _publish_to_redis( + redis_cache, cache_key, _cache_invalidation_message_json(cache_key, new_value=new_value, ttl=ttl) + ) + ) + _pending_publishes.add(task) + await asyncio.sleep(0) async def evict_and_broadcast(cache_keys: Sequence[str], user_api_key_cache: "UserApiKeyCache") -> None: @@ -106,8 +135,8 @@ async def evict_and_broadcast(cache_keys: Sequence[str], user_api_key_cache: "Us Every endpoint that mutates a cached object must call this: auth serves those objects cache-first with no freshness check, so a mutation that leaves the entry in place keeps the - stale object enforced until its TTL expires (LIT-3803). Best-effort on both steps: the DB write - has already committed, so a cache backend error must not fail the endpoint. + stale object enforced until its TTL expires (LIT-3803). Best-effort: the DB write has already + committed, so a cache backend error must not fail the endpoint. """ for cache_key in cache_keys: try: diff --git a/litellm/proxy/common_utils/config_sync_pubsub.py b/litellm/proxy/common_utils/config_sync_pubsub.py index 6d781babe63..b20c0d9c9a5 100644 --- a/litellm/proxy/common_utils/config_sync_pubsub.py +++ b/litellm/proxy/common_utils/config_sync_pubsub.py @@ -55,6 +55,7 @@ _CONFIG_SYNCED_TABLE_NAMES: Final[frozenset[str]] = frozenset( "litellm_ssoconfig", "litellm_cacheconfig", "litellm_configoverrides", + "litellm_uisettings", } ) diff --git a/litellm/proxy/common_utils/debug_utils.py b/litellm/proxy/common_utils/debug_utils.py index dc329e55e31..2544321a1b6 100644 --- a/litellm/proxy/common_utils/debug_utils.py +++ b/litellm/proxy/common_utils/debug_utils.py @@ -8,7 +8,7 @@ import sys import tracemalloc from collections import Counter from collections.abc import Mapping, Sequence -from typing import Any, Final, NamedTuple, Protocol, TypedDict +from typing import Annotated, Any, Final, NamedTuple, Protocol, TypedDict from fastapi import APIRouter, Depends, HTTPException, Query from typing_extensions import ReadOnly @@ -16,8 +16,11 @@ from typing_extensions import ReadOnly from litellm import get_secret_str from litellm._logging import verbose_proxy_logger from litellm.constants import PYTHON_GC_THRESHOLD +from litellm.litellm_core_utils.bug_report import EnvironmentReport from litellm.proxy._types import UserAPIKeyAuth from litellm.proxy.auth.user_api_key_auth import user_api_key_auth +from litellm.proxy.bug_report_config import build_proxy_environment_report +from litellm.proxy.common_utils.resource_ownership import is_proxy_admin router: Final = APIRouter() @@ -783,6 +786,23 @@ async def configure_gc_thresholds_endpoint( } +@router.get("/debug/report", include_in_schema=False) +async def get_debug_report( + user_api_key_dict: Annotated[UserAPIKeyAuth, Depends(user_api_key_auth)], +) -> EnvironmentReport: + """ + The same LiteLLM-owned environment facts the bug report link puts in a GitHub issue: + versions, deployment kind, and config flags whose keys and values LiteLLM defines. + Nothing from the operator's config values, request data, or errors + + Example usage: + curl http://localhost:4000/debug/report -H "Authorization: Bearer sk-1234" + """ + if not is_proxy_admin(user_api_key_dict): + raise HTTPException(status_code=403, detail="Only proxy admins can read /debug/report") + return build_proxy_environment_report() + + @router.get( "/otel-spans", dependencies=[Depends(user_api_key_auth)], diff --git a/litellm/proxy/common_utils/swagger_utils.py b/litellm/proxy/common_utils/swagger_utils.py index 2609a98a997..83480bf161d 100644 --- a/litellm/proxy/common_utils/swagger_utils.py +++ b/litellm/proxy/common_utils/swagger_utils.py @@ -1,3 +1,4 @@ +import inspect from typing import Any, Final from pydantic import BaseModel, Field @@ -31,11 +32,15 @@ def get_status_code(exception): return 500 # Internal Server Error as default +def _error_description(exception: type[Exception]) -> str: + return inspect.cleandoc(exception.__doc__) if exception.__doc__ else exception.__name__ + + # Create error responses ERROR_RESPONSES: Final = { get_status_code(exception): { "model": ErrorResponse, - "description": exception.__doc__ or exception.__name__, + "description": _error_description(exception), } for exception in LITELLM_EXCEPTION_TYPES } diff --git a/litellm/proxy/config_resolvers/settings_rules.py b/litellm/proxy/config_resolvers/settings_rules.py index f346dd6198d..1f0adfc5248 100644 --- a/litellm/proxy/config_resolvers/settings_rules.py +++ b/litellm/proxy/config_resolvers/settings_rules.py @@ -48,6 +48,7 @@ _UI_SETTINGS_FIELDS: Final[tuple[str, ...]] = ( "allow_agents_for_team_admins", "disable_vector_stores_for_internal_users", "allow_vector_stores_for_team_admins", + "disable_custom_api_keys", "disable_key_generate_for_org_admin", "team_admin_editable_team_fields", ) diff --git a/litellm/proxy/db/db_spend_update_writer.py b/litellm/proxy/db/db_spend_update_writer.py index d9c8b271646..e38214c98a6 100644 --- a/litellm/proxy/db/db_spend_update_writer.py +++ b/litellm/proxy/db/db_spend_update_writer.py @@ -1606,13 +1606,21 @@ class DBSpendUpdateWriter: proxy_logging_obj: ProxyLogging, ) -> None: transactions: Final = await queue.flush_and_get_aggregated_daily_spend_update_transactions() - try: - await commit( + commit_task: Final = asyncio.ensure_future( + commit( n_retry_times=n_retry_times, prisma_client=prisma_client, proxy_logging_obj=proxy_logging_obj, daily_spend_transactions=cast(dict[str, _DailySpendTransactionT], transactions), ) + ) + try: + await asyncio.shield(commit_task) + except asyncio.CancelledError: + commit_task.cancel() + if transactions: + await queue.add_update(transactions) + raise except Exception as e: # noqa: BLE001 # whatever failed here, the other tables must still flush if not transactions: return @@ -1839,14 +1847,18 @@ class DBSpendUpdateWriter: if not daily_tag_spend_update_transactions: return - try: - await DBSpendUpdateWriter.update_daily_tag_spend( + commit_task: Final = asyncio.ensure_future( + DBSpendUpdateWriter.update_daily_tag_spend( n_retry_times=n_retry_times, prisma_client=prisma_client, proxy_logging_obj=proxy_logging_obj, daily_spend_transactions=daily_tag_spend_update_transactions, ) - except Exception: + ) + try: + await asyncio.shield(commit_task) + except BaseException: # noqa: BLE001 # a cancel must restore the drained rows before its rollback returns + commit_task.cancel() await self.redis_update_buffer.restore_transactions_to_redis( daily_tag_spend_update_transactions=daily_tag_spend_update_transactions, ) @@ -2368,7 +2380,8 @@ class DBSpendUpdateWriter: table=table, transactions=tuple(transactions_to_process.values()) ) sql, params = build_bulk_upsert(table=table, batch=merged_batch) - await prisma_client.db.execute_raw(sql, *params) + async with _spend_update_tx(prisma_client) as transaction: + await transaction.execute_raw(sql, *params) except Exception as batch_error: if _spend_commit_failure_is_requeue_safe(batch_error): spend_log_error( diff --git a/litellm/proxy/hooks/key_management_event_hooks.py b/litellm/proxy/hooks/key_management_event_hooks.py index f75197532b4..5dc0f659a8d 100644 --- a/litellm/proxy/hooks/key_management_event_hooks.py +++ b/litellm/proxy/hooks/key_management_event_hooks.py @@ -1,7 +1,8 @@ import asyncio import json +from collections.abc import Sequence from datetime import datetime, timezone -from typing import Final +from typing import TYPE_CHECKING, Final from pydantic import TypeAdapter @@ -23,6 +24,9 @@ from litellm.proxy._types import ( from litellm.proxy.utils import _hash_token_if_needed from litellm.secret_managers.base_secret_manager import BaseSecretManager +if TYPE_CHECKING: + from prisma import models as prisma_models + # NOTE: This is the prefix for all virtual keys stored in AWS Secrets Manager LITELLM_PREFIX_STORED_VIRTUAL_KEYS: Final = "litellm/" @@ -233,6 +237,19 @@ class KeyManagementEventHooks: Handles the following: - Storing Audit Logs for key deletion """ + KeyManagementEventHooks.create_key_deleted_audit_logs( + keys_being_deleted=keys_being_deleted, + user_api_key_dict=user_api_key_dict, + litellm_changed_by=litellm_changed_by, + ) + await KeyManagementEventHooks._delete_virtual_keys_from_secret_manager(keys_being_deleted=keys_being_deleted) + + @staticmethod + def create_key_deleted_audit_logs( + keys_being_deleted: Sequence["LiteLLM_VerificationToken | prisma_models.LiteLLM_VerificationToken"], + user_api_key_dict: UserAPIKeyAuth, + litellm_changed_by: str | None = None, + ) -> None: from litellm.proxy.management_helpers.audit_logs import ( create_audit_log_for_update, get_audit_log_changed_by, @@ -240,35 +257,33 @@ class KeyManagementEventHooks: ) from litellm.proxy.proxy_server import litellm_proxy_admin_name - # we do this after the first for loop, since first for loop is for validation. we only want this inserted after validation passes - if is_audit_logging_enabled() and data.keys is not None: - # make an audit log for each key deleted - for key in keys_being_deleted: - if key.token is None: - continue - _key_row = key.model_dump_json(exclude_none=True) + if not is_audit_logging_enabled(): + return + for key in keys_being_deleted: + key_row = LiteLLM_VerificationToken.model_validate(key, from_attributes=True) + if key_row.token is None: + continue + _key_row = key_row.model_dump_json(exclude_none=True) - asyncio.create_task( - create_audit_log_for_update( - request_data=LiteLLM_AuditLogs( - id=str(uuid.uuid4()), - updated_at=datetime.now(timezone.utc), - changed_by=get_audit_log_changed_by( - litellm_changed_by=litellm_changed_by, - user_api_key_dict=user_api_key_dict, - litellm_proxy_admin_name=litellm_proxy_admin_name, - ), - changed_by_api_key=user_api_key_dict.token, - table_name=LitellmTableNames.KEY_TABLE_NAME, - object_id=key.token, - action="deleted", - updated_values="{}", - before_value=_key_row, - ) + asyncio.create_task( + create_audit_log_for_update( + request_data=LiteLLM_AuditLogs( + id=str(uuid.uuid4()), + updated_at=datetime.now(timezone.utc), + changed_by=get_audit_log_changed_by( + litellm_changed_by=litellm_changed_by, + user_api_key_dict=user_api_key_dict, + litellm_proxy_admin_name=litellm_proxy_admin_name, + ), + changed_by_api_key=user_api_key_dict.token, + table_name=LitellmTableNames.KEY_TABLE_NAME, + object_id=key_row.token, + action="deleted", + updated_values="{}", + before_value=_key_row, ) ) - # delete the keys from the secret manager - await KeyManagementEventHooks._delete_virtual_keys_from_secret_manager(keys_being_deleted=keys_being_deleted) + ) @staticmethod async def _store_virtual_key_in_secret_manager(secret_name: str, secret_token: str, team_id: str | None = None): diff --git a/litellm/proxy/hooks/parallel_request_limiter_v3.py b/litellm/proxy/hooks/parallel_request_limiter_v3.py index 9d35178891c..33744906b13 100644 --- a/litellm/proxy/hooks/parallel_request_limiter_v3.py +++ b/litellm/proxy/hooks/parallel_request_limiter_v3.py @@ -63,6 +63,7 @@ from litellm.router_utils.add_retry_fallback_headers import ( ensure_response_additional_headers, response_has_hidden_params, ) +from litellm.router_utils.common_utils import resolve_model_group_alias from litellm.types.caching import RedisPipelineIncrementOperation from litellm.types.llms.openai import BaseLiteLLMOpenAIResponseObject, ResponseAPIUsage from litellm.types.utils import ( @@ -91,6 +92,26 @@ else: _REQUEST_RATE_LIMIT_DATA: Final = TypeAdapter(Mapping[str, object]) +@dataclass(frozen=True, slots=True) +class RateLimitedModel: + requested: str + group: str + + def limit_in(self, limits: Mapping[str, int] | None) -> int | None: + if limits is None: + return None + requested_limit: Final = limits.get(self.requested) + return requested_limit if requested_limit is not None else limits.get(self.group) + + +def _resolve_model_group_alias_via_proxy_router(model: str) -> str | None: + from litellm.proxy.proxy_server import llm_router + + if llm_router is None: + return None + return resolve_model_group_alias(llm_router.model_group_alias, model) + + def _sibling_counter_keys(window_key: str) -> tuple[str, str]: prefix: Final = window_key.removesuffix(":window") return f"{prefix}:requests", f"{prefix}:tokens" @@ -546,7 +567,7 @@ class RequestRateLimiterStash: parallel_slot: ParallelSlotAcquisition | None = None parallel_slot_release_lock: asyncio.Lock = field(default_factory=asyncio.Lock, repr=False, compare=False) reserved_tokens: int = 0 - reserved_model: str | None = None + reserved_model: RateLimitedModel | None = None reserved_scopes: frozenset[tuple[str, str]] = field(default_factory=frozenset) itpm_reserved_tokens: int = 0 itpm_reserved_scopes: frozenset[tuple[str, str]] = field(default_factory=frozenset) @@ -626,9 +647,11 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): self, internal_usage_cache: InternalUsageCache, time_provider: Callable[[], datetime] | None = None, + model_group_resolver: Callable[[str], str | None] = _resolve_model_group_alias_via_proxy_router, ): self.internal_usage_cache = internal_usage_cache self._time_provider = time_provider or datetime.now + self._model_group_resolver = model_group_resolver if self.internal_usage_cache.dual_cache.redis_cache is not None: self.batch_rate_limiter_script = self.internal_usage_cache.dual_cache.redis_cache.async_register_script( BATCH_RATE_LIMITER_SCRIPT @@ -2346,6 +2369,14 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): if response["overall_code"] == "OVER_LIMIT": self._handle_rate_limit_error(response, descriptors, requested_model) + def _rate_limited_model(self, requested_model: str | None) -> RateLimitedModel | None: + if not requested_model: + return None + return RateLimitedModel( + requested=requested_model, + group=self._model_group_resolver(requested_model) or requested_model, + ) + def create_organization_rate_limit_descriptor( self, user_api_key_dict: UserAPIKeyAuth, requested_model: str | None = None ) -> list[RateLimitDescriptor]: @@ -2367,43 +2398,28 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): ) ) - # Model specific org rate limits - if ( + model: Final = self._rate_limited_model(requested_model) + if model is None: + return descriptors + model_specific_tpm_limit: Final = model.limit_in( + get_model_rate_limit_from_metadata(user_api_key_dict, "organization_metadata", "model_tpm_limit") + ) + model_specific_rpm_limit: Final = model.limit_in( get_model_rate_limit_from_metadata(user_api_key_dict, "organization_metadata", "model_rpm_limit") - is not None - or get_model_rate_limit_from_metadata(user_api_key_dict, "organization_metadata", "model_tpm_limit") - is not None - ): - _tpm_limit_for_team_model: Final = ( - get_model_rate_limit_from_metadata(user_api_key_dict, "organization_metadata", "model_tpm_limit") or {} + ) + if model_specific_tpm_limit is None and model_specific_rpm_limit is None: + return descriptors + descriptors.append( + RateLimitDescriptor( + key="model_per_organization", + value=f"{user_api_key_dict.org_id}:{model.group}", + rate_limit={ + "requests_per_unit": model_specific_rpm_limit, + "tokens_per_unit": model_specific_tpm_limit, + "window_size": self.window_size, + }, ) - _rpm_limit_for_team_model: Final = ( - get_model_rate_limit_from_metadata(user_api_key_dict, "organization_metadata", "model_rpm_limit") or {} - ) - - should_check_rate_limit = False - if requested_model in _tpm_limit_for_team_model or requested_model in _rpm_limit_for_team_model: - should_check_rate_limit = True - - if should_check_rate_limit: - model_specific_tpm_limit = None - model_specific_rpm_limit = None - if requested_model in _tpm_limit_for_team_model: - model_specific_tpm_limit = _tpm_limit_for_team_model[requested_model] - if requested_model in _rpm_limit_for_team_model: - model_specific_rpm_limit = _rpm_limit_for_team_model[requested_model] - descriptors.append( - RateLimitDescriptor( - key="model_per_organization", - value=f"{user_api_key_dict.org_id}:{requested_model}", - rate_limit={ - "requests_per_unit": model_specific_rpm_limit, - "tokens_per_unit": model_specific_tpm_limit, - "window_size": self.window_size, - }, - ) - ) - + ) return descriptors def _add_model_per_key_rate_limit_descriptor( @@ -2425,34 +2441,22 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): get_key_model_tpm_limit, ) - if not requested_model: + model: Final = self._rate_limited_model(requested_model) + if model is None: return - - _tpm_limit_for_key_model = get_key_model_tpm_limit(user_api_key_dict, model_name=requested_model) - _rpm_limit_for_key_model = get_key_model_rpm_limit(user_api_key_dict, model_name=requested_model) - - if _tpm_limit_for_key_model is None and _rpm_limit_for_key_model is None: - return - - _tpm_limit_for_key_model = _tpm_limit_for_key_model or {} - _rpm_limit_for_key_model = _rpm_limit_for_key_model or {} - - # Check if model has any rate limits configured - should_check_rate_limit: Final = ( - requested_model in _tpm_limit_for_key_model or requested_model in _rpm_limit_for_key_model + model_specific_tpm_limit: Final = model.limit_in( + get_key_model_tpm_limit(user_api_key_dict, model_name=model.group) ) - - if not should_check_rate_limit: + model_specific_rpm_limit: Final = model.limit_in( + get_key_model_rpm_limit(user_api_key_dict, model_name=model.group) + ) + if model_specific_tpm_limit is None and model_specific_rpm_limit is None: return - # Get model-specific limits - model_specific_tpm_limit: Final[int | None] = _tpm_limit_for_key_model.get(requested_model) - model_specific_rpm_limit: Final[int | None] = _rpm_limit_for_key_model.get(requested_model) - descriptors.append( RateLimitDescriptor( key="model_per_key", - value=f"{user_api_key_dict.api_key}:{requested_model}", + value=f"{user_api_key_dict.api_key}:{model.group}", rate_limit={ "requests_per_unit": model_specific_rpm_limit, "tokens_per_unit": model_specific_tpm_limit, @@ -2955,32 +2959,30 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): def _key_owns_model_limit( self, user_api_key_dict: UserAPIKeyAuth, - requested_model: str, + model: RateLimitedModel, rate_limit_key: Literal["model_rpm_limit", "model_tpm_limit"], ) -> bool: - key_own_limits: Final = get_key_own_model_rate_limit(user_api_key_dict, rate_limit_key) - return key_own_limits is not None and key_own_limits.get(requested_model) is not None + return model.limit_in(get_key_own_model_rate_limit(user_api_key_dict, rate_limit_key)) is not None def _inherited_team_model_limit( self, user_api_key_dict: UserAPIKeyAuth, - requested_model: str, + model: RateLimitedModel, rate_limit_key: Literal["model_rpm_limit", "model_tpm_limit"], ) -> int | None: - team_limits: Final = get_model_rate_limit_from_metadata(user_api_key_dict, "team_metadata", rate_limit_key) - team_limit: Final = team_limits.get(requested_model) if team_limits else None - if team_limit is None: - return None - if self._key_owns_model_limit(user_api_key_dict, requested_model, rate_limit_key): + team_limit: Final = model.limit_in( + get_model_rate_limit_from_metadata(user_api_key_dict, "team_metadata", rate_limit_key) + ) + if team_limit is None or self._key_owns_model_limit(user_api_key_dict, model, rate_limit_key): return None return team_limit def _key_owns_model_tpm_limit_from_request_metadata( self, request_metadata: Mapping[str, object], - model_group: str | None, + model: RateLimitedModel | None, ) -> bool: - if model_group is None: + if model is None: return False key_view: Final = UserAPIKeyAuth.model_validate( { @@ -2988,7 +2990,7 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): "model_max_budget": request_metadata.get("user_api_key_model_max_budget") or {}, } ) - return self._key_owns_model_limit(key_view, model_group, "model_tpm_limit") + return self._key_owns_model_limit(key_view, model, "model_tpm_limit") def _add_team_model_rate_limit_descriptor_from_metadata( self, @@ -2996,16 +2998,17 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): requested_model: str | None, descriptors: list[RateLimitDescriptor], ) -> None: - if requested_model is None: + model: Final = self._rate_limited_model(requested_model) + if model is None: return - team_rpm_limit: Final = self._inherited_team_model_limit(user_api_key_dict, requested_model, "model_rpm_limit") - team_tpm_limit: Final = self._inherited_team_model_limit(user_api_key_dict, requested_model, "model_tpm_limit") + team_rpm_limit: Final = self._inherited_team_model_limit(user_api_key_dict, model, "model_rpm_limit") + team_tpm_limit: Final = self._inherited_team_model_limit(user_api_key_dict, model, "model_tpm_limit") if team_rpm_limit is None and team_tpm_limit is None: return descriptors.append( RateLimitDescriptor( key="model_per_team", - value=f"{user_api_key_dict.team_id}:{requested_model}", + value=f"{user_api_key_dict.team_id}:{model.group}", rate_limit={ "requests_per_unit": team_rpm_limit, "tokens_per_unit": team_tpm_limit, @@ -3021,34 +3024,28 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): descriptors: list[RateLimitDescriptor], ) -> None: """Add project model rate limit descriptor from project_metadata if applicable.""" - if ( - get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_rpm_limit") is not None - or get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_tpm_limit") is not None - ): - _tpm_limit_for_project_model: Final = ( - get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_tpm_limit") or {} + model: Final = self._rate_limited_model(requested_model) + if model is None: + return + model_specific_tpm_limit: Final = model.limit_in( + get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_tpm_limit") + ) + model_specific_rpm_limit: Final = model.limit_in( + get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_rpm_limit") + ) + if model_specific_tpm_limit is None and model_specific_rpm_limit is None: + return + descriptors.append( + RateLimitDescriptor( + key="model_per_project", + value=f"{user_api_key_dict.project_id}:{model.group}", + rate_limit={ + "requests_per_unit": model_specific_rpm_limit, + "tokens_per_unit": model_specific_tpm_limit, + "window_size": self.window_size, + }, ) - _rpm_limit_for_project_model: Final = ( - get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_rpm_limit") or {} - ) - should_check_rate_limit: Final = ( - requested_model in _tpm_limit_for_project_model or requested_model in _rpm_limit_for_project_model - ) - - if should_check_rate_limit and requested_model is not None: - model_specific_tpm_limit: Final = _tpm_limit_for_project_model.get(requested_model) - model_specific_rpm_limit: Final = _rpm_limit_for_project_model.get(requested_model) - descriptors.append( - RateLimitDescriptor( - key="model_per_project", - value=f"{user_api_key_dict.project_id}:{requested_model}", - rate_limit={ - "requests_per_unit": model_specific_rpm_limit, - "tokens_per_unit": model_specific_tpm_limit, - "window_size": self.window_size, - }, - ) - ) + ) def add_project_io_token_rate_limit_descriptors_from_metadata( self, @@ -3062,25 +3059,21 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): TPM descriptor above -- these give Bedrock Mantle-style separate input/output token quotas at the project level. """ - if requested_model is None or user_api_key_dict.project_id is None: + model: Final = self._rate_limited_model(requested_model) + if model is None or user_api_key_dict.project_id is None: return - itpm_limit_for_project_model: Final = ( + model_itpm_limit: Final = model.limit_in( get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_itpm_limit") - or {} # mutable-ok: metadata helper returns an optional mapping ) - otpm_limit_for_project_model: Final = ( + model_otpm_limit: Final = model.limit_in( get_model_rate_limit_from_metadata(user_api_key_dict, "project_metadata", "model_otpm_limit") - or {} # mutable-ok: metadata helper returns an optional mapping ) - model_itpm_limit: Final = itpm_limit_for_project_model.get(requested_model) - model_otpm_limit: Final = otpm_limit_for_project_model.get(requested_model) - if model_itpm_limit is None and model_otpm_limit is None: return - descriptor_value: Final = f"{user_api_key_dict.project_id}:{requested_model}" + descriptor_value: Final = f"{user_api_key_dict.project_id}:{model.group}" if model_itpm_limit is not None: descriptors.append( RateLimitDescriptor( @@ -3767,7 +3760,7 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): # the (actual - reserved) delta to those — unreserved # scopes get charged the full actual usage instead. stash.reserved_tokens = estimated_tokens - stash.reserved_model = requested_model + stash.reserved_model = self._rate_limited_model(requested_model) stash.reserved_scopes = frozenset( (d["key"], d["value"]) for d in descriptors @@ -4514,9 +4507,10 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): reserved_scopes: Final[frozenset[tuple[str, str]]] = stash.reserved_scopes if stash is not None else frozenset() # Reconciliation must target the same model-scoped counter that the # pre-call reservation incremented. If a reservation was made, - # ``reserved_model`` is authoritative; otherwise fall back to the - # router's ``model_group`` (covers the no-reservation charge path). - reconcile_model: Final = reserved_model or model_group + # ``reserved_model`` (resolved at admission, so an alias map reload + # mid-flight cannot move the charge) is authoritative; otherwise fall + # back to the router's ``model_group`` (the no-reservation charge path). + reconcile_model: Final = reserved_model if reserved_model is not None else self._rate_limited_model(model_group) pipeline_operations: Final[list[RedisPipelineIncrementOperation]] = [] @@ -4534,7 +4528,7 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger): targets: Final = self._collect_tpm_scope_targets( standard_logging_metadata=standard_logging_metadata, kwargs=kwargs, - model_group=reconcile_model, + model_group=reconcile_model.group if reconcile_model is not None else None, ) charged_targets: Final = ( [target for target in targets if target[0] != "model_per_team"] diff --git a/litellm/proxy/litellm_pre_call_utils.py b/litellm/proxy/litellm_pre_call_utils.py index 44d45dcd687..90bba82aa84 100644 --- a/litellm/proxy/litellm_pre_call_utils.py +++ b/litellm/proxy/litellm_pre_call_utils.py @@ -2029,7 +2029,14 @@ async def add_litellm_data_to_request( _headers, allow_client_message_redaction_opt_out=_allow_client_message_redaction_opt_out, ) - _logging_safe_headers: Final = redact_credential_headers(_headers) + from litellm.proxy._experimental.mcp_server.utils import upstream_credential_headers + + _mcp_credential_headers: Final = upstream_credential_headers(_headers) + _logging_safe_headers: Final = redact_credential_headers( + MappingProxyType( + {name: value for name, value in _headers.items() if name.lower() not in _mcp_credential_headers} + ) + ) verbose_proxy_logger.debug("Request Headers: %s", _logging_safe_headers) verbose_proxy_logger.debug("Raw Headers: %s", _raw_headers) @@ -3116,7 +3123,15 @@ async def move_guardrails_to_metadata( - If guardrails not set on API key, then checks request metadata - Adds guardrails from policies attached to key/team metadata - Adds guardrails from policy engine based on team/key/model context + - Moves include_guardrail_response into request metadata before provider dispatch """ + if "include_guardrail_response" in data: + data[_metadata_variable_name][ + "include_guardrail_response" + ] = ( # rebind-ok: pre-call hooks mutate the shared request dict in place + data.pop("include_guardrail_response") is True + ) + # Early-out: skip all guardrails processing when nothing is configured key_metadata: Final = user_api_key_dict.metadata team_metadata: Final = user_api_key_dict.team_metadata diff --git a/litellm/proxy/management_endpoints/auto_router_endpoints.py b/litellm/proxy/management_endpoints/auto_router_endpoints.py index 03fc58622ce..2ae8639fe61 100644 --- a/litellm/proxy/management_endpoints/auto_router_endpoints.py +++ b/litellm/proxy/management_endpoints/auto_router_endpoints.py @@ -58,6 +58,8 @@ from litellm.router_utils.auto_router_model_naming import ( ) from litellm.types.management_endpoints.auto_router_endpoints import ( SHADOW_EVAL_TURN_VALVE, + AutoRouterAvailabilityRequest, + AutoRouterAvailabilityResponse, AutoRouterBenchmarkGroup, AutoRouterBenchmarksResponse, AutoRouterBenchmarkTotals, @@ -391,6 +393,54 @@ async def validate_complexity_router_config( return ComplexityRouterConfigValidationResponse(valid=error is None, error=error) +@router.post( + "/auto_router/availability", + tags=["model management"], # mutable-ok: FastAPI requires a list + response_model=AutoRouterAvailabilityResponse, +) +async def get_auto_router_availability( + data: AutoRouterAvailabilityRequest, + user_api_key_dict: Annotated[UserAPIKeyAuth, Depends(user_api_key_auth)], +) -> AutoRouterAvailabilityResponse: + from litellm.proxy.management_helpers.auto_router_availability import auto_router_availability + from litellm.proxy.proxy_server import ( + _license_check, # pyright: ignore[reportPrivateUsage] # same entitlement owner as the model write gate + heuristic_v1_tuning_baselines, + llm_router, + proxy_config, + ) + + member_team: Final = await _authorize_router_dry_run(user_api_key_dict, data.team_id) + rows: Final = proxy_config.auto_router_db_catalog + if rows is None or llm_router is None: + raise HTTPException(status_code=503, detail="Auto-router availability is unavailable") + saved: Final = next((row for row in rows if row.model_id == data.saved_model_id), None) + if data.saved_model_id is not None: + if saved is None: + raise HTTPException(status_code=404, detail="Saved auto router is unavailable") + if user_api_key_dict.user_role != LitellmUserRoles.PROXY_ADMIN and ( + saved.team_id != data.team_id or (member_team is not None and saved.created_by != user_api_key_dict.user_id) + ): + raise HTTPException(status_code=403, detail="Cannot check another user's auto router") + existing: Final = saved.deployment if saved is not None else None + others: Final = tuple(row.deployment for row in rows if row is not saved) + tuple(llm_router.config_deployments()) + candidate: Final = MappingProxyType( + { + "litellm_params": MappingProxyType( + {"model": "auto_router/complexity_router", "complexity_router_config": data.complexity_router_config} + ), + "model_info": MappingProxyType({"id": data.saved_model_id or "availability-new-router", "db_model": True}), + } + ) + return auto_router_availability( + others=others, + existing=existing, + candidate=candidate, + baselines=heuristic_v1_tuning_baselines, + limit=_license_check.auto_router_capability_limit(), + ) + + async def _resolve_saved_routing_test( data: AutoRouterRoutingTestRequest, user_api_key_dict: UserAPIKeyAuth, diff --git a/litellm/proxy/management_endpoints/internal_user_endpoints.py b/litellm/proxy/management_endpoints/internal_user_endpoints.py index 6509977f7ff..587ae416096 100644 --- a/litellm/proxy/management_endpoints/internal_user_endpoints.py +++ b/litellm/proxy/management_endpoints/internal_user_endpoints.py @@ -48,6 +48,7 @@ from litellm.proxy.common_utils.user_api_key_cache import ( user_object_permission_id_cache_key, ) from litellm.proxy.db.exception_handler import PrismaDBExceptionHandler +from litellm.proxy.hooks.key_management_event_hooks import KeyManagementEventHooks from litellm.proxy.hooks.model_max_budget_limiter import build_model_max_budget_usage from litellm.proxy.hooks.user_management_event_hooks import UserManagementEventHooks from litellm.proxy.management_endpoints.common_daily_activity import ( @@ -2539,6 +2540,12 @@ async def delete_user( prisma_client=prisma_client, ) await _verification_token_table(prisma_client).delete_many(where=key_filter) + if keys_to_delete: + KeyManagementEventHooks.create_key_deleted_audit_logs( + keys_being_deleted=keys_to_delete, + user_api_key_dict=user_api_key_dict, + litellm_changed_by=litellm_changed_by, + ) await delete_cache_key_objects( hashed_tokens=hashed_tokens_to_delete, user_api_key_cache=user_api_key_cache, @@ -2734,6 +2741,10 @@ async def _resolve_team_org_filter( async def ui_view_users( user_id: str | None = fastapi.Query(default=None, description="User ID in the request parameters"), user_email: str | None = fastapi.Query(default=None, description="User email in the request parameters"), + search: str | None = fastapi.Query( + default=None, + description="Combined search: matches users whose 'user_id' or 'user_email' contains the value (case-insensitive).", + ), team_id: str | None = fastapi.Query( default=None, description="Team ID — used when a team admin searches for users to add to their team", @@ -2743,7 +2754,7 @@ async def ui_view_users( user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), ): """ - Filter users based on partial match of user_id or email with pagination. + Filter users based on partial match of user_id or email, or combined ``search``, with pagination. Behaviour depends on the ``scope_user_search_to_org`` UI-setting flag (stored in the ``litellm_uisettings`` table): @@ -2795,9 +2806,15 @@ async def ui_view_users( if org_filter_ids is not None: where_conditions["organization_memberships"] = {"some": {"organization_id": {"in": org_filter_ids}}} + where: Final[Mapping[str, object]] = { # mutable-ok: prisma serializes `where`, keep it a plain dict + key: value + for key, value in (*where_conditions.items(), *_user_search_where(search).items()) + if value is not None + } + # Query users with pagination and filters users: Final = await _user_table(prisma_client).find_many( - where=where_conditions, + where=where, skip=skip, take=page_size, order={"created_at": "desc"}, diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py index fbc7cf18003..1845f11c0fa 100644 --- a/litellm/proxy/management_endpoints/key_management_endpoints.py +++ b/litellm/proxy/management_endpoints/key_management_endpoints.py @@ -118,9 +118,6 @@ from litellm.proxy.management_helpers.team_member_permission_checks import ( from litellm.proxy.management_helpers.utils import management_endpoint_wrapper from litellm.proxy.spend_tracking.budget_reservation import get_budget_window_start from litellm.proxy.spend_tracking.spend_tracking_utils import _is_master_key -from litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints import ( - get_ui_settings_cached, -) from litellm.proxy.utils import ( PrismaClient, ProxyLogging, @@ -487,8 +484,10 @@ async def _check_custom_key_allowed(custom_key_value: str | None) -> None: if custom_key_value is None: return - ui_settings: Final = await get_ui_settings_cached() - if ui_settings.get("disable_custom_api_keys", False) is True: + from litellm.proxy.config_resolvers.settings_rules import coerce_bool + from litellm.proxy.proxy_server import general_settings + + if coerce_bool(general_settings.get("disable_custom_api_keys", False)) is True: verbose_proxy_logger.warning("Custom API key rejected: disable_custom_api_keys is enabled") raise HTTPException( status_code=403, @@ -7591,25 +7590,47 @@ async def test_key_logging( _KEY_ALIAS_PATTERN: Final = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9_\-/\.@]{0,253}[a-zA-Z0-9]$") +_KEY_ALIAS_PATTERN_MESSAGE: Final = ( + "Invalid key_alias format. Must be 2-255 characters, start/end with alphanumeric, and only contain a-zA-Z0-9_-/.@." +) +_KEY_ALIAS_MAX_LENGTH: Final = 255 + + +def parse_key_alias_pattern(value: object) -> str | None: + if value is None: + return None + if not isinstance(value, str): + raise ValueError( + f"Invalid regex set for litellm_settings.key_alias_pattern - value={value!r}: must be a string" + ) + try: + re.compile(value) + except re.error as e: + raise ValueError(f"Invalid regex set for litellm_settings.key_alias_pattern - value={value}: {e}") from e + return value + + +def _key_alias_rule() -> tuple[re.Pattern[str], str] | None: + if litellm.key_alias_pattern is not None: + return ( + re.compile(litellm.key_alias_pattern), + f"Invalid key_alias format. Must be at most {_KEY_ALIAS_MAX_LENGTH} characters and match the configured" + f" key_alias_pattern: {litellm.key_alias_pattern}", + ) + if litellm.enable_key_alias_format_validation: + return (_KEY_ALIAS_PATTERN, _KEY_ALIAS_PATTERN_MESSAGE) + return None def _validate_key_alias_format(key_alias: str | None) -> None: """ Validate the format of the key_alias. - A baseline validation always runs, regardless of - ``litellm.enable_key_alias_format_validation``. - - The remaining charset/length rules are gated behind - ``litellm.enable_key_alias_format_validation`` (default **False**). When disabled, - only the baseline validation above is performed, so existing workflows are not - broken. - - Rules (when enabled): - - None is OK (no alias). - - Otherwise must be 2–255 chars - - start/end with alphanumeric - - only allow a-zA-Z0-9_-/.@ + Path traversal and control characters are always rejected. The alias then has to + stay within ``_KEY_ALIAS_MAX_LENGTH`` and fully match ``litellm.key_alias_pattern`` + when one is configured, else the built-in pattern when + ``litellm.enable_key_alias_format_validation`` is on, else nothing more is checked + so existing workflows are not broken. """ if key_alias is None: return @@ -7624,12 +7645,14 @@ def _validate_key_alias_format(key_alias: str | None) -> None: code=400, ) - if not litellm.enable_key_alias_format_validation: + rule: Final = _key_alias_rule() + if rule is None: return - if not _KEY_ALIAS_PATTERN.match(key_alias): + pattern, message = rule + if len(key_alias) > _KEY_ALIAS_MAX_LENGTH or pattern.fullmatch(key_alias) is None: raise ProxyException( - message="Invalid key_alias format. Must be 2-255 characters, start/end with alphanumeric, and only contain a-zA-Z0-9_-/.@.", + message=message, type=ProxyErrorTypes.bad_request_error, param="key_alias", code=400, diff --git a/litellm/proxy/management_endpoints/model_management_endpoints.py b/litellm/proxy/management_endpoints/model_management_endpoints.py index fcadcfe2cae..615a528b552 100644 --- a/litellm/proxy/management_endpoints/model_management_endpoints.py +++ b/litellm/proxy/management_endpoints/model_management_endpoints.py @@ -1782,10 +1782,11 @@ async def delete_team_models( # Under MODEL_RECONCILE_LOCK, for the same reason as delete_model: the rows are # gone, but a reconcile holding a pre-delete snapshot would upsert these ids back # onto this pod. The lock orders the eviction after any in-flight reconcile. - if llm_router is not None: - from litellm.proxy.proxy_server import MODEL_RECONCILE_LOCK + from litellm.proxy.proxy_server import MODEL_RECONCILE_LOCK, proxy_config - async with MODEL_RECONCILE_LOCK: + async with MODEL_RECONCILE_LOCK: + proxy_config.remove_auto_router_catalog_entries(frozenset(deleted_model_ids)) + if llm_router is not None: for model_id in deleted_model_ids: llm_router.delete_deployment(id=model_id) @@ -2194,6 +2195,7 @@ async def delete_model( llm_router, premium_user, prisma_client, + proxy_config, proxy_logging_obj, store_model_in_db, user_api_key_cache, @@ -2245,8 +2247,9 @@ async def delete_model( # this pod serving a model the database no longer has, until the next # reconcile. Taking the lock orders this eviction after any such in-flight # reconcile's re-add, so the eviction is the last word. - if llm_router is not None: - async with MODEL_RECONCILE_LOCK: + async with MODEL_RECONCILE_LOCK: + proxy_config.remove_auto_router_catalog_entries(frozenset({model_info.id})) + if llm_router is not None: llm_router.delete_deployment(id=model_info.id) # Runs after the row delete so the sibling check sees post-delete state. diff --git a/litellm/proxy/management_endpoints/router_settings_endpoints.py b/litellm/proxy/management_endpoints/router_settings_endpoints.py index d6d74ada35a..a557e3a6082 100644 --- a/litellm/proxy/management_endpoints/router_settings_endpoints.py +++ b/litellm/proxy/management_endpoints/router_settings_endpoints.py @@ -33,6 +33,9 @@ class RouterSettingsResponse(BaseModel): fields: list[RouterSettingsField] = Field(description="List of all configurable router settings with metadata") current_values: dict[str, Any] = Field(description="Current values of router settings") routing_strategy_descriptions: dict[str, str] = Field(description="Descriptions for each routing strategy option") + routing_group_strategies: tuple[str, ...] = Field( + description="Strategies supported when constructing a routing group" + ) source: dict[str, FieldSource] = Field(description="Source of each current router setting") @@ -41,6 +44,9 @@ class RouterFieldsResponse(BaseModel): description="List of all configurable router settings with metadata (without field values)" ) routing_strategy_descriptions: dict[str, str] = Field(description="Descriptions for each routing strategy option") + routing_group_strategies: tuple[str, ...] = Field( + description="Strategies supported when constructing a routing group" + ) def _router_setting_source( @@ -114,7 +120,10 @@ async def get_router_settings( if llm_router is not None: # Router exposes routing groups as private `_routing_groups`; the # generic `hasattr` loop below would miss them. - current_values["routing_groups"] = [group.model_dump() for group in llm_router._routing_groups.values()] + current_values["routing_groups"] = [ + group.model_dump(exclude=frozenset(("model_priorities",)) if group.model_priorities is None else None) + for group in llm_router._routing_groups.values() + ] for field in router_fields: if field.field_name == "routing_groups": continue @@ -147,6 +156,7 @@ async def get_router_settings( fields=router_fields, current_values=current_values, routing_strategy_descriptions=ROUTING_STRATEGY_DESCRIPTIONS, + routing_group_strategies=(*available_routing_strategies, "priority"), source=source, ) except Exception as e: @@ -196,6 +206,7 @@ async def get_router_fields( return RouterFieldsResponse( fields=router_fields, routing_strategy_descriptions=ROUTING_STRATEGY_DESCRIPTIONS, + routing_group_strategies=(*available_routing_strategies, "priority"), ) except Exception as e: verbose_proxy_logger.error("Error fetching router fields: %s", e) diff --git a/litellm/proxy/management_endpoints/team_endpoints.py b/litellm/proxy/management_endpoints/team_endpoints.py index 0a142166bc5..d092fc2fbb7 100644 --- a/litellm/proxy/management_endpoints/team_endpoints.py +++ b/litellm/proxy/management_endpoints/team_endpoints.py @@ -118,6 +118,7 @@ from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import evict_and_ from litellm.proxy.common_utils.callback_utils import encrypt_callback_vars from litellm.proxy.common_utils.json_merge_patch import apply_json_merge_patch from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache +from litellm.proxy.hooks.key_management_event_hooks import KeyManagementEventHooks from litellm.proxy.hooks.model_max_budget_limiter import ( build_model_max_budget_usage, resolve_model_budget, @@ -3751,6 +3752,13 @@ async def _team_member_delete( } ) + if keys_to_delete: + KeyManagementEventHooks.create_key_deleted_audit_logs( + keys_being_deleted=keys_to_delete, + user_api_key_dict=user_api_key_dict, + litellm_changed_by=None, + ) + await delete_cache_team_object( team_id=data.team_id, team_alias=existing_team_row.team_alias, @@ -4469,6 +4477,13 @@ async def delete_team( await prisma_client.delete_data(team_id_list=data.team_ids, table_name="key") + if keys_to_delete: + KeyManagementEventHooks.create_key_deleted_audit_logs( + keys_being_deleted=keys_to_delete, + user_api_key_dict=user_api_key_dict, + litellm_changed_by=litellm_changed_by, + ) + await _invalidate_deleted_key_cache( keys=keys_to_delete, user_api_key_cache=user_api_key_cache, diff --git a/litellm/proxy/management_helpers/auto_router_availability.py b/litellm/proxy/management_helpers/auto_router_availability.py new file mode 100644 index 00000000000..52cd9f0499b --- /dev/null +++ b/litellm/proxy/management_helpers/auto_router_availability.py @@ -0,0 +1,148 @@ +from collections.abc import Mapping, Sequence +from copy import deepcopy +from dataclasses import dataclass +from types import MappingProxyType +from typing import Final + +from pydantic import BaseModel, Json, TypeAdapter, ValidationError + +from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_value_helper +from litellm.router_utils.auto_router_model_naming import ( + GATED_AUTO_ROUTER_CAPABILITIES, + capability_limit_violation, + classify_strategy_router_model, + count_capability_routers, + gated_capability_of, +) +from litellm.router_utils.auto_router_tuning_baseline import ( + is_mutable_tuned_candidate, + mutable_tuned_identities, + tuning_quota_violation, +) +from litellm.types.management_endpoints.auto_router_endpoints import ( + AutoRouterAllowance, + AutoRouterAvailabilityResponse, +) + + +class _CatalogModelInfo(BaseModel): + team_id: str | None = None + + +class _CatalogSource(BaseModel): + model_id: str + created_by: str | None = None + litellm_params: Json[dict[str, object]] | dict[str, object] + model_info: Json[_CatalogModelInfo] | _CatalogModelInfo | None = None + + +@dataclass(frozen=True, slots=True) +class AutoRouterCatalogEntry: + model_id: str + team_id: str | None + created_by: str | None + deployment: Mapping[str, object] + + +def _catalog_field(value: object, key: str) -> object: + if not isinstance(value, str): + return deepcopy(value) + return decrypt_value_helper(value, key=key, exception_type="debug", return_original_value=True) + + +def build_auto_router_catalog(rows: Sequence[object]) -> tuple[AutoRouterCatalogEntry, ...] | None: + try: + sources: Final = TypeAdapter(tuple[_CatalogSource, ...]).validate_python(rows, from_attributes=True) + except ValidationError: + return None + return tuple( + AutoRouterCatalogEntry( + model_id=row.model_id, + team_id=row.model_info.team_id if row.model_info is not None else None, + created_by=row.created_by, + deployment=MappingProxyType( + { + "litellm_params": MappingProxyType( + { + "model": model, + "complexity_router_config": _catalog_field( + row.litellm_params.get("complexity_router_config"), "complexity_router_config" + ), + } + ), + "model_info": MappingProxyType({"id": row.model_id, "db_model": True}), + } + ), + ) + for row in sources + if isinstance(model := _catalog_field(row.litellm_params.get("model"), "model"), str) + and classify_strategy_router_model(model) == "complexity" + ) + + +def auto_router_availability( + *, + others: Sequence[Mapping[str, object]], + existing: Mapping[str, object] | None, + candidate: Mapping[str, object], + baselines: Mapping[str, str] | None, + limit: int | None, +) -> AutoRouterAvailabilityResponse: + existing_params: Final = None if existing is None else existing.get("litellm_params") + candidate_params: Final = candidate.get("litellm_params") + owned: Final = gated_capability_of(existing_params) if isinstance(existing_params, Mapping) else None + claimed: Final = gated_capability_of(candidate_params) if isinstance(candidate_params, Mapping) else None + counts: Final = tuple( + (capability, count_capability_routers(others, capability=capability)) + for capability in GATED_AUTO_ROUTER_CAPABILITIES + ) + tuned_count: Final = len(mutable_tuned_identities(others, baselines)) if baselines is not None else 0 + allowances: Final = tuple( + AutoRouterAllowance( + key=capability.key, + limit=limit, + remaining=None if limit is None else max(0, limit - held), + used_by_this_router=owned is capability, + ) + for capability, held in counts + ) + capability_error: Final = next( + ( + capability_limit_violation(capability=capability, held=held + 1, limit=limit) + for capability, held in counts + if capability is claimed + ), + None, + ) + tuning_error: Final = ( + tuning_quota_violation(candidate=candidate, others=others, baselines=baselines, limit=limit) + if baselines is not None + else None + ) + capability_labels: Final = { + "heuristic_v2": "Heuristic v2", + "capability": "Capability", + "llm_v2": "Fuse v2", + "tier_or_classifier_prompt": "Custom tiers or classifier instructions", + } + return AutoRouterAvailabilityResponse( + allowances=( + *allowances, + AutoRouterAllowance( + key="heuristic_tuning", + limit=limit, + remaining=None if limit is None or baselines is None else max(0, limit - tuned_count), + available=limit is None or baselines is not None, + used_by_this_router=bool( + existing is not None and baselines is not None and is_mutable_tuned_candidate(existing, baselines) + ), + ), + ), + error=( + f"{capability_labels[claimed.key]} has no available allowance. Choose another option or free an existing allowance." + if capability_error is not None and claimed is not None + else "These scoring rules need an available Rule-based tuning allowance. Check the weights, thresholds, keywords, and custom dimensions in Advanced settings. Model choices do not use this allowance." + if tuning_error is not None + else None + ), + ) diff --git a/litellm/proxy/management_helpers/bulk_user_deletion.py b/litellm/proxy/management_helpers/bulk_user_deletion.py index af51a194413..8b5b601fe8a 100644 --- a/litellm/proxy/management_helpers/bulk_user_deletion.py +++ b/litellm/proxy/management_helpers/bulk_user_deletion.py @@ -31,6 +31,7 @@ from litellm.proxy._types import ( from litellm.proxy.auth.auth_checks import delete_cache_key_objects, get_jwt_key_mapping_cache_keys_for_tokens from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import evict_and_broadcast from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache +from litellm.proxy.hooks.key_management_event_hooks import KeyManagementEventHooks from litellm.proxy.hooks.user_management_event_hooks import UserManagementEventHooks from litellm.proxy.list_api.common import PROBLEM_TYPE_BASE, ManagementProblem from litellm.proxy.management_endpoints.common_utils import ( @@ -93,20 +94,28 @@ class _TeamRemoval: team: LiteLLM_TeamTable removed: frozenset[str] matched: frozenset[int] - deleted_key_tokens: tuple[str, ...] + deleted_keys: tuple["prisma_models.LiteLLM_VerificationToken", ...] jwt_mapping_cache_keys: tuple[str, ...] + @property + def deleted_key_tokens(self) -> tuple[str, ...]: + return tuple(k.token for k in self.deleted_keys) + @dataclass(frozen=True, slots=True) class _UserBatchDeletion: removals: Mapping[str, _TeamRemoval] - deleted_key_tokens: tuple[str, ...] + deleted_keys: tuple["prisma_models.LiteLLM_VerificationToken", ...] jwt_mapping_cache_keys: tuple[str, ...] + @property + def deleted_key_tokens(self) -> tuple[str, ...]: + return tuple(k.token for k in self.deleted_keys) + @dataclass(frozen=True, slots=True) class _DeletedKeys: - tokens: tuple[str, ...] + keys: tuple["prisma_models.LiteLLM_VerificationToken", ...] jwt_mapping_cache_keys: tuple[str, ...] @@ -276,7 +285,7 @@ async def _remove_members_from_team( ), removed=cleanup_ids, matched=matched, - deleted_key_tokens=tuple(k.token for k in keys), + deleted_keys=tuple(keys), jwt_mapping_cache_keys=jwt_mapping_cache_keys, ) @@ -330,6 +339,12 @@ async def bulk_remove_team_members( members: Final = tuple(data.members[i] for i in kept_indexes) async with prisma_client.tx(timeout=_BATCH_TX_TIMEOUT) as tx: removal: Final = await _remove_members_from_team(prisma_client, tx, team_id, members, user_api_key_dict) + if removal.deleted_keys: + KeyManagementEventHooks.create_key_deleted_audit_logs( + keys_being_deleted=removal.deleted_keys, + user_api_key_dict=user_api_key_dict, + litellm_changed_by=None, + ) await delete_cache_key_objects( hashed_tokens=removal.deleted_key_tokens, user_api_key_cache=user_api_key_cache, @@ -407,7 +422,7 @@ async def _delete_user_rows( await _org_membership_tx_db(tx).delete_many(where=_in_filter("user_id", user_ids)) await _membership_tx_db(tx).delete_many(where=_in_filter("user_id", user_ids)) await _user_tx_db(tx).delete_many(where=_in_filter("user_id", user_ids)) - return _DeletedKeys(tokens=tuple(k.token for k in keys), jwt_mapping_cache_keys=jwt_mapping_cache_keys) + return _DeletedKeys(keys=tuple(keys), jwt_mapping_cache_keys=jwt_mapping_cache_keys) async def _delete_users_tx( @@ -446,7 +461,7 @@ async def _delete_users_tx( ) return _UserBatchDeletion( removals=removals, - deleted_key_tokens=deleted_keys.tokens + tuple(t for r in removals.values() for t in r.deleted_key_tokens), + deleted_keys=deleted_keys.keys + tuple(k for r in removals.values() for k in r.deleted_keys), jwt_mapping_cache_keys=deleted_keys.jwt_mapping_cache_keys + tuple(k for r in removals.values() for k in r.jwt_mapping_cache_keys), ) @@ -469,6 +484,12 @@ async def _delete_users( except Exception as e: # noqa: BLE001 # the rolled-back batch is reported per row, not as a request failure verbose_proxy_logger.error("users/bulk_delete: failed to delete users %s: %s", sorted(user_ids), e) return _error_message(e) + if deletion.deleted_keys: + KeyManagementEventHooks.create_key_deleted_audit_logs( + keys_being_deleted=deletion.deleted_keys, + user_api_key_dict=user_api_key_dict, + litellm_changed_by=litellm_changed_by, + ) await delete_cache_key_objects( hashed_tokens=deletion.deleted_key_tokens, user_api_key_cache=user_api_key_cache, @@ -555,7 +576,7 @@ async def bulk_delete_users( litellm_changed_by, ) if candidates - else _UserBatchDeletion(removals=MappingProxyType({}), deleted_key_tokens=(), jwt_mapping_cache_keys=()) + else _UserBatchDeletion(removals=MappingProxyType({}), deleted_keys=(), jwt_mapping_cache_keys=()) ) def result(index: int, user_id: str) -> UserDeleteResult: diff --git a/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py b/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py index b1960b9a046..2d071343844 100644 --- a/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py +++ b/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py @@ -53,7 +53,7 @@ from litellm.llms.deepgram.common_utils import ( deepgram_listen_requested_model, deepgram_listen_websocket_target, ) -from litellm.llms.fal_ai.cost_calculator import fal_ai_queue_base +from litellm.llms.fal_ai.cost_calculator import fal_ai_passthrough_cost, fal_ai_queue_base from litellm.llms.nvidia_nim.passthrough.transformation import nvidia_nim_model_group_in_path from litellm.llms.vertex_ai.vertex_llm_base import VertexBase from litellm.passthrough.main import AsyncPassthroughStreamingResponse @@ -460,13 +460,11 @@ async def fal_ai_proxy_route( status_code=401, detail="FAL_AI_API_KEY is not set and no fal_ai pass-through deployment credentials are configured", ) - if "/requests/" not in endpoint: - priced_model: Final = f"fal_ai/{endpoint}" - if priced_model not in (litellm.model_cost or {}): - raise HTTPException( - status_code=400, - detail=f"{priced_model} has no pricing entry; only priced Fal endpoints can be submitted through /fal_ai", - ) + if "/requests/" not in endpoint and fal_ai_passthrough_cost(endpoint, await _read_request_body(request)) is None: + raise HTTPException( + status_code=400, + detail=f"fal_ai/{endpoint} has no pricing entry for this request; only priced Fal requests can be submitted through /fal_ai", + ) endpoint_func: Final = create_pass_through_route( endpoint=endpoint, target=str(updated_url), diff --git a/litellm/proxy/policy_engine/policy_matcher.py b/litellm/proxy/policy_engine/policy_matcher.py index e0f558b5085..2ea2def8331 100644 --- a/litellm/proxy/policy_engine/policy_matcher.py +++ b/litellm/proxy/policy_engine/policy_matcher.py @@ -12,6 +12,7 @@ from typing import Final from litellm._logging import verbose_proxy_logger from litellm.proxy.auth.route_checks import RouteChecks +from litellm.proxy.policy_engine.policy_resolver import PolicyResolver from litellm.types.proxy.policy_engine import Policy, PolicyMatchContext, PolicyScope @@ -136,14 +137,46 @@ class PolicyMatcher: context: PolicyMatchContext, policies: dict[str, Policy] | None = None, ) -> Callable[[str], bool]: - """Predicate telling whether a policy exists and its condition matches the context.""" + """ + Predicate telling whether a policy exists and any policy in its + inheritance chain applies to the context. Admissions where the + policy's own condition missed but an ancestor applies are logged at + INFO, once per attachment scan. + """ resolved: Final = policies if policies is not None else PolicyMatcher._registry_policies() - return lambda policy_name: bool( - PolicyMatcher.get_policies_with_matching_conditions( - policy_names=(policy_name,), - context=context, - policies=resolved, + + def applies(policy_name: str) -> bool: + applying: Final = PolicyMatcher._applying_chain_members( + policy_name=policy_name, context=context, policies=resolved ) + if applying and policy_name not in applying: + verbose_proxy_logger.info( + "Policy '%s' applied through ancestor '%s' although its own condition did not match " + "(team_alias=%s, key_alias=%s, model=%s)", + policy_name, + applying[0], + context.team_alias, + context.key_alias, + context.model, + ) + return bool(applying) + + return applies + + @staticmethod + def _applying_chain_members( + policy_name: str, + context: PolicyMatchContext, + policies: dict[str, Policy], + ) -> tuple[str, ...]: + from litellm.proxy.policy_engine.condition_evaluator import ConditionEvaluator + + chain: Final = PolicyResolver.resolve_inheritance_chain(policy_name=policy_name, policies=policies) + return tuple( + name + for name in chain + if (policy := policies.get(name)) is not None + and (policy.condition is None or ConditionEvaluator.evaluate(policy.condition, context)) ) @staticmethod @@ -160,11 +193,14 @@ class PolicyMatcher: policies: dict[str, Policy] | None = None, ) -> list[str]: """ - Filter policies to only those whose conditions match the context. + Filter policies to only those that apply to the given context. - A policy's condition matches if: - - The policy has no condition (condition is None), OR - - The policy's condition evaluates to True for the given context + A policy applies when any policy in its inheritance chain has no + condition or a condition that evaluates to True for the context. The + resolver then drops only the chain members whose own condition fails, + so a child whose condition misses still contributes the guardrails of + its unconditional ancestors. A missing policy resolves to an empty + chain and does not apply. Args: policy_names: List of policy names to filter @@ -172,19 +208,11 @@ class PolicyMatcher: policies: Dictionary of all policies (if None, uses global registry) Returns: - List of policy names whose conditions match the context + List of policy names that apply to the context """ - from litellm.proxy.policy_engine.condition_evaluator import ConditionEvaluator - resolved: Final = policies if policies is not None else PolicyMatcher._registry_policies() - - matching_policies: Final = [] - for policy_name in policy_names: - policy = resolved.get(policy_name) - if policy is None: - continue - # Policy matches if it has no condition OR condition evaluates to True - if policy.condition is None or ConditionEvaluator.evaluate(policy.condition, context): - matching_policies.append(policy_name) - - return matching_policies + return [ + policy_name + for policy_name in policy_names + if PolicyMatcher._applying_chain_members(policy_name, context, resolved) + ] diff --git a/litellm/proxy/policy_engine/policy_resolver.py b/litellm/proxy/policy_engine/policy_resolver.py index 70503f85b03..e1422d79e15 100644 --- a/litellm/proxy/policy_engine/policy_resolver.py +++ b/litellm/proxy/policy_engine/policy_resolver.py @@ -210,6 +210,7 @@ class PolicyResolver: Returns: List of (policy_name, GuardrailPipeline) tuples """ + from litellm.proxy.policy_engine.condition_evaluator import ConditionEvaluator from litellm.proxy.policy_engine.policy_matcher import PolicyMatcher from litellm.proxy.policy_engine.policy_registry import get_policy_registry @@ -230,6 +231,11 @@ class PolicyResolver: policy = policies.get(policy_name) if policy is None: continue + if policy.condition is not None and not ConditionEvaluator.evaluate( + condition=policy.condition, context=context + ): + verbose_proxy_logger.debug("Policy '%s' condition did not match, skipping pipeline", policy_name) + continue if policy.pipeline is not None: pipelines.append((policy_name, policy.pipeline)) verbose_proxy_logger.debug( diff --git a/litellm/proxy/proxy_cli.py b/litellm/proxy/proxy_cli.py index 78885461724..ac69f2e3894 100644 --- a/litellm/proxy/proxy_cli.py +++ b/litellm/proxy/proxy_cli.py @@ -33,21 +33,20 @@ else: FastAPI = Any -def _deprioritize_script_dir_in_sys_path() -> None: +def _drop_script_dir_from_sys_path() -> None: """Stop ``litellm/proxy`` modules from shadowing installed packages. Running this file as a script puts its own directory at ``sys.path[0]``, so ``import a2a`` resolves to ``litellm/proxy/a2a`` instead of the ``a2a`` SDK - and A2A agent calls fail. The entry is moved to the end rather than dropped, - because the sibling-import fallbacks in this module (``from proxy_server - import ...``) still need it. No-op under the ``litellm`` console script. + and ``proxy_server`` resolves to a second copy of + ``litellm.proxy.proxy_server``. No-op under the ``litellm`` console script. """ script_dir: Final = os.path.dirname(os.path.abspath(__file__)) if sys.path and os.path.abspath(sys.path[0]) == script_dir: - sys.path.append(sys.path.pop(0)) + sys.path.pop(0) -_deprioritize_script_dir_in_sys_path() +_drop_script_dir_from_sys_path() sys.path.append(os.getcwd()) config_filename: Final = "litellm.secrets" @@ -881,7 +880,7 @@ class ProxyInitializationHelpers: default=False, help="Use prisma db push instead of prisma migrate for database schema updates", ) -@click.option("--local", is_flag=True, default=False, help="for local debugging") +@click.option("--local", is_flag=True, default=False, help="no-op, kept for backwards compatibility") @click.option( "--skip_server_startup", is_flag=True, @@ -1058,35 +1057,15 @@ def run_server( return args: Final = locals() - if local: - from proxy_server import ( + try: + from litellm.proxy.proxy_server import ( KeyManagementSettings, ProxyConfig, app, save_worker_config, ) - else: - try: - from .proxy_server import ( - KeyManagementSettings, - ProxyConfig, - app, - save_worker_config, - ) - except ModuleNotFoundError as e: - raise ModuleNotFoundError(f"Missing dependency {e}. Run `pip install 'litellm[proxy]'`") - except ImportError as e: - if "litellm[proxy]" in str(e): - # user is missing a proxy dependency, ask them to pip install litellm[proxy] - raise e - else: - # this is just a local/relative import error, user git cloned litellm - from proxy_server import ( - KeyManagementSettings, - ProxyConfig, - app, - save_worker_config, - ) + except ModuleNotFoundError as e: + raise ModuleNotFoundError(f"Missing dependency {e}. Run `pip install 'litellm[proxy]'`") from e if version is True: ProxyInitializationHelpers._echo_litellm_version() return @@ -1283,6 +1262,7 @@ def run_server( if os.getenv("DATABASE_URL", None) is not None or os.getenv("DIRECT_URL", None) is not None: from litellm.proxy.db.db_url_settings import ( + DISABLE_PREPARED_STATEMENTS_ENV_VAR, add_missing_query_params, idle_lifetime_params, reader_shareable_params, @@ -1305,12 +1285,16 @@ def run_server( sys.exit(1) from litellm.secret_managers.main import get_secret + env_disable_prepared_statements: Final = token_auth_flag_enabled( + os.getenv(DISABLE_PREPARED_STATEMENTS_ENV_VAR), env_var=DISABLE_PREPARED_STATEMENTS_ENV_VAR + ) + disable_prepared_statements: Final = db_disable_prepared_statements or env_disable_prepared_statements connection_url_params: Final = _build_db_connection_url_params( connection_limit=db_connection_pool_limit, pool_timeout=db_connection_timeout, connect_timeout=db_connect_timeout, socket_timeout=db_socket_timeout, - disable_prepared_statements=db_disable_prepared_statements, + disable_prepared_statements=disable_prepared_statements, extra_params=db_extra_connection_params, ) lifetime_params: Final = idle_lifetime_params(general_settings.get("database_max_idle_connection_lifetime")) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 18bc02467d1..dab7decd4dc 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -132,6 +132,8 @@ from litellm.proxy.common_utils.callback_utils import ( strip_callback_config, ) from litellm.proxy.common_utils.realtime_utils import _realtime_request_body +from litellm.proxy.management_helpers.auto_router_availability import AutoRouterCatalogEntry, build_auto_router_catalog +from litellm.router_utils.access_windows import access_windows_config_error from litellm.router_utils.add_retry_fallback_headers import ( get_fallback_errors_from_headers, get_hidden_params_dict, @@ -309,6 +311,7 @@ from litellm.litellm_core_utils.core_helpers import ( from litellm.litellm_core_utils.credential_accessor import CredentialAccessor from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj from litellm.litellm_core_utils.realtime_errors import ( + close_after_upstream_handshake_refusal, realtime_error_event, websocket_close_reason, ) @@ -594,6 +597,7 @@ from litellm.proxy.management_endpoints.key_management_endpoints import ( delete_verification_tokens, duration_in_seconds, generate_key_helper_fn, + parse_key_alias_pattern, ) from litellm.proxy.management_endpoints.key_management_endpoints import ( router as key_management_router, @@ -4852,6 +4856,22 @@ def validate_deployment_complexity_router_placement(model: Mapping[str, object]) raise ValueError(f"model {model.get('model_name', '')!r}: {violation}") +def validate_deployment_access_windows(model: Mapping[str, object]) -> None: + """ + Reject a malformed `model_info.access_windows` instead of silently dropping the deployment. + + Checked here rather than on `ModelInfo` because the proxy builds its router with + `ignore_invalid_deployments=True`, so a rejection further down turns a bad + deployment into a silently missing model instead of a refusal to start. + """ + model_info: Final = model.get("model_info") + if not isinstance(model_info, Mapping): + return + error: Final = access_windows_config_error(model_info, model_name=str(model.get("model_name", ""))) + if error is not None: + raise ValueError(error) + + def validate_auto_router_capability_limits(model_list: Sequence[Mapping[str, object]], *, limit: int | None) -> None: """ Refuse to start when config.yaml defines more auto-routers claiming a licensed capability than allowed. @@ -5049,6 +5069,7 @@ class ProxyConfig: def __init__(self) -> None: self.config: Mapping[str, object] = MappingProxyType({}) + self.auto_router_db_catalog: tuple[AutoRouterCatalogEntry, ...] | None = None self._last_semantic_filter_config: dict[str, object] | None = None self._last_websearch_interception_config: dict[str, object] | None = None self._last_hashicorp_vault_config: dict[str, object] | None = None @@ -6248,6 +6269,8 @@ class ProxyConfig: litellm.upperbound_key_generate_params = LiteLLM_UpperboundKeyGenerateParams(**value) else: raise Exception(f"Invalid value set for upperbound_key_generate_params - value={value}") + elif key == "key_alias_pattern": + litellm.key_alias_pattern = parse_key_alias_pattern(value) elif key == "json_logs" and value is True: litellm.json_logs = True litellm._turn_on_json() @@ -6552,6 +6575,7 @@ class ProxyConfig: model["litellm_params"][k] = get_secret(v) validate_deployment_max_agentic_loops(model) validate_deployment_complexity_router_placement(model) + validate_deployment_access_windows(model) pin_complexity_router_model_id(model) complexity_router_config = model["litellm_params"].get("complexity_router_config") if isinstance(complexity_router_config, dict): @@ -7669,6 +7693,12 @@ class ProxyConfig: def _should_load_db_object(self, object_type: str | SupportedDBObjectType) -> bool: return should_load_db_object(object_type=object_type) + def remove_auto_router_catalog_entries(self, model_ids: frozenset[str]) -> None: + if self.auto_router_db_catalog is not None: + self.auto_router_db_catalog = tuple( + row for row in self.auto_router_db_catalog if row.model_id not in model_ids + ) + async def _get_models_from_db(self, prisma_client: PrismaClient) -> Sequence[_ProxyModelRow] | None: """ Fetch all model deployments from the DB. @@ -7689,6 +7719,7 @@ class ProxyConfig: new_models: Final[Sequence[_ProxyModelRow]] = await ModelRepository( WriterPinnedClient(prisma_client.db) ).table.find_many() + self.auto_router_db_catalog = build_auto_router_catalog(new_models) return new_models except Exception as e: verbose_proxy_logger.exception( @@ -12513,9 +12544,9 @@ async def realtime_websocket_endpoint( user_model=user_model, ) await llm_call - except websockets.exceptions.InvalidStatusCode as e: + except websockets.exceptions.InvalidStatus as e: verbose_proxy_logger.exception("Invalid status code") - await websocket.close(code=e.status_code, reason="Invalid status code") + await close_after_upstream_handshake_refusal(websocket, e.response.status_code) except Exception as e: verbose_proxy_logger.exception("Internal server error") redacted_error: Final = _redact_string(str(e)) diff --git a/litellm/proxy/public_endpoints/autorouter_presets.json b/litellm/proxy/public_endpoints/autorouter_presets.json index 7a251afc076..1c2f96350c6 100644 --- a/litellm/proxy/public_endpoints/autorouter_presets.json +++ b/litellm/proxy/public_endpoints/autorouter_presets.json @@ -1,18 +1,18 @@ { "1m_context": { "label": "1M Context", - "description": "Routes across models with 1M-token context windows: Luna for simple queries, Terra for medium, Sol for complex, Opus 5 at high thinking for reasoning.", + "description": "Routes across models with 1M-token context windows: GPT-6 Luna for simple queries, GPT-5.6 Terra for medium, GPT-6 Sol for complex, Opus 5.5 at high thinking for reasoning.", "complexity_router_config": { "tiers": { - "SIMPLE": ["gpt-5.6-luna"], + "SIMPLE": ["gpt-6-luna"], "MEDIUM": ["gpt-5.6-terra"], - "COMPLEX": ["gpt-5.6-sol"], - "REASONING": ["claude-opus-5"] + "COMPLEX": ["gpt-6-sol"], + "REASONING": ["claude-opus-5-5"] }, "tier_model_configs": { "REASONING": [ { - "model_name": "claude-opus-5", + "model_name": "claude-opus-5-5", "litellm_params": { "reasoning_effort": "high" } } ] @@ -28,12 +28,12 @@ }, "anthropic_family": { "label": "Anthropic Family", - "description": "Routes across the Claude model family: Haiku for simple queries, Sonnet for medium, Opus for complex, Fable 5.1 at high thinking for reasoning.", + "description": "Routes across the Claude model family: Haiku for simple queries, Sonnet for medium, Opus 5.5 for complex, Fable 5.1 at high thinking for reasoning.", "complexity_router_config": { "tiers": { "SIMPLE": ["claude-haiku-4-5"], "MEDIUM": ["claude-sonnet-5"], - "COMPLEX": ["claude-opus-5"], + "COMPLEX": ["claude-opus-5-5"], "REASONING": ["claude-fable-5-1"] }, "tier_model_configs": { @@ -55,12 +55,12 @@ }, "gemini_family": { "label": "Gemini Family", - "description": "Routes across the Gemini model family: Flash Lite 2.5 for simple queries, Flash Lite 3.1 for medium, Flash 3.7 for complex, Pro 3.1 for reasoning-heavy requests.", + "description": "Routes across the Gemini model family: Flash Lite 3.5 for simple queries, Flash 3.8 for medium and complex queries, Pro 3.1 for reasoning-heavy requests.", "complexity_router_config": { "tiers": { - "SIMPLE": ["gemini-2.5-flash-lite"], - "MEDIUM": ["gemini-3.1-flash-lite"], - "COMPLEX": ["gemini-3.7-flash"], + "SIMPLE": ["gemini-3.5-flash-lite"], + "MEDIUM": ["gemini-3.8-flash"], + "COMPLEX": ["gemini-3.8-flash"], "REASONING": ["gemini-3.1-pro-preview"] }, "classifier_type": "heuristic", @@ -74,18 +74,18 @@ }, "lite": { "label": "Lite", - "description": "Cost-optimized routing across providers: DeepSeek V4 Flash for simple queries, Muse Spark 1.2 at xhigh for medium, Kimi K3 at max for complex, Claude Opus 5 for reasoning. An LLM classifier with the agentic rubric assigns tiers.", + "description": "Cost-optimized routing across providers: DeepSeek V4 Flash for simple queries, Muse Spark 1.3 at xhigh for medium, Kimi K3 at max for complex, Claude Opus 5.5 for reasoning. An LLM classifier with the agentic rubric assigns tiers.", "complexity_router_config": { "tiers": { "SIMPLE": ["deepseek-v4-flash"], - "MEDIUM": ["muse-spark-1.2"], + "MEDIUM": ["muse-spark-1.3"], "COMPLEX": ["kimi-k3"], - "REASONING": ["claude-opus-5"] + "REASONING": ["claude-opus-5-5"] }, "tier_model_configs": { "MEDIUM": [ { - "model_name": "muse-spark-1.2", + "model_name": "muse-spark-1.3", "litellm_params": { "reasoning_effort": "xhigh" } } ], @@ -113,12 +113,12 @@ }, "openai_family": { "label": "OpenAI Family", - "description": "Routes across the GPT model family: Luna for simple queries, Terra for medium, Sol for complex, Astra at xhigh thinking for reasoning.", + "description": "Routes across the GPT model family: GPT-6 Luna for simple queries, GPT-5.6 Terra for medium, GPT-6 Sol for complex, GPT-6 Astra at xhigh thinking for reasoning.", "complexity_router_config": { "tiers": { - "SIMPLE": ["gpt-5.6-luna"], + "SIMPLE": ["gpt-6-luna"], "MEDIUM": ["gpt-5.6-terra"], - "COMPLEX": ["gpt-5.6-sol"], + "COMPLEX": ["gpt-6-sol"], "REASONING": ["gpt-6-astra"] }, "tier_model_configs": { diff --git a/litellm/proxy/spend_tracking/spend_management_endpoints.py b/litellm/proxy/spend_tracking/spend_management_endpoints.py index a319535f725..822b827f985 100644 --- a/litellm/proxy/spend_tracking/spend_management_endpoints.py +++ b/litellm/proxy/spend_tracking/spend_management_endpoints.py @@ -69,6 +69,18 @@ _SESSION_KEY_EXPR: Final = "COALESCE(NULLIF(session_id, ''), request_id)" _SESSION_GROUP_KEY_SQL: Final = f"{_SESSION_KEY_EXPR}, api_key" _MCP_CALL_TYPES_SQL: Final = "('call_mcp_tool', 'list_mcp_tools')" _AGENT_CALL_TYPE_SQL: Final = "'asend_message'" +_BATCH_CALL_TYPES_SQL: Final = "('acreate_batch', 'create_batch', 'aretrieve_batch', 'retrieve_batch')" +_SPAN_TYPE_SQL_CONDITIONS: Final[Mapping[str, str]] = MappingProxyType( + { + "mcp": f"call_type IN {_MCP_CALL_TYPES_SQL}", + "agent": f"call_type = {_AGENT_CALL_TYPE_SQL}", + "batch": f"call_type IN {_BATCH_CALL_TYPES_SQL}", + "llm": ( + f"(call_type NOT IN {_MCP_CALL_TYPES_SQL} AND call_type != {_AGENT_CALL_TYPE_SQL} " + f"AND call_type NOT IN {_BATCH_CALL_TYPES_SQL})" + ), + } +) _SPEND_LOG_LIST_COLUMNS: Final = """ request_id, call_type, api_key, spend, total_tokens, prompt_tokens, completion_tokens, "startTime", "endTime", @@ -2311,6 +2323,13 @@ async def calculate_spend(request: SpendCalculateRequest): param=getattr(e, "param", "None"), code=getattr(e, "status_code", status.HTTP_400_BAD_REQUEST), ) + if isinstance(e, litellm.exceptions.ModelNotMappedError): + raise ProxyException( + message=str(e), + type="invalid_request_error", + param="model", + code=status.HTTP_400_BAD_REQUEST, + ) error_msg: Final = f"{e}" raise ProxyException( message=getattr(e, "message", error_msg), @@ -2410,6 +2429,10 @@ async def ui_view_spend_logs( default=None, description="Filter logs by cache state: 'hit' or 'miss'. Miss includes legacy rows with a null/unknown cache state", ), + span_type: str | None = fastapi.Query( + default=None, + description="Filter logs by span type: llm, agent, mcp, or batch", + ), model: str | None = fastapi.Query(default=None, description="Filter logs by model"), model_id: str | None = fastapi.Query( default=None, @@ -2512,6 +2535,13 @@ async def ui_view_spend_logs( param="cache_hit_filter", code=status.HTTP_400_BAD_REQUEST, ) + if isinstance(span_type, str) and span_type not in _SPAN_TYPE_SQL_CONDITIONS: + raise ProxyException( + message=f"Invalid span_type: {span_type}. Must be one of: llm, agent, mcp, batch", + type="bad_request", + param="span_type", + code=status.HTTP_400_BAD_REQUEST, + ) try: is_admin_view: Final = _is_admin_view_safe(user_api_key_dict=user_api_key_dict) @@ -2776,6 +2806,10 @@ async def ui_view_spend_logs( elif cache_hit_filter == "miss": sql_conditions.append("(cache_hit IS NULL OR LOWER(cache_hit) != 'true')") + span_type_condition: Final = _span_type_sql_condition(span_type) + if span_type_condition is not None: + sql_conditions.append(span_type_condition) + if exclude_internal_health_checks: sql_conditions.append(f"api_key NOT IN (${p}, ${p + 1})") sql_params.extend(_INTERNAL_HEALTH_CHECK_API_KEYS) @@ -4673,6 +4707,12 @@ def _build_status_filter_condition(status_filter: str | None) -> Mapping[str, ob return {"status": {"equals": status_filter}} +def _span_type_sql_condition(span_type: str | None) -> str | None: + if span_type is None: + return None + return _SPAN_TYPE_SQL_CONDITIONS.get(span_type) + + def _is_admin_view_safe(user_api_key_dict: UserAPIKeyAuth) -> bool: """ Safely determine if the current user has admin view permissions. diff --git a/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py b/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py index f4d4ccf5851..d520177965c 100644 --- a/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py +++ b/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py @@ -364,11 +364,18 @@ ALLOWED_UI_SETTINGS_FIELDS: Final = { } ENABLE_PTU_COST_ATTRIBUTION_UI_SETTING: Final = "enable_ptu_cost_attribution" +APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING: Final = "apply_user_budget_to_team_keys" # UI settings derived from the deployment environment. Deliberately kept out of # ALLOWED_UI_SETTINGS_FIELDS: they are read-only, never persisted, and PATCH # rejects them so an admin cannot flip an env-gated feature at runtime. -_DERIVED_UI_SETTINGS_FIELDS: Final[frozenset[str]] = frozenset({ENABLE_PTU_COST_ATTRIBUTION_UI_SETTING}) +_DERIVED_UI_SETTINGS_FIELDS: Final[frozenset[str]] = frozenset( + {ENABLE_PTU_COST_ATTRIBUTION_UI_SETTING, APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING} +) + + +def _apply_user_budget_to_team_keys_enabled(settings: Mapping[str, object]) -> bool: + return settings.get(APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING) is True def _derived_ui_setting_value(key: str) -> object: @@ -381,6 +388,12 @@ def _derived_ui_setting_value(key: str) -> object: """ if key == ENABLE_PTU_COST_ATTRIBUTION_UI_SETTING: return is_ptu_cost_attribution_enabled() + if key == APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING: + from litellm.proxy.proxy_server import general_settings + + return _apply_user_budget_to_team_keys_enabled( + cast(Mapping[str, object], general_settings) # cast-ok: proxy_server declares general_settings as bare dict + ) return None @@ -394,6 +407,7 @@ _RUNTIME_GENERAL_SETTINGS_FLAGS: Final = [ "allow_agents_for_team_admins", "disable_vector_stores_for_internal_users", "allow_vector_stores_for_team_admins", + "disable_custom_api_keys", "disable_key_generate_for_org_admin", TEAM_ADMIN_EDITABLE_TEAM_FIELDS_SETTING, ] @@ -776,6 +790,8 @@ def _ui_setting_source( if key == ENABLE_PTU_COST_ATTRIBUTION_UI_SETTING: configured_value: Final = get_secret(PTU_COST_ATTRIBUTION_ENV_VAR, None) return "config" if configured_value is not None or value is True else "default" + if key == APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING: + return "config" if value is True else "default" return source_for(settings, key, _model_field_default(settings_class, key)) @@ -1782,6 +1798,9 @@ async def get_ui_settings(): { **resolved_settings.values, ENABLE_PTU_COST_ATTRIBUTION_UI_SETTING: is_ptu_cost_attribution_enabled(), + APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING: _derived_ui_setting_value( + APPLY_USER_BUDGET_TO_TEAM_KEYS_UI_SETTING + ), } ) source: Final[Mapping[str, FieldSource]] = MappingProxyType( diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py index ea3ecb7f637..ce2f97d6d55 100644 --- a/litellm/proxy/utils.py +++ b/litellm/proxy/utils.py @@ -52,6 +52,7 @@ from litellm.constants import ( DEFAULT_MODEL_CREATED_AT_TIME, LITELLM_LOGGING_NO_UPSTREAM_LLM_CALL, MAX_TEAM_LIST_LIMIT, + PROXY_REJECTED_BEFORE_ROUTING_KEY, REDIS_SPEND_LOGS_BUFFER_DEQUEUE_COUNT, SPEND_LOG_QUEUE_MAX_BYTES, SPEND_LOG_WRITE_BATCH_MAX_BYTES, @@ -979,6 +980,94 @@ def _failure_usage_to_lift( _EMPTY_LIFT: Final = MappingProxyType({}) +def _stamp_deployment_attribution( + litellm_params: dict[str, object], model_group: str | None, team_id: str | None, dispatched: bool +) -> Mapping[str, object]: + """Stamp provider and logging-metadata attribution onto ``litellm_params`` and return it. + ``litellm_params["model_info"]`` stays unset: the router's cooldown and per-deployment rpm + callbacks key off it and must not count a proxy-side reject against the deployment. A failure + after the provider handoff keeps the metadata the router stamped; a request that never reached a + provider is flagged ``PROXY_REJECTED_BEFORE_ROUTING_KEY`` (deployment metrics key off it) whatever + its metadata says, since ``metadata.model_info`` can be caller supplied.""" + attribution: Final = _deployment_attribution_for_model_group(model_group, team_id) + if "custom_llm_provider" in attribution: + litellm_params["custom_llm_provider"] = attribution["custom_llm_provider"] + if dispatched: + return attribution + litellm_params[PROXY_REJECTED_BEFORE_ROUTING_KEY] = True + if "model_info" not in attribution: + return attribution + if litellm_params.get("metadata") is None: + litellm_params["metadata"] = {} # mutable-ok: legacy logging payload is populated in place + metadata: Final = litellm_params["metadata"] + if not isinstance(metadata, dict): + return attribution + metadata.setdefault("model_info", attribution["model_info"]) + metadata.setdefault("deployment", attribution["deployment"]) + if isinstance(model_group, str): + metadata.setdefault("model_group", model_group) + return attribution + + +def _deployment_attribution_for_model_group(model_group: object, team_id: str | None) -> Mapping[str, object]: + """Provider fields the router would have stamped had it reached a deployment: + ``custom_llm_provider`` when every deployment in the group resolves to the same + provider, plus ``model_info`` and ``deployment`` when the group has exactly one. + ``team_id`` picks the key's team deployments over a global group of the same public name.""" + if not isinstance(model_group, str): + return _EMPTY_LIFT + + from litellm.proxy.proxy_server import llm_router + + if llm_router is None: + return _EMPTY_LIFT + deployments: Final = llm_router.get_model_list(model_name=model_group, team_id=team_id) + if not deployments: + return _EMPTY_LIFT + + def _provider_for_deployment(deployment: Mapping[str, object]) -> str | None: + litellm_params: Final = cast( # cast-ok: router deployment parameters are mapping-shaped + Mapping[str, object], deployment["litellm_params"] + ) + try: + provider: Final = litellm.get_llm_provider( + model=cast(str, litellm_params["model"]), # cast-ok: router deployment model is a string + custom_llm_provider=cast( # cast-ok: router deployment provider is optional + str | None, litellm_params.get("custom_llm_provider") + ), + )[1] + return cast(str | None, provider) # cast-ok: provider resolver returns an optional provider string + except Exception: # noqa: BLE001 # get_llm_provider raises for unmapped models + return None + + providers: Final = frozenset(_provider_for_deployment(deployment) for deployment in deployments) + shared_provider: Final = next(iter(providers)) if len(providers) == 1 else None + single_deployment: Final = deployments[0] if len(deployments) == 1 else None + single_deployment_params: Final = ( + cast( # cast-ok: router deployment parameters are mapping-shaped + Mapping[str, object], single_deployment["litellm_params"] + ) + if single_deployment is not None + else None + ) + return MappingProxyType( + { + # mutable-ok: frozen immediately by the outer MappingProxyType + **({"custom_llm_provider": shared_provider} if shared_provider is not None else {}), + **( + { # mutable-ok: frozen immediately by the outer MappingProxyType + "model_info": dict( # mutable-ok: preserve the router's mutable model-info payload + single_deployment.get("model_info") or {} + ), + "deployment": single_deployment_params["model"], + } + if single_deployment is not None and single_deployment_params is not None + else {} # mutable-ok: frozen immediately by the outer MappingProxyType + ), + } + ) + + def _call_type_for_route(route: str | None) -> str | None: """The route's call type when it maps to a single operation (its async and sync variants); None for routes shared by several operations, since the method is not known here.""" @@ -3227,11 +3316,25 @@ class ProxyLogging: elif k not in ("model", "user", "litellm_logging_obj"): _optional_params[k] = v + attribution: Final = _stamp_deployment_attribution( + _litellm_params, + request_data.get("model"), + user_api_key_dict.team_id, + dispatched=litellm_logging_obj.model_call_details.get("first_api_call_start_time") is not None, + ) + litellm_logging_obj.update_environment_variables( model=request_data.get("model", ""), user=request_data.get("user", ""), optional_params=_optional_params, litellm_params=_litellm_params, + **( + { # mutable-ok: frozen immediately by keyword expansion + "custom_llm_provider": attribution["custom_llm_provider"] + } + if "custom_llm_provider" in attribution + else {} # mutable-ok: frozen immediately by keyword expansion + ), ) input: list | str | dict = "" diff --git a/litellm/proxy/vector_store_endpoints/management_endpoints.py b/litellm/proxy/vector_store_endpoints/management_endpoints.py index 2fb6813a471..cae144bb266 100644 --- a/litellm/proxy/vector_store_endpoints/management_endpoints.py +++ b/litellm/proxy/vector_store_endpoints/management_endpoints.py @@ -13,6 +13,7 @@ import json from typing import TYPE_CHECKING, Any, Final from fastapi import APIRouter, Depends, HTTPException +from typing_extensions import ReadOnly, TypedDict if TYPE_CHECKING: from prisma.models import LiteLLM_ManagedVectorStoresTable as _VectorStoreRow @@ -56,6 +57,32 @@ def _row_to_vector_store(row: "_VectorStoreRow") -> LiteLLM_ManagedVectorStore: return LiteLLM_ManagedVectorStore(**row.model_dump()) +class _ConfigOwnedDetail(TypedDict): + error: ReadOnly[str] + vector_store_id: ReadOnly[str] + + +def _raise_if_config_owned(vector_store_id: str) -> None: + if litellm.vector_store_registry is None or not litellm.vector_store_registry.is_config_vector_store( + vector_store_id + ): + return + detail: Final[_ConfigOwnedDetail] = { + "error": ( + f"Vector store {vector_store_id} is defined in the config file, so the config file owns it and it " + "cannot be changed here. Edit the config file to change it, or remove it from the file to let the " + "database own it." + ), + "vector_store_id": vector_store_id, + } + raise HTTPException(status_code=400, detail=detail) + + +def _with_ownership(vector_store: LiteLLM_ManagedVectorStore) -> LiteLLM_ManagedVectorStore: + ownership: Final = LiteLLM_ManagedVectorStore(is_config=vector_store.get("is_config", False)) + return vector_store | ownership + + _LITELLM_PARAMS_MASKER: Final = SensitiveDataMasker(extra_sensitive_patterns=frozenset(("connection",))) @@ -274,6 +301,7 @@ async def new_vector_store( status_code=400, detail="vector_store_id and custom_llm_provider are required", ) + _raise_if_config_owned(vector_store_id) # Extract and validate metadata metadata: Final = vector_store.get("vector_store_metadata") @@ -306,6 +334,8 @@ async def new_vector_store( "message": f"Vector store {vector_store.get('vector_store_id')} created successfully", "vector_store": response_vs, } + except HTTPException: + raise except Exception as e: verbose_proxy_logger.exception("Error creating vector store: %s", e) raise HTTPException(status_code=500, detail=str(e)) @@ -331,7 +361,9 @@ async def list_vector_stores( """ List all available vector stores with optional filtering and pagination. Combines both in-memory vector stores and those stored in the database. - Database is the source of truth - deleted stores are removed from memory, updated stores sync to memory. + Database is the source of truth for stores it owns: deleted stores are removed from memory, updated stores + sync to memory. Stores declared in the config file are owned by the config file, are always listed, and are + never overwritten by database rows. Parameters: - page: int - Page number for pagination (default: 1) @@ -366,8 +398,10 @@ async def list_vector_stores( if not vector_store_id: continue + if vector_store.get("is_config", False): + vector_store_map[vector_store_id] = vector_store # If vector store is in memory but NOT in database, it was deleted - if vector_store_id not in db_vector_store_ids: + elif vector_store_id not in db_vector_store_ids: verbose_proxy_logger.info( "Vector store %s exists in memory but not in database - marking for deletion from cache", vector_store_id, @@ -394,7 +428,7 @@ async def list_vector_stores( # Filter vector stores based on access control accessible_vector_stores: Final = [] for vs in await filter_listable_vector_stores(vector_store_map.values(), user_api_key_dict): - redacted = LiteLLM_ManagedVectorStore(**vs) + redacted = _with_ownership(vs) redacted["litellm_params"] = _redact_sensitive_litellm_params(vs.get("litellm_params")) accessible_vector_stores.append(redacted) @@ -467,6 +501,7 @@ async def delete_vector_store( status_code=404, detail=f"Vector store with ID {data.vector_store_id} not found", ) + _raise_if_config_owned(data.vector_store_id) # Check access control if vector_store_to_check and not await _check_vector_store_access(vector_store_to_check, user_api_key_dict): @@ -545,6 +580,7 @@ async def get_vector_store_info( litellm_params=_redact_sensitive_litellm_params(vector_store.get("litellm_params")), team_id=vector_store.get("team_id") or None, user_id=vector_store.get("user_id") or None, + is_config=vector_store.get("is_config", False), ) return {"vector_store": vector_store_pydantic_obj} @@ -591,6 +627,7 @@ async def update_vector_store( update_data: Final = data.model_dump(exclude_unset=True) vector_store_id: Final[str] = data.vector_store_id update_data.pop("vector_store_id") + _raise_if_config_owned(vector_store_id) # Per-store access control: anyone authenticated who passes the # premium-feature gate could otherwise update *any* vector store — diff --git a/litellm/responses/main.py b/litellm/responses/main.py index c5032536df4..e771cdf5ae4 100644 --- a/litellm/responses/main.py +++ b/litellm/responses/main.py @@ -26,6 +26,7 @@ from litellm.litellm_core_utils.prompt_templates.common_utils import ( update_responses_input_with_model_file_ids, update_responses_tools_with_model_file_ids, ) +from litellm.litellm_core_utils.provider_affinity import add_provider_affinity_header from litellm.llms.base_llm.responses.transformation import BaseResponsesAPIConfig from litellm.llms.custom_httpx.llm_http_handler import BaseLLMHTTPHandler from litellm.llms.openai_like.responses.transformation import OpenAILikeResponsesConfig @@ -208,16 +209,12 @@ async def aresponses_api_with_mcp( user_api_key_auth = kwargs.get("user_api_key_auth") or kwargs.get("litellm_metadata", {}).get("user_api_key_auth") # Extract MCP auth headers from request (for dynamic auth when fetching tools) - mcp_auth_header: str | None = None - mcp_server_auth_headers: dict[str, dict[str, str]] | None = None - secret_fields = kwargs.get("secret_fields") - if secret_fields and isinstance(secret_fields, dict): - ( - mcp_auth_header, - mcp_server_auth_headers, - _, - _, - ) = ResponsesAPIRequestUtils.extract_mcp_headers_from_request(secret_fields=secret_fields, tools=tools) + secret_fields: Final = kwargs.get("secret_fields") + mcp_auth_header, mcp_server_auth_headers, _, discovery_raw_headers = ( + ResponsesAPIRequestUtils.extract_mcp_headers_from_request(secret_fields=secret_fields, tools=tools) + if isinstance(secret_fields, dict) and secret_fields + else (None, None, None, None) + ) # Get original MCP tools (for events) and OpenAI tools (for LLM) by reusing existing methods ( @@ -230,6 +227,7 @@ async def aresponses_api_with_mcp( mcp_auth_header=mcp_auth_header, mcp_server_auth_headers=mcp_server_auth_headers, request_tags=LiteLLM_Proxy_MCP_Handler._get_parent_request_tags(kwargs), + raw_headers=discovery_raw_headers, ) openai_tools: Final = LiteLLM_Proxy_MCP_Handler._transform_mcp_tools_to_openai(original_mcp_tools) @@ -329,7 +327,6 @@ async def aresponses_api_with_mcp( user_api_key_auth = kwargs.get("litellm_metadata", {}).get("user_api_key_auth") # Extract MCP auth headers from the request to pass to MCP server - secret_fields = kwargs.get("secret_fields") ( mcp_auth_header, mcp_server_auth_headers, @@ -415,6 +412,7 @@ async def aresponses_api_with_mcp( mcp_auth_header=mcp_auth_header, mcp_server_auth_headers=mcp_server_auth_headers, request_tags=LiteLLM_Proxy_MCP_Handler._get_parent_request_tags(kwargs), + raw_headers=discovery_raw_headers, ) final_response = LiteLLM_Proxy_MCP_Handler._add_mcp_output_elements_to_response( response=final_response, @@ -1218,6 +1216,27 @@ def responses( # get llm provider logic litellm_params: Final = GenericLiteLLMParams(**kwargs) + try: + effective_extra_headers: Final = ( + add_provider_affinity_header( + headers=extra_headers or MappingProxyType({}), + litellm_params=MappingProxyType( + { + "provider_affinity_header": litellm_params.provider_affinity_header, + "litellm_session_id": kwargs.get("litellm_session_id"), + "session_id": kwargs.get("session_id"), + "metadata": metadata, + "litellm_metadata": kwargs.get("litellm_metadata"), + } + ), + ) + if litellm_params.provider_affinity_header is not None + else extra_headers + ) + except ValueError as affinity_error: + raise litellm.BadRequestError( + message=str(affinity_error), model=model, llm_provider=custom_llm_provider + ) from affinity_error ######################################################### # MOCK RESPONSE LOGIC @@ -1261,7 +1280,7 @@ def responses( top_p=top_p, truncation=truncation, user=user, - extra_headers=extra_headers, + extra_headers=effective_extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout, @@ -1332,7 +1351,7 @@ def responses( safety_identifier=safety_identifier, text_format=text_format, allowed_openai_params=allowed_openai_params, - extra_headers=extra_headers, + extra_headers=effective_extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout, @@ -1352,7 +1371,7 @@ def responses( custom_llm_provider=custom_llm_provider, _is_async=_is_async, stream=stream, - extra_headers=extra_headers, + extra_headers=effective_extra_headers, extra_body=extra_body, timeout=timeout if timeout is not None else request_timeout, allowed_openai_params=allowed_openai_params, @@ -1381,6 +1400,7 @@ def responses( "model_info": kwargs.get("model_info"), "data_residency": infer_openai_data_residency(custom_llm_provider, litellm_params.api_base), "metadata": (kwargs["litellm_metadata"] if "litellm_metadata" in kwargs else kwargs.get("metadata")), + "provider_affinity_header": litellm_params.provider_affinity_header, }, custom_llm_provider=custom_llm_provider, ) @@ -1400,7 +1420,7 @@ def responses( custom_llm_provider=custom_llm_provider, litellm_params=litellm_params, logging_obj=litellm_logging_obj, - extra_headers=extra_headers, + extra_headers=effective_extra_headers, extra_body=extra_body, timeout=timeout or request_timeout, _is_async=_is_async, diff --git a/litellm/responses/mcp/chat_completions_handler.py b/litellm/responses/mcp/chat_completions_handler.py index df1e3e62441..b17e0befba6 100644 --- a/litellm/responses/mcp/chat_completions_handler.py +++ b/litellm/responses/mcp/chat_completions_handler.py @@ -138,6 +138,7 @@ async def acompletion_with_mcp( mcp_auth_header=mcp_auth_header, mcp_server_auth_headers=mcp_server_auth_headers, request_tags=request_tags, + raw_headers=raw_headers, ) openai_tools: Final = LiteLLM_Proxy_MCP_Handler._transform_mcp_tools_to_openai( diff --git a/litellm/responses/mcp/litellm_proxy_mcp_handler.py b/litellm/responses/mcp/litellm_proxy_mcp_handler.py index 88a2b92c680..71f61079154 100644 --- a/litellm/responses/mcp/litellm_proxy_mcp_handler.py +++ b/litellm/responses/mcp/litellm_proxy_mcp_handler.py @@ -236,6 +236,7 @@ class LiteLLM_Proxy_MCP_Handler: mcp_auth_header: str | None = None, mcp_server_auth_headers: dict[str, dict[str, str]] | None = None, request_tags: list[str] | None = None, + raw_headers: dict[str, str] | None = None, ) -> tuple[list[MCPTool], list[str]]: """ Get available tools from the MCP server manager. @@ -326,6 +327,7 @@ class LiteLLM_Proxy_MCP_Handler: list_tools_log_source="responses", litellm_trace_id=litellm_trace_id, request_tags=request_tags, + raw_headers=raw_headers, ) tools: Final = listing.tools @@ -452,6 +454,7 @@ class LiteLLM_Proxy_MCP_Handler: mcp_auth_header: str | None = None, mcp_server_auth_headers: dict[str, dict[str, str]] | None = None, request_tags: list[str] | None = None, + raw_headers: dict[str, str] | None = None, ) -> tuple[list[MCPTool], dict[str, str]]: """ Process MCP tools through filtering and deduplication pipeline without OpenAI transformation. @@ -482,6 +485,7 @@ class LiteLLM_Proxy_MCP_Handler: mcp_auth_header=mcp_auth_header, mcp_server_auth_headers=mcp_server_auth_headers, request_tags=request_tags, + raw_headers=raw_headers, ) # Step 2: Filter tools based on allowed_tools parameter @@ -872,7 +876,7 @@ class LiteLLM_Proxy_MCP_Handler: if litellm_logging_obj: try: litellm_logging_obj.post_call(original_response=result) - await litellm_logging_obj.async_post_mcp_tool_call_hook( + result = await litellm_logging_obj.async_post_mcp_tool_call_hook( kwargs=litellm_logging_obj.model_call_details, response_obj=result, start_time=start_time, diff --git a/litellm/router.py b/litellm/router.py index 06a65b85cc3..7267f6eb3ba 100644 --- a/litellm/router.py +++ b/litellm/router.py @@ -31,6 +31,7 @@ from collections.abc import ( MutableMapping, Sequence, ) +from datetime import datetime, timezone from functools import lru_cache, partial from types import MappingProxyType from typing import TYPE_CHECKING, Any, Final, Literal, Optional, TypeAlias, TypeVar, Union, cast @@ -138,12 +139,14 @@ from litellm.router_strategy.tag_based_routing import ( get_deployments_for_tag, is_valid_deployment_tag, ) +from litellm.router_utils.access_windows import access_windows_config_error, filter_reserved_deployments from litellm.router_utils.add_retry_fallback_headers import ( _HiddenParamsHost, add_fallback_headers_to_response, add_retry_headers_to_response, apply_quality_router_decision_headers, apply_remaining_usage_headers, + apply_response_model_id, complexity_router_decision_headers, ensure_response_additional_headers, get_hidden_params_dict, @@ -174,6 +177,8 @@ from litellm.router_utils.common_utils import ( _is_proxy_admin_request, filter_team_based_models, filter_web_search_deployments, + format_fallback_outcome_message, + format_no_fallback_group_message, get_request_team_id, provider_for_generic_call, resolve_model_group_alias, @@ -201,6 +206,7 @@ from litellm.router_utils.fallback_event_handlers import ( fallback_lookup_groups, fallbacks_disabled_for_request, get_fallback_model_group_for_lookup_groups, + get_pre_routing_selection, has_unattempted_fallback_target, mid_stream_fallback_hop_kwargs, per_request_fallback_controls, @@ -243,7 +249,11 @@ from litellm.router_utils.router_callbacks.track_deployment_metrics import ( increment_deployment_failures_for_current_minute, increment_deployment_successes_for_current_minute, ) -from litellm.router_utils.routing_groups import parse_routing_groups, validate_routing_strategy +from litellm.router_utils.routing_groups import ( + apply_routing_group_priority, + parse_routing_groups, + validate_routing_strategy, +) from litellm.scheduler import FlowItem, Scheduler from litellm.types.llms.openai import ( AllMessageValues, @@ -837,7 +847,9 @@ class Router: cooldown_time (float): Time to cooldown a deployment after failure in seconds. Defaults to 1. routing_strategy (Literal["simple-shuffle", "least-busy", "usage-based-routing", "latency-based-routing", "cost-based-routing"]): Routing strategy used for the implicit "default" group (any model not claimed by an entry in `routing_groups`). Defaults to "simple-shuffle". routing_strategy_args (dict): Additional args for the default group's routing strategy (e.g. latency window). Defaults to {}. - routing_groups (Optional[List[RoutingGroup]]): Named subsets of `model_name`s that use a per-group routing strategy and args. Each model belongs to at most one explicit group; everything else lands in the implicit "default" group driven by `routing_strategy` / `routing_strategy_args`. Defaults to None. + routing_groups (Optional[List[RoutingGroup]]): Named subsets of `model_name`s with a group routing strategy. + Priority groups apply only to group calls and may overlap. Other groups supply their members' default + strategy, with at most one such group per model. Unclaimed models use the top-level strategy. alerting_config (AlertingConfig): Slack alerting configuration. Defaults to None. provider_budget_config (ProviderBudgetConfig): Provider budget configuration. Use this to set llm_provider budget limits. example $100/day to OpenAI, $100/day to Azure, etc. Defaults to None. deployment_affinity_ttl_seconds (int): TTL for user-key -> deployment affinity mapping. Defaults to 3600. @@ -1445,10 +1457,10 @@ class Router: ) -> None: """ Validates and indexes `routing_groups`. Each `model_name` may belong to - at most one explicit group. Constructs per-group strategy selectors so + at most one non-priority group. Constructs per-group strategy selectors so groups with different `routing_strategy_args` track independent state. - Models not claimed by any explicit group are served by the implicit + Models not claimed by a non-priority group are served by the implicit `"default"` group, whose selectors are the `self._logger` attributes set up in `routing_strategy_init`. """ @@ -1462,6 +1474,8 @@ class Router: alias_names: Final = frozenset(self.model_group_alias or ()) for group in groups: if group.group_name in known_model_names or group.group_name in alias_names: + if group.routing_strategy == "priority": + raise ValueError("Priority routing group names must not shadow a model or alias") verbose_router_logger.warning( "routing_groups: group_name '%s' is shadowed by an existing model_name or model_group_alias; " "the group's strategy still applies to its members, but the name is not callable until renamed.", @@ -1472,7 +1486,7 @@ class Router: ( group, self._build_strategy_selector( - strategy=group.routing_strategy, + strategy="simple-shuffle" if group.routing_strategy == "priority" else group.routing_strategy, routing_strategy_args=group.routing_strategy_args or {}, register_callbacks=False, ), @@ -1497,7 +1511,10 @@ class Router: self._routing_groups: dict[str, RoutingGroup] = {group.group_name: group for group, _ in built} self._model_to_group: dict[str, str] = { - model_name: group.group_name for group, _ in built for model_name in group.models + model_name: group.group_name + for group, _ in built + if group.routing_strategy != "priority" + for model_name in group.models } self._group_selectors: dict[str, dict[str, RouterStrategySelector]] = { group.group_name: ( @@ -1547,11 +1564,16 @@ class Router: if routing_group is None: return None return [ # mutable-ok: matches _get_all_deployments' list contract expected by downstream filters - deployment + apply_routing_group_priority(routing_group, member, deployment) for member in routing_group.models for deployment in self._get_all_deployments(model_name=member, team_id=team_id) ] + def _is_priority_routing_group(self, model: str) -> bool: + resolved: Final = self._get_model_from_alias(model=model) or model + group: Final = self.get_routing_group(resolved) + return group is not None and group.routing_strategy == "priority" + def is_recognized_model(self, model: str) -> bool: """ Whether `model` names something this router serves directly: a @@ -1715,7 +1737,12 @@ class Router: self._bind_override_selector_to_request(override, override_selector, request_kwargs) return override, override_selector - group_name: Final = model if self.get_routing_group(model) is not None else self._model_to_group.get(model) + resolved_model: Final = self._get_model_from_alias(model=model) or model + group_name: Final = ( + resolved_model + if self.get_routing_group(resolved_model) is not None + else self._model_to_group.get(resolved_model) + ) if group_name is None: strategy = self._normalize_strategy(self.routing_strategy) attr: Final = self._DEFAULT_SELECTOR_ATTR_BY_STRATEGY.get(strategy or "") @@ -1724,6 +1751,8 @@ class Router: return strategy, selector group: Final = self._routing_groups[group_name] + if group.routing_strategy == "priority": + return "simple-shuffle", None strategy = self._normalize_strategy(group.routing_strategy) selector = self._group_selectors.get(group_name, {}).get(strategy or "") verbose_router_logger.debug("routing_group=%s model=%s strategy=%s", group_name, model, strategy) @@ -2240,6 +2269,7 @@ class Router: enable_responses_api_affinity=False, enable_session_id_affinity=False, model_group_affinity_config=self.model_group_affinity_config, + is_priority_group=self._is_priority_routing_group, ) self.optional_callbacks.append(affinity_callback) litellm.logging_callback_manager.add_litellm_callback(affinity_callback) @@ -2285,6 +2315,7 @@ class Router: enable_responses_api_affinity=enable_responses_api_affinity, enable_session_id_affinity=enable_session_id_affinity, model_group_affinity_config=self.model_group_affinity_config, + is_priority_group=self._is_priority_routing_group, ) self.optional_callbacks.append(affinity_callback) litellm.logging_callback_manager.add_litellm_callback(affinity_callback) @@ -2309,7 +2340,9 @@ class Router: ): continue if pre_call_check == "prompt_caching": - _callback = PromptCachingDeploymentCheck(cache=self.cache) + _callback = PromptCachingDeploymentCheck( + cache=self.cache, is_priority_group=self._is_priority_routing_group + ) elif pre_call_check == "router_budget_limiting": if self._get_router_deployment_budget_limiter() is not None: continue @@ -7063,7 +7096,7 @@ class Router: self, exception: Exception, original_model_group: str, - all_deployments: list[DeploymentTypedDict], + all_deployments: Sequence[DeploymentTypedDict], args: tuple, kwargs: dict, input_kwargs: dict, @@ -7160,6 +7193,9 @@ class Router: # behind the router name, and fallbacks are configured per tier, not per router. lookup_groups: Final[tuple[str, ...]] = fallback_lookup_groups(kwargs, model_group) fallback_failure_exception_str = "" + no_fallback_group_explained = False + hop_depth: Final = kwargs.get("fallback_depth") + nested_fallback_hop: Final = isinstance(hop_depth, int) and hop_depth > 0 if disable_fallbacks is True or original_model_group is None: raise e @@ -7186,7 +7222,8 @@ class Router: _request_team_id: Final[str | None] = (kwargs.get("metadata", {}) or {}).get("user_api_key_team_id") # Use wildcard-aware lookup so order-based fallback also works for model # groups resolved via pattern routing (e.g. `openai/*` -> `openai/gpt-4.1-mini`). - all_deployments: Final = self.get_model_list(model_name=original_model_group, team_id=_request_team_id) or [] + order_model_group: Final = get_pre_routing_selection(kwargs) or original_model_group + all_deployments: Final = self.get_model_list(model_name=order_model_group, team_id=_request_team_id) or () _order_set: Final[set] = { litellm.utils._get_deployment_order(d) for d in all_deployments @@ -7199,7 +7236,7 @@ class Router: skip_up_to: Final = current_target if current_target is not None else order_values[0] # Build order-based fallback entries (skip already-tried levels) order_fallback_entries: Final[list] = [ - {"model": original_model_group, "_target_order": o} for o in order_values if o > skip_up_to + {"model": order_model_group, "_target_order": o} for o in order_values if o > skip_up_to ] # Get external fallbacks — handle both standard and non-standard formats external_fallback_group: list | None = None @@ -7351,8 +7388,13 @@ class Router: " -> ".join(lookup_groups), masked_fallbacks, ) - if hasattr(original_exception, "message") and litellm.expose_router_debug_in_errors: - original_exception.message += f"No fallback model group found for lookup_groups={' -> '.join(lookup_groups)}. Fallbacks={masked_fallbacks}" + if ( + hasattr(original_exception, "message") + and litellm.expose_router_debug_in_errors + and not nested_fallback_hop + ): + original_exception.message += format_no_fallback_group_message(lookup_groups, fallbacks) + no_fallback_group_explained = True raise original_exception input_kwargs.update( @@ -7383,11 +7425,16 @@ class Router: cooldown_info, ) - if hasattr(original_exception, "message") and litellm.expose_router_debug_in_errors: - # add the available fallbacks to the exception - original_exception.message += f". Received Model Group={model_group}\nAvailable Model Group Fallbacks={mask_sensitive_structure(fallback_model_group)}" - if len(fallback_failure_exception_str) > 0: - original_exception.message += f"\nError doing the fallback: {fallback_failure_exception_str}" + attempted_fallback_group: Final = input_kwargs.get("fallback_model_group") + if ( + hasattr(original_exception, "message") + and litellm.expose_router_debug_in_errors + and not no_fallback_group_explained + and not nested_fallback_hop + ): + original_exception.message += format_fallback_outcome_message( + model_group, attempted_fallback_group, fallback_failure_exception_str + ) raise original_exception @@ -8774,6 +8821,9 @@ class Router: ) if ptu_error is not None and is_ptu_cost_attribution_enabled(): raise ValueError(ptu_error) + access_windows_error: Final = access_windows_config_error(_model_info, model_name=_model_name) + if access_windows_error is not None: + raise ValueError(access_windows_error) zeroed_pricing: Final = zeroed_ptu_pricing(_model_info, _litellm_params) if config_sourced else None litellm_params: Final[LiteLLM_Params] = LiteLLM_Params( **( # pyright: ignore[reportArgumentType] # untyped merged dict; already true for every field here @@ -11172,6 +11222,9 @@ class Router: return response additional_headers: Final = ensure_response_additional_headers(response) + apply_response_model_id( + response, find_deployment_metadata(request_kwargs) if request_kwargs is not None else None + ) additional_headers["x-litellm-model-group"] = model_group apply_quality_router_decision_headers(additional_headers, request_kwargs) additional_headers.update(complexity_router_decision_headers(request_kwargs)) @@ -11662,7 +11715,14 @@ class Router: else: continue - returned_models.extend(self._get_all_deployments(model_name=_router_model_name, model_alias=model_alias)) + if (alias_group := self.get_routing_group(_router_model_name)) is not None: + returned_models.extend( + {**row, "model_name": model_alias} for row in self._materialize_routing_group_rows((alias_group,)) + ) + else: + returned_models.extend( + self._get_all_deployments(model_name=_router_model_name, model_alias=model_alias) + ) return returned_models @@ -11693,7 +11753,7 @@ class Router: def _materialize_routing_group_rows(self, groups: tuple[RoutingGroup, ...]) -> tuple[DeploymentTypedDict, ...]: return tuple( - self._as_routing_group_row(deployment) + self._as_routing_group_row(apply_routing_group_priority(group, member, deployment)) for group in groups for member in group.models for deployment in self._get_all_deployments(model_name=member, model_alias=group.group_name) @@ -12000,7 +12060,10 @@ class Router: ): _settings_to_return[var] = self.lowestlatency_logger.routing_args.json() - _settings_to_return["routing_groups"] = [group.model_dump() for group in self._routing_groups.values()] + _settings_to_return["routing_groups"] = [ + group.model_dump(exclude=frozenset(("model_priorities",)) if group.model_priorities is None else None) + for group in self._routing_groups.values() + ] return _settings_to_return def update_settings(self, **kwargs): @@ -12535,12 +12598,30 @@ class Router: request_team_id: Final = get_request_team_id(request_kwargs) # check if aliases set on litellm model alias map if specific_deployment is True: - return model, self._get_deployment_by_litellm_model(model=model) + return model, self._drop_strategy_markers( + model, + self._filter_reserved_deployments( + model=model, + healthy_deployments=self._get_deployment_by_litellm_model(model=model), + request_team_id=request_team_id, + ), + ) elif model not in self.model_names and self.has_model_id(model): deployment: Final = self.get_deployment(model_id=model) if deployment is not None: deployment_model: Final = deployment.litellm_params.model - return deployment_model, deployment.model_dump(exclude_none=True) + return deployment_model, cast( # cast-ok: contract requires a plain dict for a single deployment + dict, + self._filter_reserved_deployments( + model=deployment_model, + healthy_deployments=( + cast( # cast-ok: model_dump of a router deployment + DeploymentTypedDict, deployment.model_dump(exclude_none=True) + ), + ), + request_team_id=request_team_id, + )[0], + ) raise ValueError( f"LiteLLM Router: Trying to call specific deployment, but Model ID :{model} does not exist in Model ID map" ) @@ -12558,8 +12639,26 @@ class Router: ) if early is not None: if not isinstance(early[1], list): - return early - return early[0], self._drop_strategy_markers(early[0], early[1]) + return early[0], cast( # cast-ok: contract requires a plain dict for a single deployment + dict, + self._filter_reserved_deployments( + model=early[0], + healthy_deployments=( + cast( # cast-ok: early resolve returns a router deployment + DeploymentTypedDict, early[1] + ), + ), + request_team_id=request_team_id, + )[0], + ) + return early[0], self._drop_strategy_markers( + early[0], + self._filter_reserved_deployments( + model=early[0], + healthy_deployments=early[1], + request_team_id=request_team_id, + ), + ) ## get healthy deployments ### get all deployments @@ -12569,10 +12668,14 @@ class Router: else self._get_all_deployments(model_name=model, team_id=request_team_id) ) _pre_model_access_group_filter_len: Final = len(healthy_deployments) - healthy_deployments = self._filter_deployments_by_model_access_groups( + healthy_deployments = self._filter_reserved_deployments( model=model, - healthy_deployments=healthy_deployments, - request_kwargs=request_kwargs, + healthy_deployments=self._filter_deployments_by_model_access_groups( + model=model, + healthy_deployments=healthy_deployments, + request_kwargs=request_kwargs, + request_team_id=request_team_id, + ), request_team_id=request_team_id, ) _access_group_filter_emptied_candidates = ( @@ -12585,10 +12688,14 @@ class Router: # _get_deployment_by_litellm_model does not re-apply that filter. if _pre_model_access_group_filter_len == 0: _litellm_model_deployments: Final = self._get_deployment_by_litellm_model(model=model) - healthy_deployments = self._filter_deployments_by_model_access_groups( + healthy_deployments = self._filter_reserved_deployments( model=model, - healthy_deployments=_litellm_model_deployments, - request_kwargs=request_kwargs, + healthy_deployments=self._filter_deployments_by_model_access_groups( + model=model, + healthy_deployments=_litellm_model_deployments, + request_kwargs=request_kwargs, + request_team_id=request_team_id, + ), request_team_id=request_team_id, ) # If the litellm-model lookup produced candidates that access-group @@ -12616,10 +12723,14 @@ class Router: # Re-assign model to the fallback and try to get deployments again model = fallback_model healthy_deployments = self._get_all_deployments(model_name=model, team_id=request_team_id) - healthy_deployments = self._filter_deployments_by_model_access_groups( + healthy_deployments = self._filter_reserved_deployments( model=model, - healthy_deployments=healthy_deployments, - request_kwargs=request_kwargs, + healthy_deployments=self._filter_deployments_by_model_access_groups( + model=model, + healthy_deployments=healthy_deployments, + request_kwargs=request_kwargs, + request_team_id=request_team_id, + ), request_team_id=request_team_id, ) @@ -12653,6 +12764,24 @@ class Router: ) return selectable + def _filter_reserved_deployments( + self, + model: str, + healthy_deployments: Sequence[DeploymentTypedDict], + request_team_id: str | None, + ) -> tuple[DeploymentTypedDict, ...]: + result: Final = filter_reserved_deployments( + self._drop_strategy_markers(model, healthy_deployments), request_team_id, now=datetime.now(timezone.utc) + ) + if result.blocking_window is not None and len(result.deployments) == 0: + raise litellm.BadRequestError( + message=f"Deployment {model} is reserved for another team until " + f"{result.blocking_window.end:%H:%M} {result.blocking_window.timezone}", + model=model, + llm_provider="", + ) + return result.deployments + def _filter_deployments_by_model_access_groups( self, model: str, @@ -14115,6 +14244,12 @@ class Router: request_kwargs=request_kwargs, ) + if self._is_priority_routing_group(model): + pass_through_deployments = litellm.utils.get_order_filtered_deployments( + pass_through_deployments, + target_order=request_kwargs.pop("_target_order", None) if request_kwargs is not None else None, + ) + if len(pass_through_deployments) == 0: model_ids = self.get_model_ids(model_name=model) _cooldown_time = self.cooldown_cache.get_min_cooldown( diff --git a/litellm/router_strategy/complexity_router/fuse_presets.json b/litellm/router_strategy/complexity_router/fuse_presets.json index 4006366dc25..d3f9c48c0d4 100644 --- a/litellm/router_strategy/complexity_router/fuse_presets.json +++ b/litellm/router_strategy/complexity_router/fuse_presets.json @@ -1,5 +1,5 @@ { - "version": "2026-09-17-v1", + "version": "2026-09-22-v1", "models": [ { "id": "gpt-6-astra-v1", @@ -8,6 +8,20 @@ "text": "OpenAI model for demanding end-to-end work, including reasoning, coding, research, and document tasks", "sources": ["https://developers.openai.com/api/docs/models/gpt-6-astra"] }, + { + "id": "gpt-6-sol-v1", + "label": "GPT-6 Sol", + "model": "gpt-6-sol", + "text": "OpenAI model for complex coding and agentic workflows, supporting reasoning and tool calling through the Responses API", + "sources": ["https://developers.openai.com/api/docs/models/gpt-6-sol"] + }, + { + "id": "gpt-6-luna-v1", + "label": "GPT-6 Luna", + "model": "gpt-6-luna", + "text": "OpenAI model for efficient, high-volume workloads, supporting reasoning and tool calling through the Responses API", + "sources": ["https://developers.openai.com/api/docs/models/gpt-6-luna"] + }, { "id": "gpt-5.6-sol-v1", "label": "GPT-5.6 Sol", @@ -63,6 +77,13 @@ "model": "claude-fable-5-1", "text": "Anthropic model for demanding reasoning, long-running agentic coding, and multistep research, with always-on adaptive thinking", "sources": ["https://platform.claude.com/docs/en/models/fable-5-1/overview"] + }, + { + "id": "claude-opus-5-5-v1", + "label": "Claude Opus 5.5", + "model": "claude-opus-5-5", + "text": "Anthropic model for complex reasoning and agentic work, supporting adaptive thinking and tool use", + "sources": ["https://platform.claude.com/docs/en/models/opus-5-5/overview"] } ], "harnesses": [ diff --git a/litellm/router_utils/access_windows.py b/litellm/router_utils/access_windows.py new file mode 100644 index 00000000000..5a44584b33d --- /dev/null +++ b/litellm/router_utils/access_windows.py @@ -0,0 +1,75 @@ +from collections.abc import Mapping, Sequence +from dataclasses import dataclass +from datetime import datetime, timezone +from typing import Final, Generic, TypeVar +from zoneinfo import ZoneInfo + +from pydantic import TypeAdapter, ValidationError + +from litellm.types.router import ModelAccessWindow + +_WINDOWS_ADAPTER: Final = TypeAdapter(tuple[ModelAccessWindow, ...]) + +_DeploymentT = TypeVar("_DeploymentT", bound=Mapping[str, object]) + + +def parse_access_windows(model_info: Mapping[str, object]) -> tuple[ModelAccessWindow, ...]: + raw: Final = model_info.get("access_windows") + if raw is None: + return () + return _WINDOWS_ADAPTER.validate_python(raw) + + +def access_windows_config_error(model_info: Mapping[str, object], *, model_name: str) -> str | None: + if model_info.get("access_windows") is None: + return None + try: + parse_access_windows(model_info) + except ValidationError as exc: + first: Final = exc.errors()[0] + loc: Final = ".".join(str(part) for part in first["loc"]) + return f"model '{model_name}': invalid model_info.access_windows: {loc}: {first['msg']}" + return None + + +def is_window_active(window: ModelAccessWindow, now: datetime) -> bool: + aware: Final = now if now.tzinfo is not None else now.replace(tzinfo=timezone.utc) + local: Final = aware.astimezone(ZoneInfo(window.timezone)).time() + if window.start < window.end: + return window.start <= local < window.end + return local >= window.start or local < window.end + + +@dataclass(frozen=True, slots=True) +class ReservationFilterResult(Generic[_DeploymentT]): + deployments: tuple[_DeploymentT, ...] + blocking_window: ModelAccessWindow | None + + +def _reservation_blocking_window( + deployment: Mapping[str, object], request_team_id: str | None, now: datetime +) -> ModelAccessWindow | None: + model_info: Final = deployment.get("model_info") + if not isinstance(model_info, Mapping): + return None + active: Final = tuple(window for window in parse_access_windows(model_info) if is_window_active(window, now)) + if not active: + return None + if request_team_id is not None and any(request_team_id in window.team_ids for window in active): + return None + return active[0] + + +def filter_reserved_deployments( + healthy_deployments: Sequence[_DeploymentT], + request_team_id: str | None, + now: datetime, +) -> ReservationFilterResult[_DeploymentT]: + checks: Final = tuple( + (deployment, _reservation_blocking_window(deployment, request_team_id, now)) + for deployment in healthy_deployments + ) + return ReservationFilterResult( + deployments=tuple(deployment for deployment, blocking in checks if blocking is None), + blocking_window=next((blocking for _, blocking in checks if blocking is not None), None), + ) diff --git a/litellm/router_utils/add_retry_fallback_headers.py b/litellm/router_utils/add_retry_fallback_headers.py index cbca5880b52..6e07693b7ea 100644 --- a/litellm/router_utils/add_retry_fallback_headers.py +++ b/litellm/router_utils/add_retry_fallback_headers.py @@ -131,6 +131,19 @@ def ensure_response_additional_headers(response: object) -> dict[str, object]: return additional_headers +def apply_response_model_id(response: object, request_metadata: Mapping[str, object] | None) -> None: + if request_metadata is None: + return + model_id: Final = _routing_header_mapping(request_metadata.get("model_info")).get("id") + if not isinstance(model_id, str) or not model_id: + return + hidden_params: Final = get_hidden_params_dict(response, create=isinstance(response, dict)) + if hidden_params.get("model_id"): + return + hidden_params["model_id"] = model_id + _write_hidden_params(response, hidden_params) + + def apply_quality_router_decision_headers( additional_headers: dict[str, object], request_kwargs: object, diff --git a/litellm/router_utils/auto_router_tuning_baseline.py b/litellm/router_utils/auto_router_tuning_baseline.py index 9699ab886b9..e87548bf6de 100644 --- a/litellm/router_utils/auto_router_tuning_baseline.py +++ b/litellm/router_utils/auto_router_tuning_baseline.py @@ -10,12 +10,10 @@ from pydantic import ValidationError from litellm.router_strategy.complexity_router.config import ComplexityRouterConfig -TUNING_BASELINE_PARAM_NAME: Final = "auto_router_tuning_baseline_v2" +# v2 hashes combine models and scoring rules; a new snapshot is required to separate them. +TUNING_BASELINE_PARAM_NAME: Final = "auto_router_tuning_baseline_v3" HEURISTIC_V1_TUNING_FIELDS: Final = ( - "tiers", - "tier_model_configs", - "classifier_type", "tier_boundaries", "reasoning_override_min_score", "token_thresholds", @@ -49,8 +47,10 @@ def tuning_fingerprint(complexity_router_config: object) -> str | None: validated: Final = ComplexityRouterConfig.model_validate(raw) except ValidationError: return None - supplied: Final = ((_TUNING_FIELD_SET - frozenset(("tier_model_configs",))) & frozenset(raw)) | ( - frozenset(("tier_model_configs",)) if validated.tier_model_configs else frozenset() + # The UI always writes this built-in marker. Freeze its spelling so future defaults cannot change recorded hashes. + default_escalation: Final = validated.escalation_keywords in (None, ["LITELLM ESCALATE"]) + supplied: Final = (_TUNING_FIELD_SET & frozenset(raw)) - ( + frozenset(("escalation_keywords",)) if default_escalation else frozenset() ) payload: Final = validated.model_dump( mode="json", @@ -148,9 +148,9 @@ def tuning_limit_violation(*, held: int, limit: int | None) -> str | None: if limit is None or held <= limit: return None return ( - f"At most {limit} auto-router(s) with changed heuristic scorer settings or tier models can be modified " + f"At most {limit} auto-router(s) with changed heuristic scoring rules can be modified " "without an auto-router license. Keep this router on its recorded settings, or revert the other changed " - "router to its baseline, or remove one of them." + "router to its baseline, or remove one of them. Selecting models does not use this allowance." ) diff --git a/litellm/router_utils/common_utils.py b/litellm/router_utils/common_utils.py index 49cca8ee99e..7d111a80264 100644 --- a/litellm/router_utils/common_utils.py +++ b/litellm/router_utils/common_utils.py @@ -1,6 +1,6 @@ import hashlib import json -from collections.abc import Mapping +from collections.abc import Mapping, Sequence from types import MappingProxyType from typing import TYPE_CHECKING, Final @@ -12,6 +12,7 @@ from litellm._logging import verbose_logger, verbose_router_logger from litellm.constants import ROUTER_FALLBACK_ERROR_DETAIL_MAX_CHARS from litellm.exceptions import BadRequestError from litellm.litellm_core_utils.get_llm_provider_logic import get_llm_provider +from litellm.litellm_core_utils.sensitive_data_masker import mask_sensitive_structure from litellm.types.router import CredentialLiteLLMParams from litellm.types.utils import LlmProviders @@ -76,6 +77,36 @@ def truncate_fallback_error_detail(detail: str) -> str: return f"{detail[:ROUTER_FALLBACK_ERROR_DETAIL_MAX_CHARS]}... [truncated {dropped} characters]" +def format_no_fallback_group_message(lookup_groups: Sequence[str], fallbacks: Sequence[Mapping[str, object]]) -> str: + """User-facing explanation appended when a request fails and no fallback chain matches its model group.""" + requested: Final = " -> ".join(lookup_groups) + configured: Final = tuple(dict.fromkeys(key for entry in fallbacks for key in entry)) + configured_text: Final = ( + f" Fallbacks are configured for: {', '.join(configured)}." if configured else " No fallbacks are configured." + ) + return ( + f"\n\nLiteLLM: model group '{requested}' failed with the error above and no fallback model group was found " + f"for it, so the request was not retried on another model.{configured_text}" + " Add a fallbacks entry for that model group (Router fallbacks or proxy router_settings.fallbacks)" + " to retry on another model." + ) + + +def format_fallback_outcome_message( + model_group: str | None, + fallback_model_group: Sequence[object] | None, + fallback_failure_detail: str, +) -> str: + """User-facing explanation appended when the fallback orchestrator gives up and re-raises the primary error.""" + lead: Final = f"\n\nLiteLLM: model group '{model_group}' failed with the error above." + if not fallback_model_group: + return f"{lead} No fallback was attempted." + targets: Final = ", ".join(str(mask_sensitive_structure(target)) for target in fallback_model_group) + if not fallback_failure_detail: + return f"{lead} Fallback model group(s) configured: {targets}." + return f"{lead} Fallback to {targets} also failed: {fallback_failure_detail}" + + def get_litellm_params_sensitive_credential_hash(litellm_params: dict) -> str: """ Hash of the credential params, used for mapping the file id to the right model diff --git a/litellm/router_utils/fallback_event_handlers.py b/litellm/router_utils/fallback_event_handlers.py index 61e0d82e66b..4745e4094e6 100644 --- a/litellm/router_utils/fallback_event_handlers.py +++ b/litellm/router_utils/fallback_event_handlers.py @@ -498,7 +498,12 @@ async def _is_fallback_target_authorized( ) -> bool: access_check: Final = litellm_router.fallback_access_check target: Final = _get_fallback_target_model_group(fallback_entry) - if access_check is None or target is None or target == original_model_group: + if ( + access_check is None + or target is None + or target == original_model_group + or target == get_pre_routing_selection(kwargs) + ): return True if await access_check(model=target, request_kwargs=kwargs, llm_router=litellm_router): return True diff --git a/litellm/router_utils/pre_call_checks/deployment_affinity_check.py b/litellm/router_utils/pre_call_checks/deployment_affinity_check.py index 3b88ac2eb00..edba4c27647 100644 --- a/litellm/router_utils/pre_call_checks/deployment_affinity_check.py +++ b/litellm/router_utils/pre_call_checks/deployment_affinity_check.py @@ -13,7 +13,7 @@ where routing to a consistent deployment is still beneficial. """ import hashlib -from collections.abc import Mapping, Sequence +from collections.abc import Callable, Mapping, Sequence from typing import Any, Final, cast from typing_extensions import ReadOnly, TypedDict @@ -79,6 +79,7 @@ class DeploymentAffinityCheck(CustomLogger): enable_responses_api_affinity: bool, enable_session_id_affinity: bool = False, model_group_affinity_config: dict[str, list[str]] | None = None, + is_priority_group: Callable[[str], bool] | None = None, ): super().__init__() self.cache = cache @@ -87,6 +88,7 @@ class DeploymentAffinityCheck(CustomLogger): self.enable_responses_api_affinity = enable_responses_api_affinity self.enable_session_id_affinity = enable_session_id_affinity self.model_group_affinity_config: dict[str, list[str]] = model_group_affinity_config or {} + self.is_priority_group = is_priority_group def _get_effective_flags(self, model_group: str) -> tuple[bool, bool, bool]: """ @@ -384,6 +386,9 @@ class DeploymentAffinityCheck(CustomLogger): ) return [deployment] + if self.is_priority_group is not None and self.is_priority_group(model): + return typed_healthy_deployments + stable_model_map_key: Final = self._get_stable_model_map_key_from_deployments( healthy_deployments=typed_healthy_deployments ) diff --git a/litellm/router_utils/pre_call_checks/prompt_caching_deployment_check.py b/litellm/router_utils/pre_call_checks/prompt_caching_deployment_check.py index 0589e290b47..eabd79f1847 100644 --- a/litellm/router_utils/pre_call_checks/prompt_caching_deployment_check.py +++ b/litellm/router_utils/pre_call_checks/prompt_caching_deployment_check.py @@ -4,6 +4,7 @@ Check if prompt caching is valid for a given deployment Route to previously cached model id, if valid """ +from collections.abc import Callable from typing import Final, cast from litellm import verbose_logger @@ -48,8 +49,10 @@ def _get_min_token_count_for_deployments(healthy_deployments: list[dict]) -> int class PromptCachingDeploymentCheck(CustomLogger): - def __init__(self, cache: DualCache): + def __init__(self, cache: DualCache, is_priority_group: Callable[[str], bool] | None = None): + super().__init__() self.cache = cache + self.is_priority_group = is_priority_group async def async_filter_deployments( self, @@ -59,6 +62,8 @@ class PromptCachingDeploymentCheck(CustomLogger): request_kwargs: dict | None = None, parent_otel_span: Span | None = None, ) -> list[dict]: + if self.is_priority_group is not None and self.is_priority_group(model): + return healthy_deployments if request_kwargs is not None and request_kwargs.get("_target_order") is not None: return healthy_deployments diff --git a/litellm/router_utils/routing_groups.py b/litellm/router_utils/routing_groups.py index 772c8bd805c..4438e53ca7d 100644 --- a/litellm/router_utils/routing_groups.py +++ b/litellm/router_utils/routing_groups.py @@ -2,7 +2,20 @@ from collections.abc import Sequence from typing import Final from litellm._logging import verbose_router_logger -from litellm.types.router import RoutingGroup, RoutingStrategy +from litellm.types.router import DeploymentTypedDict, RoutingGroup, RoutingStrategy + + +def apply_routing_group_priority( + group: RoutingGroup, member: str, deployment: DeploymentTypedDict +) -> DeploymentTypedDict: + if group.routing_strategy != "priority" or group.model_priorities is None: + return deployment + prioritized: Final[DeploymentTypedDict] = { + **deployment, + "litellm_params": {**deployment["litellm_params"], "order": group.model_priorities[member]}, + } + return prioritized + VALID_ROUTING_STRATEGIES: Final = ("simple-shuffle", "lar1", *(s.value for s in RoutingStrategy)) @@ -43,10 +56,18 @@ def parse_routing_groups( raise ValueError(f"routing_groups: group names must be unique, duplicate group_name '{min(duplicate_names)}'.") for group in groups: - validate_routing_strategy(group.routing_strategy) + if group.routing_strategy != "priority": + validate_routing_strategy(group.routing_strategy) owners_by_model: Final = tuple( - (model_name, tuple(group.group_name for group in groups if model_name in group.models)) + ( + model_name, + tuple( + group.group_name + for group in groups + if group.routing_strategy != "priority" and model_name in group.models + ), + ) for model_name in dict.fromkeys(model_name for group in groups for model_name in group.models) ) conflicts: Final = tuple( diff --git a/litellm/rust_bridge/_native.pyi b/litellm/rust_bridge/_native.pyi index 61e597bf674..355a5e5062e 100644 --- a/litellm/rust_bridge/_native.pyi +++ b/litellm/rust_bridge/_native.pyi @@ -12,6 +12,22 @@ class RustUpstreamError(Exception): ... class ForkedAfterNativeRuntimeStarted(RuntimeError): ... class ProcessReservedForForking(RuntimeError): ... +@final +class NativeDiagnosticProcessor: + def __new__(cls, minimum_custom_key_length: int) -> NativeDiagnosticProcessor: ... + def redact_text(self, text: str) -> str: ... + def redact_structured_text(self, key: str | None, text: str) -> str: ... + def redact_client_message(self, text: str) -> str: ... + def process_diagnostic( + self, + message: str, + exception: str | None, + stack: str | None, + leaves: Sequence[tuple[str | None, str]], + policy: tuple[bool, int, int], + ) -> tuple[str, str | None, str | None, list[str], bool]: ... + def scrub_access_arguments(self, arguments: Sequence[str]) -> list[str]: ... + def ocr( request: LiteLLMOcrRequest, args: tuple[object, ...], @@ -105,6 +121,7 @@ class _ResponseCacheRuntime: *, callback_kwargs: Mapping[str, object] | Sequence[object] | None = None, ) -> object: ... + def lookup_semantic(self, request: object) -> tuple[object, float | None]: ... def store( self, request: object, @@ -124,6 +141,7 @@ class _ResponseCacheRuntime: *, callback_kwargs: Mapping[str, object] | None = None, ) -> Future[object]: ... + def async_lookup_semantic(self, request: object) -> Future[tuple[object, float | None]]: ... def async_store( self, request: object, @@ -333,6 +351,7 @@ def reserve_process_for_forking() -> None: ... __all__ = [ "ForkedAfterNativeRuntimeStarted", "HuggingFaceEncoding", + "NativeDiagnosticProcessor", "ProcessReservedForForking", "ResponsesWebSocketConnection", "RustBridgeDeclined", diff --git a/litellm/rust_bridge/catalog.py b/litellm/rust_bridge/catalog.py index d7479631e04..1a2d153871d 100644 --- a/litellm/rust_bridge/catalog.py +++ b/litellm/rust_bridge/catalog.py @@ -86,16 +86,30 @@ class SecretManagerRule: return isinstance(context, SecretManagerContext) and (self.systems is None or context.system in self.systems) -Context: TypeAlias = RouteContext | CacheContext | SecretManagerContext -Rule: TypeAlias = RouteRule | CacheRule | SecretManagerRule +@dataclass(frozen=True, slots=True) +class LoggerContext: + pass + + +@dataclass(frozen=True, slots=True) +class LoggerRule: + rollout: Rollout + + def matches(self, context: Context) -> bool: + return isinstance(context, LoggerContext) + + +Context: TypeAlias = RouteContext | CacheContext | SecretManagerContext | LoggerContext +Rule: TypeAlias = RouteRule | CacheRule | SecretManagerRule | LoggerRule Rules: TypeAlias = tuple[Rule, ...] RULES: Final[Rules] = ( + LoggerRule(Rollout.RUST_OPT_IN), RouteRule(Route.OCR, Rollout.RUST_REQUIRED, providers=frozenset({"aws_textract"})), RouteRule(Route.OCR, Rollout.RUST_OPT_OUT), - RouteRule(Route.MESSAGES, Rollout.RUST_OPT_IN), - RouteRule(Route.TOKEN_COUNTER, Rollout.RUST_OPT_IN), - RouteRule(Route.TOKENIZER, Rollout.RUST_OPT_IN), + RouteRule(Route.MESSAGES, Rollout.PYTHON_ONLY), + RouteRule(Route.TOKEN_COUNTER, Rollout.PYTHON_ONLY), + RouteRule(Route.TOKENIZER, Rollout.PYTHON_ONLY), RouteRule(Route.TRANSCRIPTION, Rollout.RUST_REQUIRED, providers=frozenset({"bedrock"})), CacheRule(Rollout.PYTHON_ONLY, backends=frozenset({LiteLLMCacheType.LOCAL})), CacheRule(Rollout.PYTHON_ONLY, backends=frozenset({LiteLLMCacheType.REDIS})), diff --git a/litellm/rust_bridge/diagnostics.py b/litellm/rust_bridge/diagnostics.py new file mode 100644 index 00000000000..fbe1b8122d7 --- /dev/null +++ b/litellm/rust_bridge/diagnostics.py @@ -0,0 +1,59 @@ +from __future__ import annotations + +from collections.abc import Callable, Sequence +from functools import lru_cache +from typing import Final, Protocol, TypeVar, cast + +from litellm.rust_bridge.bindings import NativeBinding + +ResultT: Final = TypeVar("ResultT") + + +class NativeDiagnosticProcessor(Protocol): + def redact_text(self, text: str) -> str: ... + def redact_structured_text(self, key: str | None, text: str) -> str: ... + def redact_client_message(self, text: str) -> str: ... + def process_diagnostic( + self, + message: str, + exception: str | None, + stack: str | None, + leaves: tuple[tuple[str | None, str], ...], + policy: tuple[bool, int, int], + ) -> tuple[str, str | None, str | None, Sequence[str], bool]: ... + def scrub_access_arguments(self, arguments: tuple[str, ...]) -> Sequence[str]: ... + + +class NativeDiagnosticFactory(Protocol): + def __call__(self, minimum_custom_key_length: int) -> NativeDiagnosticProcessor: ... + + +def _as_factory(value: object) -> NativeDiagnosticFactory | None: + if not isinstance(value, type): + return None + return cast(NativeDiagnosticFactory, value) # cast-ok: PyO3 factory must be a type + + +PROCESSOR: Final = NativeBinding("NativeDiagnosticProcessor", validate=_as_factory) + + +@lru_cache(maxsize=4) +def _construct(factory: NativeDiagnosticFactory, minimum_custom_key_length: int) -> NativeDiagnosticProcessor: + return factory(minimum_custom_key_length) + + +def run(native: Callable[[NativeDiagnosticProcessor], ResultT], python: Callable[[], ResultT]) -> ResultT: + from litellm.constants import MINIMUM_CUSTOM_KEY_LENGTH + from litellm.rust_bridge.catalog import LoggerContext, decision + from litellm.rust_bridge.configuration import Decision + + selected: Final = decision(LoggerContext()) + if selected is Decision.PYTHON: + return python() + factory: Final = PROCESSOR.load() + if factory is None: + return python() + try: + return native(_construct(factory, MINIMUM_CUSTOM_KEY_LENGTH)) + except Exception: + return python() diff --git a/litellm/rust_bridge/logger.py b/litellm/rust_bridge/logger.py new file mode 100644 index 00000000000..bcd53852a2f --- /dev/null +++ b/litellm/rust_bridge/logger.py @@ -0,0 +1,63 @@ +from __future__ import annotations + +from collections.abc import Mapping +from typing import Final + +from pydantic import JsonValue + +from litellm._logging import ( + CorrelationContextFilter, + DiagnosticProcessingFilter, + session_id_var, + set_session_id, + set_trace_id, + trace_id_var, + verbose_logger, +) + +_REDACTION: Final = DiagnosticProcessingFilter() +_CORRELATION: Final = CorrelationContextFilter() + + +def context() -> tuple[str, str]: + return session_id_var.get(), trace_id_var.get() + + +def enabled(level: int) -> bool: + return verbose_logger.isEnabledFor(level) + + +def emit( + level: int, + message: str, + pathname: str, + lineno: int, + target: str, + fields: Mapping[str, JsonValue], + correlation: tuple[str, str], +) -> None: + if not enabled(level): + return + session_token: Final = set_session_id(correlation[0]) + trace_token: Final = set_trace_id(correlation[1]) + try: + record: Final = verbose_logger.makeRecord( + verbose_logger.name, + level, + pathname, + lineno, + message, + (), + None, + func=target, + extra={ + "rust_target": target, + "rust_fields": dict(fields), + }, # mutable-ok: LogRecord requires JSON dict extras + ) + _REDACTION.filter(record) + _CORRELATION.filter(record) + verbose_logger.handle(record) + finally: + trace_id_var.reset(trace_token) + session_id_var.reset(session_token) diff --git a/litellm/rust_bridge/response_cache.py b/litellm/rust_bridge/response_cache.py index 82d27fce27b..a6fc121a3b5 100644 --- a/litellm/rust_bridge/response_cache.py +++ b/litellm/rust_bridge/response_cache.py @@ -46,9 +46,11 @@ class NativeResponseCacheRuntime(Protocol): def kind(self) -> str: ... def lookup(self, request: NativeCacheRequest) -> object: ... + def lookup_semantic(self, request: NativeCacheRequest) -> tuple[object, float | None]: ... def store(self, request: NativeCacheRequest, response: object) -> None: ... def lookup_batch(self, requests: Sequence[NativeCacheRequest]) -> object: ... def async_lookup(self, request: NativeCacheRequest) -> Awaitable[object]: ... + def async_lookup_semantic(self, request: NativeCacheRequest) -> Awaitable[tuple[object, float | None]]: ... def async_store(self, request: NativeCacheRequest, response: object) -> Awaitable[None]: ... def async_lookup_batch(self, requests: Sequence[NativeCacheRequest]) -> Awaitable[object]: ... def async_store_batch( @@ -108,6 +110,11 @@ class ResponseCacheRuntime: def lookup(self, request: NativeCacheRequest) -> object: return self.native.lookup(request) + def lookup_semantic(self, request: NativeCacheRequest) -> tuple[object, float | None]: + """The cached response and the similarity a semantic backend reports, if any.""" + response, similarity = self.native.lookup_semantic(request) + return response, similarity + def store(self, request: NativeCacheRequest, response: object) -> None: self.native.store(request, response) @@ -117,6 +124,10 @@ class ResponseCacheRuntime: async def async_lookup(self, request: NativeCacheRequest) -> object: return await self.native.async_lookup(request) + async def async_lookup_semantic(self, request: NativeCacheRequest) -> tuple[object, float | None]: + response, similarity = await self.native.async_lookup_semantic(request) + return response, similarity + async def async_store(self, request: NativeCacheRequest, response: object) -> None: await self.native.async_store(request, response) diff --git a/litellm/rust_bridge/settings.py b/litellm/rust_bridge/settings.py index 866f2fce989..46e96b60620 100644 --- a/litellm/rust_bridge/settings.py +++ b/litellm/rust_bridge/settings.py @@ -58,12 +58,6 @@ class SecretManagerBinding: settings_object: object -def warn(message: str) -> None: - from litellm._logging import verbose_logger - - verbose_logger.warning("%s", message) - - def secret_manager() -> SecretManager: from litellm.secret_managers.main import ( _should_read_secret_from_secret_manager, # pyright: ignore[reportPrivateUsage] # canonical resolver is private diff --git a/litellm/secret_managers/aws_secret_manager_v2.py b/litellm/secret_managers/aws_secret_manager_v2.py index 0fb59105b5f..3e9f4e259d5 100644 --- a/litellm/secret_managers/aws_secret_manager_v2.py +++ b/litellm/secret_managers/aws_secret_manager_v2.py @@ -16,6 +16,8 @@ Requires: import json import os +from collections.abc import Mapping +from types import MappingProxyType from typing import TYPE_CHECKING, Final import httpx @@ -294,32 +296,13 @@ class AWSSecretsManagerV2(BaseAWSLLM, BaseSecretManager): raise ValueError("Tags must be a dict or list of {Key, Value} pairs") data["Tags"] = tags_list - endpoint_url, headers, body = self._prepare_request( - action="CreateSecret", + create_response: Final = await self._async_create_or_restore_secret( secret_name=secret_name, - secret_value=secret_value, - optional_params=optional_params, request_data=data, + optional_params=optional_params, + timeout=timeout, ) - async_client: Final = get_async_httpx_client( - llm_provider=httpxSpecialProvider.SecretManager, - params={"timeout": timeout}, - ) - - try: - response: Final = await async_client.post( - url=endpoint_url, - headers=headers, - data=body.decode("utf-8"), - ) - response.raise_for_status() - create_response: Final = response.json() - except httpx.HTTPStatusError as err: - raise ValueError(f"HTTP error occurred: {err.response.text}") - except httpx.TimeoutException: - raise ValueError("Timeout error occurred") - if self.replica_regions: try: await self.async_replicate_secret( @@ -343,6 +326,110 @@ class AWSSecretsManagerV2(BaseAWSLLM, BaseSecretManager): return create_response + async def _async_create_or_restore_secret( + self, + secret_name: str, + request_data: Mapping[str, object], + optional_params: dict | None, + timeout: float | httpx.Timeout | None, + ) -> dict[str, object]: + try: + return await self._async_post_action( + action="CreateSecret", + secret_name=secret_name, + request_data=request_data, + optional_params=optional_params, + timeout=timeout, + ) + except ValueError: + if not await self._async_is_scheduled_for_deletion( + secret_name=secret_name, + optional_params=optional_params, + timeout=timeout, + ): + raise + + verbose_logger.info( + "Secret %s is scheduled for deletion, restoring and updating in place (RestoreSecret + UpdateSecret)", + secret_name, + ) + await self._async_post_action( + action="RestoreSecret", + secret_name=secret_name, + request_data=None, + optional_params=optional_params, + timeout=timeout, + ) + update_data: Final = MappingProxyType( + {("SecretId" if key == "Name" else key): value for key, value in request_data.items() if key != "Tags"} + ) + tags: Final = request_data.get("Tags") + try: + updated: Final = await self._async_post_action( + action="UpdateSecret", + secret_name=secret_name, + request_data=update_data, + optional_params=optional_params, + timeout=timeout, + ) + if tags is not None: + await self._async_post_action( + action="TagResource", + secret_name=secret_name, + request_data=MappingProxyType({"SecretId": secret_name, "Tags": tags}), + optional_params=optional_params, + timeout=timeout, + ) + except ValueError: + await self.async_delete_secret(secret_name=secret_name, optional_params=optional_params, timeout=timeout) + raise + return updated + + async def _async_is_scheduled_for_deletion( + self, + secret_name: str, + optional_params: dict | None, + timeout: float | httpx.Timeout | None, + ) -> bool: + try: + described: Final = await self._async_post_action( + action="DescribeSecret", + secret_name=secret_name, + request_data=None, + optional_params=optional_params, + timeout=timeout, + ) + except ValueError: + return False + return described.get("DeletedDate") is not None + + async def _async_post_action( + self, + action: str, + secret_name: str, + request_data: Mapping[str, object] | None, + optional_params: dict | None, + timeout: float | httpx.Timeout | None, + ) -> dict[str, object]: + endpoint_url, headers, body = self._prepare_request( + action=action, + secret_name=secret_name, + optional_params=optional_params, + request_data=dict(request_data) if request_data is not None else None, + ) + async_client: Final = get_async_httpx_client( + llm_provider=httpxSpecialProvider.SecretManager, + params={"timeout": timeout}, + ) + try: + response: Final = await async_client.post(url=endpoint_url, headers=headers, data=body.decode("utf-8")) + response.raise_for_status() + return response.json() + except httpx.HTTPStatusError as err: + raise ValueError(f"HTTP error occurred: {err.response.text}") + except httpx.TimeoutException: + raise ValueError("Timeout error occurred") + async def async_replicate_secret( self, secret_name: str, diff --git a/litellm/types/caching.py b/litellm/types/caching.py index 747f202d35e..6d42556a9c4 100644 --- a/litellm/types/caching.py +++ b/litellm/types/caching.py @@ -3,7 +3,7 @@ from enum import Enum from typing import Any, Final, Literal, Optional, Union from pydantic import BaseModel -from typing_extensions import TypedDict +from typing_extensions import ReadOnly, TypedDict class LiteLLMCacheType(str, Enum): @@ -137,12 +137,16 @@ class HealthCheckCacheParams(BaseModel): redis_version: str | int | float | None = None +EMBEDDING_CACHE_FORMAT_VERSION: Final = 2 + + class CachedEmbedding(TypedDict): """Type definition for cached embedding objects""" - embedding: list[float] | None - index: int | None - object: str | None - model: str | None - prompt_tokens: int | None - prompt_tokens_details: dict | None + embedding: ReadOnly[list[float] | str | None] + index: ReadOnly[int | None] + object: ReadOnly[str | None] + model: ReadOnly[str | None] + prompt_tokens: ReadOnly[int | None] + prompt_tokens_details: ReadOnly[dict | None] + format_version: ReadOnly[int] diff --git a/litellm/types/management_endpoints/auto_router_endpoints.py b/litellm/types/management_endpoints/auto_router_endpoints.py index 93ea925bd9e..334ca0dfb08 100644 --- a/litellm/types/management_endpoints/auto_router_endpoints.py +++ b/litellm/types/management_endpoints/auto_router_endpoints.py @@ -44,6 +44,25 @@ class ComplexityRouterConfigValidationResponse(BaseModel): error: str | None = None +class AutoRouterAvailabilityRequest(BaseModel): + team_id: str | None = None + saved_model_id: str | None = None + complexity_router_config: Mapping[str, object] | None = None + + +class AutoRouterAllowance(BaseModel): + key: str + limit: int | None + remaining: int | None + used_by_this_router: bool = False + available: bool = True + + +class AutoRouterAvailabilityResponse(BaseModel): + allowances: tuple[AutoRouterAllowance, ...] + error: str | None = None + + class AutoRouterRoutingTestRequest(BaseModel): """A single request to classify against a complexity-router config that need not be saved yet. diff --git a/litellm/types/management_endpoints/router_settings_endpoints.py b/litellm/types/management_endpoints/router_settings_endpoints.py index cef180b202a..4d1ac58edb0 100644 --- a/litellm/types/management_endpoints/router_settings_endpoints.py +++ b/litellm/types/management_endpoints/router_settings_endpoints.py @@ -80,6 +80,7 @@ class RouterSettingsField(BaseModel): # Routing strategy descriptions ROUTING_STRATEGY_DESCRIPTIONS: Final[dict[str, str]] = { + "priority": "Routes group calls to the lowest-priority-number available model, with failover to higher numbers. Equal priorities share traffic. Direct member calls keep their existing policy.", "simple-shuffle": "Randomly picks a deployment from the list. Simple and fast.", "least-busy": "Routes to the deployment with the lowest number of ongoing requests.", "latency-based-routing": "Routes to the deployment with the lowest latency over a sliding window.", diff --git a/litellm/types/router.py b/litellm/types/router.py index 8ca27a9fb66..57bd4263894 100644 --- a/litellm/types/router.py +++ b/litellm/types/router.py @@ -6,7 +6,8 @@ import datetime import enum from collections.abc import Mapping, Sequence from dataclasses import dataclass -from typing import TYPE_CHECKING, Any, ClassVar, Final, Generic, Literal, TypeVar, get_type_hints +from typing import TYPE_CHECKING, Annotated, Any, ClassVar, Final, Generic, Literal, TypeVar, get_type_hints +from zoneinfo import ZoneInfo, ZoneInfoNotFoundError import httpx from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator @@ -15,6 +16,7 @@ from typing_extensions import Protocol, ReadOnly, Required, TypedDict, runtime_c from litellm._logging import verbose_logger from litellm._uuid import uuid from litellm.litellm_core_utils.core_helpers import normalize_drop_params +from litellm.litellm_core_utils.provider_affinity import validate_provider_affinity_header_name from litellm.types.router_weights import RouterWeights if TYPE_CHECKING: @@ -59,6 +61,25 @@ class RoutingGroup(BaseModel): routing_strategy: str routing_strategy_args: dict | None = None + model_priorities: dict[str, Annotated[int, Field(strict=True, ge=1, le=9007199254740991)]] | None = Field( + default=None, + description="For priority groups, every model's priority. Lower numbers are tried first; equal numbers share traffic.", + ) + + @model_validator(mode="after") + def _validate_model_priorities(self) -> "RoutingGroup": + if self.routing_strategy != "priority": + if self.model_priorities: + raise ValueError("model_priorities requires routing_strategy='priority'") + return self + if not self.models or len(self.models) != len(frozenset(self.models)): + raise ValueError("Priority routing groups require nonempty, distinct models") + if self.model_priorities is None or frozenset(self.model_priorities) != frozenset(self.models): + raise ValueError("model_priorities must contain exactly the group's models") + if self.routing_strategy_args: + raise ValueError("Priority routing groups use model_priorities, not routing_strategy_args") + return self + model_config = ConfigDict(protected_namespaces=()) @@ -163,6 +184,44 @@ def _as_utc(value: datetime.datetime | None) -> datetime.datetime | None: return value.astimezone(datetime.timezone.utc) +class ModelAccessWindow(BaseModel): + model_config = ConfigDict(frozen=True, extra="forbid") + + start: datetime.time + end: datetime.time + timezone: str + team_ids: tuple[str, ...] = Field(min_length=1) + + @field_validator("start", "end") + @classmethod + def _naive_wall_clock(cls, value: datetime.time) -> datetime.time: + if value.tzinfo is not None: + raise ValueError("start and end must be local wall-clock times without a UTC offset") + return value + + @field_validator("timezone") + @classmethod + def _known_iana_timezone(cls, value: str) -> str: + try: + ZoneInfo(value) + except (ZoneInfoNotFoundError, ValueError) as exc: + raise ValueError(f"unknown IANA timezone '{value}'") from exc + return value + + @field_validator("team_ids") + @classmethod + def _non_empty_team_ids(cls, value: tuple[str, ...]) -> tuple[str, ...]: + if any(not team_id for team_id in value): + raise ValueError("team_ids entries must be non-empty") + return value + + @model_validator(mode="after") + def _start_differs_from_end(self) -> "ModelAccessWindow": + if self.start == self.end: + raise ValueError("start and end must differ") + return self + + class ModelInfo(MirroredPricingParams): id: str | None # Allow id to be optional on input, but it will always be present as a str in the model instance db_model: bool = False # used for proxy - to separate models which are stored in the db vs. config. @@ -188,6 +247,8 @@ class ModelInfo(MirroredPricingParams): # admin-toggled pause flag; mirrors LiteLLM_ProxyModelTable.blocked blocked: bool | None = None + access_windows: tuple[ModelAccessWindow, ...] | None = None + # Bounds live on the model rather than litellm.constants: names there reach # litellm/__init__ through several modules' star re-exports, and a Final rebound that # way trips the basedpyright gate. @@ -336,6 +397,7 @@ class GenericLiteLLMParams(CredentialLiteLLMParams, CustomPricingLiteLLMParams): organization: str | None = None # for openai orgs configurable_clientside_auth_params: CONFIGURABLE_CLIENTSIDE_AUTH_PARAMS = None litellm_credential_name: str | None = None + provider_affinity_header: str | None = None ## LOGGING PARAMS ## litellm_trace_id: str | None = None @@ -407,6 +469,13 @@ class GenericLiteLLMParams(CredentialLiteLLMParams, CustomPricingLiteLLMParams): valkey_text_field: str | None = None valkey_embedding_field: str | None = None + @field_validator("provider_affinity_header") + @classmethod + def validate_provider_affinity_header(cls, value: str | None) -> str | None: + if value is None: + return None + return validate_provider_affinity_header_name(value) + @model_validator(mode="before") @classmethod def preprocess_input_data(cls, data: object) -> object: @@ -509,6 +578,7 @@ class LiteLLMParamsTypedDict(TypedDict, total=False): stream_timeout: float | str | None max_retries: int | None organization: list | str | None # for openai orgs + provider_affinity_header: ReadOnly[str | None] configurable_clientside_auth_params: ( CONFIGURABLE_CLIENTSIDE_AUTH_PARAMS # for allowing api base switching on finetuned models ) diff --git a/litellm/types/utils.py b/litellm/types/utils.py index f10f102d8ec..dfc98a9d89d 100644 --- a/litellm/types/utils.py +++ b/litellm/types/utils.py @@ -3256,6 +3256,7 @@ class StandardLoggingPayloadErrorInformation(TypedDict, total=False): error_budget_entity_id: str | None error_budget_limit: float | None error_budget_spend: float | None + normalized_error: ReadOnly[str | None] class GuardrailMode(TypedDict, total=False): @@ -4073,6 +4074,7 @@ all_litellm_params = ( "litellm_credential_name", "allowed_openai_params", "litellm_session_id", + "provider_affinity_header", "use_litellm_proxy", "use_chat_completions_api", "rust", diff --git a/litellm/types/vector_stores.py b/litellm/types/vector_stores.py index 6d2ca308798..34c14e6b042 100644 --- a/litellm/types/vector_stores.py +++ b/litellm/types/vector_stores.py @@ -44,6 +44,8 @@ class LiteLLM_ManagedVectorStore(TypedDict, total=False): team_id: str | None user_id: str | None + is_config: ReadOnly[bool] + class LiteLLM_ManagedVectorStoreListResponse(TypedDict, total=False): """Response format for listing vector stores""" diff --git a/litellm/utils.py b/litellm/utils.py index 8ce83f475a4..dd35c17809f 100644 --- a/litellm/utils.py +++ b/litellm/utils.py @@ -472,6 +472,7 @@ from .exceptions import ( BudgetExceededError, ContentPolicyViolationError, ContextWindowExceededError, + ModelNotMappedError, NotFoundError, OpenAIError, PermissionDeniedError, @@ -1439,11 +1440,22 @@ async def async_post_call_success_deployment_hook( modified_response = response CustomLogger: Final = _get_cached_custom_logger() + CustomGuardrail: Final = _get_cached_custom_guardrail() for callback in litellm.callbacks: if isinstance(callback, CustomLogger): - result = await callback.async_post_call_success_deployment_hook( - request_data, cast(LLMResponseTypes, modified_response), typed_call_type - ) + try: + result = await callback.async_post_call_success_deployment_hook( + request_data, cast(LLMResponseTypes, modified_response), typed_call_type + ) + except Exception: # noqa: BLE001 # a broken callback must not fail a completed request + if isinstance(callback, CustomGuardrail): + raise + verbose_logger.exception( + "async_post_call_success_deployment_hook error in %s for call_type=%s", + type(callback).__name__, + typed_call_type, + ) + continue if result is not None: modified_response = result @@ -2015,13 +2027,19 @@ def client(original_function): print_verbose(f"Error while checking max token limit: {e}") # MODEL CALL + call_kwargs: Final = ( + {**kwargs, "input": _caching_handler_response.embedding_uncached_input} + if _caching_handler_response is not None + and _caching_handler_response.embedding_uncached_input is not None + else kwargs + ) try: - result = await original_function(*args, **kwargs) + result = await original_function(*args, **call_kwargs) except Exception as deployment_error: _deployment_call_end_time = datetime.datetime.now() # noqa: DTZ005 # matches the naive datetimes this whole function already times start_time/end_time with try: await async_post_call_failure_deployment_hook( - request_data=kwargs, + request_data=call_kwargs, exception=deployment_error, call_type=call_type, ) @@ -2062,7 +2080,7 @@ def client(original_function): post_call_processing( original_response=result, model=model, - optional_params=kwargs, + optional_params=call_kwargs, original_function=original_function, rules_obj=rules_obj, ) @@ -2070,7 +2088,7 @@ def client(original_function): _call_type_enum: Final = _CALL_TYPE_ENUM_MAP.get(call_type) if _call_type_enum is not None: result = await async_post_call_success_deployment_hook( - request_data=kwargs, + request_data=call_kwargs, response=result, call_type=_call_type_enum, ) @@ -2079,7 +2097,7 @@ def client(original_function): await _llm_caching_handler.async_set_cache( result=result, original_function=original_function, - kwargs=kwargs, + kwargs=call_kwargs, args=args, ) @@ -4979,7 +4997,9 @@ def add_provider_specific_params_to_optional_params( **extra_body, } - dropped_keys: Final = EXTRA_BODY_ROUTING_KEYS | frozenset(additional_drop_params or ()) + dropped_keys: Final = EXTRA_BODY_ROUTING_KEYS | frozenset( + param for param in (additional_drop_params or ()) if isinstance(param, str) + ) processed_extra_body: Final = {k: v for k, v in initial_extra_body.items() if k not in dropped_keys} _ensure_extra_body_is_safe: Final = getattr(sys.modules[__name__], "_ensure_extra_body_is_safe") @@ -5822,6 +5842,13 @@ def _is_potential_model_name_in_model_cost( _ABOVE_THRESHOLD_COST_KEY: Final = ABOVE_THRESHOLD_COST_KEY_PATTERN +def _model_not_mapped_message(model: str, custom_llm_provider: str | None) -> str: + return ( + f"This model isn't mapped yet. model={model}, custom_llm_provider={custom_llm_provider}. " + "Add it here - https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json." + ) + + def _get_model_info_helper( model: str, custom_llm_provider: str | None = None, @@ -6004,9 +6031,7 @@ def _get_model_info_helper( key, _model_info = generalization if _model_info is None or key is None: - raise ValueError( - "This model isn't mapped yet. Add it here - https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json" - ) + raise ModelNotMappedError(_model_not_mapped_message(model, custom_llm_provider)) _input_cost_per_token: float | None = _model_info.get("input_cost_per_token") if _input_cost_per_token is None: # default value to 0, be noisy about this @@ -6241,11 +6266,11 @@ def _get_model_info_helper( if cost_key not in returned_model_info and _ABOVE_THRESHOLD_COST_KEY.search(cost_key) is not None: returned_model_info[cost_key] = cost_value return returned_model_info + except ModelNotMappedError: + raise except Exception as e: verbose_logger.debug("Error getting model info: %s", e) - raise Exception( - f"This model isn't mapped yet. model={model}, custom_llm_provider={custom_llm_provider}. Add it here - https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json." - ) + raise Exception(_model_not_mapped_message(model, custom_llm_provider)) def _build_model_info( diff --git a/litellm/vector_stores/vector_store_registry.py b/litellm/vector_stores/vector_store_registry.py index c7aed77286c..e78d2aa5f6a 100644 --- a/litellm/vector_stores/vector_store_registry.py +++ b/litellm/vector_stores/vector_store_registry.py @@ -340,7 +340,7 @@ class VectorStoreRegistry: # Verify vector store still exists in database (if we have DB access) # This ensures deleted vector stores are removed from cache - if vector_store is not None and prisma_client is not None: + if vector_store is not None and prisma_client is not None and not vector_store.get("is_config", False): try: # Check if it still exists in database db_vector_store = await ManagedVectorStoresRepository(prisma_client).table.find_unique( @@ -426,6 +426,7 @@ class VectorStoreRegistry: vector_store_metadata=vector_store_litellm_params.get("vector_store_metadata"), created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), + is_config=True, ) self.vector_stores.append(litellm_managed_vector_store) @@ -452,6 +453,10 @@ class VectorStoreRegistry: return response + def is_config_vector_store(self, vector_store_id: str) -> bool: + vector_store: Final = self.get_litellm_managed_vector_store_from_registry(vector_store_id=vector_store_id) + return vector_store is not None and vector_store.get("is_config", False) + def add_vector_store_to_registry(self, vector_store: LiteLLM_ManagedVectorStore): """ Add a vector store to the registry @@ -475,10 +480,11 @@ class VectorStoreRegistry: ] def update_vector_store_in_registry(self, vector_store_id: str, updated_data: LiteLLM_ManagedVectorStore): - """Update or add a vector store in the registry""" + """Update or add a vector store in the registry. Config-defined stores are left untouched""" for i, vector_store in enumerate(self.vector_stores): if vector_store.get("vector_store_id") == vector_store_id: - self.vector_stores[i] = updated_data + if not vector_store.get("is_config", False): + self.vector_stores[i] = updated_data return self.vector_stores.append(updated_data) diff --git a/migrations/Dockerfile b/migrations/Dockerfile index f34940c0ce0..255b94b0ea8 100644 --- a/migrations/Dockerfile +++ b/migrations/Dockerfile @@ -1,5 +1,5 @@ -ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d -ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:e624c5d5e42382ce7165ddafcbbf8e6769a24cbd02ea6114b880b05ae5ba2a8d +ARG LITELLM_BUILD_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d +ARG LITELLM_RUNTIME_IMAGE=cgr.dev/chainguard/wolfi-base@sha256:1d95114038f76513a9ace6fca107d5582b08c65981f81f61cb56bf7fd2ef216d ARG UV_IMAGE=ghcr.io/astral-sh/uv:0.11.7@sha256:240fb85ab0f263ef12f492d8476aa3a2e4e1e333f7d67fbdd923d00a506a516a FROM $UV_IMAGE AS uvbin diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json index 7cde9a1162e..ae02744b8e1 100644 --- a/model_prices_and_context_window.json +++ b/model_prices_and_context_window.json @@ -53,13 +53,6 @@ "mode": "image_generation", "output_cost_per_image": 0.04 }, - "1024-x-1024/dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 1.9e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "1024-x-1024/max-steps/stability.stable-diffusion-xl-v1": { "litellm_provider": "bedrock", "max_input_tokens": 77, @@ -67,13 +60,6 @@ "mode": "image_generation", "output_cost_per_image": 0.08 }, - "256-x-256/dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 2.4414e-07, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "512-x-512/50-steps/stability.stable-diffusion-xl-v0": { "litellm_provider": "bedrock", "max_input_tokens": 77, @@ -81,13 +67,6 @@ "mode": "image_generation", "output_cost_per_image": 0.018 }, - "512-x-512/dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 6.86e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "512-x-512/max-steps/stability.stable-diffusion-xl-v0": { "litellm_provider": "bedrock", "max_input_tokens": 77, @@ -102,7 +81,8 @@ "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 1.25e-05 + "output_cost_per_token": 1.25e-05, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.j2-ultra-v1": { "input_cost_per_token": 1.88e-05, @@ -111,7 +91,8 @@ "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 1.88e-05 + "output_cost_per_token": 1.88e-05, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.jamba-1-5-large-v1:0": { "deprecation_date": "2026-11-26", @@ -121,7 +102,8 @@ "max_output_tokens": 256000, "max_tokens": 256000, "mode": "chat", - "output_cost_per_token": 8e-06 + "output_cost_per_token": 8e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.jamba-1-5-mini-v1:0": { "deprecation_date": "2026-11-26", @@ -131,7 +113,8 @@ "max_output_tokens": 256000, "max_tokens": 256000, "mode": "chat", - "output_cost_per_token": 4e-07 + "output_cost_per_token": 4e-07, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "ai21.jamba-instruct-v1:0": { "input_cost_per_token": 5e-07, @@ -141,6 +124,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 7e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_system_messages": true }, "aiml/dall-e-2": { @@ -316,6 +300,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 1e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -327,6 +312,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 6e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -338,6 +324,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 1e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -349,6 +336,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 6e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_pdf_input": true }, @@ -360,7 +348,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 6e-07, - "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-writer-palmyra-vision-7b.html", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_vision": true }, "amazon.nova-lite-v1:0": { @@ -578,17 +566,6 @@ "supports_vision": true, "supports_tool_choice": true }, - "amazon.nova-sonic-v1:0": { - "deprecation_date": "2026-09-14", - "input_cost_per_audio_token": 3.4e-06, - "input_cost_per_token": 6e-08, - "litellm_provider": "bedrock", - "mode": "realtime", - "output_cost_per_audio_token": 1.36e-05, - "output_cost_per_token": 2.4e-07, - "supports_audio_input": true, - "supports_audio_output": true - }, "amazon.nova-2-sonic-v1:0": { "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 3.3e-07, @@ -846,7 +823,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -972,23 +949,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "anthropic.claude-3-opus-20240229-v1:0": { "input_cost_per_token": 1.5e-05, "litellm_provider": "bedrock", @@ -1004,23 +964,6 @@ "cache_read_input_token_cost": 1.5e-06, "cache_creation_input_token_cost": 1.875e-05 }, - "anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "anthropic.claude-instant-v1": { "input_cost_per_token": 8e-07, "litellm_provider": "bedrock", @@ -1114,7 +1057,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1149,7 +1093,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1184,7 +1129,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1219,7 +1165,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1254,7 +1201,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-4-6-v1": { "supports_adaptive_thinking": true, @@ -1289,7 +1237,8 @@ "supports_max_reasoning_effort": true, "bedrock_output_config_effort_ceiling": "max", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-opus-4-7": { "bedrock_converse_supports_strict_tools": false, @@ -1321,7 +1270,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -1375,7 +1324,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -1413,7 +1362,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -1451,12 +1400,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-4-7": { "bedrock_converse_supports_strict_tools": false, @@ -1488,12 +1438,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-fable-5": { "cache_creation_input_token_cost": 1.25e-05, @@ -1761,7 +1712,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.375e-05, @@ -1839,6 +1791,46 @@ "prompt_cache_min_tokens": 512, "source": "https://aws.amazon.com/bedrock/pricing/" }, + "anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "global.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, "supports_adaptive_thinking": true, @@ -1877,6 +1869,46 @@ "prompt_cache_min_tokens": 512, "source": "https://aws.amazon.com/bedrock/pricing/" }, + "global.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "us.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, "supports_adaptive_thinking": true, @@ -1915,6 +1947,46 @@ "prompt_cache_min_tokens": 512, "source": "https://aws.amazon.com/bedrock/pricing/" }, + "us.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "eu.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, "supports_adaptive_thinking": true, @@ -1950,7 +2022,48 @@ "supports_max_reasoning_effort": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, + "eu.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, @@ -1987,7 +2100,48 @@ "supports_max_reasoning_effort": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, + "au.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-opus-5": { "bedrock_converse_supports_strict_tools": false, @@ -2024,7 +2178,48 @@ "supports_max_reasoning_effort": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, + "jp.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "supports_adaptive_thinking": true, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_1hr": 8.8e-06, + "cache_read_input_token_cost": 2.2e-07, + "input_cost_per_token": 4.4e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.2e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_native_structured_output": false, + "supports_max_reasoning_effort": true, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "prompt_cache_min_tokens": 512, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-opus-4-8": { "bedrock_converse_supports_strict_tools": false, @@ -2057,7 +2252,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -2096,7 +2291,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -2135,7 +2330,7 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", @@ -2174,12 +2369,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-opus-4-8": { "bedrock_converse_supports_strict_tools": false, @@ -2212,12 +2408,13 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-opus-4-8": { "bedrock_converse_supports_strict_tools": false, @@ -2250,16 +2447,18 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-opus-4-7": { "bedrock_converse_supports_strict_tools": false, "cache_creation_input_token_cost": 6.875e-06, + "cache_creation_input_token_cost_above_1hr": 1.1e-05, "cache_read_input_token_cost": 5.5e-07, "input_cost_per_token": 5.5e-06, "litellm_provider": "bedrock_converse", @@ -2286,11 +2485,12 @@ "supports_tool_choice": true, "supports_vision": true, "supports_xhigh_reasoning_effort": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_max_reasoning_effort": true, "supports_minimal_reasoning_effort": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -2445,7 +2645,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -2483,7 +2684,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -2521,7 +2723,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "xhigh", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-4-6": { "supports_adaptive_thinking": true, @@ -2660,7 +2863,8 @@ "supports_native_structured_output": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "au.anthropic.claude-sonnet-4-6": { "supports_adaptive_thinking": true, @@ -2694,7 +2898,8 @@ "supports_native_structured_output": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-sonnet-4-6": { "supports_adaptive_thinking": true, @@ -2728,7 +2933,8 @@ "supports_native_structured_output": true, "supports_output_config": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -2760,7 +2966,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -2797,7 +3004,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.5e-06, - "output_cost_per_token_batches": 7.5e-06 + "output_cost_per_token_batches": 7.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "anthropic.claude-v1": { "input_cost_per_token": 8e-06, @@ -2982,60 +3190,6 @@ "supports_vision": true, "supports_tool_choice": true }, - "apac.anthropic.claude-3-5-sonnet-20240620-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, - "apac.anthropic.claude-3-5-sonnet-20241022-v2:0": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "apac.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "apac.anthropic.claude-haiku-4-5-20251001-v1:0": { "cache_creation_input_token_cost": 1.375e-06, "cache_read_input_token_cost": 1.1e-07, @@ -3063,23 +3217,6 @@ "input_cost_per_token_batches": 5.5e-07, "output_cost_per_token_batches": 2.75e-06 }, - "apac.anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "apac.anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, "cache_read_input_token_cost": 3e-07, @@ -3110,7 +3247,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "assemblyai/best": { "input_cost_per_second": 3.333e-05, @@ -3159,7 +3297,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "azure/ada": { "input_cost_per_token": 1e-07, @@ -3424,6 +3563,41 @@ "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 512 }, + "azure_ai/claude-opus-5-5": { + "supports_mid_conversation_system": true, + "input_cost_per_token": 4e-06, + "output_cost_per_token": 2e-05, + "litellm_provider": "azure_ai", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "supports_adaptive_thinking": true, + "thinking_always_on": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_forced_tool_use": false, + "supports_function_calling": true, + "supports_native_structured_output": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_max_reasoning_effort": true, + "prompt_cache_min_tokens": 512 + }, "azure_ai/claude-opus-4-8": { "deprecation_date": "2027-09-01", "supports_mid_conversation_system": true, @@ -3457,29 +3631,6 @@ "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 1024 }, - "azure_ai/claude-opus-4-1": { - "deprecation_date": "2026-08-05", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "azure_ai", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, "azure_ai/claude-sonnet-4-5": { "deprecation_date": "2026-10-19", "cache_creation_input_token_cost": 3.75e-06, @@ -4428,7 +4579,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 6.875e-08 }, "azure/eu/gpt-5-mini-2025-08-07": { "cache_read_input_token_cost": 2.75e-08, @@ -4467,11 +4619,13 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 1.375e-08 }, "azure/eu/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "litellm_provider": "azure", @@ -4511,43 +4665,6 @@ "output_cost_per_token_priority": 2.2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.375e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.375e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1.1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, @@ -4646,7 +4763,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 2.75e-09 }, "azure/eu/o1-2024-12-17": { "cache_read_input_token_cost": 8.25e-06, @@ -4684,21 +4802,6 @@ "supports_prompt_caching": true, "supports_vision": false }, - "azure/eu/o1-preview-2024-09-12": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_vision": false - }, "azure/eu/o3-mini-2025-01-31": { "cache_read_input_token_cost": 6.05e-07, "deprecation_date": "2026-11-19", @@ -4814,6 +4917,7 @@ "azure/global/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, "litellm_provider": "azure", @@ -4853,43 +4957,6 @@ "output_cost_per_token_priority": 2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/global/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/global/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, @@ -4965,19 +5032,6 @@ "supports_function_calling": true, "supports_tool_choice": true }, - "azure/gpt-3.5-turbo-0125": { - "deprecation_date": "2025-03-31", - "input_cost_per_token": 5e-07, - "litellm_provider": "azure", - "max_input_tokens": 16384, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, "azure/gpt-3.5-turbo-instruct-0914": { "input_cost_per_token": 1.5e-06, "litellm_provider": "azure_text", @@ -4997,32 +5051,6 @@ "supports_function_calling": true, "supports_tool_choice": true }, - "azure/gpt-35-turbo-0125": { - "deprecation_date": "2025-05-31", - "input_cost_per_token": 5e-07, - "litellm_provider": "azure", - "max_input_tokens": 16384, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, - "azure/gpt-35-turbo-1106": { - "deprecation_date": "2025-03-31", - "input_cost_per_token": 1e-06, - "litellm_provider": "azure", - "max_input_tokens": 16384, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 2e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, "azure/gpt-35-turbo-16k": { "input_cost_per_token": 3e-06, "litellm_provider": "azure", @@ -5790,40 +5818,6 @@ "supports_system_messages": true, "supports_tool_choice": true }, - "azure/gpt-realtime-2": { - "cache_read_input_audio_token_cost": 4e-07, - "cache_read_input_token_cost": 4e-07, - "deprecation_date": "2026-08-31", - "input_cost_per_audio_token": 3.2e-05, - "input_cost_per_image_token": 5e-06, - "input_cost_per_token": 4e-06, - "litellm_provider": "azure", - "max_input_tokens": 32000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 6.4e-05, - "output_cost_per_token": 2.4e-05, - "source": "https://learn.microsoft.com/en-us/azure/foundry/foundry-models/concepts/models-sold-directly-by-azure", - "supported_endpoints": [ - "/v1/realtime" - ], - "supported_modalities": [ - "text", - "image", - "audio" - ], - "supported_output_modalities": [ - "text", - "audio" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "azure/gpt-realtime-2.1": { "cache_creation_input_audio_token_cost": 4e-07, "cache_read_input_audio_token_cost": 4e-07, @@ -6118,46 +6112,8 @@ "input_cost_per_token_batches": 6.25e-07, "output_cost_per_token_batches": 5e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_minimal_reasoning_effort": true - }, - "azure/gpt-5.1-chat-2025-11-13": { - "cache_read_input_token_cost": 1.25e-07, - "cache_read_input_token_cost_priority": 2.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "input_cost_per_token_priority": 2.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "output_cost_per_token_priority": 2e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_native_streaming": true, - "supports_parallel_function_calling": false, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": false, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_batches": 6.25e-08 }, "azure/gpt-5.1-codex-2025-11-13": { "cache_read_input_token_cost": 1.25e-07, @@ -6232,6 +6188,7 @@ "azure/gpt-5": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, "input_cost_per_token_batches": 6.25e-07, @@ -6305,74 +6262,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5-chat": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5-chat-latest": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 6.25e-08 }, "azure/gpt-5-codex": { "cache_read_input_token_cost": 1.25e-07, @@ -6409,6 +6300,7 @@ "azure/gpt-5-mini": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_token": 2.5e-07, "input_cost_per_token_batches": 1.25e-07, @@ -6482,11 +6374,13 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 1.25e-08 }, "azure/gpt-5-nano": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 5e-09, + "cache_read_input_token_cost_batches": 2.5e-09, "input_cost_per_token": 5e-08, "input_cost_per_token_batches": 2.5e-08, "litellm_provider": "azure", @@ -6554,7 +6448,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 2.5e-09 }, "azure/gpt-5-pro": { "deprecation_date": "2027-04-07", @@ -6591,6 +6486,7 @@ "azure/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, "litellm_provider": "azure", @@ -6630,43 +6526,6 @@ "output_cost_per_token_priority": 2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.25e-07, @@ -6766,6 +6625,7 @@ "azure/gpt-5.2": { "deprecation_date": "2027-06-08", "cache_read_input_token_cost": 1.75e-07, + "cache_read_input_token_cost_batches": 8.75e-08, "cache_read_input_token_cost_priority": 3.5e-07, "input_cost_per_token": 1.75e-06, "input_cost_per_token_batches": 8.75e-07, @@ -6841,79 +6701,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5.2-chat": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "azure/gpt-5.2-chat-2025-12-11": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-05-13", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 8.75e-08 }, "azure/gpt-5.2-codex": { "cache_read_input_token_cost": 1.75e-07, @@ -6947,42 +6736,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "azure/gpt-5.3-chat": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "azure/gpt-5.3-codex": { "cache_read_input_token_cost": 1.75e-07, "cache_read_input_token_cost_priority": 3.5e-07, @@ -7100,9 +6853,11 @@ "deprecation_date": "2027-09-02", "cache_read_input_token_cost": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens": 5e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens_flex": 2.5e-07, "cache_read_input_token_cost_priority": 5e-07, "cache_read_input_token_cost_above_272k_tokens_priority": 1e-06, + "cache_read_input_token_cost_batches": 1.3e-07, "input_cost_per_token": 2.5e-06, "input_cost_per_token_above_272k_tokens": 5e-06, "input_cost_per_token_priority": 5e-06, @@ -7140,9 +6895,11 @@ "supports_vision": true, "supports_none_reasoning_effort": true, "default_reasoning_effort": "none", + "input_cost_per_token_above_272k_tokens_batches": 2.5e-06, "input_cost_per_token_above_272k_tokens_flex": 2.5e-06, "input_cost_per_token_batches": 1.25e-06, "input_cost_per_token_flex": 1.25e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.125e-05, "output_cost_per_token_above_272k_tokens_flex": 1.125e-05, "output_cost_per_token_batches": 7.5e-06, "output_cost_per_token_flex": 7.5e-06, @@ -7154,6 +6911,8 @@ "deprecation_date": "2027-09-02", "cache_read_input_token_cost": 2.75e-07, "cache_read_input_token_cost_above_272k_tokens": 5.5e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, "cache_read_input_token_cost_priority": 5.5e-07, "input_cost_per_token": 2.75e-06, "input_cost_per_token_priority": 5.5e-06, @@ -7189,8 +6948,10 @@ "supports_none_reasoning_effort": true, "default_reasoning_effort": "none", "input_cost_per_token_above_272k_tokens": 5.5e-06, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, "input_cost_per_token_batches": 1.375e-06, "output_cost_per_token_above_272k_tokens": 2.475e-05, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05, "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, @@ -7200,6 +6961,8 @@ "deprecation_date": "2027-09-02", "cache_read_input_token_cost": 2.75e-07, "cache_read_input_token_cost_above_272k_tokens": 5.5e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, "cache_read_input_token_cost_priority": 5.5e-07, "input_cost_per_token": 2.75e-06, "input_cost_per_token_priority": 5.5e-06, @@ -7235,8 +6998,10 @@ "supports_none_reasoning_effort": true, "default_reasoning_effort": "none", "input_cost_per_token_above_272k_tokens": 5.5e-06, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, "input_cost_per_token_batches": 1.375e-06, "output_cost_per_token_above_272k_tokens": 2.475e-05, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05, "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, @@ -7294,7 +7059,11 @@ "output_cost_per_token_flex": 7.5e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, + "cache_read_input_token_cost_batches": 1.3e-07, + "input_cost_per_token_above_272k_tokens_batches": 2.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.125e-05 }, "azure/us/gpt-5.4-2026-03-05": { "cache_read_input_token_cost": 2.75e-07, @@ -7340,7 +7109,11 @@ "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05 }, "azure/eu/gpt-5.4-2026-03-05": { "cache_read_input_token_cost": 2.75e-07, @@ -7386,7 +7159,11 @@ "output_cost_per_token_batches": 8.25e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true + "supports_minimal_reasoning_effort": true, + "cache_read_input_token_cost_above_272k_tokens_batches": 2.75e-07, + "cache_read_input_token_cost_batches": 1.43e-07, + "input_cost_per_token_above_272k_tokens_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 1.2375e-05 }, "azure/gpt-5.4-pro": { "deprecation_date": "2027-09-07", @@ -7394,6 +7171,7 @@ "cache_read_input_token_cost_above_272k_tokens": 6e-06, "input_cost_per_token": 3e-05, "input_cost_per_token_above_272k_tokens": 6e-05, + "input_cost_per_token_above_272k_tokens_batches": 3e-05, "input_cost_per_token_above_272k_tokens_flex": 3e-05, "input_cost_per_token_batches": 1.5e-05, "input_cost_per_token_flex": 1.5e-05, @@ -7404,6 +7182,7 @@ "mode": "responses", "output_cost_per_token": 0.00018, "output_cost_per_token_above_272k_tokens": 0.00027, + "output_cost_per_token_above_272k_tokens_batches": 0.000135, "output_cost_per_token_above_272k_tokens_flex": 0.000135, "output_cost_per_token_batches": 9e-05, "output_cost_per_token_flex": 9e-05, @@ -7482,7 +7261,9 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, - "supports_web_search": true + "supports_web_search": true, + "input_cost_per_token_above_272k_tokens_batches": 3e-05, + "output_cost_per_token_above_272k_tokens_batches": 0.000135 }, "azure/gpt-5.6": { "cache_creation_input_token_cost": 6.25e-06, @@ -8625,11 +8406,14 @@ "deprecation_date": "2027-10-26", "cache_read_input_token_cost": 5e-07, "cache_read_input_token_cost_above_272k_tokens": 1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5e-07, "cache_read_input_token_cost_priority": 1.25e-06, "cache_read_input_token_cost_above_272k_tokens_priority": 2e-06, + "cache_read_input_token_cost_batches": 2.5e-07, "cache_read_input_token_cost_flex": 2.5e-07, "input_cost_per_token": 5e-06, "input_cost_per_token_above_272k_tokens": 1e-05, + "input_cost_per_token_above_272k_tokens_batches": 5e-06, "input_cost_per_token_above_272k_tokens_flex": 5e-06, "input_cost_per_token_priority": 1.25e-05, "input_cost_per_token_above_272k_tokens_priority": 2e-05, @@ -8642,6 +8426,7 @@ "mode": "chat", "output_cost_per_token": 3e-05, "output_cost_per_token_above_272k_tokens": 4.5e-05, + "output_cost_per_token_above_272k_tokens_batches": 2.25e-05, "output_cost_per_token_priority": 7.5e-05, "output_cost_per_token_above_272k_tokens_priority": 9e-05, "output_cost_per_token_batches": 1.5e-05, @@ -8682,9 +8467,12 @@ "deprecation_date": "2027-10-26", "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, "input_cost_per_token_priority": 1.375e-05, "output_cost_per_token": 3.3e-05, @@ -8695,6 +8483,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -8733,9 +8522,12 @@ "deprecation_date": "2027-10-26", "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, "input_cost_per_token_priority": 1.375e-05, "output_cost_per_token": 3.3e-05, @@ -8746,6 +8538,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -8783,8 +8576,10 @@ "azure/gpt-5.5-2026-04-23": { "cache_read_input_token_cost": 5e-07, "cache_read_input_token_cost_above_272k_tokens": 1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5e-07, "cache_read_input_token_cost_priority": 1.25e-06, "cache_read_input_token_cost_above_272k_tokens_priority": 2e-06, + "cache_read_input_token_cost_batches": 2.5e-07, "cache_read_input_token_cost_flex": 2.5e-07, "input_cost_per_token": 5e-06, "input_cost_per_token_above_272k_tokens": 1e-05, @@ -8828,9 +8623,11 @@ "supports_vision": true, "supports_web_search": true, "deprecation_date": "2027-10-26", + "input_cost_per_token_above_272k_tokens_batches": 5e-06, "input_cost_per_token_above_272k_tokens_flex": 5e-06, "input_cost_per_token_batches": 2.5e-06, "input_cost_per_token_flex": 2.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.25e-05, "output_cost_per_token_batches": 1.5e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -8889,11 +8686,17 @@ "supports_none_reasoning_effort": true, "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", + "cache_read_input_token_cost_above_272k_tokens_batches": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, + "input_cost_per_token_above_272k_tokens_batches": 5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.25e-05 }, "azure/us/gpt-5.5-2026-04-23": { "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, @@ -8935,7 +8738,9 @@ "supports_vision": true, "supports_web_search": true, "deprecation_date": "2027-10-26", + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -8988,11 +8793,17 @@ "supports_none_reasoning_effort": true, "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05 }, "azure/eu/gpt-5.5-2026-04-23": { "cache_read_input_token_cost": 5.5e-07, "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, "cache_read_input_token_cost_priority": 1.375e-06, "input_cost_per_token": 5.5e-06, "input_cost_per_token_above_272k_tokens": 1.1e-05, @@ -9034,7 +8845,9 @@ "supports_vision": true, "supports_web_search": true, "deprecation_date": "2027-10-26", + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, "input_cost_per_token_batches": 2.75e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05, "output_cost_per_token_batches": 1.65e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -9087,7 +8900,11 @@ "supports_none_reasoning_effort": true, "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" + "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", + "cache_read_input_token_cost_above_272k_tokens_batches": 5.5e-07, + "cache_read_input_token_cost_batches": 2.75e-07, + "input_cost_per_token_above_272k_tokens_batches": 5.5e-06, + "output_cost_per_token_above_272k_tokens_batches": 2.475e-05 }, "azure/gpt-5.5-pro": { "cache_read_input_token_cost": 3e-06, @@ -9176,6 +8993,7 @@ "azure/gpt-5.4-mini": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "cache_read_input_token_cost_priority": 1.5e-07, "input_cost_per_token": 7.5e-07, @@ -9273,11 +9091,13 @@ "output_cost_per_token_flex": 2.25e-06, "output_cost_per_token_priority": 9e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_xhigh_reasoning_effort": true + "supports_xhigh_reasoning_effort": true, + "cache_read_input_token_cost_batches": 3.75e-08 }, "azure/gpt-5.4-nano": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 2e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "input_cost_per_token": 2e-07, "litellm_provider": "azure", @@ -9369,7 +9189,8 @@ "output_cost_per_token_batches": 6.25e-07, "output_cost_per_token_flex": 6.25e-07, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_xhigh_reasoning_effort": true + "supports_xhigh_reasoning_effort": true, + "cache_read_input_token_cost_batches": 1e-08 }, "azure/gpt-image-1": { "cache_read_input_token_cost": 1.25e-06, @@ -9772,39 +9593,6 @@ "supports_reasoning": true, "supports_vision": false }, - "azure/o1-preview": { - "cache_read_input_token_cost": 7.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_vision": false - }, - "azure/o1-preview-2024-09-12": { - "cache_read_input_token_cost": 7.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_vision": false - }, "azure/o3": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 5e-07, @@ -10416,7 +10204,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 6.875e-08 }, "azure/us/gpt-5-mini-2025-08-07": { "cache_read_input_token_cost": 2.75e-08, @@ -10455,7 +10244,8 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 1.375e-08 }, "azure/us/gpt-5-nano-2025-08-07": { "cache_read_input_token_cost": 5.5e-09, @@ -10491,11 +10281,13 @@ "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, - "supports_vision": true + "supports_vision": true, + "cache_read_input_token_cost_batches": 2.75e-09 }, "azure/us/gpt-5.1": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "litellm_provider": "azure", @@ -10535,43 +10327,6 @@ "output_cost_per_token_priority": 2.2e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/gpt-5.1-chat": { - "cache_read_input_token_cost": 1.375e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 1.375e-06, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1.1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/gpt-5.1-codex": { "deprecation_date": "2027-05-15", "cache_read_input_token_cost": 1.375e-07, @@ -10672,21 +10427,6 @@ "supports_prompt_caching": true, "supports_vision": false }, - "azure/us/o1-preview-2024-09-12": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "max_input_tokens": 128000, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_vision": false - }, "azure/us/o3-2025-04-16": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 5.5e-07, @@ -11188,18 +10928,6 @@ "/v1/images/edits" ] }, - "azure_ai/MAI-Image-2e": { - "deprecation_date": "2026-08-15", - "input_cost_per_token": 5e-06, - "litellm_provider": "azure_ai", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "output_cost_per_image_token": 1.95e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supported_endpoints": [ - "/v1/images/generations" - ] - }, "azure_ai/MAI-Thinking-1": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, @@ -11224,34 +10952,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "azure_ai/Llama-3.2-11B-Vision-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 3.7e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 3.7e-07, - "source": "https://marketplace.microsoft.com/en/marketplace/apps/metagenai.meta-llama-3-2-11b-vision-instruct-offer?tab=Overview", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "azure_ai/Llama-3.2-90B-Vision-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 2.04e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 2.04e-06, - "source": "https://marketplace.microsoft.com/en/marketplace/apps/metagenai.meta-llama-3-2-90b-vision-instruct-offer?tab=Overview", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, "azure_ai/Llama-3.3-70B-Instruct": { "input_cost_per_token": 7.1e-07, "litellm_provider": "azure_ai", @@ -11300,18 +11000,6 @@ "output_cost_per_token": 3.7e-07, "supports_tool_choice": true }, - "azure_ai/Meta-Llama-3.1-405B-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 5.33e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 1.6e-05, - "source": "https://marketplace.microsoft.com/en-us/marketplace/apps/metagenai.meta-llama-3-1-405b-instruct-offer?tab=PlansAndPrice", - "supports_tool_choice": true - }, "azure_ai/Meta-Llama-3.1-70B-Instruct": { "input_cost_per_token": 2.68e-06, "litellm_provider": "azure_ai", @@ -11323,18 +11011,6 @@ "source": "https://marketplace.microsoft.com/en-us/marketplace/apps/metagenai.meta-llama-3-1-70b-instruct-offer?tab=PlansAndPrice", "supports_tool_choice": true }, - "azure_ai/Meta-Llama-3.1-8B-Instruct": { - "deprecation_date": "2026-06-13", - "input_cost_per_token": 3e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 2048, - "max_tokens": 2048, - "mode": "chat", - "output_cost_per_token": 6.1e-07, - "source": "https://marketplace.microsoft.com/en-us/marketplace/apps/metagenai.meta-llama-3-1-8b-instruct-offer?tab=PlansAndPrice", - "supports_tool_choice": true - }, "azure_ai/Phi-3-medium-128k-instruct": { "input_cost_per_token": 1.7e-07, "litellm_provider": "azure_ai", @@ -11505,16 +11181,6 @@ "supports_tool_choice": true, "supports_reasoning": true }, - "azure_ai/mistral-document-ai-2505": { - "deprecation_date": "2026-07-20", - "litellm_provider": "azure_ai", - "ocr_cost_per_page": 0.003, - "mode": "ocr", - "supported_endpoints": [ - "/v1/ocr" - ], - "source": "https://devblogs.microsoft.com/foundry/whats-new-in-azure-ai-foundry-august-2025/#mistral-document-ai-(ocr)-%E2%80%94-serverless-in-foundry" - }, "azure_ai/mistral-document-ai-2512": { "litellm_provider": "azure_ai", "ocr_cost_per_page": 0.003, @@ -11615,17 +11281,6 @@ "mode": "rerank", "output_cost_per_token": 0.0 }, - "azure_ai/cohere-rerank-v3.5": { - "deprecation_date": "2026-05-14", - "input_cost_per_query": 0.002, - "input_cost_per_token": 0.0, - "litellm_provider": "azure_ai", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "rerank", - "output_cost_per_token": 0.0 - }, "azure_ai/cohere-rerank-v4.0-pro": { "input_cost_per_query": 0.0025, "input_cost_per_token": 0.0, @@ -11678,19 +11333,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "azure_ai/deepseek-r1": { - "deprecation_date": "2026-08-13", - "input_cost_per_token": 1.35e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 5.4e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_reasoning": true, - "supports_tool_choice": true - }, "azure_ai/deepseek-v3": { "input_cost_per_token": 1.14e-06, "litellm_provider": "azure_ai", @@ -11702,33 +11344,6 @@ "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", "supports_tool_choice": true }, - "azure_ai/deepseek-v3-0324": { - "deprecation_date": "2026-07-13", - "input_cost_per_token": 1.14e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 128000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4.56e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_tool_choice": true - }, - "azure_ai/deepseek-v3.1": { - "deprecation_date": "2026-07-13", - "input_cost_per_token": 1.23e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 4.94e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "azure_ai/deepseek-v4-pro": { "deprecation_date": "2028-02-20", "input_cost_per_token": 1.74e-06, @@ -11795,68 +11410,6 @@ ], "supports_embedding_image_input": true }, - "azure_ai/global/grok-3": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 3e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/global/grok-3-mini": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.27e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/grok-3": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 3e-06, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/grok-3-mini": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.27e-06, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true - }, "azure_ai/grok-4": { "input_cost_per_token": 3e-06, "litellm_provider": "azure_ai", @@ -11950,36 +11503,6 @@ "supports_vision": true, "supports_web_search": true }, - "azure_ai/grok-4-fast-non-reasoning": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2e-07, - "output_cost_per_token": 5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_web_search": true - }, - "azure_ai/grok-4-fast-reasoning": { - "deprecation_date": "2026-05-01", - "input_cost_per_token": 2e-07, - "output_cost_per_token": 5e-07, - "litellm_provider": "azure_ai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "azure_ai/grok-4-1-fast-non-reasoning": { "input_cost_per_token": 2e-07, "output_cost_per_token": 5e-07, @@ -12358,6 +11881,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-northeast-1/minimax.minimax-m2.1": { @@ -12371,6 +11897,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-northeast-1/minimax.minimax-m2.5": { @@ -12385,6 +11914,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/ap-northeast-1/moonshotai.kimi-k2-thinking": { @@ -12410,6 +11942,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-northeast-1/qwen.qwen3-coder-next": { @@ -12423,6 +11957,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/moonshotai.kimi-k2-thinking": { @@ -12450,7 +11987,9 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_video_input": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true }, "bedrock/ap-south-1/meta.llama3-70b-instruct-v1:0": { "input_cost_per_token": 3.18e-06, @@ -12482,6 +12021,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-south-1/minimax.minimax-m2.1": { @@ -12495,6 +12037,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-south-1/minimax.minimax-m2.5": { @@ -12509,6 +12054,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/ap-south-1/moonshotai.kimi-k2-thinking": { @@ -12534,6 +12082,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-south-1/qwen.qwen3-coder-next": { @@ -12547,6 +12097,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-2/minimax.minimax-m2.5": { @@ -12561,6 +12114,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.236e-06 }, "bedrock/ap-southeast-3/deepseek.v3.2": { @@ -12575,6 +12131,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-3/minimax.minimax-m2.1": { @@ -12588,6 +12147,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-3/minimax.minimax-m2.5": { @@ -12602,6 +12164,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/ap-southeast-3/moonshotai.kimi-k2.5": { @@ -12616,6 +12181,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ap-southeast-3/qwen.qwen3-coder-next": { @@ -12629,6 +12196,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/ca-central-1/meta.llama3-70b-instruct-v1:0": { @@ -12661,6 +12231,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-north-1/minimax.minimax-m2.1": { @@ -12674,6 +12247,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-north-1/minimax.minimax-m2.5": { @@ -12688,6 +12264,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-north-1/moonshotai.kimi-k2.5": { @@ -12702,6 +12281,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-central-1/1-month-commitment/anthropic.claude-instant-v1": { @@ -12802,6 +12383,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-central-1/minimax.minimax-m2.5": { @@ -12816,6 +12400,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-central-1/qwen.qwen3-coder-next": { @@ -12829,6 +12416,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-1/meta.llama3-70b-instruct-v1:0": { @@ -12860,6 +12450,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-1/minimax.minimax-m2.5": { @@ -12874,6 +12467,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-west-1/qwen.qwen3-coder-next": { @@ -12887,6 +12483,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-2/meta.llama3-70b-instruct-v1:0": { @@ -12918,6 +12517,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-2/minimax.minimax-m2.5": { @@ -12932,8 +12534,28 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.86e-06 }, + "bedrock/eu-west-2/nvidia.nemotron-super-3-120b": { + "input_cost_per_token": 2.3e-07, + "litellm_provider": "bedrock", + "max_input_tokens": 256000, + "max_output_tokens": 32000, + "max_tokens": 32000, + "mode": "chat", + "output_cost_per_token": 1.01e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_system_messages": true, + "supports_tool_choice": true, + "supports_vision": false + }, "bedrock/eu-west-2/qwen.qwen3-coder-next": { "input_cost_per_token": 7.8e-07, "litellm_provider": "bedrock", @@ -12945,6 +12567,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-west-3/mistral.mistral-7b-instruct-v0:2": { @@ -12958,13 +12583,14 @@ "supports_tool_choice": true }, "bedrock/eu-west-3/mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 1.04e-05, + "input_cost_per_token": 5.2e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 3.12e-05, + "output_cost_per_token": 1.56e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "bedrock/eu-west-3/mistral.mixtral-8x7b-instruct-v0:1": { @@ -12988,6 +12614,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/eu-south-1/minimax.minimax-m2.5": { @@ -13002,6 +12631,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/eu-south-1/qwen.qwen3-coder-next": { @@ -13015,6 +12647,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/invoke/anthropic.claude-3-5-sonnet-20240620-v1:0": { @@ -13065,6 +12700,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/sa-east-1/minimax.minimax-m2.1": { @@ -13078,6 +12716,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/sa-east-1/minimax.minimax-m2.5": { @@ -13092,6 +12733,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.44e-06 }, "bedrock/sa-east-1/moonshotai.kimi-k2-thinking": { @@ -13117,6 +12761,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/sa-east-1/qwen.qwen3-coder-next": { @@ -13130,6 +12776,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/1-month-commitment/anthropic.claude-instant-v1": { @@ -13249,13 +12898,14 @@ "supports_tool_choice": true }, "bedrock/us-east-1/mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 8e-06, + "input_cost_per_token": 4e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 2.4e-05, + "output_cost_per_token": 1.2e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "bedrock/us-east-1/mistral.mixtral-8x7b-instruct-v0:1": { @@ -13280,6 +12930,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/minimax.minimax-m2.1": { @@ -13293,6 +12946,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/minimax.minimax-m2.5": { @@ -13306,6 +12962,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/moonshotai.kimi-k2-thinking": { @@ -13331,6 +12990,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-1/qwen.qwen3-coder-next": { @@ -13344,6 +13005,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/deepseek.v3.2": { @@ -13358,6 +13022,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/minimax.minimax-m2.1": { @@ -13371,6 +13038,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/minimax.minimax-m2.5": { @@ -13385,6 +13055,9 @@ "supports_reasoning": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "output_cost_per_token": 1.2e-06 }, "bedrock/us-east-2/moonshotai.kimi-k2-thinking": { @@ -13410,6 +13083,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-east-2/qwen.qwen3-coder-next": { @@ -13423,6 +13098,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-gov-east-1/amazon.nova-pro-v1:0": { @@ -13486,40 +13164,6 @@ "mode": "chat", "output_cost_per_token": 1.5e-06 }, - "bedrock/us-gov-east-1/anthropic.claude-3-5-sonnet-20240620-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3.6e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.8e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3.6e-07, - "cache_creation_input_token_cost": 4.5e-06 - }, - "bedrock/us-gov-east-1/anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 3e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-08, - "cache_creation_input_token_cost": 3.75e-07 - }, "bedrock/us-gov-east-1/anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.5e-06, "cache_creation_input_token_cost_above_1hr": 7.2e-06, @@ -13697,61 +13341,6 @@ "mode": "chat", "output_cost_per_token": 1.5e-06 }, - "bedrock/us-gov-west-1/anthropic.claude-3-7-sonnet-20250219-v1:0": { - "cache_creation_input_token_cost": 4.5e-06, - "cache_read_input_token_cost": 3.6e-07, - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3.6e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.8e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "bedrock/us-gov-west-1/anthropic.claude-3-5-sonnet-20240620-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3.6e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.8e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3.6e-07, - "cache_creation_input_token_cost": 4.5e-06 - }, - "bedrock/us-gov-west-1/anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 3e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-08, - "cache_creation_input_token_cost": 3.75e-07 - }, "bedrock/us-gov-west-1/anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.5e-06, "cache_creation_input_token_cost_above_1hr": 7.2e-06, @@ -13939,13 +13528,14 @@ "supports_tool_choice": true }, "bedrock/us-west-2/mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 8e-06, + "input_cost_per_token": 4e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 2.4e-05, + "output_cost_per_token": 1.2e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "bedrock/us-west-2/mistral.mixtral-8x7b-instruct-v0:1": { @@ -13970,6 +13560,9 @@ "supports_reasoning": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/minimax.minimax-m2.1": { @@ -13983,6 +13576,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/minimax.minimax-m2.5": { @@ -13996,6 +13592,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/moonshotai.kimi-k2-thinking": { @@ -14021,6 +13620,8 @@ "supports_system_messages": true, "supports_tool_choice": true, "supports_vision": true, + "supports_audio_input": false, + "supports_response_schema": true, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/qwen.qwen3-coder-next": { @@ -14034,6 +13635,9 @@ "supports_function_calling": true, "supports_system_messages": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us.anthropic.claude-3-5-haiku-20241022-v1:0": { @@ -14189,34 +13793,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "cerebras/zai-glm-4.6": { - "deprecation_date": "2026-01-20", - "input_cost_per_token": 2.25e-06, - "litellm_provider": "cerebras", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2.75e-06, - "source": "https://www.cerebras.ai/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, - "cerebras/zai-glm-4.7": { - "deprecation_date": "2026-08-17", - "input_cost_per_token": 2.25e-06, - "litellm_provider": "cerebras", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2.75e-06, - "source": "https://www.cerebras.ai/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "cerebras/qwen-3.8-27b": { "input_cost_per_token": 9.9e-07, "litellm_provider": "cerebras", @@ -14242,23 +13818,6 @@ "mode": "chat", "output_cost_per_token": 5e-07 }, - "chatgpt-4o-latest": { - "deprecation_date": "2026-02-17", - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "gpt-4o-transcribe-diarize": { "input_cost_per_audio_token": 2.5e-06, "input_cost_per_token": 2.5e-06, @@ -14321,131 +13880,6 @@ "prompt_cache_min_tokens": 4096, "source": "https://platform.claude.com/docs/en/about-claude/pricing" }, - "claude-3-7-sonnet-20250219": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-02-19", - "input_cost_per_token": 3e-06, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, - "claude-3-haiku-20240307": { - "cache_creation_input_token_cost": 3e-07, - "cache_creation_input_token_cost_above_1hr": 5e-07, - "cache_read_input_token_cost": 3e-08, - "deprecation_date": "2026-04-20", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "claude-3-opus-20240229": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "deprecation_date": "2026-01-05", - "input_cost_per_token": 1.5e-05, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "claude-4-opus-20250514": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_read_input_token_cost": 1.5e-06, - "deprecation_date": "2026-06-15", - "input_cost_per_token": 1.5e-05, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "claude-4-sonnet-20250514": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost": 3e-07, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "deprecation_date": "2026-06-15", - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "litellm_provider": "anthropic", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "prompt_cache_min_tokens": 1024 - }, "claude-sonnet-4-5": { "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, @@ -14624,92 +14058,6 @@ "input_cost_per_token_batches": 1.5e-06, "output_cost_per_token_batches": 7.5e-06 }, - "claude-opus-4-1": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_native_structured_output": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024, - "deprecation_date": "2026-08-05" - }, - "claude-opus-4-1-20250805": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "deprecation_date": "2026-08-05", - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_native_structured_output": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "claude-opus-4-20250514": { - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "deprecation_date": "2026-06-15", - "litellm_provider": "anthropic", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, "claude-opus-4-5-20251101": { "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, @@ -15137,38 +14485,6 @@ "prompt_cache_min_tokens": 1024, "source": "https://platform.claude.com/docs/en/about-claude/pricing" }, - "claude-sonnet-4-20250514": { - "deprecation_date": "2026-06-15", - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "litellm_provider": "anthropic", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, "cloudflare/@cf/meta/llama-2-7b-chat-fp16": { "input_cost_per_token": 1.923e-06, "litellm_provider": "cloudflare", @@ -15521,36 +14837,6 @@ "supports_assistant_prefill": true, "supports_tool_choice": true }, - "codex-mini-latest": { - "cache_read_input_token_cost": 3.75e-07, - "deprecation_date": "2026-02-12", - "input_cost_per_token": 1.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 6e-06, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "cohere.command-light-text-v14": { "input_cost_per_token": 3e-07, "litellm_provider": "bedrock", @@ -15559,38 +14845,18 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 6e-07, - "supports_tool_choice": true - }, - "cohere.command-r-plus-v1:0": { - "deprecation_date": "2026-08-19", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_tool_choice": true - }, - "cohere.command-r-v1:0": { - "deprecation_date": "2026-08-19", - "input_cost_per_token": 5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "cohere.command-text-v14": { - "input_cost_per_token": 1.5e-06, + "input_cost_per_token": 1e-06, "litellm_provider": "bedrock", "max_input_tokens": 4096, "max_output_tokens": 4096, "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "cohere.embed-english-v3": { @@ -15600,6 +14866,7 @@ "max_tokens": 512, "mode": "embedding", "output_cost_per_token": 0.0, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_embedding_image_input": true }, "cohere.embed-multilingual-v3": { @@ -15609,6 +14876,7 @@ "max_tokens": 512, "mode": "embedding", "output_cost_per_token": 0.0, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_embedding_image_input": true }, "cohere.embed-v4:0": { @@ -15619,6 +14887,7 @@ "mode": "embedding", "output_cost_per_token": 0.0, "output_vector_size": 1536, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_embedding_image_input": true }, "us.cohere.embed-v4:0": { @@ -15672,16 +14941,6 @@ "mode": "rerank", "output_cost_per_token": 0.0 }, - "command": { - "input_cost_per_token": 1e-06, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "completion", - "output_cost_per_token": 2e-06, - "deprecation_date": "2025-09-15" - }, "command-a-03-2025": { "input_cost_per_token": 2.5e-06, "litellm_provider": "cohere_chat", @@ -15708,17 +14967,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "command-light": { - "input_cost_per_token": 3e-07, - "litellm_provider": "cohere_chat", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_tool_choice": true, - "deprecation_date": "2025-09-15" - }, "command-nightly": { "input_cost_per_token": 1e-06, "litellm_provider": "cohere", @@ -15728,18 +14976,6 @@ "mode": "completion", "output_cost_per_token": 2e-06 }, - "command-r": { - "input_cost_per_token": 1.5e-07, - "litellm_provider": "cohere_chat", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_function_calling": true, - "supports_tool_choice": true, - "deprecation_date": "2025-09-15" - }, "command-r-08-2024": { "input_cost_per_token": 1.5e-07, "litellm_provider": "cohere_chat", @@ -15751,18 +14987,6 @@ "supports_function_calling": true, "supports_tool_choice": true }, - "command-r-plus": { - "input_cost_per_token": 2.5e-06, - "litellm_provider": "cohere_chat", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supports_function_calling": true, - "supports_tool_choice": true, - "deprecation_date": "2025-09-15" - }, "command-r-plus-08-2024": { "input_cost_per_token": 2.5e-06, "litellm_provider": "cohere_chat", @@ -15815,26 +15039,6 @@ "supports_vision": true, "source": "https://platform.openai.com/docs/models/computer-use-preview" }, - "dall-e-2": { - "deprecation_date": "2026-05-12", - "input_cost_per_image": 0.02, - "litellm_provider": "openai", - "mode": "image_generation", - "supported_endpoints": [ - "/v1/images/generations", - "/v1/images/edits", - "/v1/images/variations" - ] - }, - "dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_image": 0.04, - "litellm_provider": "openai", - "mode": "image_generation", - "supported_endpoints": [ - "/v1/images/generations" - ] - }, "deepseek-chat": { "cache_read_input_token_cost": 2.8e-08, "input_cost_per_token": 2.8e-07, @@ -18831,30 +18035,6 @@ "output_vector_size": 1024, "source": "https://www.databricks.com/product/pricing/foundation-model-serving" }, - "databricks/databricks-claude-3-7-sonnet": { - "cache_creation_input_token_cost": 3.74997e-06, - "cache_read_input_token_cost": 3.0002e-07, - "deprecation_date": "2026-04-12", - "input_cost_per_token": 2.9999900000000002e-06, - "input_dbu_cost_per_token": 4.2857e-05, - "litellm_provider": "databricks", - "max_input_tokens": 200000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.5000020000000002e-05, - "output_dbu_cost_per_token": 0.000214286, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_anthropic_thinking_payload": true, - "supports_tool_choice": true - }, "databricks/databricks-claude-fable-5": { "cache_creation_input_token_cost": 1.250004e-05, "cache_read_input_token_cost": 1.00002e-06, @@ -19817,44 +18997,6 @@ "supports_prompt_caching": true, "supports_tool_choice": true }, - "databricks/databricks-gpt-5-1-codex-max": { - "cache_creation_input_token_cost": 1.24999e-06, - "cache_read_input_token_cost": 1.2502e-07, - "deprecation_date": "2026-07-16", - "input_cost_per_token": 1.24999e-06, - "input_dbu_cost_per_token": 1.7857e-05, - "litellm_provider": "databricks", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 9.999990000000002e-06, - "output_dbu_cost_per_token": 0.000142857, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_prompt_caching": true - }, - "databricks/databricks-gpt-5-1-codex-mini": { - "cache_creation_input_token_cost": 2.4997e-07, - "cache_read_input_token_cost": 2.499e-08, - "deprecation_date": "2026-07-16", - "input_cost_per_token": 2.4997e-07, - "input_dbu_cost_per_token": 3.571e-06, - "litellm_provider": "databricks", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.99997e-06, - "output_dbu_cost_per_token": 2.8571e-05, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_prompt_caching": true - }, "databricks/databricks-gpt-5-2": { "cache_creation_input_token_cost": 1.75e-06, "cache_read_input_token_cost": 1.75e-07, @@ -19875,25 +19017,6 @@ "supports_prompt_caching": true, "supports_tool_choice": true }, - "databricks/databricks-gpt-5-2-codex": { - "cache_creation_input_token_cost": 1.75e-06, - "cache_read_input_token_cost": 1.75e-07, - "deprecation_date": "2026-07-16", - "input_cost_per_token": 1.75e-06, - "input_dbu_cost_per_token": 2.5e-05, - "litellm_provider": "databricks", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_dbu_cost_per_token": 0.0002, - "source": "https://www.databricks.com/product/pricing/proprietary-foundation-model-serving", - "supports_prompt_caching": true - }, "databricks/databricks-gpt-5-3-codex": { "cache_creation_input_token_cost": 1.75e-06, "cache_read_input_token_cost": 1.75e-07, @@ -20320,25 +19443,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "databricks/databricks-llama-2-70b-chat": { - "cache_creation_input_token_cost": 5.0001e-07, - "cache_read_input_token_cost": 5.0001e-07, - "deprecation_date": "2024-10-30", - "input_cost_per_token": 5.0001e-07, - "input_dbu_cost_per_token": 7.143e-06, - "litellm_provider": "databricks", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.5000300000000002e-06, - "output_dbu_cost_per_token": 2.1429e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, "databricks/databricks-llama-4-maverick": { "cache_creation_input_token_cost": 5.0001e-07, "cache_read_input_token_cost": 5.0001e-07, @@ -20357,25 +19461,6 @@ "source": "https://www.databricks.com/product/pricing/foundation-model-serving", "supports_tool_choice": true }, - "databricks/databricks-meta-llama-3-1-405b-instruct": { - "cache_creation_input_token_cost": 5.00003e-06, - "cache_read_input_token_cost": 5.00003e-06, - "deprecation_date": "2026-02-15", - "input_cost_per_token": 5.00003e-06, - "input_dbu_cost_per_token": 7.1429e-05, - "litellm_provider": "databricks", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.5000020000000002e-05, - "output_dbu_cost_per_token": 0.000214286, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, "databricks/databricks-meta-llama-3-1-8b-instruct": { "cache_creation_input_token_cost": 1.5001e-07, "cache_read_input_token_cost": 1.5001e-07, @@ -20411,82 +19496,6 @@ "source": "https://www.databricks.com/product/pricing/foundation-model-serving", "supports_tool_choice": true }, - "databricks/databricks-meta-llama-3-70b-instruct": { - "cache_creation_input_token_cost": 1.00002e-06, - "cache_read_input_token_cost": 1.00002e-06, - "deprecation_date": "2024-07-23", - "input_cost_per_token": 1.00002e-06, - "input_dbu_cost_per_token": 1.4286e-05, - "litellm_provider": "databricks", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 2.9999900000000002e-06, - "output_dbu_cost_per_token": 4.2857e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, - "databricks/databricks-mixtral-8x7b-instruct": { - "cache_creation_input_token_cost": 5.0001e-07, - "cache_read_input_token_cost": 5.0001e-07, - "deprecation_date": "2025-04-30", - "input_cost_per_token": 5.0001e-07, - "input_dbu_cost_per_token": 7.143e-06, - "litellm_provider": "databricks", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.00002e-06, - "output_dbu_cost_per_token": 1.4286e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, - "databricks/databricks-mpt-30b-instruct": { - "cache_creation_input_token_cost": 1.00002e-06, - "cache_read_input_token_cost": 1.00002e-06, - "deprecation_date": "2024-08-30", - "input_cost_per_token": 1.00002e-06, - "input_dbu_cost_per_token": 1.4286e-05, - "litellm_provider": "databricks", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 1.00002e-06, - "output_dbu_cost_per_token": 1.4286e-05, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, - "databricks/databricks-mpt-7b-instruct": { - "cache_creation_input_token_cost": 5.0001e-07, - "cache_read_input_token_cost": 5.0001e-07, - "deprecation_date": "2024-08-30", - "input_cost_per_token": 5.0001e-07, - "input_dbu_cost_per_token": 7.143e-06, - "litellm_provider": "databricks", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "metadata": { - "notes": "Input/output cost per token is dbu cost * $0.070, based on databricks Llama 3.1 70B conversion. Number provided for reference, '*_dbu_cost_per_token' used in actual calculation." - }, - "mode": "chat", - "output_cost_per_token": 0.0, - "output_dbu_cost_per_token": 0.0, - "source": "https://www.databricks.com/product/pricing/foundation-model-serving", - "supports_tool_choice": true - }, "databricks/databricks-qwen35-122b-a10b": { "cache_creation_input_token_cost": 2.2001e-07, "cache_read_input_token_cost": 2.2001e-07, @@ -21551,18 +20560,6 @@ "supports_tool_choice": true, "supports_function_calling": true }, - "deepinfra/google/gemini-2.0-flash-001": { - "deprecation_date": "2026-06-01", - "max_tokens": 1000000, - "max_input_tokens": 1000000, - "max_output_tokens": 1000000, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 4e-07, - "litellm_provider": "deepinfra", - "mode": "chat", - "supports_tool_choice": true, - "supports_function_calling": true - }, "deepinfra/google/gemini-2.5-flash": { "max_tokens": 1000000, "max_input_tokens": 1000000, @@ -22064,6 +21061,7 @@ "max_tokens": 81920, "mode": "chat", "output_cost_per_token": 1.68e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_reasoning": true, "supports_tool_choice": true, @@ -22421,15 +21419,6 @@ "/v1/audio/speech" ] }, - "embed-english-light-v2.0": { - "deprecation_date": "2026-04-04", - "input_cost_per_token": 1e-07, - "litellm_provider": "cohere", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "embedding", - "output_cost_per_token": 0.0 - }, "embed-english-light-v3.0": { "input_cost_per_token": 1e-07, "litellm_provider": "cohere", @@ -22438,15 +21427,6 @@ "mode": "embedding", "output_cost_per_token": 0.0 }, - "embed-english-v2.0": { - "deprecation_date": "2026-04-04", - "input_cost_per_token": 1e-07, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_tokens": 4096, - "mode": "embedding", - "output_cost_per_token": 0.0 - }, "embed-english-v3.0": { "input_cost_per_image": 0.0001, "input_cost_per_token": 1e-07, @@ -22461,15 +21441,6 @@ "supports_embedding_image_input": true, "supports_image_input": true }, - "embed-multilingual-v2.0": { - "deprecation_date": "2026-04-04", - "input_cost_per_token": 1e-07, - "litellm_provider": "cohere", - "max_input_tokens": 768, - "max_tokens": 768, - "mode": "embedding", - "output_cost_per_token": 0.0 - }, "embed-multilingual-v3.0": { "input_cost_per_token": 1e-07, "litellm_provider": "cohere", @@ -22566,7 +21537,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5.5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -22637,23 +21608,6 @@ "cache_read_input_token_cost": 3e-07, "cache_creation_input_token_cost": 3.75e-06 }, - "eu.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "eu.anthropic.claude-3-opus-20240229-v1:0": { "input_cost_per_token": 1.5e-05, "litellm_provider": "bedrock", @@ -22669,23 +21623,6 @@ "cache_read_input_token_cost": 1.5e-06, "cache_creation_input_token_cost": 1.875e-05 }, - "eu.anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "eu.anthropic.claude-opus-4-1-20250805-v1:0": { "cache_creation_input_token_cost": 1.875e-05, "cache_read_input_token_cost": 1.5e-06, @@ -22769,7 +21706,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.125e-06, @@ -22806,7 +21744,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.meta.llama3-2-1b-instruct-v1:0": { "input_cost_per_token": 1.3e-07, @@ -25257,26 +24196,6 @@ "supports_tool_choice": true, "supports_vision": false }, - "fireworks_ai/accounts/fireworks/models/deepseek-v4-pro": { - "cache_read_input_token_cost": 6e-07, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 1.2e-06, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/accounts/fireworks/models/deepseek-v4-pro-0813": { "cache_read_input_token_cost": 4.4e-08, "cache_read_input_token_cost_priority": 5.5e-08, @@ -25664,26 +24583,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "fireworks_ai/accounts/fireworks/models/minimax-m2p7": { - "cache_read_input_token_cost": 6e-08, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 3e-07, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 196608, - "max_output_tokens": 196608, - "max_tokens": 196608, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/accounts/fireworks/models/minimax-m3": { "cache_read_input_token_cost": 6e-08, "cache_read_input_token_cost_priority": 9e-08, @@ -25771,26 +24670,6 @@ "supports_tool_choice": true, "supports_vision": false }, - "fireworks_ai/deepseek-v4-pro": { - "cache_read_input_token_cost": 6e-07, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 1.2e-06, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/glm-4p7": { "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 6e-07, @@ -25990,26 +24869,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "fireworks_ai/minimax-m2p7": { - "cache_read_input_token_cost": 6e-08, - "cache_read_input_token_cost_priority": 6e-07, - "deprecation_date": "2026-08-27", - "input_cost_per_token": 3e-07, - "input_cost_per_token_priority": 1.2e-06, - "litellm_provider": "fireworks_ai", - "max_input_tokens": 196608, - "max_output_tokens": 196608, - "max_tokens": 196608, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_priority": 1.2e-06, - "source": "https://api.fireworks.ai/v1/serverless/models", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false - }, "fireworks_ai/minimax-m3": { "cache_read_input_token_cost": 6e-08, "cache_read_input_token_cost_priority": 9e-08, @@ -26187,31 +25046,6 @@ "comment": "Open flagship GLM for long-horizon coding agents and million-token context work", "source": "https://api.friendli.ai/serverless/v1/models" }, - "friendliai/LGAI-EXAONE/K-EXAONE-2.0-750B-A37B": { - "litellm_provider": "friendliai", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "input_cost_per_token": 6e-07, - "output_cost_per_token": 2.4e-06, - "cache_read_input_token_cost": 1.2e-07, - "supports_prompt_caching": true, - "supports_reasoning": true, - "reasoning_effort_levels": [], - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_native_structured_output": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_image_input": false, - "supports_video_input": false, - "mode": "chat", - "comment": "Frontier-scale multilingual language model developed by LG AI Research", - "deprecation_date": "2026-09-06", - "source": "https://api.friendli.ai/serverless/v1/models" - }, "friendliai/deepseek-ai/DeepSeek-V3.2": { "litellm_provider": "friendliai", "max_input_tokens": 163840, @@ -26377,6 +25211,7 @@ }, "ft:gpt-4o-2024-08-06": { "cache_read_input_token_cost": 1.875e-06, + "cache_read_input_token_cost_batches": 9e-07, "input_cost_per_token": 3.75e-06, "input_cost_per_token_batches": 2.225e-06, "litellm_provider": "openai", @@ -26415,6 +25250,7 @@ }, "ft:gpt-4o-mini-2024-07-18": { "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_token": 3e-07, "input_cost_per_token_batches": 1.5e-07, "litellm_provider": "openai", @@ -26435,6 +25271,7 @@ }, "ft:gpt-4.1-2025-04-14": { "cache_read_input_token_cost": 7.5e-07, + "cache_read_input_token_cost_batches": 5e-07, "input_cost_per_token": 3e-06, "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "openai", @@ -26454,6 +25291,7 @@ }, "ft:gpt-4.1-mini-2025-04-14": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "input_cost_per_token": 8e-07, "input_cost_per_token_batches": 4e-07, "litellm_provider": "openai", @@ -26473,6 +25311,7 @@ }, "ft:gpt-4.1-nano-2025-04-14": { "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 2.5e-08, "deprecation_date": "2026-10-23", "input_cost_per_token": 2e-07, "input_cost_per_token_batches": 1e-07, @@ -26493,6 +25332,7 @@ }, "ft:o4-mini-2025-04-16": { "cache_read_input_token_cost": 1e-06, + "cache_read_input_token_cost_batches": 5e-07, "deprecation_date": "2026-10-23", "input_cost_per_token": 4e-06, "input_cost_per_token_batches": 2e-06, @@ -26511,160 +25351,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "gemini-2.0-flash": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 1e-06, - "input_cost_per_audio_token_batches": 5e-07, - "input_cost_per_character": 3.75e-08, - "input_cost_per_token": 1.5e-07, - "input_cost_per_token_batches": 7.5e-08, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "output_cost_per_token_batches": 3e-07, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini-2.0-flash-001": { - "cache_read_input_token_cost": 3.75e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 1e-06, - "input_cost_per_token": 1.5e-07, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini-2.0-flash-lite": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_audio_token_batches": 3.75e-08, - "input_cost_per_character": 1.875e-08, - "input_cost_per_token": 7.5e-08, - "input_cost_per_token_batches": 3.75e-08, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "output_cost_per_token_batches": 1.5e-07, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini-2.0-flash-lite-001": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_token": 7.5e-08, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models#gemini-2.0-flash", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini-2.5-flash": { "cache_read_input_audio_token_cost": 1e-07, "deprecation_date": "2026-10-20", @@ -26776,6 +25462,7 @@ "cache_read_input_token_cost": 2e-07, "cache_read_input_token_cost_above_200k_tokens": 4e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 1e-07, "cache_read_input_token_cost_flex": 1e-07, "cache_read_input_token_cost_priority": 3.6e-07, "deprecation_date": "2027-05-28", @@ -26868,6 +25555,7 @@ }, "gemini-3.1-flash-image": { "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 2.5e-08, "cache_read_input_token_cost_flex": 2.5e-08, "deprecation_date": "2027-05-28", "input_cost_per_image": 0.00056, @@ -26951,6 +25639,7 @@ }, "gemini-3.1-flash-lite-image": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "input_cost_per_image": 0.00028, "input_cost_per_token": 2.5e-07, @@ -27043,6 +25732,7 @@ "cache_read_input_audio_token_cost": 5e-08, "deprecation_date": "2027-05-07", "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_audio_token": 5e-07, @@ -27102,6 +25792,7 @@ "gemini-3.5-flash-lite": { "deprecation_date": "2027-07-21", "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 1.5e-08, "cache_read_input_token_cost_flex": 1.5e-08, "cache_read_input_token_cost_priority": 5.4e-08, "input_cost_per_token": 3e-07, @@ -27158,6 +25849,7 @@ }, "deep-research-pro-preview-12-2025": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "input_cost_per_image": 0.0011, "input_cost_per_token": 2e-06, "input_cost_per_token_batches": 1e-06, @@ -27351,7 +26043,7 @@ "mode": "realtime", "output_cost_per_audio_token": 1.2e-05, "output_cost_per_token": 2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_endpoints": [ "/vertex_ai/live", "/v1/realtime" @@ -27387,7 +26079,6 @@ "input_cost_per_image_token": 3e-06 }, "gemini-live-2.5-flash-preview-native-audio-09-2025": { - "cache_read_input_token_cost": 7.5e-08, "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, "litellm_provider": "vertex_ai-language-models", @@ -27416,7 +26107,7 @@ "supports_function_calling": true, "supports_parallel_function_calling": true, "supports_pdf_input": true, - "supports_prompt_caching": true, + "supports_prompt_caching": false, "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, @@ -27432,7 +26123,6 @@ "input_cost_per_image_token": 3e-06 }, "gemini/gemini-live-2.5-flash-preview-native-audio-09-2025": { - "cache_read_input_token_cost": 7.5e-08, "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, "litellm_provider": "gemini", @@ -27462,7 +26152,7 @@ "supports_function_calling": true, "supports_parallel_function_calling": true, "supports_pdf_input": true, - "supports_prompt_caching": true, + "supports_prompt_caching": false, "supports_response_schema": true, "supports_system_messages": true, "supports_tool_choice": true, @@ -27477,53 +26167,6 @@ }, "gemini_native_audio": true }, - "gemini-2.5-flash-lite-preview-06-17": { - "deprecation_date": "2025-11-18", - "cache_read_input_token_cost": 1e-08, - "input_cost_per_audio_token": 5e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 4e-07, - "output_cost_per_token": 4e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, "gemini-2.5-pro": { "deprecation_date": "2026-10-20", "cache_read_input_token_cost": 1.25e-07, @@ -27582,62 +26225,6 @@ "output_cost_per_token_flex": 5e-06, "output_cost_per_token_priority": 1.8e-05 }, - "gemini-3-pro-preview": { - "deprecation_date": "2026-03-26", - "cache_read_input_token_cost": 2e-07, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07, - "input_cost_per_token": 2e-06, - "input_cost_per_token_above_200k_tokens": 4e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "vertex_ai-language-models", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_token": 1.2e-05, - "output_cost_per_token_above_200k_tokens": 1.8e-05, - "output_cost_per_token_batches": 6e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "supports_native_streaming": true, - "input_cost_per_token_priority": 3.6e-06, - "input_cost_per_token_above_200k_tokens_priority": 7.2e-06, - "output_cost_per_token_priority": 2.16e-05, - "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, - "cache_read_input_token_cost_priority": 3.6e-07, - "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, "gemini-3.1-pro-preview": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 2e-07, @@ -27868,6 +26455,7 @@ "prompt_cache_min_tokens": 4096, "deprecation_date": "2027-05-19", "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_token": 1.5e-06, "input_cost_per_audio_token": 1.5e-06, "litellm_provider": "vertex_ai", @@ -27927,6 +26515,7 @@ "vertex_ai/gemini-3.6-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -27984,6 +26573,7 @@ "vertex_ai/gemini-3.7-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -28042,6 +26632,7 @@ "vertex_ai/gemini-3.8-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -28288,53 +26879,9 @@ "supports_url_context": true, "supports_vision": true }, - "gemini/gemini-robotics-er-1.5-preview": { - "cache_read_input_token_cost": 0, - "deprecation_date": "2026-04-30", - "input_cost_per_token": 3e-07, - "input_cost_per_audio_token": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "output_cost_per_reasoning_token": 2.5e-06, - "source": "https://ai.google.dev/gemini-api/docs/models#gemini-robotics-er-1-5-preview", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions" - ], - "supported_modalities": [ - "text", - "image", - "video", - "audio" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": false, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "rpm": 10, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini/gemini-robotics-er-2-preview": { "cache_read_input_token_cost": 1e-07, + "cache_read_input_token_cost_batches": 5e-08, "input_cost_per_audio_token": 2e-06, "input_cost_per_token": 1e-06, "input_cost_per_token_batches": 5e-07, @@ -28382,53 +26929,6 @@ "supports_web_search": true, "web_search_billing_unit": "per_query" }, - "gemini/gemini-robotics-er-1.6-preview": { - "deprecation_date": "2026-08-31", - "input_cost_per_audio_token": 2e-06, - "input_cost_per_token": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 131072, - "max_output_tokens": 65536, - "max_tokens": 65536, - "mode": "chat", - "output_cost_per_reasoning_token": 5e-06, - "output_cost_per_token": 5e-06, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-robotics-er", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "web_search_billing_unit": "per_query" - }, "gemini-2.5-computer-use-preview-10-2025": { "input_cost_per_token": 1.25e-06, "input_cost_per_token_above_200k_tokens": 2.5e-06, @@ -28565,27 +27065,6 @@ "source": "https://ai.google.dev/gemini-api/docs/embeddings#model-versions", "tpm": 10000000 }, - "gemini/gemini-embedding-2-preview": { - "deprecation_date": "2026-08-10", - "input_cost_per_audio_token": 6.5e-06, - "input_cost_per_audio_token_batches": 3.25e-06, - "input_cost_per_image_token": 4.5e-07, - "input_cost_per_image_token_batches": 2.25e-07, - "input_cost_per_token": 2e-07, - "input_cost_per_token_batches": 1e-07, - "input_cost_per_video_token": 1.2e-05, - "input_cost_per_video_token_batches": 6e-06, - "litellm_provider": "gemini", - "max_input_tokens": 8192, - "max_tokens": 8192, - "mode": "embedding", - "output_cost_per_token": 0, - "output_vector_size": 3072, - "rpm": 10000, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supports_multimodal": true, - "tpm": 10000000 - }, "gemini/gemini-embedding-2": { "input_cost_per_audio_token": 6.5e-06, "input_cost_per_audio_token_batches": 3.25e-06, @@ -28608,138 +27087,10 @@ "supports_vision": true, "tpm": 10000000 }, - "gemini/gemini-1.5-flash": { - "deprecation_date": "2025-09-29", - "input_cost_per_token": 7.5e-08, - "input_cost_per_token_above_128k_tokens": 1.5e-07, - "litellm_provider": "gemini", - "max_input_tokens": 8192, - "max_tokens": 8192, - "mode": "embedding", - "output_cost_per_token": 0, - "output_vector_size": 3072, - "rpm": 10000, - "source": "https://ai.google.dev/gemini-api/docs/embeddings#multimodal", - "supports_multimodal": true, - "tpm": 10000000 - }, - "gemini/gemini-2.0-flash": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4e-07, - "rpm": 10000, - "source": "https://ai.google.dev/pricing#2_0flash", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 10000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini/gemini-2.0-flash-001": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4e-07, - "rpm": 10000, - "source": "https://ai.google.dev/pricing#2_0flash", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 10000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, - "gemini/gemini-2.0-flash-lite": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_token": 7.5e-08, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "rpm": 4000, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.0-flash-lite", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 4000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini/gemini-2.5-flash": { "cache_read_input_audio_token_cost": 1e-07, "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 3e-08, "cache_read_input_token_cost_flex": 3e-08, "cache_read_input_token_cost_priority": 5.4e-08, "input_cost_per_audio_token": 1e-06, @@ -28898,50 +27249,6 @@ "web_search_billing_unit": "per_query", "supports_reasoning": false }, - "gemini/gemini-3-pro-image-preview": { - "deprecation_date": "2026-06-25", - "input_cost_per_image": 0.0011, - "input_cost_per_token": 2e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 65536, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "image_generation", - "output_cost_per_image": 0.134, - "output_cost_per_image_token": 0.00012, - "output_cost_per_token": 1.2e-05, - "rpm": 1000, - "tpm": 4000000, - "output_cost_per_token_batches": 6e-06, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, "gemini/nano-banana-pro-preview": { "input_cost_per_image": 0.0011, "input_cost_per_token": 2e-06, @@ -29027,49 +27334,6 @@ }, "web_search_billing_unit": "per_query" }, - "gemini/gemini-3.1-flash-image-preview": { - "deprecation_date": "2026-06-25", - "input_cost_per_token": 5e-07, - "input_cost_per_token_batches": 2.5e-07, - "litellm_provider": "gemini", - "max_input_tokens": 65536, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "image_generation", - "output_cost_per_image": 0.045, - "output_cost_per_image_token": 6e-05, - "output_cost_per_token": 3e-06, - "output_cost_per_token_batches": 1.5e-06, - "rpm": 1000, - "tpm": 4000000, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-3.1-flash-image-preview", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_vision": true, - "supports_web_search": true, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, "gemini/gemini-3.1-flash-lite-image": { "input_cost_per_image": 0.00028, "input_cost_per_token": 2.5e-07, @@ -29151,6 +27415,7 @@ "gemini/gemini-2.5-flash-lite": { "cache_read_input_audio_token_cost": 3e-08, "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "cache_read_input_token_cost_priority": 1.8e-08, "input_cost_per_audio_token": 3e-07, @@ -29207,104 +27472,6 @@ "supports_audio_input": true, "supports_image_size": false }, - "gemini/gemini-2.5-flash-lite-preview-09-2025": { - "cache_read_input_token_cost": 1e-08, - "deprecation_date": "2026-03-31", - "input_cost_per_audio_token": 3e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 4e-07, - "output_cost_per_token": 4e-07, - "rpm": 15, - "source": "https://developers.googleblog.com/en/continuing-to-bring-you-our-latest-models-with-an-improved-gemini-2-5-flash-and-flash-lite-release/", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, - "gemini/gemini-2.5-flash-preview-09-2025": { - "cache_read_input_token_cost": 3e-08, - "deprecation_date": "2026-02-17", - "input_cost_per_audio_token": 1e-06, - "input_cost_per_token": 3e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 2.5e-06, - "output_cost_per_token": 2.5e-06, - "rpm": 15, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, "gemini/gemini-flash-latest": { "cache_read_input_token_cost": 7.5e-08, "input_cost_per_token": 7.5e-07, @@ -29422,55 +27589,6 @@ "supports_video_input": true, "web_search_billing_unit": "per_query" }, - "gemini/gemini-2.5-flash-lite-preview-06-17": { - "deprecation_date": "2025-11-18", - "cache_read_input_token_cost": 1e-08, - "input_cost_per_audio_token": 5e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_reasoning_token": 4e-07, - "output_cost_per_token": 4e-07, - "rpm": 15, - "source": "https://ai.google.dev/gemini-api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - }, - "google_maps_grounding_cost_per_query": 0.025, - "supports_image_size": false - }, "gemini/gemini-2.5-flash-preview-tts": { "input_cost_per_token": 5e-07, "input_cost_per_token_batches": 2.5e-07, @@ -29496,6 +27614,7 @@ "cache_read_input_token_cost": 1.25e-07, "cache_read_input_token_cost_above_200k_tokens": 2.5e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 4.5e-07, + "cache_read_input_token_cost_batches": 1.25e-07, "cache_read_input_token_cost_flex": 1.25e-07, "cache_read_input_token_cost_priority": 2.25e-07, "input_cost_per_token": 1.25e-06, @@ -29580,117 +27699,10 @@ "supports_vision": true, "tpm": 800000 }, - "gemini/gemini-3-pro-preview": { - "deprecation_date": "2026-03-09", - "cache_read_input_token_cost": 2e-07, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "input_cost_per_token": 2e-06, - "input_cost_per_token_above_200k_tokens": 4e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65535, - "max_tokens": 65535, - "mode": "chat", - "output_cost_per_token": 1.2e-05, - "output_cost_per_token_above_200k_tokens": 1.8e-05, - "output_cost_per_token_batches": 6e-06, - "rpm": 2000, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 800000, - "input_cost_per_token_priority": 3.6e-06, - "input_cost_per_token_above_200k_tokens_priority": 7.2e-06, - "output_cost_per_token_priority": 2.16e-05, - "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, - "cache_read_input_token_cost_priority": 3.6e-07, - "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query" - }, - "gemini/gemini-3.1-flash-lite-preview": { - "cache_read_input_token_cost": 2.5e-08, - "deprecation_date": "2026-05-25", - "input_cost_per_audio_token": 5e-07, - "input_cost_per_token": 2.5e-07, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 65536, - "max_tokens": 65536, - "mode": "chat", - "output_cost_per_reasoning_token": 1.5e-06, - "output_cost_per_token": 1.5e-06, - "rpm": 15, - "source": "https://ai.google.dev/gemini-api/docs/models", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/completions", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_input": true, - "supports_audio_output": false, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_url_context": true, - "supports_video_input": true, - "supports_vision": true, - "supports_web_search": true, - "supports_native_streaming": true, - "tpm": 250000, - "search_context_cost_per_query": { - "search_context_size_low": 0.014, - "search_context_size_medium": 0.014, - "search_context_size_high": 0.014 - }, - "web_search_billing_unit": "per_query", - "google_maps_grounding_cost_per_query": 0.014 - }, "gemini/gemini-3.1-flash-lite": { "cache_read_input_audio_token_cost": 5e-08, "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "deprecation_date": "2027-05-07", @@ -29752,6 +27764,7 @@ }, "gemini/gemini-3.5-flash-lite": { "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 2e-08, "cache_read_input_token_cost_flex": 2e-08, "cache_read_input_token_cost_priority": 5e-08, "input_cost_per_token": 3e-07, @@ -29811,6 +27824,7 @@ "gemini/gemini-3-flash-preview": { "cache_read_input_audio_token_cost": 1e-07, "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 5e-08, "cache_read_input_token_cost_flex": 5e-08, "input_cost_per_audio_token": 1e-06, "input_cost_per_token": 5e-07, @@ -29872,6 +27886,7 @@ "gemini/gemini-3.5-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_audio_token": 1.5e-06, "input_cost_per_token": 1.5e-06, "litellm_provider": "gemini", @@ -29933,6 +27948,7 @@ "gemini/gemini-3.6-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -29992,6 +28008,7 @@ "gemini/gemini-3.7-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30052,6 +28069,7 @@ "gemini/gemini-3.8-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30194,6 +28212,7 @@ "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, "cache_read_input_token_cost_priority": 3.6e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 2e-07, "cache_read_input_token_cost_flex": 2e-07, "search_context_cost_per_query": { "search_context_size_low": 0.014, @@ -30256,6 +28275,7 @@ "output_cost_per_token_above_200k_tokens_priority": 3.24e-05, "cache_read_input_token_cost_priority": 3.6e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 2e-07, "cache_read_input_token_cost_flex": 2e-07, "search_context_cost_per_query": { "search_context_size_low": 0.014, @@ -30360,6 +28380,7 @@ "prompt_cache_min_tokens": 4096, "deprecation_date": "2027-05-19", "cache_read_input_token_cost": 1.5e-07, + "cache_read_input_token_cost_batches": 7.5e-08, "input_cost_per_audio_token": 1.5e-06, "input_cost_per_token": 1.5e-06, "litellm_provider": "vertex_ai-language-models", @@ -30419,6 +28440,7 @@ "gemini-3.6-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30476,6 +28498,7 @@ "gemini-3.7-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30534,6 +28557,7 @@ "gemini-3.8-flash": { "prompt_cache_min_tokens": 4096, "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "input_cost_per_token": 7.5e-07, "input_cost_per_token_batches": 3.75e-07, @@ -30771,34 +28795,6 @@ "output_cost_per_image": 0.04, "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" }, - "gemini/imagen-3.0-generate-002": { - "deprecation_date": "2025-11-10", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "gemini/imagen-4.0-fast-generate-001": { - "deprecation_date": "2026-08-17", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "gemini/imagen-4.0-generate-001": { - "deprecation_date": "2026-08-17", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "gemini/imagen-4.0-ultra-generate-001": { - "deprecation_date": "2026-08-17", - "litellm_provider": "gemini", - "mode": "image_generation", - "output_cost_per_image": 0.06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, "gemini/learnlm-1.5-pro-experimental": { "input_cost_per_audio_per_second": 0, "input_cost_per_audio_per_second_above_128k_tokens": 0, @@ -30877,21 +28873,6 @@ "supports_web_search": false, "output_cost_per_image": 0.08 }, - "gemini/veo-2.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "gemini", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.35, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, "gemini/veo-3.1-fast-generate-preview": { "litellm_provider": "gemini", "max_input_tokens": 1024, @@ -31751,10 +29732,21 @@ "output_cost_per_token": 3.15e-06 }, "baseten/zai-org/GLM-4.7": { + "cache_read_input_token_cost": 1.2e-07, "input_cost_per_token": 6e-07, "litellm_provider": "baseten", + "max_input_tokens": 200000, + "max_output_tokens": 200000, + "max_tokens": 200000, "mode": "chat", - "output_cost_per_token": 2.2e-06 + "output_cost_per_token": 2.2e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": false, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false }, "baseten/zai-org/GLM-4.6": { "input_cost_per_token": 6e-07, @@ -31781,10 +29773,21 @@ "output_cost_per_token": 2.5e-06 }, "baseten/openai/gpt-oss-120b": { + "cache_read_input_token_cost": 1e-07, "input_cost_per_token": 1e-07, "litellm_provider": "baseten", + "max_input_tokens": 128072, + "max_output_tokens": 128072, + "max_tokens": 128072, "mode": "chat", - "output_cost_per_token": 5e-07 + "output_cost_per_token": 5e-07, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false }, "baseten/deepseek-ai/DeepSeek-V3.1": { "input_cost_per_token": 5e-07, @@ -31901,7 +29904,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.5e-06, - "output_cost_per_token_batches": 7.5e-06 + "output_cost_per_token_batches": 7.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -31933,7 +29937,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-haiku-4-5-20251001-v1:0": { "cache_creation_input_token_cost": 1.25e-06, @@ -31947,7 +29952,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -32079,33 +30084,6 @@ "supports_system_messages": true, "supports_tool_choice": true }, - "gpt-4-0125-preview": { - "deprecation_date": "2026-03-26", - "input_cost_per_token": 1e-05, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 3e-05, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, - "gpt-4-0314": { - "deprecation_date": "2026-03-26", - "input_cost_per_token": 3e-05, - "litellm_provider": "openai", - "max_input_tokens": 8192, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 6e-05, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4-0613": { "deprecation_date": "2026-10-23", "input_cost_per_token": 3e-05, @@ -32175,22 +30153,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "gpt-4-turbo-preview": { - "deprecation_date": "2026-03-26", - "input_cost_per_token": 1e-05, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 3e-05, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4.1": { "cache_read_input_token_cost": 5e-07, "cache_read_input_token_cost_priority": 8.75e-07, @@ -32533,24 +30495,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "gpt-4o-audio-preview": { - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 2.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 1e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-audio-preview-2024-12-17": { "deprecation_date": "2027-01-20", "input_cost_per_audio_token": 4e-05, @@ -32735,44 +30679,6 @@ "supports_tool_choice": true, "supports_vision": false }, - "gpt-audio-mini-2025-10-06": { - "deprecation_date": "2026-07-23", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 2.4e-06, - "source": "https://developers.openai.com/api/docs/pricing", - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses", - "/v1/realtime", - "/v1/batch" - ], - "supported_modalities": [ - "text", - "audio" - ], - "supported_output_modalities": [ - "text", - "audio" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": false, - "supports_reasoning": false, - "supports_response_schema": false, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": false - }, "gpt-audio-mini-2025-12-15": { "input_cost_per_audio_token": 1e-05, "input_cost_per_token": 6e-07, @@ -32869,24 +30775,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "gpt-4o-mini-audio-preview": { - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_token": 1.5e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 6e-07, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-mini-audio-preview-2024-12-17": { "deprecation_date": "2027-01-20", "input_cost_per_audio_token": 1e-05, @@ -32905,26 +30793,6 @@ "supports_system_messages": true, "supports_tool_choice": true }, - "gpt-4o-mini-realtime-preview": { - "cache_creation_input_audio_token_cost": 3e-07, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 2.4e-06, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-mini-realtime-preview-2024-12-17": { "cache_creation_input_audio_token_cost": 3e-07, "cache_read_input_token_cost": 3e-07, @@ -32971,32 +30839,6 @@ "supports_vision": true, "supports_web_search": true }, - "gpt-4o-mini-search-preview-2025-03-11": { - "cache_read_input_token_cost": 7.5e-08, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.5e-07, - "input_cost_per_token_batches": 7.5e-08, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 6e-07, - "output_cost_per_token_batches": 3e-07, - "search_context_cost_per_query": { - "search_context_size_high": 0.025, - "search_context_size_low": 0.025, - "search_context_size_medium": 0.025 - }, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "gpt-4o-mini-transcribe": { "input_cost_per_audio_token": 1.25e-06, "input_cost_per_token": 1.25e-06, @@ -33031,63 +30873,6 @@ "audio" ] }, - "gpt-4o-realtime-preview": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 2e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, - "gpt-4o-realtime-preview-2024-12-17": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 2e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, - "gpt-4o-realtime-preview-2025-06-03": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-05-07", - "input_cost_per_audio_token": 4e-05, - "input_cost_per_token": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 8e-05, - "output_cost_per_token": 2e-05, - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-4o-search-preview": { "cache_read_input_token_cost": 1.25e-06, "input_cost_per_token": 2.5e-06, @@ -33114,32 +30899,6 @@ "supports_vision": true, "supports_web_search": true }, - "gpt-4o-search-preview-2025-03-11": { - "cache_read_input_token_cost": 1.25e-06, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2.5e-06, - "input_cost_per_token_batches": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "output_cost_per_token_batches": 5e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.025, - "search_context_size_low": 0.025, - "search_context_size_medium": 0.025 - }, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "gpt-4o-transcribe": { "input_cost_per_audio_token": 2.5e-06, "input_cost_per_token": 2.5e-06, @@ -33157,6 +30916,7 @@ }, "gpt-image-1.5": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-12-01", "input_cost_per_token": 5e-06, "litellm_provider": "openai", @@ -33176,6 +30936,7 @@ }, "gpt-image-1.5-2025-12-16": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-12-01", "input_cost_per_token": 5e-06, "litellm_provider": "openai", @@ -33195,6 +30956,7 @@ }, "gpt-image-2": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.25e-07, "input_cost_per_token": 5e-06, "litellm_provider": "openai", "mode": "image_generation", @@ -33646,6 +31408,7 @@ }, "gpt-5": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, @@ -33696,6 +31459,7 @@ }, "gpt-5.1": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, @@ -33747,6 +31511,7 @@ }, "gpt-5.1-2025-11-13": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "input_cost_per_token": 1.25e-06, @@ -33796,54 +31561,9 @@ "supports_xhigh_reasoning_effort": false, "supports_minimal_reasoning_effort": false }, - "gpt-5.1-chat-latest": { - "cache_read_input_token_cost": 1.25e-07, - "cache_read_input_token_cost_priority": 2.5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "input_cost_per_token_priority": 2.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "output_cost_per_token_priority": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text", - "image" - ], - "supports_function_calling": false, - "supports_native_streaming": true, - "supports_parallel_function_calling": false, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": false, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": true, - "default_reasoning_effort": "none", - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, "gpt-5.2": { "cache_read_input_token_cost": 1.75e-07, + "cache_read_input_token_cost_batches": 8.75e-08, "cache_read_input_token_cost_flex": 8.75e-08, "cache_read_input_token_cost_priority": 3.5e-07, "input_cost_per_token": 1.75e-06, @@ -33896,6 +31616,7 @@ }, "gpt-5.2-2025-12-11": { "cache_read_input_token_cost": 1.75e-07, + "cache_read_input_token_cost_batches": 8.75e-08, "cache_read_input_token_cost_flex": 8.75e-08, "cache_read_input_token_cost_priority": 3.5e-07, "input_cost_per_token": 1.75e-06, @@ -33946,94 +31667,6 @@ "supports_xhigh_reasoning_effort": true, "supports_minimal_reasoning_effort": false }, - "gpt-5.2-chat-latest": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-08-10", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.3-chat-latest": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-08-10", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, "gpt-5.2-pro": { "input_cost_per_token": 2.1e-05, "input_cost_per_token_batches": 1.05e-05, @@ -34194,6 +31827,158 @@ "supports_web_search": true, "supports_xhigh_reasoning_effort": true }, + "gpt-6-sol": { + "cache_creation_input_token_cost": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 5e-06, + "cache_creation_input_token_cost_above_272k_tokens_flex": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens_priority": 1e-05, + "cache_creation_input_token_cost_flex": 1.25e-06, + "cache_creation_input_token_cost_priority": 5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_272k_tokens": 4e-07, + "cache_read_input_token_cost_above_272k_tokens_flex": 2e-07, + "cache_read_input_token_cost_above_272k_tokens_priority": 8e-07, + "cache_read_input_token_cost_batches": 1e-07, + "cache_read_input_token_cost_above_272k_tokens_batches": 2e-07, + "cache_creation_input_token_cost_batches": 1.25e-06, + "cache_creation_input_token_cost_above_272k_tokens_batches": 2.5e-06, + "cache_read_input_token_cost_flex": 1e-07, + "cache_read_input_token_cost_priority": 4e-07, + "input_cost_per_token": 2e-06, + "input_cost_per_token_above_272k_tokens": 4e-06, + "input_cost_per_token_above_272k_tokens_flex": 2e-06, + "input_cost_per_token_above_272k_tokens_priority": 8e-06, + "input_cost_per_token_batches": 1e-06, + "input_cost_per_token_above_272k_tokens_batches": 2e-06, + "input_cost_per_token_flex": 1e-06, + "input_cost_per_token_priority": 4e-06, + "litellm_provider": "openai", + "max_input_tokens": 922000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 1e-05, + "output_cost_per_token_above_272k_tokens": 1.5e-05, + "output_cost_per_token_above_272k_tokens_flex": 7.5e-06, + "output_cost_per_token_above_272k_tokens_priority": 3e-05, + "output_cost_per_token_batches": 5e-06, + "output_cost_per_token_above_272k_tokens_batches": 7.5e-06, + "output_cost_per_token_flex": 5e-06, + "output_cost_per_token_priority": 2e-05, + "regional_processing_uplift_multiplier_eu": 1.1, + "regional_processing_uplift_multiplier_us": 1.1, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "source": "https://developers.openai.com/api/docs/pricing", + "supported_endpoints": [ + "/v1/chat/completions", + "/v1/batch", + "/v1/responses" + ], + "supported_modalities": [ + "text", + "image" + ], + "supported_output_modalities": [ + "text" + ], + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_minimal_reasoning_effort": false, + "supports_native_streaming": true, + "supports_none_reasoning_effort": true, + "supports_parallel_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_cache_breakpoint": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_system_messages": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true, + "supports_xhigh_reasoning_effort": true + }, + "gpt-6-luna": { + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_creation_input_token_cost_above_272k_tokens_flex": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens_priority": 5e-07, + "cache_creation_input_token_cost_flex": 6.25e-08, + "cache_creation_input_token_cost_priority": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "cache_read_input_token_cost_above_272k_tokens_flex": 1e-08, + "cache_read_input_token_cost_above_272k_tokens_priority": 4e-08, + "cache_read_input_token_cost_batches": 5e-09, + "cache_read_input_token_cost_above_272k_tokens_batches": 1e-08, + "cache_creation_input_token_cost_batches": 6.25e-08, + "cache_creation_input_token_cost_above_272k_tokens_batches": 1.25e-07, + "cache_read_input_token_cost_flex": 5e-09, + "cache_read_input_token_cost_priority": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, + "input_cost_per_token_above_272k_tokens_flex": 1e-07, + "input_cost_per_token_above_272k_tokens_priority": 4e-07, + "input_cost_per_token_batches": 5e-08, + "input_cost_per_token_above_272k_tokens_batches": 1e-07, + "input_cost_per_token_flex": 5e-08, + "input_cost_per_token_priority": 2e-07, + "litellm_provider": "openai", + "max_input_tokens": 922000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, + "output_cost_per_token_above_272k_tokens_flex": 3.75e-07, + "output_cost_per_token_above_272k_tokens_priority": 1.5e-06, + "output_cost_per_token_batches": 2.5e-07, + "output_cost_per_token_above_272k_tokens_batches": 3.75e-07, + "output_cost_per_token_flex": 2.5e-07, + "output_cost_per_token_priority": 1e-06, + "regional_processing_uplift_multiplier_eu": 1.1, + "regional_processing_uplift_multiplier_us": 1.1, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "source": "https://developers.openai.com/api/docs/pricing", + "supported_endpoints": [ + "/v1/chat/completions", + "/v1/batch", + "/v1/responses" + ], + "supported_modalities": [ + "text", + "image" + ], + "supported_output_modalities": [ + "text" + ], + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_minimal_reasoning_effort": false, + "supports_native_streaming": true, + "supports_none_reasoning_effort": true, + "supports_parallel_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_cache_breakpoint": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_system_messages": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true, + "supports_xhigh_reasoning_effort": true + }, "gpt-5.6": { "cache_creation_input_token_cost": 5e-06, "cache_creation_input_token_cost_above_272k_tokens": 1e-05, @@ -34948,7 +32733,7 @@ "gpt-5.4": { "cache_read_input_token_cost": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens": 5e-07, - "cache_read_input_token_cost_batches": 1.25e-07, + "cache_read_input_token_cost_batches": 1.3e-07, "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, "cache_read_input_token_cost_flex": 1.3e-07, "cache_read_input_token_cost_priority": 5e-07, @@ -35005,7 +32790,7 @@ "gpt-5.4-2026-03-05": { "cache_read_input_token_cost": 2.5e-07, "cache_read_input_token_cost_above_272k_tokens": 5e-07, - "cache_read_input_token_cost_batches": 1.25e-07, + "cache_read_input_token_cost_batches": 1.3e-07, "cache_read_input_token_cost_above_272k_tokens_batches": 2.5e-07, "cache_read_input_token_cost_flex": 1.3e-07, "cache_read_input_token_cost_priority": 5e-07, @@ -35165,6 +32950,7 @@ }, "gpt-5.4-mini": { "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "cache_read_input_token_cost_priority": 1.5e-07, "input_cost_per_token": 7.5e-07, @@ -35218,6 +33004,7 @@ }, "gpt-5.4-mini-2026-03-17": { "cache_read_input_token_cost": 7.5e-08, + "cache_read_input_token_cost_batches": 3.75e-08, "cache_read_input_token_cost_flex": 3.75e-08, "cache_read_input_token_cost_priority": 1.5e-07, "input_cost_per_token": 7.5e-07, @@ -35271,6 +33058,7 @@ }, "gpt-5.4-nano": { "cache_read_input_token_cost": 2e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "input_cost_per_token": 2e-07, "input_cost_per_token_flex": 1e-07, @@ -35321,6 +33109,7 @@ }, "gpt-5.4-nano-2026-03-17": { "cache_read_input_token_cost": 2e-08, + "cache_read_input_token_cost_batches": 1e-08, "cache_read_input_token_cost_flex": 1e-08, "input_cost_per_token": 2e-07, "input_cost_per_token_flex": 1e-07, @@ -35456,6 +33245,7 @@ }, "gpt-5-2025-08-07": { "cache_read_input_token_cost": 1.25e-07, + "cache_read_input_token_cost_batches": 6.25e-08, "cache_read_input_token_cost_flex": 6.25e-08, "cache_read_input_token_cost_priority": 2.5e-07, "deprecation_date": "2026-12-11", @@ -35540,251 +33330,6 @@ "supports_xhigh_reasoning_effort": false, "supports_minimal_reasoning_effort": true }, - "gpt-5-chat-latest": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": false, - "supports_native_streaming": true, - "supports_parallel_function_calling": false, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": false, - "supports_vision": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5-codex": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.1-codex": { - "cache_read_input_token_cost": 1.25e-07, - "cache_read_input_token_cost_priority": 2.5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "input_cost_per_token_priority": 2.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1e-05, - "output_cost_per_token_priority": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.1-codex-max": { - "cache_read_input_token_cost": 1.25e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.1-codex-mini": { - "cache_read_input_token_cost": 2.5e-08, - "cache_read_input_token_cost_priority": 4.5e-08, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2.5e-07, - "input_cost_per_token_priority": 4.5e-07, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 2e-06, - "output_cost_per_token_priority": 3.6e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": false, - "supports_minimal_reasoning_effort": true - }, - "gpt-5.2-codex": { - "cache_read_input_token_cost": 1.75e-07, - "cache_read_input_token_cost_priority": 3.5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1.75e-06, - "input_cost_per_token_priority": 3.5e-06, - "litellm_provider": "openai", - "max_input_tokens": 272000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "responses", - "output_cost_per_token": 1.4e-05, - "output_cost_per_token_priority": 2.8e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "supports_none_reasoning_effort": false, - "supports_xhigh_reasoning_effort": true, - "supports_minimal_reasoning_effort": true - }, "gpt-5.3-codex": { "cache_read_input_token_cost": 1.75e-07, "cache_read_input_token_cost_priority": 3.5e-07, @@ -35830,6 +33375,7 @@ }, "gpt-5-mini": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_token": 2.5e-07, @@ -35880,6 +33426,7 @@ }, "gpt-5-mini-2025-08-07": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "deprecation_date": "2026-12-11", @@ -35931,6 +33478,7 @@ }, "gpt-5-nano": { "cache_read_input_token_cost": 5e-09, + "cache_read_input_token_cost_batches": 2.5e-09, "cache_read_input_token_cost_flex": 2.5e-09, "input_cost_per_token": 5e-08, "input_cost_per_token_batches": 2.5e-08, @@ -35979,6 +33527,7 @@ }, "gpt-5-nano-2025-08-07": { "cache_read_input_token_cost": 5e-09, + "cache_read_input_token_cost_batches": 2.5e-09, "cache_read_input_token_cost_flex": 2.5e-09, "deprecation_date": "2026-12-11", "input_cost_per_token": 5e-08, @@ -36028,6 +33577,7 @@ }, "gpt-image-1": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-10-23", "input_cost_per_image_token": 1e-05, "input_cost_per_image_token_batches": 5e-06, @@ -36044,6 +33594,7 @@ }, "gpt-image-1-mini": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "deprecation_date": "2026-12-01", "input_cost_per_image_token": 2.5e-06, "input_cost_per_image_token_batches": 1.25e-06, @@ -36619,44 +34170,14 @@ "supports_response_schema": true, "supports_vision": true }, - "groq/llama-3.1-8b-instant": { - "deprecation_date": "2026-08-16", - "input_cost_per_token": 5e-08, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 8e-08, - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true - }, - "groq/llama-3.3-70b-versatile": { - "deprecation_date": "2026-08-16", - "input_cost_per_token": 5.9e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 7.9e-07, - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true - }, - "groq/gemma-7b-it": { - "deprecation_date": "2024-12-18", - "input_cost_per_token": 5e-08, + "groq/llama-guard-3-8b": { + "input_cost_per_token": 2e-07, "litellm_provider": "groq", "max_input_tokens": 8192, - "max_output_tokens": 8192, "max_tokens": 8192, "mode": "chat", - "output_cost_per_token": 8e-08, - "supports_function_calling": true, - "supports_response_schema": false, - "supports_tool_choice": true + "output_cost_per_token": 2e-07, + "source": "https://console.groq.com/docs/model/llama-guard-3-8b" }, "groq/meta-llama/llama-prompt-guard-2-22m": { "input_cost_per_token": 3e-08, @@ -36678,58 +34199,6 @@ "output_cost_per_token": 4e-08, "source": "https://console.groq.com/docs/model/meta-llama/llama-prompt-guard-2-86m" }, - "groq/meta-llama/llama-guard-4-12b": { - "deprecation_date": "2026-03-05", - "input_cost_per_token": 2e-07, - "litellm_provider": "groq", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 2e-07 - }, - "groq/meta-llama/llama-4-maverick-17b-128e-instruct": { - "deprecation_date": "2026-03-09", - "input_cost_per_token": 2e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "groq/meta-llama/llama-4-scout-17b-16e-instruct": { - "deprecation_date": "2026-07-17", - "input_cost_per_token": 1.1e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3.4e-07, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "groq/moonshotai/kimi-k2-instruct-0905": { - "deprecation_date": "2026-04-15", - "input_cost_per_token": 1e-06, - "output_cost_per_token": 3e-06, - "cache_read_input_token_cost": 5e-07, - "litellm_provider": "groq", - "max_input_tokens": 262144, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "groq/openai/gpt-oss-120b": { "cache_read_input_token_cost": 7.5e-08, "input_cost_per_token": 1.5e-07, @@ -36810,45 +34279,6 @@ "mode": "audio_speech", "source": "https://console.groq.com/docs/models" }, - "groq/playai-tts": { - "deprecation_date": "2025-12-31", - "input_cost_per_character": 5e-05, - "litellm_provider": "groq", - "max_input_tokens": 10000, - "max_output_tokens": 10000, - "max_tokens": 10000, - "mode": "audio_speech" - }, - "groq/qwen/qwen3.6-27b": { - "input_cost_per_token": 6e-07, - "litellm_provider": "groq", - "max_input_tokens": 131072, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://console.groq.com/docs/model/qwen/qwen3.6-27b", - "deprecation_date": "2026-09-14", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_vision": true - }, - "groq/qwen/qwen3-32b": { - "deprecation_date": "2026-07-17", - "input_cost_per_token": 2.9e-07, - "litellm_provider": "groq", - "max_input_tokens": 131000, - "max_output_tokens": 131000, - "max_tokens": 131000, - "mode": "chat", - "output_cost_per_token": 5.9e-07, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true - }, "groq/whisper-large-v3": { "input_cost_per_second": 3.083e-05, "litellm_provider": "groq", @@ -36861,27 +34291,6 @@ "mode": "audio_transcription", "output_cost_per_second": 0.0 }, - "hd/1024-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 7.629e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "hd/1024-x-1792/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 6.539e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "hd/1792-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 6.539e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "heroku/claude-3-5-haiku": { "litellm_provider": "heroku", "max_tokens": 8192, @@ -37325,7 +34734,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "jp.anthropic.claude-haiku-4-5-20251001-v1:0": { "cache_creation_input_token_cost": 1.375e-06, @@ -37339,7 +34749,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5.5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -37916,7 +35326,8 @@ "max_output_tokens": 4096, "max_tokens": 4096, "mode": "chat", - "output_cost_per_token": 1e-06 + "output_cost_per_token": 1e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "meta.llama2-70b-chat-v1": { "input_cost_per_token": 1.95e-06, @@ -37925,7 +35336,8 @@ "max_output_tokens": 4096, "max_tokens": 4096, "mode": "chat", - "output_cost_per_token": 2.56e-06 + "output_cost_per_token": 2.56e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "meta.llama3-1-405b-instruct-v1:0": { "input_cost_per_token": 5.32e-06, @@ -38625,16 +36037,18 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "mistral.mistral-large-2402-v1:0": { - "input_cost_per_token": 8e-06, + "input_cost_per_token": 4e-06, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", - "output_cost_per_token": 2.4e-05, + "output_cost_per_token": 1.2e-05, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "mistral.mistral-large-2407-v1:0": { @@ -38666,12 +36080,15 @@ }, "mistral.mistral-small-2402-v1:0": { "input_cost_per_token": 1e-06, + "input_cost_per_token_batches": 5e-07, "litellm_provider": "bedrock", "max_input_tokens": 32000, "max_output_tokens": 8191, "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 3e-06, + "output_cost_per_token_batches": 1.5e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true }, "mistral.mixtral-8x7b-instruct-v0:1": { @@ -38682,6 +36099,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 7e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_tool_choice": true }, "mistral.voxtral-mini-3b-2507": { @@ -38692,6 +36110,7 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 4e-08, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_audio_input": true, "supports_system_messages": true, "supports_native_structured_output": true @@ -38704,23 +36123,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 3e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_audio_input": true, "supports_system_messages": true, "supports_native_structured_output": true }, - "mistral/codestral-2405": { - "deprecation_date": "2025-06-16", - "input_cost_per_token": 1e-06, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 3e-06, - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/codestral-2508": { "cache_read_input_token_cost": 3e-08, "input_cost_per_token": 3e-07, @@ -38764,51 +36171,6 @@ "supports_assistant_prefill": true, "supports_tool_choice": true }, - "mistral/devstral-medium-2507": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/devstral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/devstral-small-2505": { - "deprecation_date": "2025-11-30", - "input_cost_per_token": 1e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://mistral.ai/news/devstral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/devstral-small-2507": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 1e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://mistral.ai/news/devstral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/devstral-small-latest": { "cache_read_input_token_cost": 1e-08, "input_cost_per_token": 1e-07, @@ -38824,21 +36186,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/labs-devstral-small-2512": { - "deprecation_date": "2026-03-31", - "input_cost_per_token": 1e-07, - "litellm_provider": "mistral", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://docs.mistral.ai/models/devstral-small-2-25-12", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/devstral-latest": { "cache_read_input_token_cost": 4e-08, "input_cost_per_token": 4e-07, @@ -38869,21 +36216,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/devstral-2512": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/devstral-2-vibe-cli", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/ministral-14b-2512": { "input_cost_per_token": 2e-07, "litellm_provider": "mistral", @@ -39159,54 +36491,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/magistral-medium-2506": { - "deprecation_date": "2025-11-30", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://mistral.ai/news/magistral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/magistral-medium-2509": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://mistral.ai/news/magistral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/magistral-medium-1-2-2509": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://mistral.ai/news/magistral", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/mistral-ocr-latest": { "litellm_provider": "mistral", "ocr_cost_per_page": 0.004, @@ -39246,20 +36530,6 @@ "/v1/batch" ] }, - "mistral/mistral-ocr-2505-completion": { - "deprecation_date": "2026-05-31", - "litellm_provider": "mistral", - "ocr_cost_per_page": 0.001, - "ocr_cost_per_page_batches": 0.0005, - "annotation_cost_per_page": 0.003, - "annotation_cost_per_page_batches": 0.0015, - "mode": "ocr", - "supported_endpoints": [ - "/v1/ocr", - "/v1/batch" - ], - "source": "https://mistral.ai/pricing#api-pricing" - }, "mistral/mistral-ocr-2512": { "litellm_provider": "mistral", "ocr_cost_per_page": 0.002, @@ -39290,22 +36560,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/magistral-small-2506": { - "deprecation_date": "2025-11-30", - "input_cost_per_token": 5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://mistral.ai/pricing#api-pricing", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/magistral-small-latest": { "cache_read_input_token_cost": 1.5e-08, "input_cost_per_token": 1.5e-07, @@ -39323,22 +36577,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/magistral-small-1-2-2509": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 40000, - "max_output_tokens": 40000, - "max_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://mistral.ai/pricing#api-pricing", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/mistral-embed": { "input_cost_per_token": 1e-07, "litellm_provider": "mistral", @@ -39362,48 +36600,6 @@ "max_tokens": 8192, "mode": "embedding" }, - "mistral/mistral-large-2402": { - "deprecation_date": "2025-06-16", - "input_cost_per_token": 4e-06, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 1.2e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-large-2407": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 9e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-large-2411": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/mistral-large-latest": { "cache_read_input_token_cost": 5e-08, "input_cost_per_token": 5e-07, @@ -39473,49 +36669,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/mistral-medium-2312": { - "deprecation_date": "2025-06-16", - "input_cost_per_token": 2.7e-06, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 8.1e-06, - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-medium-2505": { - "deprecation_date": "2026-08-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 2e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/mistral-medium-2508": { - "deprecation_date": "2026-08-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/mistral-medium-3", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/mistral-medium-2604": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 1.5e-06, @@ -39558,22 +36711,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/mistral-medium-3-1-2508": { - "deprecation_date": "2026-08-31", - "input_cost_per_token": 4e-07, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://mistral.ai/news/mistral-medium-3", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/mistral-medium-3-5": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 1.5e-06, @@ -39630,22 +36767,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "mistral/mistral-small-3-2-2506": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 6e-08, - "litellm_provider": "mistral", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.8e-07, - "source": "https://mistral.ai/pricing", - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/ministral-3-3b-2512": { "cache_read_input_token_cost": 1e-08, "input_cost_per_token": 1e-07, @@ -39739,32 +36860,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/open-codestral-mamba": { - "deprecation_date": "2025-06-06", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-07, - "source": "https://mistral.ai/technology/", - "supports_assistant_prefill": true, - "supports_tool_choice": true - }, - "mistral/open-mistral-7b": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 2.5e-07, - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "mistral/open-mistral-nemo": { "cache_read_input_token_cost": 3e-08, "input_cost_per_token": 3e-07, @@ -39779,78 +36874,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "mistral/open-mistral-nemo-2407": { - "deprecation_date": "2026-07-31", - "input_cost_per_token": 3e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://mistral.ai/technology/", - "supports_assistant_prefill": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/open-mixtral-8x22b": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 65336, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 6e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/open-mixtral-8x7b": { - "deprecation_date": "2025-03-30", - "input_cost_per_token": 7e-07, - "litellm_provider": "mistral", - "max_input_tokens": 32000, - "max_output_tokens": 8191, - "max_tokens": 8191, - "mode": "chat", - "output_cost_per_token": 7e-07, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "mistral/pixtral-12b-2409": { - "deprecation_date": "2025-12-31", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 1.5e-07, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "mistral/pixtral-large-2411": { - "deprecation_date": "2026-05-31", - "input_cost_per_token": 2e-06, - "litellm_provider": "mistral", - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "max_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "mistral/pixtral-large-latest": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, @@ -39899,36 +36922,6 @@ "supports_audio_input": false, "supports_response_schema": true }, - "moonshot/kimi-k2-0711-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_web_search": true - }, - "moonshot/kimi-k2-0905-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "moonshot/kimi-k2.7-code": { "cache_read_input_token_cost": 1.9e-07, "input_cost_per_token": 9.5e-07, @@ -39947,21 +36940,6 @@ "supports_video_input": true, "supports_vision": true }, - "moonshot/kimi-k2-turbo-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 1.15e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 8e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "moonshot/kimi-k2.5": { "cache_read_input_token_cost": 1e-07, "input_cost_per_token": 6e-07, @@ -40018,111 +36996,6 @@ "supports_video_input": true, "supports_vision": true }, - "moonshot/kimi-latest": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 2e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-latest-128k": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 2e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-latest-32k": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 1e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 32768, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-latest-8k": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-01-28", - "input_cost_per_token": 2e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "moonshot/kimi-thinking-preview": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2025-11-11", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_vision": true - }, - "moonshot/kimi-k2-thinking": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 6e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "supports_web_search": true - }, - "moonshot/kimi-k2-thinking-turbo": { - "cache_read_input_token_cost": 1.5e-07, - "deprecation_date": "2026-05-25", - "input_cost_per_token": 1.15e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 8e-06, - "source": "https://platform.moonshot.ai/docs/pricing/chat#generation-model-kimi-k2", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "supports_web_search": true - }, "moonshot/moonshot-v1-128k": { "input_cost_per_token": 2e-06, "litellm_provider": "moonshot", @@ -40136,19 +37009,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "moonshot/moonshot-v1-128k-0430": { - "deprecation_date": "2024-04-30", - "input_cost_per_token": 2e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 5e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true - }, "moonshot/moonshot-v1-128k-vision-preview": { "input_cost_per_token": 2e-06, "litellm_provider": "moonshot", @@ -40176,19 +37036,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "moonshot/moonshot-v1-32k-0430": { - "deprecation_date": "2024-04-30", - "input_cost_per_token": 1e-06, - "litellm_provider": "moonshot", - "max_input_tokens": 32768, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true - }, "moonshot/moonshot-v1-32k-vision-preview": { "input_cost_per_token": 1e-06, "litellm_provider": "moonshot", @@ -40216,19 +37063,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "moonshot/moonshot-v1-8k-0430": { - "deprecation_date": "2024-04-30", - "input_cost_per_token": 2e-07, - "litellm_provider": "moonshot", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://platform.moonshot.ai/docs/pricing", - "supports_function_calling": true, - "supports_tool_choice": true - }, "moonshot/moonshot-v1-8k-vision-preview": { "input_cost_per_token": 2e-07, "litellm_provider": "moonshot", @@ -41419,88 +38253,6 @@ "supports_vision": true, "supports_web_search": true }, - "o3-deep-research": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1e-05, - "input_cost_per_token_batches": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 4e-05, - "output_cost_per_token_batches": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, - "o3-deep-research-2025-06-26": { - "cache_read_input_token_cost": 2.5e-06, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 1e-05, - "input_cost_per_token_batches": 5e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 4e-05, - "output_cost_per_token_batches": 2e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, "o3-mini": { "cache_read_input_token_cost": 5.5e-07, "deprecation_date": "2026-10-23", @@ -41686,88 +38438,6 @@ "supports_vision": true, "supports_web_search": true }, - "o4-mini-deep-research": { - "cache_read_input_token_cost": 5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 8e-06, - "output_cost_per_token_batches": 4e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, - "o4-mini-deep-research-2025-06-26": { - "cache_read_input_token_cost": 5e-07, - "deprecation_date": "2026-07-23", - "input_cost_per_token": 2e-06, - "input_cost_per_token_batches": 1e-06, - "litellm_provider": "openai", - "max_input_tokens": 200000, - "max_output_tokens": 100000, - "max_tokens": 100000, - "mode": "responses", - "output_cost_per_token": 8e-06, - "output_cost_per_token_batches": 4e-06, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supported_endpoints": [ - "/v1/chat/completions", - "/v1/batch", - "/v1/responses" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "text" - ], - "supports_function_calling": true, - "supports_native_streaming": true, - "supports_parallel_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true - }, "oci/meta.llama-3.1-8b-instruct": { "input_cost_per_token": 7.2e-07, "litellm_provider": "oci", @@ -42639,6 +39309,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 6e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_reasoning": true, "supports_response_schema": true, @@ -42652,6 +39323,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 3e-07, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_reasoning": true, "supports_response_schema": true, @@ -42740,32 +39412,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "openrouter/anthropic/claude-opus-4": { - "input_cost_per_image": 0.0048, - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "openrouter", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_pdf_input": true, - "supports_response_schema": false, - "supports_web_search": true - }, "openrouter/anthropic/claude-opus-4.1": { "input_cost_per_image": 0.0048, "cache_creation_input_token_cost": 1.875e-05, @@ -43019,6 +39665,28 @@ "supports_web_search": true, "supports_xhigh_reasoning_effort": true }, + "openrouter/anthropic/claude-opus-5.5": { + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true + }, "openrouter/bytedance/ui-tars-1.5-7b": { "cache_read_input_token_cost": 1e-07, "input_cost_per_token": 1e-07, @@ -43190,21 +39858,21 @@ "supports_web_search": false }, "openrouter/deepseek/deepseek-v4-pro": { - "input_cost_per_token": 9.31074e-07, + "input_cost_per_token": 8.92272e-07, "input_cost_per_token_cache_hit": 4.4e-08, "litellm_provider": "openrouter", "max_input_tokens": 1048576, "max_output_tokens": 384000, "max_tokens": 384000, "mode": "chat", - "output_cost_per_token": 1.862148e-06, + "output_cost_per_token": 1.784544e-06, "source": "https://openrouter.ai/api/v1/models", "supports_function_calling": true, "supports_prompt_caching": true, "supports_reasoning": true, "supports_response_schema": true, "supports_tool_choice": true, - "cache_read_input_token_cost": 7.75895e-08, + "cache_read_input_token_cost": 7.4356e-08, "supports_audio_input": false, "supports_pdf_input": false, "supports_vision": false, @@ -43253,23 +39921,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/google/gemini-2.0-flash-001": { - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7e-07, - "input_cost_per_token": 1e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 4e-07, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true - }, "openrouter/google/gemini-2.5-flash": { "cache_creation_input_token_cost": 8.33333333333333e-08, "cache_read_input_audio_token_cost": 1e-07, @@ -43693,27 +40344,6 @@ "supports_vision": true, "supports_web_search": false }, - "openrouter/mistralai/mistral-large-2512": { - "cache_read_input_token_cost": 5.5e-08, - "input_cost_per_image": 0, - "input_cost_per_token": 5.5e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 262144, - "max_output_tokens": 209715, - "max_tokens": 209715, - "mode": "chat", - "output_cost_per_token": 1.65e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/mistralai/mistral-7b-instruct": { "input_cost_per_token": 1.3e-07, "litellm_provider": "openrouter", @@ -45895,7 +42525,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/ap-south-1/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.8e-07, @@ -45908,7 +42541,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/ap-southeast-2/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.545e-07, @@ -45921,7 +42557,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/eu-west-1/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.8e-07, @@ -45934,7 +42573,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/eu-west-2/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 2.3e-07, @@ -45947,7 +42589,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/sa-east-1/qwen.qwen3-next-80b-a3b": { "input_cost_per_token": 1.8e-07, @@ -45960,7 +42605,10 @@ "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_native_structured_output": true, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "qwen.qwen3-vl-235b-a22b": { "input_cost_per_token": 5.3e-07, @@ -46464,17 +43112,6 @@ "supports_reasoning": true, "supports_system_messages": true }, - "rerank-english-v2.0": { - "input_cost_per_query": 0.002, - "input_cost_per_token": 0.0, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "rerank", - "output_cost_per_token": 0.0, - "deprecation_date": "2025-04-30" - }, "rerank-english-v3.0": { "input_cost_per_query": 0.002, "input_cost_per_token": 0.0, @@ -46485,17 +43122,6 @@ "mode": "rerank", "output_cost_per_token": 0.0 }, - "rerank-multilingual-v2.0": { - "input_cost_per_query": 0.002, - "input_cost_per_token": 0.0, - "litellm_provider": "cohere", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "rerank", - "output_cost_per_token": 0.0, - "deprecation_date": "2025-04-30" - }, "rerank-multilingual-v3.0": { "input_cost_per_query": 0.002, "input_cost_per_token": 0.0, @@ -46636,31 +43262,6 @@ "output_cost_per_token": 7e-06, "source": "https://cloud.sambanova.ai/plans/pricing" }, - "sambanova/DeepSeek-R1-Distill-Llama-70B": { - "deprecation_date": "2026-03-20", - "input_cost_per_token": 7e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.4e-06, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/DeepSeek-V3-0324": { - "deprecation_date": "2026-04-14", - "input_cost_per_token": 3e-06, - "litellm_provider": "sambanova", - "max_input_tokens": 32768, - "max_output_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 4.5e-06, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "sambanova/Llama-4-Maverick-17B-128E-Instruct": { "input_cost_per_token": 6.3e-07, "litellm_provider": "sambanova", @@ -46678,73 +43279,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "sambanova/Llama-4-Scout-17B-16E-Instruct": { - "deprecation_date": "2025-06-19", - "input_cost_per_token": 4e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "metadata": { - "notes": "For vision models, images are converted to 6432 input tokens and are billed at that amount" - }, - "mode": "chat", - "output_cost_per_token": 7e-07, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "sambanova/Meta-Llama-3.1-405B-Instruct": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 5e-06, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-05, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "sambanova/Meta-Llama-3.1-8B-Instruct": { - "deprecation_date": "2026-04-14", - "input_cost_per_token": 1e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "sambanova/Meta-Llama-3.2-1B-Instruct": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 4e-08, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 8e-08, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/Meta-Llama-3.2-3B-Instruct": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 8e-08, - "litellm_provider": "sambanova", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.6e-07, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, "sambanova/Meta-Llama-3.3-70B-Instruct": { "input_cost_per_token": 6e-07, "litellm_provider": "sambanova", @@ -46758,54 +43292,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "sambanova/Meta-Llama-Guard-3-8B": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 3e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 3e-07, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/QwQ-32B": { - "deprecation_date": "2025-06-25", - "input_cost_per_token": 5e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 16384, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 1e-06, - "source": "https://cloud.sambanova.ai/plans/pricing" - }, - "sambanova/Qwen2-Audio-7B-Instruct": { - "deprecation_date": "2025-06-19", - "input_cost_per_token": 5e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 4096, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 0.0001, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_audio_input": true - }, - "sambanova/Qwen3-32B": { - "deprecation_date": "2026-04-06", - "input_cost_per_token": 4e-07, - "litellm_provider": "sambanova", - "max_input_tokens": 8192, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://cloud.sambanova.ai/plans/pricing", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, "sambanova/DeepSeek-V3.1": { "max_tokens": 131072, "max_input_tokens": 131072, @@ -47398,27 +43884,6 @@ "mode": "image_generation", "output_cost_per_image": 0.14 }, - "standard/1024-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 3.81469e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "standard/1024-x-1792/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 4.359e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, - "standard/1792-x-1024/dall-e-3": { - "deprecation_date": "2026-05-12", - "input_cost_per_pixel": 4.359e-08, - "litellm_provider": "openai", - "mode": "image_generation", - "output_cost_per_pixel": 0.0 - }, "linkup/search": { "input_cost_per_query": 0.00587, "litellm_provider": "linkup", @@ -47553,36 +44018,6 @@ "output_vector_size": 768, "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" }, - "text-moderation-007": { - "deprecation_date": "2025-10-27", - "input_cost_per_token": 0.0, - "litellm_provider": "openai", - "max_input_tokens": 32768, - "max_output_tokens": 0, - "max_tokens": 0, - "mode": "moderation", - "output_cost_per_token": 0.0 - }, - "text-moderation-latest": { - "deprecation_date": "2025-10-27", - "input_cost_per_token": 0.0, - "litellm_provider": "openai", - "max_input_tokens": 32768, - "max_output_tokens": 0, - "max_tokens": 0, - "mode": "moderation", - "output_cost_per_token": 0.0 - }, - "text-moderation-stable": { - "deprecation_date": "2025-10-27", - "input_cost_per_token": 0.0, - "litellm_provider": "openai", - "max_input_tokens": 32768, - "max_output_tokens": 0, - "max_tokens": 0, - "mode": "moderation", - "output_cost_per_token": 0.0 - }, "text-multilingual-embedding-002": { "deprecation_date": "2027-04-01", "input_cost_per_character": 2.5e-08, @@ -47680,19 +44115,6 @@ "mode": "chat", "output_cost_per_token": 1e-07 }, - "together_ai/Qwen/Qwen2.5-72B-Instruct-Turbo": { - "deprecation_date": "2026-02-06", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "input_cost_per_token": 1.2e-06, - "output_cost_per_token": 1.2e-06, - "max_input_tokens": 131072, - "source": "https://api.together.ai/v1/models" - }, "together_ai/Qwen/Qwen2.5-7B-Instruct-Turbo": { "litellm_provider": "together_ai", "mode": "chat", @@ -47705,87 +44127,6 @@ "max_input_tokens": 32768, "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen3-235B-A22B-Instruct-2507-tput": { - "deprecation_date": "2026-07-10", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "source": "https://www.together.ai/models/qwen3-235b-a22b-instruct-2507-fp8", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-235B-A22B-Thinking-2507": { - "deprecation_date": "2026-04-16", - "input_cost_per_token": 6.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://www.together.ai/models/qwen3-235b-a22b-thinking-2507", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-235B-A22B-fp8-tput": { - "deprecation_date": "2026-02-06", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 40000, - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://www.together.ai/models/qwen3-235b-a22b-fp8-tput", - "supports_function_calling": false, - "supports_parallel_function_calling": false, - "supports_tool_choice": false - }, - "together_ai/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": { - "deprecation_date": "2026-06-04", - "input_cost_per_token": 2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/deepseek-ai/DeepSeek-R1": { - "deprecation_date": "2026-05-14", - "input_cost_per_token": 3e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 128000, - "max_output_tokens": 20480, - "max_tokens": 20480, - "metadata": { - "successor": "together_ai/deepseek-ai/DeepSeek-V4-Pro-0813" - }, - "mode": "chat", - "output_cost_per_token": 7e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/deepseek-ai/DeepSeek-R1-0528-tput": { - "deprecation_date": "2026-02-03", - "input_cost_per_token": 5.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 128000, - "mode": "chat", - "output_cost_per_token": 2.19e-06, - "source": "https://www.together.ai/models/deepseek-r1-0528-throughput", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/deepseek-ai/DeepSeek-V3": { "input_cost_per_token": 1.25e-06, "litellm_provider": "together_ai", @@ -47802,33 +44143,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/deepseek-ai/DeepSeek-V3.1": { - "deprecation_date": "2026-05-14", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "max_tokens": 16384, - "metadata": { - "successor": "together_ai/deepseek-ai/DeepSeek-V4-Pro-0813" - }, - "mode": "chat", - "output_cost_per_token": 1.7e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "max_input_tokens": 131072, - "max_output_tokens": 16384 - }, - "together_ai/meta-llama/Llama-3.2-3B-Instruct-Turbo": { - "deprecation_date": "2026-03-06", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/meta-llama/Llama-3.3-70B-Instruct-Turbo": { "input_cost_per_token": 1.04e-06, "litellm_provider": "together_ai", @@ -47842,112 +44156,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/meta-llama/Llama-3.3-70B-Instruct-Turbo-Free": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 0, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 0, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8": { - "deprecation_date": "2026-03-31", - "input_cost_per_token": 2.7e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.5e-07, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Llama-4-Scout-17B-16E-Instruct": { - "deprecation_date": "2026-02-06", - "input_cost_per_token": 1.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 5.9e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo": { - "deprecation_date": "2026-02-06", - "input_cost_per_token": 3.5e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 3.5e-06, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo": { - "deprecation_date": "2026-02-25", - "input_cost_per_token": 8.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.8e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo": { - "deprecation_date": "2026-03-06", - "input_cost_per_token": 1.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.8e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/mistralai/Mistral-7B-Instruct-v0.1": { - "deprecation_date": "2025-11-13", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "input_cost_per_token": 2e-07, - "output_cost_per_token": 2e-07, - "max_input_tokens": 32768, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/mistralai/Mistral-Small-24B-Instruct-2501": { - "deprecation_date": "2026-04-02", - "litellm_provider": "together_ai", - "mode": "chat", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 3e-07, - "max_input_tokens": 32768, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/mistralai/Mixtral-8x7B-Instruct-v0.1": { - "deprecation_date": "2026-04-16", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/moonshotai/Kimi-K2-Instruct": { "input_cost_per_token": 1e-06, "litellm_provider": "together_ai", @@ -47976,19 +44184,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/openai/gpt-oss-20b": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 5e-08, - "litellm_provider": "together_ai", - "max_input_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/togethercomputer/CodeLlama-34b-Instruct": { "litellm_provider": "together_ai", "mode": "chat", @@ -47996,19 +44191,6 @@ "supports_parallel_function_calling": true, "supports_tool_choice": true }, - "together_ai/zai-org/GLM-4.5-Air-FP8": { - "deprecation_date": "2026-04-02", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 1.1e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/zai-org/GLM-4.6": { "input_cost_per_token": 6e-07, "litellm_provider": "together_ai", @@ -48025,102 +44207,6 @@ "supports_reasoning": true, "supports_tool_choice": true }, - "together_ai/zai-org/GLM-4.7": { - "deprecation_date": "2026-04-02", - "input_cost_per_token": 4.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 202752, - "max_tokens": 202752, - "metadata": { - "successor": "together_ai/zai-org/GLM-5.2" - }, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_reasoning": true, - "supports_tool_choice": true - }, - "together_ai/moonshotai/Kimi-K2.5": { - "deprecation_date": "2026-05-21", - "input_cost_per_token": 5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 256000, - "max_tokens": 256000, - "metadata": { - "successor": "together_ai/moonshotai/Kimi-K3" - }, - "mode": "chat", - "output_cost_per_token": 2.8e-06, - "source": "https://www.together.ai/models/kimi-k2-5", - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_reasoning": true - }, - "together_ai/moonshotai/Kimi-K2-Instruct-0905": { - "deprecation_date": "2026-03-06", - "input_cost_per_token": 1e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "metadata": { - "successor": "together_ai/moonshotai/Kimi-K3" - }, - "mode": "chat", - "output_cost_per_token": 3e-06, - "source": "https://www.together.ai/models/kimi-k2-0905", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-Next-80B-A3B-Instruct": { - "deprecation_date": "2026-04-02", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "metadata": { - "successor": "together_ai/Qwen/Qwen3.7-Plus" - }, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3-Next-80B-A3B-Thinking": { - "deprecation_date": "2026-02-25", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "metadata": { - "successor": "together_ai/Qwen/Qwen3.6-Plus" - }, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/Qwen/Qwen3.5-397B-A17B": { - "cache_read_input_token_cost": 3.5e-07, - "deprecation_date": "2026-06-29", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 3.6e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/MiniMaxAI/MiniMax-M3": { "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 3e-07, @@ -48242,23 +44328,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/deepseek-ai/DeepSeek-V4-Pro": { - "deprecation_date": "2026-08-27", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.74e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 512000, - "max_tokens": 512000, - "mode": "chat", - "output_cost_per_token": 3.48e-06, - "source": "https://docs.together.ai/docs/serverless-models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, "together_ai/deepseek-ai/DeepSeek-V4-Pro-0813": { "cache_read_input_token_cost": 1.3e-07, "deprecation_date": "2026-09-29", @@ -48275,52 +44344,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/google/gemma-3n-E4B-it": { - "deprecation_date": "2026-08-25", - "input_cost_per_token": 6e-08, - "litellm_provider": "together_ai", - "max_input_tokens": 32768, - "max_tokens": 32768, - "mode": "chat", - "output_cost_per_token": 1.2e-07, - "source": "https://docs.together.ai/docs/serverless-models" - }, - "together_ai/google/gemma-4-31B-it": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 3.9e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 9.7e-07, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "together_ai/intfloat/multilingual-e5-large-instruct": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 2e-08, - "litellm_provider": "together_ai", - "max_input_tokens": 514, - "max_tokens": 514, - "mode": "embedding", - "output_cost_per_token": 2e-08, - "output_vector_size": 1024, - "source": "https://docs.together.ai/docs/serverless-models" - }, - "together_ai/meta-llama/Llama-Guard-4-12B": { - "deprecation_date": "2026-08-25", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 1048576, - "max_tokens": 1048576, - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://docs.together.ai/docs/serverless-models" - }, "together_ai/meta-models/Muse-Glimmer-30B": { "cache_read_input_token_cost": 4e-08, "input_cost_per_token": 3.5e-07, @@ -48332,23 +44355,6 @@ "source": "https://api.together.ai/v1/models", "supports_prompt_caching": true }, - "together_ai/moonshotai/Kimi-K2.7-Code": { - "deprecation_date": "2026-08-27", - "cache_read_input_token_cost": 1.9e-07, - "input_cost_per_token": 9.5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 4e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "together_ai/moonshotai/Kimi-K3": { "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 3e-06, @@ -48371,33 +44377,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "together_ai/nvidia/nemotron-3-ultra-550b-a55b": { - "deprecation_date": "2026-08-27", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 512288, - "max_tokens": 512288, - "mode": "chat", - "output_cost_per_token": 3.6e-06, - "source": "https://api.together.ai/v1/models", - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true - }, - "together_ai/pearl-ai/gemma-4-31b-it": { - "deprecation_date": "2026-08-27", - "input_cost_per_token": 2.8e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "max_tokens": 262144, - "mode": "chat", - "output_cost_per_token": 8.6e-07, - "source": "https://docs.together.ai/docs/serverless-models" - }, "together_ai/thinkingmachines/Inkling": { "cache_read_input_token_cost": 1.7e-07, "input_cost_per_token": 1e-06, @@ -48413,18 +44392,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "together_ai/thinkingmachines/Inkling-Small": { - "deprecation_date": "2026-09-14", - "cache_read_input_token_cost": 1e-07, - "input_cost_per_token": 5e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 524288, - "max_tokens": 524288, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://api.together.ai/v1/models", - "supports_prompt_caching": true - }, "together_ai/zai-org/GLM-5.2": { "cache_read_input_token_cost": 2.6e-07, "input_cost_per_token": 1.4e-06, @@ -48571,22 +44538,6 @@ "supports_response_schema": true, "supports_tool_choice": true }, - "us.amazon.nova-premier-v1:0": { - "deprecation_date": "2026-09-14", - "input_cost_per_token": 2.5e-06, - "litellm_provider": "bedrock_converse", - "max_input_tokens": 1000000, - "max_output_tokens": 10000, - "max_tokens": 10000, - "mode": "chat", - "output_cost_per_token": 1.25e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_vision": true, - "cache_read_input_token_cost": 6.25e-07 - }, "us.amazon.nova-pro-v1:0": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 8e-07, @@ -48633,7 +44584,7 @@ "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5.5e-06, - "source": "https://aws.amazon.com/about-aws/whats-new/2025/10/claude-4-5-haiku-anthropic-amazon-bedrock", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -48704,23 +44655,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "us.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 2.5e-07, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.25e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 2.5e-08, - "cache_creation_input_token_cost": 3.125e-07 - }, "us.anthropic.claude-3-opus-20240229-v1:0": { "input_cost_per_token": 1.5e-05, "litellm_provider": "bedrock", @@ -48736,23 +44670,6 @@ "cache_read_input_token_cost": 1.5e-06, "cache_creation_input_token_cost": 1.875e-05 }, - "us.anthropic.claude-3-sonnet-20240229-v1:0": { - "deprecation_date": "2026-07-30", - "input_cost_per_token": 3e-06, - "litellm_provider": "bedrock", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-07, - "cache_creation_input_token_cost": 3.75e-06 - }, "us.anthropic.claude-opus-4-1-20250805-v1:0": { "cache_creation_input_token_cost": 1.875e-05, "cache_read_input_token_cost": 1.5e-06, @@ -48778,7 +44695,8 @@ "supports_response_schema": true, "supports_tool_choice": true, "supports_vision": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.125e-06, @@ -48815,24 +44733,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 1024, "input_cost_per_token_batches": 1.65e-06, - "output_cost_per_token_batches": 8.25e-06 - }, - "us-gov.anthropic.claude-3-haiku-20240307-v1:0": { - "deprecation_date": "2026-09-10", - "input_cost_per_token": 3e-07, - "litellm_provider": "bedrock_converse", - "max_input_tokens": 200000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "chat", - "output_cost_per_token": 1.5e-06, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "cache_read_input_token_cost": 3e-08, - "cache_creation_input_token_cost": 3.75e-07 + "output_cost_per_token_batches": 8.25e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0": { "cache_creation_input_token_cost": 4.5e-06, @@ -48862,7 +44764,8 @@ "supports_vision": true, "supports_native_structured_output": true, "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us-gov.anthropic.claude-sonnet-5": { "bedrock_converse_supports_strict_tools": false, @@ -48920,7 +44823,7 @@ "supports_function_calling": true, "supports_max_reasoning_effort": true, "supports_mid_conversation_system": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_output_config": true, "supports_parallel_tool_use_config": true, "supports_pdf_input": true, @@ -48965,6 +44868,41 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true }, + "us-gov.anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "cache_creation_input_token_cost": 6e-06, + "cache_creation_input_token_cost_above_1hr": 9.6e-06, + "cache_read_input_token_cost": 2.4e-07, + "input_cost_per_token": 4.8e-06, + "litellm_provider": "bedrock_converse", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.4e-05, + "prompt_cache_min_tokens": 512, + "source": "https://aws.amazon.com/bedrock/pricing/", + "supports_adaptive_thinking": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_mid_conversation_system": true, + "supports_native_structured_output": false, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "thinking_always_on": true, + "supports_forced_tool_use": false + }, "us-gov.anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.5e-05, "cache_creation_input_token_cost_above_1hr": 2.4e-05, @@ -49011,7 +44949,10 @@ "supports_function_calling": true, "supports_native_structured_output": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "us-gov.nvidia.nemotron-nano-12b-v2": { "input_cost_per_token": 2.4e-07, @@ -49022,7 +44963,10 @@ "mode": "chat", "output_cost_per_token": 7.2e-07, "supports_system_messages": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true }, "us-gov.nvidia.nemotron-nano-9b-v2": { "input_cost_per_token": 7.2e-08, @@ -49032,7 +44976,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 2.76e-07, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true, + "supports_vision": false }, "us-gov.nvidia.nemotron-super-3-120b": { "input_cost_per_token": 1.8e-07, @@ -49046,7 +44994,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "us-gov.openai.gpt-oss-20b-1:0": { "input_cost_per_token": 8.4e-08, @@ -49114,7 +45065,8 @@ "supports_parallel_tool_use_config": true, "prompt_cache_min_tokens": 4096, "input_cost_per_token_batches": 5.5e-07, - "output_cost_per_token_batches": 2.75e-06 + "output_cost_per_token_batches": 2.75e-06, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-opus-4-20250514-v1:0": { "cache_creation_input_token_cost": 1.875e-05, @@ -49172,7 +45124,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.anthropic.claude-opus-4-5-20251101-v1:0": { "cache_creation_input_token_cost": 6.25e-06, @@ -49204,19 +45157,21 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "eu.anthropic.claude-opus-4-5-20251101-v1:0": { - "cache_creation_input_token_cost": 6.25e-06, - "cache_read_input_token_cost": 5e-07, - "input_cost_per_token": 5e-06, + "cache_creation_input_token_cost": 6.875e-06, + "cache_creation_input_token_cost_above_1hr": 1.1e-05, + "cache_read_input_token_cost": 5.5e-07, + "input_cost_per_token": 5.5e-06, "litellm_provider": "bedrock_converse", "supports_tool_search": true, "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", - "output_cost_per_token": 2.5e-05, + "output_cost_per_token": 2.75e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -49235,7 +45190,8 @@ "supports_output_config": true, "bedrock_output_config_effort_ceiling": "high", "supports_parallel_tool_use_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.anthropic.claude-sonnet-4-20250514-v1:0": { "cache_creation_input_token_cost": 3.75e-06, @@ -49267,7 +45223,8 @@ "supports_tool_choice": true, "supports_vision": true, "bedrock_converse_supports_strict_tools": false, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://aws.amazon.com/bedrock/pricing/" }, "us.deepseek.r1-v1:0": { "input_cost_per_token": 1.35e-06, @@ -49277,6 +45234,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 5.4e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": false, "supports_reasoning": true, "supports_tool_choice": false @@ -49292,7 +45250,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_native_structured_output": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "eu.deepseek.v3.2": { "input_cost_per_token": 7.4e-07, @@ -49305,7 +45266,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_native_structured_output": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "us.meta.llama3-1-405b-instruct-v1:0": { "input_cost_per_token": 5.32e-06, @@ -49447,6 +45411,7 @@ "max_tokens": 4096, "mode": "chat", "output_cost_per_token": 6e-06, + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_tool_choice": false }, @@ -49961,34 +45926,6 @@ "output_cost_per_token": 9e-07, "supports_tool_choice": true }, - "vercel_ai_gateway/google/gemini-2.0-flash": { - "deprecation_date": "2026-06-01", - "input_cost_per_token": 1.5e-07, - "litellm_provider": "vercel_ai_gateway", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 6e-07, - "supports_vision": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_response_schema": true - }, - "vercel_ai_gateway/google/gemini-2.0-flash-lite": { - "deprecation_date": "2026-06-01", - "input_cost_per_token": 7.5e-08, - "litellm_provider": "vercel_ai_gateway", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "supports_vision": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_response_schema": true - }, "vercel_ai_gateway/google/gemini-2.5-flash": { "input_cost_per_token": 3e-07, "litellm_provider": "vercel_ai_gateway", @@ -50797,16 +46734,20 @@ "deprecation_date": "2026-10-15", "cache_creation_input_token_cost": 1.25e-06, "cache_creation_input_token_cost_above_1hr": 2e-06, + "cache_creation_input_token_cost_batches": 6.25e-07, "cache_read_input_token_cost": 1e-07, + "cache_read_input_token_cost_batches": 5e-08, "input_cost_per_token": 1e-06, + "input_cost_per_token_batches": 5e-07, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, + "output_cost_per_token_batches": 2.5e-06, "regional_endpoint_uplift_multiplier": 1.1, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_assistant_prefill": true, "supports_function_calling": true, "supports_pdf_input": true, @@ -50822,16 +46763,20 @@ "deprecation_date": "2026-10-15", "cache_creation_input_token_cost": 1.25e-06, "cache_creation_input_token_cost_above_1hr": 2e-06, + "cache_creation_input_token_cost_batches": 6.25e-07, "cache_read_input_token_cost": 1e-07, + "cache_read_input_token_cost_batches": 5e-08, "input_cost_per_token": 1e-06, + "input_cost_per_token_batches": 5e-07, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 5e-06, + "output_cost_per_token_batches": 2.5e-06, "regional_endpoint_uplift_multiplier": 1.1, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_assistant_prefill": true, "supports_function_calling": true, "supports_pdf_input": true, @@ -50872,28 +46817,6 @@ "supports_tool_choice": true, "supports_vision": true }, - "vertex_ai/claude-3-7-sonnet@20250219": { - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "deprecation_date": "2026-05-11", - "input_cost_per_token": 3e-06, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true - }, "vertex_ai/claude-3-haiku": { "input_cost_per_token": 2.5e-07, "litellm_provider": "vertex_ai-anthropic_models", @@ -50972,84 +46895,22 @@ "supports_tool_choice": true, "supports_vision": true }, - "vertex_ai/claude-opus-4": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-opus-4-1": { - "deprecation_date": "2026-08-05", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "input_cost_per_token_batches": 7.5e-06, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "output_cost_per_token_batches": 3.75e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, - "vertex_ai/claude-opus-4-1@20250805": { - "deprecation_date": "2026-08-05", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "input_cost_per_token_batches": 7.5e-06, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "output_cost_per_token_batches": 3.75e-05, - "supports_assistant_prefill": true, - "supports_function_calling": true, - "supports_tool_choice": true, - "supports_vision": true - }, "vertex_ai/claude-opus-4-5": { "deprecation_date": "2026-11-24", "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "regional_endpoint_uplift_multiplier": 1.1, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -51066,20 +46927,25 @@ "supports_tool_choice": true, "supports_vision": true, "supports_output_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-5@20251101": { "deprecation_date": "2026-11-24", "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "regional_endpoint_uplift_multiplier": 1.1, "search_context_cost_per_query": { "search_context_size_high": 0.01, @@ -51097,7 +46963,8 @@ "supports_vision": true, "supports_native_streaming": true, "supports_output_config": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-6": { "deprecation_date": "2027-02-05", @@ -51106,14 +46973,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51130,7 +47001,8 @@ "supports_vision": true, "supports_output_config": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-6@default": { "deprecation_date": "2027-02-05", @@ -51139,14 +47011,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51163,7 +47039,8 @@ "supports_vision": true, "supports_output_config": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 4096 + "prompt_cache_min_tokens": 4096, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-7": { "deprecation_date": "2027-04-16", @@ -51171,14 +47048,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51196,7 +47077,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-7@default": { "deprecation_date": "2027-04-16", @@ -51204,14 +47086,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51229,7 +47115,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 2048 + "prompt_cache_min_tokens": 2048, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5": { "deprecation_date": "2027-06-08", @@ -51237,14 +47124,18 @@ "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 1e-06, + "cache_read_input_token_cost_batches": 5e-07, "input_cost_per_token": 1e-05, + "input_cost_per_token_batches": 5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-05, + "output_cost_per_token_batches": 2.5e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51264,14 +47155,17 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5-1": { "regional_endpoint_uplift_multiplier": 1.1, "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 2.5e-07, + "cache_read_input_token_cost_batches": 1.25e-07, "input_cost_per_token": 1e-05, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, @@ -51301,7 +47195,10 @@ "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 512, - "deprecation_date": "2027-03-01" + "deprecation_date": "2027-03-01", + "input_cost_per_token_batches": 5e-06, + "output_cost_per_token_batches": 2.5e-05, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5@default": { "deprecation_date": "2027-06-08", @@ -51309,14 +47206,18 @@ "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 1e-06, + "cache_read_input_token_cost_batches": 5e-07, "input_cost_per_token": 1e-05, + "input_cost_per_token_batches": 5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-05, + "output_cost_per_token_batches": 2.5e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51336,14 +47237,17 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-fable-5-1@default": { "regional_endpoint_uplift_multiplier": 1.1, "supports_mid_conversation_system": true, "cache_creation_input_token_cost": 1.25e-05, "cache_creation_input_token_cost_above_1hr": 2e-05, + "cache_creation_input_token_cost_batches": 6.25e-06, "cache_read_input_token_cost": 2.5e-07, + "cache_read_input_token_cost_batches": 1.25e-07, "input_cost_per_token": 1e-05, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, @@ -51373,7 +47277,10 @@ "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, "prompt_cache_min_tokens": 512, - "deprecation_date": "2027-03-01" + "deprecation_date": "2027-03-01", + "input_cost_per_token_batches": 5e-06, + "output_cost_per_token_batches": 2.5e-05, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-5": { "deprecation_date": "2027-01-24", @@ -51382,14 +47289,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51407,7 +47318,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-5@default": { "deprecation_date": "2027-01-24", @@ -51416,14 +47328,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51441,7 +47357,90 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 512 + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/claude-opus-5-5": { + "regional_endpoint_uplift_multiplier": 1.1, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_creation_input_token_cost_batches": 2.5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, + "input_cost_per_token": 4e-06, + "input_cost_per_token_batches": 2.5e-06, + "litellm_provider": "vertex_ai-anthropic_models", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "output_cost_per_token_batches": 1.25e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_adaptive_thinking": true, + "thinking_always_on": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_forced_tool_use": false, + "supports_function_calling": true, + "supports_native_structured_output": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_max_reasoning_effort": true, + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/claude-opus-5-5@default": { + "regional_endpoint_uplift_multiplier": 1.1, + "supports_mid_conversation_system": true, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_creation_input_token_cost_batches": 2.5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, + "input_cost_per_token": 4e-06, + "input_cost_per_token_batches": 2.5e-06, + "litellm_provider": "vertex_ai-anthropic_models", + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2e-05, + "output_cost_per_token_batches": 1.25e-05, + "search_context_cost_per_query": { + "search_context_size_high": 0.01, + "search_context_size_low": 0.01, + "search_context_size_medium": 0.01 + }, + "supports_adaptive_thinking": true, + "thinking_always_on": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_forced_tool_use": false, + "supports_function_calling": true, + "supports_native_structured_output": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "supports_max_reasoning_effort": true, + "prompt_cache_min_tokens": 512, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-8": { "deprecation_date": "2027-05-28", @@ -51450,14 +47449,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51475,7 +47478,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-opus-4-8@default": { "deprecation_date": "2027-05-28", @@ -51484,14 +47488,18 @@ "supports_adaptive_thinking": true, "cache_creation_input_token_cost": 6.25e-06, "cache_creation_input_token_cost_above_1hr": 1e-05, + "cache_creation_input_token_cost_batches": 3.125e-06, "cache_read_input_token_cost": 5e-07, + "cache_read_input_token_cost_batches": 2.5e-07, "input_cost_per_token": 5e-06, + "input_cost_per_token_batches": 2.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.5e-05, + "output_cost_per_token_batches": 1.25e-05, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51509,18 +47517,21 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-5": { "deprecation_date": "2026-09-29", "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05, "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 3e-06, "input_cost_per_token_above_200k_tokens": 6e-06, "output_cost_per_token_above_200k_tokens": 2.25e-05, "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, "cache_read_input_token_cost_above_200k_tokens": 6e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, @@ -51539,7 +47550,8 @@ "supports_response_schema": true, "supports_tool_choice": true, "supports_vision": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-5": { "deprecation_date": "2026-12-24", @@ -51549,12 +47561,14 @@ "cache_creation_input_token_cost_above_1hr": 4e-06, "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, + "input_cost_per_token_batches": 1e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 1e-05, + "output_cost_per_token_batches": 5e-06, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -51573,7 +47587,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-6": { "regional_endpoint_uplift_multiplier": 1.1, @@ -51581,14 +47596,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_batches": 1.88e-06, "cache_read_input_token_cost": 3e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token": 3e-06, + "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 1.5e-05, + "output_cost_per_token_batches": 7.5e-06, "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -51605,18 +47624,21 @@ "search_context_size_medium": 0.01 }, "supports_output_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-5@20250929": { "deprecation_date": "2026-09-29", "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05, "cache_read_input_token_cost": 3e-07, "input_cost_per_token": 3e-06, "input_cost_per_token_above_200k_tokens": 6e-06, "output_cost_per_token_above_200k_tokens": 2.25e-05, "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, "cache_read_input_token_cost_above_200k_tokens": 6e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 200000, @@ -51636,99 +47658,8 @@ "supports_tool_choice": true, "supports_vision": true, "supports_native_streaming": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-opus-4@20250514": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 1.875e-05, - "cache_creation_input_token_cost_above_1hr": 3e-05, - "cache_read_input_token_cost": 1.5e-06, - "input_cost_per_token": 1.5e-05, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 200000, - "max_output_tokens": 32000, - "max_tokens": 32000, - "mode": "chat", - "output_cost_per_token": 7.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-sonnet-4": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 - }, - "vertex_ai/claude-sonnet-4@20250514": { - "deprecation_date": "2026-05-14", - "cache_creation_input_token_cost": 3.75e-06, - "cache_creation_input_token_cost_above_1hr": 6e-06, - "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, - "input_cost_per_token_above_200k_tokens": 6e-06, - "output_cost_per_token_above_200k_tokens": 2.25e-05, - "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06, - "cache_read_input_token_cost_above_200k_tokens": 6e-07, - "litellm_provider": "vertex_ai-anthropic_models", - "max_input_tokens": 1000000, - "max_output_tokens": 64000, - "max_tokens": 64000, - "mode": "chat", - "output_cost_per_token": 1.5e-05, - "search_context_cost_per_query": { - "search_context_size_high": 0.01, - "search_context_size_low": 0.01, - "search_context_size_medium": 0.01 - }, - "supports_assistant_prefill": true, - "supports_computer_use": true, - "supports_function_calling": true, - "supports_pdf_input": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/mistralai/codestral-2@001": { "input_cost_per_token": 3e-07, @@ -51738,6 +47669,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51749,6 +47681,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51760,6 +47693,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51771,6 +47705,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -51808,14 +47743,17 @@ "supports_tool_choice": true }, "vertex_ai/deepseek-ai/deepseek-v3.1-maas": { + "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 6e-07, + "input_cost_per_token_batches": 3e-07, "litellm_provider": "vertex_ai-deepseek_models", "max_input_tokens": 163840, "max_output_tokens": 32768, "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 1.7e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 8.5e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "us-central1" ], @@ -51826,6 +47764,7 @@ "supports_tool_choice": true }, "vertex_ai/deepseek-ai/deepseek-v3.2-maas": { + "cache_read_input_token_cost": 5.6e-08, "input_cost_per_token": 5.6e-07, "input_cost_per_token_batches": 2.8e-07, "litellm_provider": "vertex_ai-deepseek_models", @@ -51835,7 +47774,7 @@ "mode": "chat", "output_cost_per_token": 1.68e-06, "output_cost_per_token_batches": 8.4e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -51847,13 +47786,15 @@ }, "vertex_ai/deepseek-ai/deepseek-r1-0528-maas": { "input_cost_per_token": 1.35e-06, + "input_cost_per_token_batches": 6.75e-07, "litellm_provider": "vertex_ai-deepseek_models", "max_input_tokens": 65336, "max_output_tokens": 8192, "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 5.4e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 2.7e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "us-central1" ], @@ -51918,6 +47859,7 @@ "cache_read_input_token_cost": 2e-07, "cache_read_input_token_cost_above_200k_tokens": 4e-07, "cache_read_input_token_cost_above_200k_tokens_priority": 7.2e-07, + "cache_read_input_token_cost_batches": 1e-07, "cache_read_input_token_cost_flex": 1e-07, "cache_read_input_token_cost_priority": 3.6e-07, "deprecation_date": "2027-05-28", @@ -51962,6 +47904,7 @@ }, "vertex_ai/gemini-3.1-flash-image": { "cache_read_input_token_cost": 5e-08, + "cache_read_input_token_cost_batches": 2.5e-08, "cache_read_input_token_cost_flex": 2.5e-08, "deprecation_date": "2027-05-28", "input_cost_per_image": 0.00056, @@ -51997,6 +47940,7 @@ }, "vertex_ai/gemini-3.1-flash-lite-image": { "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "input_cost_per_image": 0.00028, "input_cost_per_token": 2.5e-07, @@ -52089,6 +48033,7 @@ "cache_read_input_audio_token_cost": 5e-08, "deprecation_date": "2027-05-07", "cache_read_input_token_cost": 2.5e-08, + "cache_read_input_token_cost_batches": 1.25e-08, "cache_read_input_token_cost_flex": 1.25e-08, "cache_read_input_token_cost_priority": 4.5e-08, "input_cost_per_audio_token": 5e-07, @@ -52149,6 +48094,7 @@ "vertex_ai/gemini-3.5-flash-lite": { "deprecation_date": "2027-07-21", "cache_read_input_token_cost": 3e-08, + "cache_read_input_token_cost_batches": 1.5e-08, "cache_read_input_token_cost_flex": 1.5e-08, "cache_read_input_token_cost_priority": 5.4e-08, "input_cost_per_token": 3e-07, @@ -52206,6 +48152,7 @@ }, "vertex_ai/deep-research-pro-preview-12-2025": { "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_batches": 1e-07, "input_cost_per_image": 0.0011, "input_cost_per_token": 2e-06, "input_cost_per_token_batches": 1e-06, @@ -52220,62 +48167,6 @@ "output_cost_per_token_batches": 6e-06, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "vertex_ai/imagegeneration@006": { - "deprecation_date": "2025-09-24", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-fast-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-generate-002": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-3.0-capability-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/image/edit-insert-objects" - }, - "vertex_ai/imagen-4.0-fast-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.02, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-4.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.04, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, - "vertex_ai/imagen-4.0-ultra-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-image-models", - "mode": "image_generation", - "output_cost_per_image": 0.06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" - }, "vertex_ai/jamba-1.5": { "input_cost_per_token": 2e-07, "litellm_provider": "vertex_ai-ai21_models", @@ -52479,13 +48370,15 @@ }, "vertex_ai/meta/llama-4-maverick-17b-128e-instruct-maas": { "input_cost_per_token": 3.5e-07, + "input_cost_per_token_batches": 1.75e-07, "litellm_provider": "vertex_ai-llama_models", "max_input_tokens": 1000000, "max_output_tokens": 1000000, "max_tokens": 1000000, "mode": "chat", "output_cost_per_token": 1.15e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 5.75e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_modalities": [ "text", "image" @@ -52539,13 +48432,15 @@ }, "vertex_ai/meta/llama-4-scout-17b-16e-instruct-maas": { "input_cost_per_token": 2.5e-07, + "input_cost_per_token_batches": 1.25e-07, "litellm_provider": "vertex_ai-llama_models", "max_input_tokens": 10000000, "max_output_tokens": 10000000, "max_tokens": 10000000, "mode": "chat", "output_cost_per_token": 7e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "output_cost_per_token_batches": 3.5e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_modalities": [ "text", "image" @@ -52591,6 +48486,7 @@ "supports_tool_choice": true }, "vertex_ai/minimaxai/minimax-m2-maas": { + "cache_read_input_token_cost": 3e-08, "input_cost_per_token": 3e-07, "litellm_provider": "vertex_ai-minimax_models", "max_input_tokens": 196608, @@ -52598,11 +48494,12 @@ "max_tokens": 196608, "mode": "chat", "output_cost_per_token": 1.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, "vertex_ai/moonshotai/kimi-k2-thinking-maas": { + "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 6e-07, "litellm_provider": "vertex_ai-moonshot_models", "max_input_tokens": 256000, @@ -52610,12 +48507,13 @@ "max_tokens": 256000, "mode": "chat", "output_cost_per_token": 2.5e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true, "supports_web_search": true }, "vertex_ai/zai-org/glm-4.7-maas": { + "cache_read_input_token_cost": 6e-08, "input_cost_per_token": 6e-07, "litellm_provider": "vertex_ai-zai_models", "max_input_tokens": 200000, @@ -52623,7 +48521,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 2.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#partner-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -52640,7 +48538,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 3.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#glm-models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -52657,6 +48555,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52668,6 +48567,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52679,6 +48579,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52690,6 +48591,7 @@ "max_tokens": 8191, "mode": "chat", "output_cost_per_token": 2e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_tool_choice": true }, @@ -52770,7 +48672,7 @@ "supports_function_calling": true, "supports_tool_choice": true, "supports_vision": true, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/mistral-small-2503@001": { "input_cost_per_token": 1e-07, @@ -52782,7 +48684,7 @@ "output_cost_per_token": 3e-07, "supports_function_calling": true, "supports_tool_choice": true, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/mistral-ocr-2505": { "litellm_provider": "vertex_ai", @@ -52799,7 +48701,7 @@ "input_cost_per_token": 3e-07, "output_cost_per_token": 1.2e-06, "ocr_cost_per_page": 0.0003, - "source": "https://cloud.google.com/vertex-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "us-central1" ] @@ -52822,13 +48724,15 @@ }, "vertex_ai/openai/gpt-oss-120b-maas": { "input_cost_per_token": 9e-08, + "input_cost_per_token_batches": 4.5e-08, "litellm_provider": "vertex_ai-openai_models", "max_input_tokens": 131072, "max_output_tokens": 32768, "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 3.6e-07, - "source": "https://console.cloud.google.com/vertex-ai/publishers/openai/model-garden/gpt-oss-120b-maas", + "output_cost_per_token_batches": 1.8e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_reasoning": true }, "vertex_ai/openai/gpt-oss-20b-maas": { @@ -52839,9 +48743,11 @@ "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 2.5e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_reasoning": true, - "cache_read_input_token_cost": 7e-09 + "cache_read_input_token_cost": 7e-09, + "input_cost_per_token_batches": 3.5e-08, + "output_cost_per_token_batches": 1.25e-07 }, "vertex_ai/xai/grok-4.1-fast-non-reasoning": { "cache_read_input_token_cost": 5e-08, @@ -52852,7 +48758,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-07, - "source": "https://docs.x.ai/developers/models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_prompt_caching": true, "supports_response_schema": true, @@ -52869,7 +48775,7 @@ "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 5e-07, - "source": "https://docs.x.ai/developers/models", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supports_function_calling": true, "supports_prompt_caching": true, "supports_reasoning": true, @@ -52961,13 +48867,15 @@ }, "vertex_ai/qwen/qwen3-235b-a22b-instruct-2507-maas": { "input_cost_per_token": 2.2e-07, + "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "vertex_ai-qwen_models", "max_input_tokens": 262144, "max_output_tokens": 16384, "max_tokens": 16384, "mode": "chat", "output_cost_per_token": 8.8e-07, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "output_cost_per_token_batches": 4.4e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global", "us-south1" @@ -52976,14 +48884,17 @@ "supports_tool_choice": true }, "vertex_ai/qwen/qwen3-coder-480b-a35b-instruct-maas": { + "cache_read_input_token_cost": 2.2e-08, "input_cost_per_token": 2.2e-07, + "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "vertex_ai-qwen_models", "max_input_tokens": 262144, "max_output_tokens": 32768, "max_tokens": 32768, "mode": "chat", "output_cost_per_token": 1.8e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "output_cost_per_token_batches": 9e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -52998,7 +48909,7 @@ "max_tokens": 262144, "mode": "chat", "output_cost_per_token": 1.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], @@ -53013,58 +48924,13 @@ "max_tokens": 262144, "mode": "chat", "output_cost_per_token": 1.2e-06, - "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing", + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", "supported_regions": [ "global" ], "supports_function_calling": true, "supports_tool_choice": true }, - "vertex_ai/veo-2.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-video-models", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.35, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, - "vertex_ai/veo-3.0-fast-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-video-models", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.15, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, - "vertex_ai/veo-3.0-generate-001": { - "deprecation_date": "2026-06-30", - "litellm_provider": "vertex_ai-video-models", - "max_input_tokens": 1024, - "max_tokens": 1024, - "mode": "video_generation", - "output_cost_per_second": 0.4, - "source": "https://ai.google.dev/gemini-api/docs/video", - "supported_modalities": [ - "text" - ], - "supported_output_modalities": [ - "video" - ] - }, "vertex_ai/veo-3.1-generate-preview": { "litellm_provider": "vertex_ai-video-models", "max_input_tokens": 1024, @@ -53353,59 +49219,6 @@ "mode": "chat", "source": "https://wandb.ai/site/pricing/tokens/" }, - "wandb/zai-org/GLM-4.5": { - "deprecation_date": "2026-03-04", - "supports_reasoning": true, - "max_tokens": 131072, - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "input_cost_per_token": 0.055, - "output_cost_per_token": 0.2, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/Qwen/Qwen3-235B-A22B-Instruct-2507": { - "deprecation_date": "2026-08-04", - "max_tokens": 262144, - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 1e-07, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/Qwen/Qwen3-Coder-480B-A35B-Instruct": { - "deprecation_date": "2026-08-25", - "max_tokens": 262144, - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "input_cost_per_token": 1e-06, - "output_cost_per_token": 1.5e-06, - "litellm_provider": "wandb", - "mode": "chat", - "source": "https://wandb.ai/site/pricing/tokens/" - }, - "wandb/Qwen/Qwen3-235B-A22B-Thinking-2507": { - "deprecation_date": "2026-08-04", - "supports_reasoning": true, - "max_tokens": 262144, - "max_input_tokens": 262144, - "max_output_tokens": 262144, - "input_cost_per_token": 1e-07, - "output_cost_per_token": 1e-07, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/moonshotai/Kimi-K2-Instruct": { - "deprecation_date": "2026-03-04", - "max_tokens": 128000, - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "input_cost_per_token": 6e-07, - "output_cost_per_token": 2.5e-06, - "litellm_provider": "wandb", - "mode": "chat" - }, "wandb/moonshotai/Kimi-K2.5": { "max_tokens": 262144, "max_input_tokens": 262144, @@ -53421,20 +49234,6 @@ "supports_response_schema": true, "supports_vision": true }, - "wandb/MiniMaxAI/MiniMax-M2.5": { - "deprecation_date": "2026-08-25", - "max_tokens": 197000, - "max_input_tokens": 197000, - "max_output_tokens": 197000, - "input_cost_per_token": 3e-07, - "output_cost_per_token": 1.2e-06, - "litellm_provider": "wandb", - "mode": "chat", - "source": "https://wandb.ai/inference/coreweave/cw_MiniMaxAI_MiniMax-M2.5", - "supports_function_calling": true, - "supports_reasoning": true, - "supports_response_schema": true - }, "wandb/meta-llama/Llama-3.1-8B-Instruct": { "max_tokens": 128000, "max_input_tokens": 131000, @@ -53456,27 +49255,6 @@ "mode": "chat", "source": "https://wandb.ai/site/pricing/tokens/" }, - "wandb/deepseek-ai/DeepSeek-R1-0528": { - "deprecation_date": "2026-03-04", - "supports_reasoning": true, - "max_tokens": 161000, - "max_input_tokens": 161000, - "max_output_tokens": 161000, - "input_cost_per_token": 1.35e-06, - "output_cost_per_token": 5.4e-06, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/deepseek-ai/DeepSeek-V3-0324": { - "deprecation_date": "2026-03-04", - "max_tokens": 161000, - "max_input_tokens": 161000, - "max_output_tokens": 161000, - "input_cost_per_token": 1.14e-06, - "output_cost_per_token": 2.75e-06, - "litellm_provider": "wandb", - "mode": "chat" - }, "wandb/meta-llama/Llama-3.3-70B-Instruct": { "max_tokens": 128000, "max_input_tokens": 128000, @@ -53487,26 +49265,6 @@ "mode": "chat", "source": "https://wandb.ai/site/pricing/tokens/" }, - "wandb/meta-llama/Llama-4-Scout-17B-16E-Instruct": { - "deprecation_date": "2026-04-21", - "max_tokens": 64000, - "max_input_tokens": 64000, - "max_output_tokens": 64000, - "input_cost_per_token": 1.7e-07, - "output_cost_per_token": 6.6e-07, - "litellm_provider": "wandb", - "mode": "chat" - }, - "wandb/microsoft/Phi-4-mini-instruct": { - "deprecation_date": "2026-08-04", - "max_tokens": 128000, - "max_input_tokens": 128000, - "max_output_tokens": 128000, - "input_cost_per_token": 0.008, - "output_cost_per_token": 0.035, - "litellm_provider": "wandb", - "mode": "chat" - }, "watsonx/ibm/granite-3-8b-instruct": { "input_cost_per_token": 2e-07, "litellm_provider": "watsonx", @@ -53907,440 +49665,6 @@ "deprecation_date": "2027-02-26", "source": "https://developers.openai.com/api/docs/pricing" }, - "xai/grok-3": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-beta": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-fast-beta": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-fast-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini": { - "cache_read_input_token_cost": 2e-07, - "deprecation_date": "2026-02-28", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-beta": { - "cache_read_input_token_cost": 2e-07, - "deprecation_date": "2026-02-28", - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-fast": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-fast-beta": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-fast-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-3-mini-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 131072, - "max_output_tokens": 131072, - "max_tokens": 131072, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://x.ai/api#pricing", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-02-28", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4": { - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-fast-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-fast-non-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-0709": { - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-latest": { - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_tool_choice": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-reasoning-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-non-reasoning": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-non-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, - "xai/grok-4-1-fast-non-reasoning-latest": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1.25e-06, - "litellm_provider": "xai", - "max_input_tokens": 2000000.0, - "max_output_tokens": 2000000.0, - "max_tokens": 2000000.0, - "mode": "chat", - "output_cost_per_token": 2.5e-06, - "source": "https://docs.x.ai/docs/models/grok-4-1-fast-non-reasoning", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "deprecation_date": "2026-05-15", - "input_cost_per_token_above_200k_tokens": 2.5e-06, - "output_cost_per_token_above_200k_tokens": 5e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07 - }, "xai/grok-4.20-multi-agent-beta-0309": { "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 1.25e-06, @@ -54585,72 +49909,6 @@ "supports_vision": true, "supports_web_search": true }, - "xai/grok-code-fast": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.x.ai/v1/language-models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "input_cost_per_token_above_200k_tokens": 2e-06, - "output_cost_per_token_above_200k_tokens": 4e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "supports_response_schema": true, - "supports_vision": true, - "deprecation_date": "2026-05-15", - "input_cost_per_image_token": 1e-06 - }, - "xai/grok-code-fast-1": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.x.ai/v1/language-models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "input_cost_per_token_above_200k_tokens": 2e-06, - "output_cost_per_token_above_200k_tokens": 4e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "supports_response_schema": true, - "supports_vision": true, - "deprecation_date": "2026-05-15", - "input_cost_per_image_token": 1e-06 - }, - "xai/grok-code-fast-1-0825": { - "cache_read_input_token_cost": 2e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "xai", - "max_input_tokens": 256000, - "max_output_tokens": 256000, - "max_tokens": 256000, - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.x.ai/v1/language-models", - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_tool_choice": true, - "input_cost_per_token_above_200k_tokens": 2e-06, - "output_cost_per_token_above_200k_tokens": 4e-06, - "cache_read_input_token_cost_above_200k_tokens": 4e-07, - "supports_response_schema": true, - "supports_vision": true, - "deprecation_date": "2026-05-15", - "input_cost_per_image_token": 1e-06 - }, "zai.glm-4.7": { "input_cost_per_token": 6e-07, "litellm_provider": "bedrock_converse", @@ -57393,30 +52651,6 @@ "supports_reasoning": true, "supports_vision": true }, - "scaleway/google/gemma-3-27b-it": { - "input_cost_per_token": 2.5e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 40000, - "max_output_tokens": 8192, - "max_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 5e-07, - "supports_function_calling": true, - "supports_vision": true, - "deprecation_date": "2026-08-01" - }, - "scaleway/hcompany/holo2-30b-a3b": { - "input_cost_per_token": 3e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 22000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 7e-07, - "supports_reasoning": true, - "supports_vision": true, - "deprecation_date": "2026-08-09" - }, "scaleway/mistralai/mistral-medium-3.5-128b": { "input_cost_per_token": 1.5e-06, "litellm_provider": "scaleway", @@ -57430,29 +52664,6 @@ "supports_vision": true, "supports_tool_choice": true }, - "scaleway/mistralai/devstral-2-123b-instruct-2512": { - "input_cost_per_token": 4e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 200000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 2e-06, - "supports_function_calling": true, - "deprecation_date": "2026-08-01" - }, - "scaleway/mistralai/voxtral-small-24b-2507": { - "input_cost_per_audio_token": 1.5e-07, - "input_cost_per_token": 1.5e-07, - "litellm_provider": "scaleway", - "max_input_tokens": 32000, - "max_output_tokens": 16384, - "max_tokens": 16384, - "mode": "chat", - "output_cost_per_token": 3.5e-07, - "supports_audio_input": true, - "deprecation_date": "2026-08-01" - }, "scaleway/mistralai/mistral-small-3.2-24b-instruct-2506": { "input_cost_per_token": 1.5e-07, "litellm_provider": "scaleway", @@ -59012,26 +54223,6 @@ "/v1/audio/speech" ] }, - "gpt-4o-mini-tts-2025-03-20": { - "deprecation_date": "2026-07-23", - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "mode": "audio_speech", - "output_cost_per_audio_token": 1.2e-05, - "output_cost_per_second": 0.00025, - "output_cost_per_token": 1e-05, - "source": "https://developers.openai.com/api/docs/pricing", - "supported_endpoints": [ - "/v1/audio/speech" - ], - "supported_modalities": [ - "text", - "audio" - ], - "supported_output_modalities": [ - "audio" - ] - }, "gpt-4o-mini-tts-2025-12-15": { "input_cost_per_token": 6e-07, "litellm_provider": "openai", @@ -59135,41 +54326,6 @@ "supports_none_reasoning_effort": false, "supports_xhigh_reasoning_effort": false }, - "gpt-realtime-mini-2025-10-06": { - "cache_creation_input_audio_token_cost": 3e-07, - "cache_read_input_audio_token_cost": 3e-07, - "cache_read_input_token_cost": 6e-08, - "deprecation_date": "2026-07-23", - "input_cost_per_audio_token": 1e-05, - "input_cost_per_image_token": 8e-07, - "input_cost_per_token": 6e-07, - "litellm_provider": "openai", - "max_input_tokens": 128000, - "max_output_tokens": 4096, - "max_tokens": 4096, - "mode": "realtime", - "output_cost_per_audio_token": 2e-05, - "output_cost_per_token": 2.4e-06, - "source": "https://developers.openai.com/api/docs/pricing", - "supported_endpoints": [ - "/v1/realtime" - ], - "supported_modalities": [ - "text", - "image", - "audio" - ], - "supported_output_modalities": [ - "text", - "audio" - ], - "supports_audio_input": true, - "supports_audio_output": true, - "supports_function_calling": true, - "supports_parallel_function_calling": true, - "supports_system_messages": true, - "supports_tool_choice": true - }, "gpt-realtime-mini-2025-12-15": { "cache_creation_input_audio_token_cost": 3e-07, "cache_read_input_audio_token_cost": 3e-07, @@ -59254,7 +54410,7 @@ "litellm_provider": "openai", "mode": "video_generation", "output_cost_per_video_per_second": 0.5, - "source": "https://platform.openai.com/docs/api-reference/videos", + "source": "https://developers.openai.com/api/docs/pricing", "supported_modalities": [ "text", "image" @@ -59265,6 +54421,7 @@ }, "chatgpt-image-latest": { "cache_read_input_token_cost": 1.25e-06, + "cache_read_input_token_cost_batches": 6.3e-07, "deprecation_date": "2026-12-01", "input_cost_per_image_token": 8e-06, "input_cost_per_image_token_batches": 4e-06, @@ -59323,42 +54480,6 @@ "tpm": 250000, "rpm": 10 }, - "gemini/gemini-2.0-flash-lite-001": { - "cache_read_input_token_cost": 1.875e-08, - "deprecation_date": "2026-06-01", - "input_cost_per_audio_token": 7.5e-08, - "input_cost_per_token": 7.5e-08, - "litellm_provider": "gemini", - "max_input_tokens": 1048576, - "max_output_tokens": 8192, - "mode": "chat", - "output_cost_per_token": 3e-07, - "rpm": 4000, - "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.0-flash-lite", - "supported_modalities": [ - "text", - "image", - "audio", - "video" - ], - "supported_output_modalities": [ - "text" - ], - "supports_audio_output": true, - "supports_function_calling": true, - "supports_prompt_caching": true, - "supports_response_schema": true, - "supports_system_messages": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": true, - "tpm": 4000000, - "search_context_cost_per_query": { - "search_context_size_low": 0.035, - "search_context_size_medium": 0.035, - "search_context_size_high": 0.035 - } - }, "gemini-2.5-flash-native-audio-latest": { "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, @@ -60004,12 +55125,14 @@ "cache_creation_input_token_cost_above_1hr": 4e-06, "cache_read_input_token_cost": 2e-07, "input_cost_per_token": 2e-06, + "input_cost_per_token_batches": 1e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", "output_cost_per_token": 1e-05, + "output_cost_per_token_batches": 5e-06, "search_context_cost_per_query": { "search_context_size_high": 0.01, "search_context_size_low": 0.01, @@ -60028,7 +55151,8 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true, "supports_max_reasoning_effort": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "vertex_ai/claude-sonnet-4-6@default": { "regional_endpoint_uplift_multiplier": 1.1, @@ -60036,14 +55160,18 @@ "supports_legacy_thinking": true, "cache_creation_input_token_cost": 3.75e-06, "cache_creation_input_token_cost_above_1hr": 6e-06, + "cache_creation_input_token_cost_batches": 1.88e-06, "cache_read_input_token_cost": 3e-07, + "cache_read_input_token_cost_batches": 1.5e-07, "input_cost_per_token": 3e-06, + "input_cost_per_token_batches": 1.5e-06, "litellm_provider": "vertex_ai-anthropic_models", "max_input_tokens": 1000000, "max_output_tokens": 64000, "max_tokens": 64000, "mode": "chat", "output_cost_per_token": 1.5e-05, + "output_cost_per_token_batches": 7.5e-06, "supports_assistant_prefill": true, "supports_computer_use": true, "supports_function_calling": true, @@ -60060,7 +55188,8 @@ "search_context_size_medium": 0.01 }, "supports_output_config": true, - "prompt_cache_min_tokens": 1024 + "prompt_cache_min_tokens": 1024, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, "duckduckgo/search": { "litellm_provider": "duckduckgo", @@ -60253,14 +55382,14 @@ "supports_vision": true }, "bedrock_mantle/openai.gpt-daybreak-blue-5.6-sol": { - "input_cost_per_token": 5.5e-06, - "input_cost_per_token_above_272k_tokens": 1.1e-05, - "cache_creation_input_token_cost": 6.875e-06, - "cache_creation_input_token_cost_above_272k_tokens": 1.375e-05, - "cache_read_input_token_cost": 5.5e-07, - "cache_read_input_token_cost_above_272k_tokens": 1.1e-06, - "output_cost_per_token": 3.3e-05, - "output_cost_per_token_above_272k_tokens": 4.95e-05, + "input_cost_per_token": 4.4e-06, + "input_cost_per_token_above_272k_tokens": 8.8e-06, + "cache_creation_input_token_cost": 5.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 1.1e-05, + "cache_read_input_token_cost": 4.4e-07, + "cache_read_input_token_cost_above_272k_tokens": 8.8e-07, + "output_cost_per_token": 2.2e-05, + "output_cost_per_token_above_272k_tokens": 3.3e-05, "litellm_provider": "bedrock_mantle", "max_input_tokens": 1050000, "max_output_tokens": 128000, @@ -60343,6 +55472,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60356,7 +55486,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "global.openai.gpt-5.6-sol": { "input_cost_per_token": 4e-06, @@ -60372,6 +55503,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60385,7 +55517,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "us.openai.gpt-5.6-terra": { "input_cost_per_token": 2.2e-06, @@ -60401,6 +55534,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60414,7 +55548,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "global.openai.gpt-5.6-terra": { "input_cost_per_token": 2e-06, @@ -60430,6 +55565,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60443,7 +55579,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "us.openai.gpt-5.6-luna": { "input_cost_per_token": 2.2e-07, @@ -60459,6 +55596,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60472,7 +55610,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "global.openai.gpt-5.6-luna": { "input_cost_per_token": 2e-07, @@ -60488,6 +55627,7 @@ "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supported_modalities": [ "text", "image" @@ -60501,7 +55641,8 @@ "supports_tool_choice": true, "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, - "supports_vision": true + "supports_vision": true, + "supports_sampling_params": false }, "bedrock_mantle/openai.gpt-6-astra": { "input_cost_per_token": 1.1e-05, @@ -60571,7 +55712,7 @@ "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, "supports_vision": true, - "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html" + "source": "https://aws.amazon.com/bedrock/pricing/" }, "global.openai.gpt-6-astra": { "input_cost_per_token": 1e-05, @@ -60603,7 +55744,7 @@ "supports_reasoning": true, "supports_xhigh_reasoning_effort": true, "supports_vision": true, - "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html" + "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock_mantle/openai.gpt-5.5": { "input_cost_per_token": 5.5e-06, @@ -60817,6 +55958,7 @@ "max_output_tokens": 500000, "max_tokens": 500000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_prompt_caching": false, "supports_reasoning": true, @@ -60832,6 +55974,7 @@ "max_output_tokens": 500000, "max_tokens": 500000, "mode": "chat", + "source": "https://aws.amazon.com/bedrock/pricing/", "supports_function_calling": true, "supports_prompt_caching": false, "supports_reasoning": true, @@ -61035,6 +56178,9 @@ "supports_system_messages": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-west-2/zai.glm-5": { @@ -61050,6 +56196,9 @@ "supports_system_messages": true, "supports_native_structured_output": true, "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false, "source": "https://aws.amazon.com/bedrock/pricing/" }, "bedrock/us-gov-east-1/anthropic.claude-haiku-4-5-20251001-v1:0": { @@ -62376,10 +57525,10 @@ }, "gemini/gemini-robotics-er-2-streaming-preview": { "input_cost_per_audio_token": 2e-06, - "input_cost_per_token": 2e-06, + "input_cost_per_token": 1e-06, "litellm_provider": "gemini", "mode": "chat", - "output_cost_per_token": 1e-05, + "output_cost_per_token": 5e-06, "search_context_cost_per_query": { "search_context_size_high": 0.014, "search_context_size_low": 0.014, @@ -65518,23 +60667,6 @@ "image" ] }, - "xai/grok-imagine-image-pro": { - "input_cost_per_image": 0.05, - "litellm_provider": "xai", - "mode": "image_generation", - "source": "https://docs.x.ai/docs/models", - "supported_endpoints": [ - "/v1/images/generations" - ], - "supported_modalities": [ - "text", - "image" - ], - "supported_output_modalities": [ - "image" - ], - "deprecation_date": "2026-05-15" - }, "xai/grok-imagine-image-2.0": { "input_cost_per_image": 0.06, "litellm_provider": "xai", @@ -66152,16 +61284,6 @@ "output_cost_per_token": 2.82e-07, "source": "https://api.together.ai/v1/models" }, - "together_ai/moonshotai/Kimi-K2.6": { - "deprecation_date": "2026-08-19", - "input_cost_per_token": 1.2e-06, - "output_cost_per_token": 4.5e-06, - "cache_read_input_token_cost": 2e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "together_ai/moonshotai/Kimi-K2.5-fp4": { "input_cost_per_token": 5e-07, "output_cost_per_token": 2.8e-06, @@ -66179,25 +61301,6 @@ "mode": "chat", "source": "https://api.together.ai/v1/models" }, - "together_ai/zai-org/GLM-5": { - "deprecation_date": "2026-06-22", - "input_cost_per_token": 1e-06, - "output_cost_per_token": 3.2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 202752, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, - "together_ai/zai-org/GLM-5.1": { - "deprecation_date": "2026-07-10", - "input_cost_per_token": 1.4e-06, - "output_cost_per_token": 4.4e-06, - "cache_read_input_token_cost": 2.6e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 202752, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "together_ai/deepseek-ai/DeepSeek-R1-0528": { "input_cost_per_token": 3e-06, "output_cost_per_token": 7e-06, @@ -66206,33 +61309,6 @@ "mode": "chat", "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen3-Coder-Next-FP8": { - "deprecation_date": "2026-05-14", - "input_cost_per_token": 5e-07, - "output_cost_per_token": 1.2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen3-VL-32B-Instruct": { - "deprecation_date": "2026-02-25", - "input_cost_per_token": 5e-07, - "output_cost_per_token": 1.5e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen3-VL-8B-Instruct": { - "deprecation_date": "2026-04-16", - "input_cost_per_token": 1.8e-07, - "output_cost_per_token": 6.8e-07, - "litellm_provider": "together_ai", - "max_input_tokens": 262144, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "together_ai/mistralai/Ministral-3-14B-Instruct-2512": { "input_cost_per_token": 2e-07, "output_cost_per_token": 2e-07, @@ -66257,15 +61333,6 @@ "mode": "chat", "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/QwQ-32B": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 1.2e-06, - "output_cost_per_token": 1.2e-06, - "litellm_provider": "together_ai", - "max_input_tokens": 131072, - "mode": "chat", - "source": "https://api.together.ai/v1/models" - }, "cerebras/gemma-4-31b": { "input_cost_per_token": 9.9e-07, "litellm_provider": "cerebras", @@ -66356,7 +61423,10 @@ "supports_function_calling": true, "supports_native_structured_output": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-west-1/nvidia.nemotron-nano-12b-v2": { "input_cost_per_token": 2.4e-07, @@ -66367,7 +61437,10 @@ "mode": "chat", "output_cost_per_token": 7.2e-07, "supports_system_messages": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true }, "bedrock/us-gov-west-1/nvidia.nemotron-nano-9b-v2": { "input_cost_per_token": 7.2e-08, @@ -66377,7 +61450,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 2.76e-07, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-west-1/nvidia.nemotron-super-3-120b": { "input_cost_per_token": 1.8e-07, @@ -66391,7 +61468,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-west-1/openai.gpt-oss-20b-1:0": { "input_cost_per_token": 8.4e-08, @@ -66473,7 +61553,7 @@ "supports_function_calling": true, "supports_max_reasoning_effort": true, "supports_mid_conversation_system": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_output_config": true, "supports_parallel_tool_use_config": true, "supports_pdf_input": true, @@ -66517,6 +61597,41 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true }, + "bedrock/us-gov-west-1/anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "cache_creation_input_token_cost": 6e-06, + "cache_creation_input_token_cost_above_1hr": 9.6e-06, + "cache_read_input_token_cost": 2.4e-07, + "input_cost_per_token": 4.8e-06, + "litellm_provider": "bedrock", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.4e-05, + "prompt_cache_min_tokens": 512, + "supports_adaptive_thinking": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_mid_conversation_system": true, + "supports_native_structured_output": false, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, "bedrock/us-gov-west-1/anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.5e-05, "cache_creation_input_token_cost_above_1hr": 2.4e-05, @@ -66562,7 +61677,10 @@ "supports_function_calling": true, "supports_native_structured_output": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-east-1/nvidia.nemotron-nano-12b-v2": { "input_cost_per_token": 2.4e-07, @@ -66573,7 +61691,10 @@ "mode": "chat", "output_cost_per_token": 7.2e-07, "supports_system_messages": true, - "supports_vision": true + "supports_vision": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true }, "bedrock/us-gov-east-1/nvidia.nemotron-nano-9b-v2": { "input_cost_per_token": 7.2e-08, @@ -66583,7 +61704,11 @@ "max_tokens": 8192, "mode": "chat", "output_cost_per_token": 2.76e-07, - "supports_system_messages": true + "supports_system_messages": true, + "supports_audio_input": false, + "supports_function_calling": true, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-east-1/nvidia.nemotron-super-3-120b": { "input_cost_per_token": 1.8e-07, @@ -66597,7 +61722,10 @@ "supports_function_calling": true, "supports_reasoning": true, "supports_system_messages": true, - "supports_tool_choice": true + "supports_tool_choice": true, + "supports_audio_input": false, + "supports_response_schema": true, + "supports_vision": false }, "bedrock/us-gov-east-1/openai.gpt-oss-20b-1:0": { "input_cost_per_token": 8.4e-08, @@ -66679,7 +61807,7 @@ "supports_function_calling": true, "supports_max_reasoning_effort": true, "supports_mid_conversation_system": true, - "supports_native_structured_output": true, + "supports_native_structured_output": false, "supports_output_config": true, "supports_parallel_tool_use_config": true, "supports_pdf_input": true, @@ -66723,6 +61851,41 @@ "supports_vision": true, "supports_xhigh_reasoning_effort": true }, + "bedrock/us-gov-east-1/anthropic.claude-opus-5-5": { + "bedrock_converse_supports_strict_tools": false, + "cache_creation_input_token_cost": 6e-06, + "cache_creation_input_token_cost_above_1hr": 9.6e-06, + "cache_read_input_token_cost": 2.4e-07, + "input_cost_per_token": 4.8e-06, + "litellm_provider": "bedrock", + "supports_tool_search": true, + "max_input_tokens": 1000000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 2.4e-05, + "prompt_cache_min_tokens": 512, + "supports_adaptive_thinking": true, + "supports_assistant_prefill": false, + "supports_computer_use": true, + "supports_function_calling": true, + "supports_max_reasoning_effort": true, + "supports_mid_conversation_system": true, + "supports_native_structured_output": false, + "supports_output_config": true, + "supports_parallel_tool_use_config": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_sampling_params": false, + "supports_tool_choice": true, + "supports_vision": true, + "supports_xhigh_reasoning_effort": true, + "thinking_always_on": true, + "supports_forced_tool_use": false, + "source": "https://aws.amazon.com/bedrock/pricing/" + }, "bedrock/us-gov-east-1/anthropic.claude-fable-5-1": { "cache_creation_input_token_cost": 1.5e-05, "cache_creation_input_token_cost_above_1hr": 2.4e-05, @@ -68245,7 +63408,7 @@ "max_tokens": 262144, "mode": "chat", "output_cost_per_token": 4.4e-06, - "source": "https://www.baseten.co/pricing/", + "source": "https://inference.baseten.co/v1/models", "supported_modalities": [ "text", "image" @@ -68255,6 +63418,7 @@ ], "supports_function_calling": true, "supports_prompt_caching": true, + "supports_reasoning": true, "supports_response_schema": true, "supports_tool_choice": true, "supports_vision": true @@ -69040,13 +64204,13 @@ "supports_web_search": false }, "openrouter/qwen/qwen3.6-27b": { - "input_cost_per_token": 3e-07, - "output_cost_per_token": 2e-06, - "cache_read_input_token_cost": 3e-08, + "input_cost_per_token": 3.2e-07, + "output_cost_per_token": 2.7e-06, + "cache_read_input_token_cost": 1.5e-07, "litellm_provider": "openrouter", "max_input_tokens": 262144, - "max_output_tokens": 65536, - "max_tokens": 65536, + "max_output_tokens": 262140, + "max_tokens": 262140, "mode": "chat", "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, @@ -71007,38 +66171,6 @@ "output_cost_per_token": 1.5e-07, "source": "https://api.together.ai/v1/models" }, - "together_ai/deepseek-ai/deepseek-coder-33b-instruct": { - "deprecation_date": "2024-08-22", - "input_cost_per_token": 8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/deepseek-ai/DeepSeek-R1-Distill-Llama-70B": { - "deprecation_date": "2025-12-23", - "input_cost_per_token": 2e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 2e-06, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 1.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-14B": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 1.6e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.6e-06, - "source": "https://api.together.ai/v1/models" - }, "vertex_ai/gemini-2.5-flash-native-audio": { "input_cost_per_audio_token": 3e-06, "input_cost_per_token": 5e-07, @@ -71057,16 +66189,6 @@ "output_cost_per_token": 1e-05, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "vertex_ai/gemini-3.1-flash-live-preview": { - "input_cost_per_audio_token": 3e-06, - "input_cost_per_second": 8.33333333333e-05, - "input_cost_per_token": 7.5e-07, - "litellm_provider": "vertex_ai", - "mode": "realtime", - "output_cost_per_audio_token": 1.2e-05, - "output_cost_per_token": 4.5e-06, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" - }, "vertex_ai/gemini-3.1-flash-tts-preview": { "input_cost_per_token": 1e-06, "input_cost_per_token_batches": 5e-07, @@ -71099,15 +66221,31 @@ "output_cost_per_token": 9e-06, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "vertex_ai/gemini-robotics-er-2": { - "cache_read_input_token_cost": 1e-07, - "input_cost_per_token": 1e-06, - "input_cost_per_token_batches": 5e-07, + "vertex_ai/gemini-omni-1.1-flash-preview": { + "input_cost_per_token": 1.5e-06, "litellm_provider": "vertex_ai", + "max_output_tokens": 57920, + "max_tokens": 57920, "mode": "chat", - "output_cost_per_token": 5e-06, - "output_cost_per_token_batches": 2.5e-06, - "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + "output_cost_per_reasoning_token": 9e-06, + "output_cost_per_token": 9e-06, + "output_cost_per_video_token": 1.75e-05, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", + "supported_endpoints": [ + "/v1beta/interactions" + ], + "supported_modalities": [ + "text", + "image", + "video" + ], + "supported_output_modalities": [ + "text", + "video" + ], + "supports_reasoning": true, + "supports_video_input": true, + "supports_vision": true }, "vertex_ai/gemma-4-26b-a4b-it": { "cache_read_input_token_cost": 1.5e-08, @@ -71117,14 +66255,6 @@ "output_cost_per_token": 6e-07, "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" }, - "together_ai/google/gemma-2-27b-it": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://api.together.ai/v1/models" - }, "gpt-5.5-cyber": { "cache_read_input_token_cost": 1.25e-06, "input_cost_per_token": 1.25e-05, @@ -71142,14 +66272,6 @@ "output_cost_per_token": 2.5e-05, "source": "https://developers.openai.com/api/docs/pricing" }, - "together_ai/meta-llama/Llama-3-8b-chat-hf": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://api.together.ai/v1/models" - }, "together_ai/meta-llama/Llama-3.1-405B-Instruct": { "input_cost_per_token": 3.5e-06, "litellm_provider": "together_ai", @@ -71171,38 +66293,6 @@ "output_cost_per_token": 6e-08, "source": "https://api.together.ai/v1/models" }, - "together_ai/meta-llama/Meta-Llama-3-70B-Instruct-Turbo": { - "deprecation_date": "2025-12-23", - "input_cost_per_token": 8.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/meta-llama/Meta-Llama-3-8B-Instruct": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 2e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 2e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 6e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 6e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/nvidia/Llama-3.1-Nemotron-70B-Instruct-HF": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 8.8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8.8e-07, - "source": "https://api.together.ai/v1/models" - }, "together_ai/Qwen/Qwen2-1.5B-Instruct": { "input_cost_per_token": 2e-08, "litellm_provider": "together_ai", @@ -71210,22 +66300,6 @@ "output_cost_per_token": 2e-08, "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen2-72B-Instruct": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 9e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 9e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen2-VL-72B-Instruct": { - "deprecation_date": "2025-08-28", - "input_cost_per_token": 1.2e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://api.together.ai/v1/models" - }, "together_ai/Qwen/Qwen2.5-14B-Instruct": { "input_cost_per_token": 8e-07, "litellm_provider": "together_ai", @@ -71240,22 +66314,6 @@ "output_cost_per_token": 1.2e-06, "source": "https://api.together.ai/v1/models" }, - "together_ai/Qwen/Qwen2.5-Coder-32B-Instruct": { - "deprecation_date": "2025-11-13", - "input_cost_per_token": 8e-07, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-07, - "source": "https://api.together.ai/v1/models" - }, - "together_ai/Qwen/Qwen2.5-VL-72B-Instruct": { - "deprecation_date": "2026-01-05", - "input_cost_per_token": 1.95e-06, - "litellm_provider": "together_ai", - "mode": "chat", - "output_cost_per_token": 8e-06, - "source": "https://api.together.ai/v1/models" - }, "azure/eu/codex-mini": { "deprecation_date": "2026-11-15", "cache_read_input_token_cost": 4.13e-07, @@ -71324,6 +66382,7 @@ "azure/eu/gpt-5": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "input_cost_per_token_batches": 6.875e-07, @@ -71347,6 +66406,7 @@ "azure/eu/gpt-5-mini": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 2.75e-08, + "cache_read_input_token_cost_batches": 1.375e-08, "cache_read_input_token_cost_priority": 4.95e-08, "input_cost_per_token": 2.75e-07, "input_cost_per_token_batches": 1.375e-07, @@ -71361,6 +66421,7 @@ "azure/eu/gpt-5-nano": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 5.5e-09, + "cache_read_input_token_cost_batches": 2.75e-09, "input_cost_per_token": 5.5e-08, "input_cost_per_token_batches": 2.75e-08, "litellm_provider": "azure", @@ -71391,6 +66452,7 @@ "azure/eu/gpt-5.2": { "deprecation_date": "2027-06-08", "cache_read_input_token_cost": 1.925e-07, + "cache_read_input_token_cost_batches": 9.625e-08, "cache_read_input_token_cost_priority": 3.85e-07, "input_cost_per_token": 1.925e-06, "input_cost_per_token_batches": 9.625e-07, @@ -71402,15 +66464,6 @@ "output_cost_per_token_priority": 3.08e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/gpt-5.2-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/gpt-5.2-codex": { "deprecation_date": "2027-07-13", "cache_read_input_token_cost": 1.925e-07, @@ -71429,15 +66482,6 @@ "output_cost_per_token_batches": 9.24e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/gpt-5.3-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/gpt-5.3-codex": { "deprecation_date": "2027-08-24", "cache_read_input_token_cost": 1.925e-07, @@ -71453,6 +66497,7 @@ "azure/eu/gpt-5.4-mini": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 8.25e-08, + "cache_read_input_token_cost_batches": 4.125e-08, "cache_read_input_token_cost_priority": 1.65e-07, "input_cost_per_token": 8.25e-07, "input_cost_per_token_batches": 4.125e-07, @@ -71467,6 +66512,7 @@ "azure/eu/gpt-5.4-nano": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 2.2e-08, + "cache_read_input_token_cost_batches": 1.1e-08, "input_cost_per_token": 2.2e-07, "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "azure", @@ -71479,11 +66525,13 @@ "deprecation_date": "2027-09-07", "input_cost_per_token": 3.3e-05, "input_cost_per_token_above_272k_tokens": 6.6e-05, + "input_cost_per_token_above_272k_tokens_batches": 3.3e-05, "input_cost_per_token_batches": 1.65e-05, "litellm_provider": "azure", "mode": "chat", "output_cost_per_token": 0.000198, "output_cost_per_token_above_272k_tokens": 0.000297, + "output_cost_per_token_above_272k_tokens_batches": 0.0001485, "output_cost_per_token_batches": 9.9e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -71510,14 +66558,6 @@ "output_cost_per_token_batches": 2.42e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/eu/o1-preview": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/eu/o3-2025-04-16": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 5.5e-07, @@ -71678,6 +66718,7 @@ "azure/us/gpt-5": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 1.375e-07, + "cache_read_input_token_cost_batches": 6.875e-08, "cache_read_input_token_cost_priority": 2.75e-07, "input_cost_per_token": 1.375e-06, "input_cost_per_token_batches": 6.875e-07, @@ -71701,6 +66742,7 @@ "azure/us/gpt-5-mini": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 2.75e-08, + "cache_read_input_token_cost_batches": 1.375e-08, "cache_read_input_token_cost_priority": 4.95e-08, "input_cost_per_token": 2.75e-07, "input_cost_per_token_batches": 1.375e-07, @@ -71715,6 +66757,7 @@ "azure/us/gpt-5-nano": { "deprecation_date": "2027-02-09", "cache_read_input_token_cost": 5.5e-09, + "cache_read_input_token_cost_batches": 2.75e-09, "input_cost_per_token": 5.5e-08, "input_cost_per_token_batches": 2.75e-08, "litellm_provider": "azure", @@ -71745,6 +66788,7 @@ "azure/us/gpt-5.2": { "deprecation_date": "2027-06-08", "cache_read_input_token_cost": 1.925e-07, + "cache_read_input_token_cost_batches": 9.625e-08, "cache_read_input_token_cost_priority": 3.85e-07, "input_cost_per_token": 1.925e-06, "input_cost_per_token_batches": 9.625e-07, @@ -71756,15 +66800,6 @@ "output_cost_per_token_priority": 3.08e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/gpt-5.2-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/gpt-5.2-codex": { "deprecation_date": "2027-07-13", "cache_read_input_token_cost": 1.925e-07, @@ -71783,15 +66818,6 @@ "output_cost_per_token_batches": 9.24e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/gpt-5.3-chat": { - "deprecation_date": "2026-06-29", - "cache_read_input_token_cost": 1.925e-07, - "input_cost_per_token": 1.925e-06, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 1.54e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/gpt-5.3-codex": { "deprecation_date": "2027-08-24", "cache_read_input_token_cost": 1.925e-07, @@ -71807,6 +66833,7 @@ "azure/us/gpt-5.4-mini": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 8.25e-08, + "cache_read_input_token_cost_batches": 4.125e-08, "cache_read_input_token_cost_priority": 1.65e-07, "input_cost_per_token": 8.25e-07, "input_cost_per_token_batches": 4.125e-07, @@ -71821,6 +66848,7 @@ "azure/us/gpt-5.4-nano": { "deprecation_date": "2027-09-21", "cache_read_input_token_cost": 2.2e-08, + "cache_read_input_token_cost_batches": 1.1e-08, "input_cost_per_token": 2.2e-07, "input_cost_per_token_batches": 1.1e-07, "litellm_provider": "azure", @@ -71833,11 +66861,13 @@ "deprecation_date": "2027-09-07", "input_cost_per_token": 3.3e-05, "input_cost_per_token_above_272k_tokens": 6.6e-05, + "input_cost_per_token_above_272k_tokens_batches": 3.3e-05, "input_cost_per_token_batches": 1.65e-05, "litellm_provider": "azure", "mode": "chat", "output_cost_per_token": 0.000198, "output_cost_per_token_above_272k_tokens": 0.000297, + "output_cost_per_token_above_272k_tokens_batches": 0.0001485, "output_cost_per_token_batches": 9.9e-05, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, @@ -71851,14 +66881,6 @@ "output_cost_per_token_batches": 2.42e-06, "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" }, - "azure/us/o1-preview": { - "cache_read_input_token_cost": 8.25e-06, - "input_cost_per_token": 1.65e-05, - "litellm_provider": "azure", - "mode": "chat", - "output_cost_per_token": 6.6e-05, - "source": "https://prices.azure.com/api/retail/prices?$filter=serviceName%20eq%20'Foundry%20Models'%20and%20armRegionName%20eq%20'eastus'%20and%20priceType%20eq%20'Consumption'" - }, "azure/us/o3-deep-research": { "deprecation_date": "2026-11-19", "cache_read_input_token_cost": 2.75e-06, @@ -73104,16 +68126,16 @@ "supports_web_search": true }, "openrouter/~anthropic/claude-opus-latest": { - "cache_creation_input_token_cost": 6.25e-06, - "cache_creation_input_token_cost_above_1hr": 1e-05, - "cache_read_input_token_cost": 5e-07, - "input_cost_per_token": 5e-06, + "cache_creation_input_token_cost": 5e-06, + "cache_creation_input_token_cost_above_1hr": 8e-06, + "cache_read_input_token_cost": 2e-07, + "input_cost_per_token": 4e-06, "litellm_provider": "openrouter", "max_input_tokens": 1000000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", - "output_cost_per_token": 2.5e-05, + "output_cost_per_token": 2e-05, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73148,15 +68170,14 @@ "supports_web_search": true }, "openrouter/~deepseek/deepseek-flash-latest": { - "cache_read_input_token_cost": 6e-09, - "input_cost_per_token": 3e-07, + "cache_read_input_token_cost": 3.6e-09, + "input_cost_per_token": 1.2e-07, "litellm_provider": "openrouter", "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, + "max_output_tokens": 943718, + "max_tokens": 943718, "mode": "chat", - "off_peak_pricing": {"windows":[{"weekdays":["saturday","sunday"],"hours_utc":"00:00-00:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"00:00-01:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"04:00-06:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"10:00-00:00"}],"input_cost_per_token":1.5e-7,"output_cost_per_token":6e-7,"cache_read_input_token_cost":3e-9}, - "output_cost_per_token": 1.2e-06, + "output_cost_per_token": 4.8e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73169,15 +68190,14 @@ "supports_web_search": false }, "openrouter/~deepseek/deepseek-pro-latest": { - "cache_read_input_token_cost": 4.4e-08, - "input_cost_per_token": 1.32e-06, + "cache_read_input_token_cost": 1.2726e-08, + "input_cost_per_token": 3.9996e-07, "litellm_provider": "openrouter", "max_input_tokens": 1048576, - "max_output_tokens": 384000, - "max_tokens": 384000, + "max_output_tokens": 393216, + "max_tokens": 393216, "mode": "chat", - "off_peak_pricing": {"windows":[{"weekdays":["saturday","sunday"],"hours_utc":"00:00-00:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"00:00-01:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"04:00-06:00"},{"weekdays":["monday","tuesday","wednesday","thursday","friday"],"hours_utc":"10:00-00:00"}],"input_cost_per_token":6.6e-7,"output_cost_per_token":0.00000198,"cache_read_input_token_cost":2.2e-8}, - "output_cost_per_token": 3.96e-06, + "output_cost_per_token": 1.19988e-06, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73190,14 +68210,14 @@ "supports_web_search": false }, "openrouter/~deepseek/deepseek-v4-flash-latest": { - "cache_read_input_token_cost": 1.6e-08, - "input_cost_per_token": 4e-08, + "cache_read_input_token_cost": 8e-09, + "input_cost_per_token": 3e-08, "litellm_provider": "openrouter", "max_input_tokens": 1310720, "max_output_tokens": 943718, "max_tokens": 943718, "mode": "chat", - "output_cost_per_token": 6.4e-07, + "output_cost_per_token": 8e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73260,13 +68280,13 @@ }, "openrouter/~moonshotai/kimi-latest": { "cache_read_input_token_cost": 3e-07, - "input_cost_per_token": 3e-06, + "input_cost_per_token": 1.4989e-06, "litellm_provider": "openrouter", "max_input_tokens": 1048576, "max_output_tokens": 943718, "max_tokens": 943718, "mode": "chat", - "output_cost_per_token": 1.5e-05, + "output_cost_per_token": 1.0758e-05, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73304,19 +68324,19 @@ "supports_web_search": true }, "openrouter/~openai/gpt-luna-latest": { - "cache_creation_input_token_cost": 2.5e-07, - "cache_creation_input_token_cost_above_272k_tokens": 5e-07, - "cache_read_input_token_cost": 2e-08, - "cache_read_input_token_cost_above_272k_tokens": 4e-08, - "input_cost_per_token": 2e-07, - "input_cost_per_token_above_272k_tokens": 4e-07, + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, "litellm_provider": "openrouter", "max_input_tokens": 1050000, "max_output_tokens": 128000, "max_tokens": 128000, "mode": "chat", - "output_cost_per_token": 1.2e-06, - "output_cost_per_token_above_272k_tokens": 1.8e-06, + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -73422,14 +68442,14 @@ "supports_web_search": true }, "openrouter/~z-ai/glm-flash-latest": { - "cache_read_input_token_cost": 5e-08, - "input_cost_per_token": 1.5e-07, + "cache_read_input_token_cost": 1.5e-08, + "input_cost_per_token": 7.5e-08, "litellm_provider": "openrouter", "max_input_tokens": 1310720, "max_output_tokens": 943718, "max_tokens": 943718, "mode": "chat", - "output_cost_per_token": 5e-07, + "output_cost_per_token": 2.5e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, @@ -74204,85 +69224,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/deepseek/deepseek-v4-flash-0731:batch": { - "cache_read_input_token_cost": 3.5e-09, - "input_cost_per_token": 1.1e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 3.3e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, - "openrouter/deepseek/deepseek-v4-flash-0731:free": { - "input_cost_per_token": 0.0, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 393216, - "max_tokens": 393216, - "mode": "chat", - "output_cost_per_token": 0.0, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": false, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, - "openrouter/deepseek/deepseek-v4-flash-vision-exp:batch": { - "cache_read_input_token_cost": 3.5e-09, - "input_cost_per_token": 1.1e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 3.3e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, - "openrouter/deepseek/deepseek-v4-pro-0813:batch": { - "cache_read_input_token_cost": 2.2e-08, - "input_cost_per_token": 6.6e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 1.98e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/dots-studio/dots-3-note-preview:free": { "deprecation_date": "2026-12-31", "input_cost_per_token": 0.0, @@ -74798,26 +69739,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/kwaipilot/kat-coder-pro-v2": { - "cache_read_input_token_cost": 6e-08, - "input_cost_per_token": 3e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 262144, - "max_output_tokens": 144000, - "max_tokens": 144000, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": false, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/kwaipilot/kat-coder-pro-v2.5": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 7.4e-07, @@ -74897,26 +69818,6 @@ "supports_vision": true, "supports_web_search": false }, - "openrouter/meta/muse-glimmer-30b:batch": { - "cache_read_input_token_cost": 2e-08, - "input_cost_per_token": 1.75e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 131072, - "max_output_tokens": 117964, - "max_tokens": 117964, - "mode": "chat", - "output_cost_per_token": 7.5e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/meta/muse-spark-1.1": { "cache_read_input_token_cost": 1.5e-07, "input_cost_per_token": 1.25e-06, @@ -75055,26 +69956,6 @@ "supports_vision": false, "supports_web_search": false }, - "openrouter/minimax/minimax-m3:batch": { - "cache_read_input_token_cost": 6e-08, - "input_cost_per_token": 3e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 524288, - "max_output_tokens": 471859, - "max_tokens": 471859, - "mode": "chat", - "output_cost_per_token": 1.2e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/mistralai/codestral-2508:batch": { "cache_read_input_token_cost": 1.5e-08, "input_cost_per_token": 1.5e-07, @@ -76024,24 +70905,105 @@ "supports_vision": true, "supports_web_search": true }, - "openrouter/openai/gpt-oss-120b:batch": { - "input_cost_per_token": 1.5e-07, + "openrouter/openai/gpt-6-luna": { + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, "litellm_provider": "openrouter", - "max_input_tokens": 131072, - "max_output_tokens": 117964, - "max_tokens": 117964, + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, "mode": "chat", - "output_cost_per_token": 6e-07, + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, "source": "https://openrouter.ai/api/v1/models", "supports_audio_input": false, "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": false, + "supports_pdf_input": true, + "supports_prompt_caching": true, "supports_reasoning": true, "supports_response_schema": true, "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false + "supports_vision": true, + "supports_web_search": true + }, + "openrouter/openai/gpt-6-luna-pro": { + "cache_creation_input_token_cost": 1.25e-07, + "cache_creation_input_token_cost_above_272k_tokens": 2.5e-07, + "cache_read_input_token_cost": 1e-08, + "cache_read_input_token_cost_above_272k_tokens": 2e-08, + "input_cost_per_token": 1e-07, + "input_cost_per_token_above_272k_tokens": 2e-07, + "litellm_provider": "openrouter", + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 5e-07, + "output_cost_per_token_above_272k_tokens": 7.5e-07, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true + }, + "openrouter/openai/gpt-6-sol": { + "cache_creation_input_token_cost": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_272k_tokens": 4e-07, + "input_cost_per_token": 2e-06, + "input_cost_per_token_above_272k_tokens": 4e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 1e-05, + "output_cost_per_token_above_272k_tokens": 1.5e-05, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true + }, + "openrouter/openai/gpt-6-sol-pro": { + "cache_creation_input_token_cost": 2.5e-06, + "cache_creation_input_token_cost_above_272k_tokens": 5e-06, + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_272k_tokens": 4e-07, + "input_cost_per_token": 2e-06, + "input_cost_per_token_above_272k_tokens": 4e-06, + "litellm_provider": "openrouter", + "max_input_tokens": 1050000, + "max_output_tokens": 128000, + "max_tokens": 128000, + "mode": "chat", + "output_cost_per_token": 1e-05, + "output_cost_per_token_above_272k_tokens": 1.5e-05, + "source": "https://openrouter.ai/api/v1/models", + "supports_audio_input": false, + "supports_function_calling": true, + "supports_pdf_input": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true, + "supports_web_search": true }, "openrouter/openai/o3-mini:batch": { "cache_read_input_token_cost": 2.75e-07, @@ -76217,45 +71179,6 @@ "supports_vision": true, "supports_web_search": true }, - "openrouter/qwen/qwen3.5-9b:batch": { - "input_cost_per_token": 1.7e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 262144, - "max_output_tokens": 235929, - "max_tokens": 235929, - "mode": "chat", - "output_cost_per_token": 2.5e-07, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": false, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, - "openrouter/qwen/qwen3.8-2.4t-a95b:batch": { - "cache_read_input_token_cost": 2.5e-07, - "input_cost_per_token": 2e-06, - "litellm_provider": "openrouter", - "max_input_tokens": 1010000, - "max_output_tokens": 909000, - "max_tokens": 909000, - "mode": "chat", - "output_cost_per_token": 6e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/qwen/qwen3.8-27b:free": { "input_cost_per_token": 0.0, "litellm_provider": "openrouter", @@ -76788,26 +71711,6 @@ "supports_vision": true, "supports_web_search": false }, - "openrouter/thinkingmachines/inkling:batch": { - "cache_read_input_token_cost": 1.7e-07, - "input_cost_per_token": 1e-06, - "litellm_provider": "openrouter", - "max_input_tokens": 524288, - "max_output_tokens": 471859, - "max_tokens": 471859, - "mode": "chat", - "output_cost_per_token": 4.05e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": true, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": false, - "supports_tool_choice": true, - "supports_vision": true, - "supports_web_search": false - }, "openrouter/thinkingmachines/inkling:free": { "input_cost_per_token": 0.0, "litellm_provider": "openrouter", @@ -76929,26 +71832,6 @@ "supports_vision": true, "supports_web_search": true }, - "openrouter/z-ai/glm-5.2:batch": { - "cache_read_input_token_cost": 7e-08, - "input_cost_per_token": 7e-07, - "litellm_provider": "openrouter", - "max_input_tokens": 1048576, - "max_output_tokens": 943718, - "max_tokens": 943718, - "mode": "chat", - "output_cost_per_token": 2.2e-06, - "source": "https://openrouter.ai/api/v1/models", - "supports_audio_input": false, - "supports_function_calling": true, - "supports_pdf_input": false, - "supports_prompt_caching": true, - "supports_reasoning": true, - "supports_response_schema": true, - "supports_tool_choice": true, - "supports_vision": false, - "supports_web_search": false - }, "openrouter/z-ai/glm-5.3-flash:batch": { "cache_read_input_token_cost": 1.2e-08, "input_cost_per_token": 6e-08, @@ -77678,5 +72561,330 @@ "supports_tool_choice": true, "supports_vision": true, "supports_web_search": false + }, + "baseten/deepseek-ai/DeepSeek-V4.1-Flash": { + "cache_read_input_token_cost": 7e-09, + "input_cost_per_token": 3e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 32768, + "max_tokens": 32768, + "mode": "chat", + "output_cost_per_token": 1.2e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/moonshotai/Kimi-K2.6": { + "cache_read_input_token_cost": 1.6e-07, + "input_cost_per_token": 9.5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 262000, + "max_output_tokens": 262000, + "max_tokens": 262000, + "mode": "chat", + "output_cost_per_token": 4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/moonshotai/Kimi-K2.7-Code": { + "cache_read_input_token_cost": 1.6e-07, + "input_cost_per_token": 9.5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 262000, + "max_output_tokens": 262000, + "max_tokens": 262000, + "mode": "chat", + "output_cost_per_token": 4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/moonshotai/Kimi-K3": { + "cache_read_input_token_cost": 3e-07, + "input_cost_per_token": 3e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 1.5e-05, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/nvidia/NVIDIA-Nemotron-3-Ultra-550B-A55B": { + "cache_read_input_token_cost": 1.2e-07, + "input_cost_per_token": 6e-07, + "litellm_provider": "baseten", + "max_input_tokens": 202800, + "max_output_tokens": 202800, + "max_tokens": 202800, + "mode": "chat", + "output_cost_per_token": 2.4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/thinkingmachines/inkling": { + "cache_read_input_token_cost": 1.7e-07, + "input_cost_per_token": 1e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 32768, + "max_tokens": 32768, + "mode": "chat", + "output_cost_per_token": 4.05e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/thinkingmachines/inkling-small": { + "cache_read_input_token_cost": 1e-07, + "input_cost_per_token": 5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 32768, + "max_tokens": 32768, + "mode": "chat", + "output_cost_per_token": 1.2e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/zai-org/GLM-5.2": { + "cache_read_input_token_cost": 1.4e-07, + "input_cost_per_token": 1.4e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 4.4e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/zai-org/GLM-5.3-Flash": { + "cache_read_input_token_cost": 3e-08, + "input_cost_per_token": 1.5e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 131072, + "max_tokens": 131072, + "mode": "chat", + "output_cost_per_token": 5e-07, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "baseten/deepseek-ai/DeepSeek-V4-Flash-0731": { + "cache_read_input_token_cost": 2.8e-08, + "input_cost_per_token": 1.3e-07, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 384000, + "max_tokens": 384000, + "mode": "chat", + "output_cost_per_token": 2.6e-07, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/deepseek-ai/DeepSeek-V4-Pro": { + "cache_read_input_token_cost": 1.45e-07, + "input_cost_per_token": 1.74e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 3.48e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/deepseek-ai/DeepSeek-V4-Pro-0813": { + "cache_read_input_token_cost": 1.32e-07, + "input_cost_per_token": 1.32e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 3.96e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": false + }, + "baseten/zai-org/GLM-5.2-Fast": { + "cache_read_input_token_cost": 2.1e-07, + "input_cost_per_token": 2.1e-06, + "litellm_provider": "baseten", + "max_input_tokens": 1048576, + "max_output_tokens": 262144, + "max_tokens": 262144, + "mode": "chat", + "output_cost_per_token": 6.6e-06, + "source": "https://inference.baseten.co/v1/models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "xai/grok-code-fast": { + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_200k_tokens": 4e-07, + "input_cost_per_image_token": 1e-06, + "input_cost_per_token": 1e-06, + "input_cost_per_token_above_200k_tokens": 2e-06, + "litellm_provider": "xai", + "max_input_tokens": 256000, + "max_output_tokens": 256000, + "max_tokens": 256000, + "mode": "chat", + "output_cost_per_token": 2e-06, + "output_cost_per_token_above_200k_tokens": 4e-06, + "source": "https://api.x.ai/v1/language-models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "xai/grok-code-fast-1": { + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_200k_tokens": 4e-07, + "input_cost_per_image_token": 1e-06, + "input_cost_per_token": 1e-06, + "input_cost_per_token_above_200k_tokens": 2e-06, + "litellm_provider": "xai", + "max_input_tokens": 256000, + "max_output_tokens": 256000, + "max_tokens": 256000, + "mode": "chat", + "output_cost_per_token": 2e-06, + "output_cost_per_token_above_200k_tokens": 4e-06, + "source": "https://api.x.ai/v1/language-models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "xai/grok-code-fast-1-0825": { + "cache_read_input_token_cost": 2e-07, + "cache_read_input_token_cost_above_200k_tokens": 4e-07, + "input_cost_per_image_token": 1e-06, + "input_cost_per_token": 1e-06, + "input_cost_per_token_above_200k_tokens": 2e-06, + "litellm_provider": "xai", + "max_input_tokens": 256000, + "max_output_tokens": 256000, + "max_tokens": 256000, + "mode": "chat", + "output_cost_per_token": 2e-06, + "output_cost_per_token_above_200k_tokens": 4e-06, + "source": "https://api.x.ai/v1/language-models", + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "supports_vision": true + }, + "vertex_ai/gemini-2.0-flash": { + "input_cost_per_audio_token": 1e-06, + "input_cost_per_audio_token_batches": 5e-07, + "input_cost_per_character": 3.75e-08, + "input_cost_per_token": 1.5e-07, + "input_cost_per_token_batches": 7.5e-08, + "litellm_provider": "vertex_ai", + "mode": "chat", + "output_cost_per_token": 6e-07, + "output_cost_per_token_batches": 3e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/gemini-2.0-flash-lite": { + "input_cost_per_audio_token": 7.5e-08, + "input_cost_per_audio_token_batches": 3.75e-08, + "input_cost_per_character": 1.875e-08, + "input_cost_per_token": 7.5e-08, + "input_cost_per_token_batches": 3.75e-08, + "litellm_provider": "vertex_ai", + "mode": "chat", + "output_cost_per_token": 3e-07, + "output_cost_per_token_batches": 1.5e-07, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing" + }, + "vertex_ai/zai-org/glm-5.2-maas": { + "cache_read_input_token_cost": 1.4e-07, + "input_cost_per_token": 1.4e-06, + "litellm_provider": "vertex_ai-zai_models", + "max_input_tokens": 1000000, + "max_output_tokens": 64000, + "max_tokens": 64000, + "mode": "chat", + "output_cost_per_token": 4.4e-06, + "source": "https://cloud.google.com/gemini-enterprise-agent-platform/generative-ai/pricing", + "supported_regions": ["global"], + "supports_function_calling": true, + "supports_prompt_caching": true, + "supports_reasoning": true, + "supports_response_schema": true, + "supports_tool_choice": true } } diff --git a/pyproject.toml b/pyproject.toml index f447343ff33..ba72378989a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "litellm" -version = "1.103.0" +version = "1.104.0" description = "Library to easily interface with LLM API providers" readme = "README.md" requires-python = ">=3.10, <3.15" @@ -75,8 +75,8 @@ proxy = [ "mcp>=2.2.0,<3", "httpx2>=2.5.0,<3", "pydantic>=2.12.0,<3", - "litellm-proxy-extras==0.4.100", - "litellm-enterprise==0.1.69", + "litellm-proxy-extras==0.4.101", + "litellm-enterprise==0.1.70", "RestrictedPython>=8.5,<9.0", "rich>=13.9.4,<14.0", "InquirerPy>=0.3.4,<1.0", @@ -355,7 +355,7 @@ litellm-enterprise = { workspace = true } members = ["enterprise", "litellm-proxy-extras"] [tool.commitizen] -version = "1.103.0" +version = "1.104.0" version_files = [ "pyproject.toml:^version", ] diff --git a/scripts/comment-fixed-issue.test.ts b/scripts/comment-fixed-issue.test.ts index f9cd41d96d8..fef5c0f4007 100644 --- a/scripts/comment-fixed-issue.test.ts +++ b/scripts/comment-fixed-issue.test.ts @@ -3,62 +3,140 @@ import { describe, expect, test } from "bun:test"; import type { Comment, GitHubApi } from "./auto-close-duplicates"; import { FIXED_MARKER, + OPEN_PULL_REQUESTS_QUERY, + SUPERSEDED_MARKER, + closeVerdict, closerOf, - commentFixedIssue, + describeIssue, + describeSweep, + fixOf, fixedBody, + handleFixedIssue, nextMinor, parseVersion, placement, readConfig, releaseCandidate, + supersededBody, + sweep, type ClosedIssue, type FixedConfig, + type IssueClosure, + type LinkedIssue, + type LinkedPullRequest, + type PullRequestsPage, } from "./comment-fixed-issue"; const MERGE_COMMIT = "68c4c82ac977b48b2b81ee8d633d5771307c6162"; +const ISSUE = 41750; const mergedPr = { __typename: "PullRequest" as const, number: 41767, merged: true, baseRefName: "main", + repository: { nameWithOwner: "BerriAI/litellm" }, mergeCommit: { oid: MERGE_COMMIT }, }; -type Closer = ClosedIssue["timelineItems"]["nodes"][number]["closer"]; +const commitCloser = { __typename: "Commit" as const, oid: MERGE_COMMIT, repository: { nameWithOwner: "BerriAI/litellm" } }; -const closedBy = (closer: Closer, state: ClosedIssue["state"] = "CLOSED"): ClosedIssue => ({ +type Closer = IssueClosure["timelineItems"]["nodes"][number]["closer"]; + +const closure = (closer: Closer, state: IssueClosure["state"] = "CLOSED"): IssueClosure => ({ state, timelineItems: { nodes: [{ closer }] }, }); +const page = (pages: readonly (readonly LinkedPullRequest[])[], index: number): PullRequestsPage => ({ + pageInfo: { hasNextPage: index + 1 < pages.length, endCursor: String(index + 1) }, + nodes: pages[index] ?? [], +}); + +const cursorIndex = (after: string | null): number => (after === null ? 0 : Number(after)); + +const closedBy = (closer: Closer, state?: IssueClosure["state"], linked: readonly LinkedPullRequest[] = []): ClosedIssue => ({ + ...closure(closer, state), + closedByPullRequestsReferences: page([linked], 0), +}); + +const reopenedAt = (createdAt: string): LinkedPullRequest["reopens"] => ({ nodes: [{ createdAt }] }); + +const linkedIssue = (number: number, closer: Closer = mergedPr, state?: IssueClosure["state"]): LinkedIssue => ({ + number, + repository: { nameWithOwner: "BerriAI/litellm" }, + ...closure(closer, state), +}); + +const links = (...issues: readonly LinkedIssue[]): LinkedPullRequest["closingIssuesReferences"] => ({ totalCount: issues.length, nodes: issues }); + +const openPr = (number: number, overrides: Partial = {}): LinkedPullRequest => ({ + number, + state: "OPEN", + baseRefName: "main", + repository: { nameWithOwner: "BerriAI/litellm" }, + closingIssuesReferences: links(linkedIssue(ISSUE)), + reopens: { nodes: [] }, + ...overrides, +}); + const pyproject = (version: string): string => `[project]\nname = "litellm"\nversion = "${version}"\n\n[tool.commitizen]\nversion = "${version}"\n`; -const config: FixedConfig = { repo: "BerriAI/litellm", issueNumber: 41750, defaultBranch: "main", dryRun: false }; +const config: FixedConfig = { repo: "BerriAI/litellm", defaultBranch: "main", commentDryRun: false, closeDryRun: false }; + +const prFix = (issue = ISSUE, number = 41767) => ({ issue, source: { kind: "pull_request" as const, number, oid: MERGE_COMMIT } }); +const commitFix = (issue = ISSUE) => ({ issue, source: { kind: "commit" as const, oid: MERGE_COMMIT } }); +const oneFixBody = supersededBody([prFix()], "main"); + +const noPause = async (): Promise => {}; + +const supersededComment: Comment = { + id: 2, + body: `${SUPERSEDED_MARKER}\n#41750 was fixed by #41767 on main, so this pull request is closed. Reopen it if something was missed.`, + created_at: "2026-09-18T00:00:00Z", + user: { type: "Bot", login: "github-actions[bot]" }, +}; interface World { readonly issue?: ClosedIssue | null; readonly comments?: readonly Comment[]; + readonly pullRequestComments?: Readonly>; + readonly openPullRequests?: readonly (readonly LinkedPullRequest[])[]; + readonly linkedPullRequests?: readonly (readonly LinkedPullRequest[])[]; readonly version?: string; // Which existing rc.1 tags contain the merge commit; a tag absent from the map does not exist readonly tags?: Readonly>; + readonly reachable?: Readonly>; } function fakeApi(world: World = {}): { readonly api: GitHubApi; readonly writes: string[] } { const writes: string[] = []; const tags = world.tags ?? {}; + const reachable = world.reachable ?? { main: [MERGE_COMMIT] }; + const pages = world.openPullRequests ?? []; const api: GitHubApi = { request: async (method: string, path: string, body?: object): Promise => { if (method === "POST" && path === "/graphql") { - return { data: { repository: { issue: world.issue === undefined ? closedBy(mergedPr) : world.issue } } } as T; + const { query, variables } = body as { query: string; variables: { after: string | null } }; + if (query === OPEN_PULL_REQUESTS_QUERY) { + return { data: { repository: { pullRequests: page(pages, cursorIndex(variables.after)) } } } as T; + } + const issue = world.issue === undefined ? closedBy(mergedPr) : world.issue; + if (issue === null || world.linkedPullRequests === undefined) { + return { data: { repository: { issue } } } as T; + } + const closedByPullRequestsReferences = page(world.linkedPullRequests, cursorIndex(variables.after)); + return { data: { repository: { issue: { ...issue, closedByPullRequestsReferences } } } } as T; } if (method !== "GET") { writes.push(`${method} ${path} ${JSON.stringify(body)}`); return {} as T; } - if (path.startsWith("/repos/BerriAI/litellm/issues/41750/comments")) { - return (world.comments ?? []) as T; + const comments = /^\/repos\/BerriAI\/litellm\/issues\/(\d+)\/comments/.exec(path); + if (comments !== null) { + const number = Number(comments[1]); + return ((number === ISSUE ? world.comments : world.pullRequestComments?.[number]) ?? []) as T; } if (path === `/repos/BerriAI/litellm/contents/pyproject.toml?ref=${MERGE_COMMIT}`) { return { content: btoa(pyproject(world.version ?? "1.103.0")).replace(/(.{60})/g, "$1\n") } as T; @@ -68,6 +146,10 @@ function fakeApi(world: World = {}): { readonly api: GitHubApi; readonly writes: return (matching[1] in tags ? [{ ref: `refs/tags/${matching[1]}` }] : []) as T; } const compare = /^\/repos\/BerriAI\/litellm\/compare\/(.+)\.\.\.(.+)$/.exec(path); + const branch = compare === null ? undefined : reachable[compare[1] ?? ""]; + if (compare !== null && branch !== undefined) { + return { status: branch.includes(compare[2] ?? "") ? "behind" : "diverged" } as T; + } if (compare !== null && compare[2] === MERGE_COMMIT) { return { status: tags[compare[1]] ? "behind" : "ahead" } as T; } @@ -79,23 +161,28 @@ function fakeApi(world: World = {}): { readonly api: GitHubApi; readonly writes: describe("closerOf", () => { test("a pull request merged into the default branch is the fix", () => { - expect(closerOf(closedBy(mergedPr), "main")).toEqual({ kind: "pull_request", number: 41767, mergeCommit: MERGE_COMMIT }); + expect(closerOf(closedBy(mergedPr), "BerriAI/litellm", "main")).toEqual({ kind: "pull_request", number: 41767, mergeCommit: MERGE_COMMIT }); }); test("an issue closed by hand, by a commit, or by an unmerged pull request gets no comment", () => { - expect(closerOf(closedBy(null), "main")).toEqual({ kind: "skip", reason: "closed by hand, not by a pull request" }); - expect(closerOf(closedBy({ __typename: "Commit", oid: MERGE_COMMIT }), "main").kind).toBe("skip"); - expect(closerOf(closedBy({ ...mergedPr, merged: false }), "main").kind).toBe("skip"); - expect(closerOf(closedBy({ ...mergedPr, mergeCommit: null }), "main").kind).toBe("skip"); + expect(closerOf(closedBy(null), "BerriAI/litellm", "main")).toEqual({ kind: "skip", reason: "closed by hand, not by a pull request" }); + expect(closerOf(closedBy(commitCloser), "BerriAI/litellm", "main").kind).toBe("skip"); + expect(closerOf(closedBy({ ...mergedPr, merged: false }), "BerriAI/litellm", "main").kind).toBe("skip"); + expect(closerOf(closedBy({ ...mergedPr, mergeCommit: null }), "BerriAI/litellm", "main").kind).toBe("skip"); }); test("a pull request merged into a release branch is not a fix on main", () => { - const verdict = closerOf(closedBy({ ...mergedPr, baseRefName: "release/1.102.0rc2" }), "main"); + const verdict = closerOf(closedBy({ ...mergedPr, baseRefName: "release/1.102.0rc2" }), "BerriAI/litellm", "main"); expect(verdict).toEqual({ kind: "skip", reason: "#41767 merged into release/1.102.0rc2, not main" }); }); test("an issue reopened after the close event is left alone", () => { - expect(closerOf(closedBy(mergedPr, "OPEN"), "main")).toEqual({ kind: "skip", reason: "the issue is open again" }); + expect(closerOf(closedBy(mergedPr, "OPEN"), "BerriAI/litellm", "main")).toEqual({ kind: "skip", reason: "the issue is open again" }); + }); + + test("a pull request merged in a fork closes the issue on GitHub but is no fix here", () => { + const forkPr = { ...mergedPr, number: 9, repository: { nameWithOwner: "someone/litellm" } }; + expect(closerOf(closedBy(forkPr), "BerriAI/litellm", "main")).toEqual({ kind: "skip", reason: "closed by someone/litellm#9, a pull request in another repository" }); }); }); @@ -173,44 +260,327 @@ describe("fixedBody", () => { }); }); -describe("commentFixedIssue", () => { +describe("fixOf", () => { + test("a merged pull request or a commit is a fix, whatever branch it was merged into", () => { + expect(fixOf(closure(mergedPr), "BerriAI/litellm")).toEqual({ kind: "pull_request", number: 41767, oid: MERGE_COMMIT }); + expect(fixOf(closure({ ...mergedPr, baseRefName: "litellm_internal_staging" }), "BerriAI/litellm")).toEqual({ kind: "pull_request", number: 41767, oid: MERGE_COMMIT }); + expect(fixOf(closure(commitCloser), "BerriAI/litellm")).toEqual({ kind: "commit", oid: MERGE_COMMIT }); + }); + + test("a hand close, a fork's pull request, an unmerged pull request, or a reopened issue is no fix", () => { + expect(fixOf(closure(null), "BerriAI/litellm")).toEqual({ kind: "skip", reason: "was closed by hand" }); + expect(fixOf(closure({ ...mergedPr, repository: { nameWithOwner: "someone/litellm" } }), "BerriAI/litellm")).toEqual({ kind: "skip", reason: "was closed from someone/litellm" }); + expect(fixOf(closure({ ...commitCloser, repository: { nameWithOwner: "someone/litellm" } }), "BerriAI/litellm")).toEqual({ kind: "skip", reason: "was closed from someone/litellm" }); + expect(fixOf(closure({ ...mergedPr, merged: false }), "BerriAI/litellm")).toEqual({ kind: "skip", reason: "was closed by #41767, which is not merged" }); + expect(fixOf(closure({ ...mergedPr, mergeCommit: null }), "BerriAI/litellm").kind).toBe("skip"); + expect(fixOf(closure(mergedPr, "OPEN"), "BerriAI/litellm")).toEqual({ kind: "skip", reason: "is open again" }); + }); +}); + +describe("closeVerdict", () => { + test("an open pull request whose only linked issue was fixed by a merged pull request is a candidate", () => { + expect(closeVerdict(openPr(41760), config)).toEqual({ kind: "candidate", fixes: [prFix()] }); + }); + + test("every linked issue has to be fixed, and each fix is named", () => { + const both = openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE), linkedIssue(41751, commitCloser)) }); + expect(closeVerdict(both, config)).toEqual({ kind: "candidate", fixes: [prFix(), commitFix(41751)] }); + }); + + test("a pull request that still links an open issue keeps its work", () => { + const stillOpen = openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE), linkedIssue(41751, null, "OPEN")) }); + expect(closeVerdict(stillOpen, config)).toEqual({ kind: "skip", reason: "still linked to open #41751" }); + }); + + test("a linked issue closed by hand or by an unmerged pull request is not a fix that supersedes the pull request", () => { + expect(closeVerdict(openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE, null)) }), config)).toEqual({ + kind: "skip", + reason: `#${ISSUE} was closed by hand`, + }); + const unmerged = openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE, { ...mergedPr, merged: false })) }); + expect(closeVerdict(unmerged, config)).toEqual({ kind: "skip", reason: `#${ISSUE} was closed by #41767, which is not merged` }); + }); + + test("a pull request linking an issue in another repository, or more issues than the query reads, is left alone", () => { + const foreign = { ...linkedIssue(41751), repository: { nameWithOwner: "mlflow/mlflow" } }; + expect(closeVerdict(openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE), foreign) }), config)).toEqual({ + kind: "skip", + reason: "links mlflow/mlflow#41751", + }); + const truncated = openPr(41760, { closingIssuesReferences: { totalCount: 11, nodes: [linkedIssue(ISSUE)] } }); + expect(closeVerdict(truncated, config)).toEqual({ kind: "skip", reason: "links 11 issues, more than the 10 this workflow reads" }); + }); + + test("a pull request against a release line is a backport and stays open, one against a retired development branch does not", () => { + for (const base of ["release/v1.102.0-rc.2", "stable/v1.83.14", "v_1_83_3_stable_patch"]) { + expect(closeVerdict(openPr(41760, { baseRefName: base }), config)).toEqual({ kind: "skip", reason: `targets the release line ${base}` }); + } + expect(closeVerdict(openPr(41760, { baseRefName: "litellm_internal_staging" }), config).kind).toBe("candidate"); + }); + + test("a pull request in a fork, one that is not open, or one linking no issue is left alone", () => { + expect(closeVerdict(openPr(1, { repository: { nameWithOwner: "someone/litellm" } }), config)).toEqual({ kind: "skip", reason: "lives in someone/litellm" }); + expect(closeVerdict(openPr(41767, { state: "MERGED" }), config)).toEqual({ kind: "skip", reason: "is merged" }); + expect(closeVerdict(openPr(41760, { closingIssuesReferences: links() }), config)).toEqual({ kind: "skip", reason: "links no issue" }); + }); +}); + +describe("supersededBody", () => { + test("names each issue with the pull request or commit that fixed it, invites a reopen, and carries the marker the rerun looks for", () => { + expect(oneFixBody.startsWith(SUPERSEDED_MARKER)).toBe(true); + expect(oneFixBody).toContain("#41750 was fixed by #41767 on main"); + expect(oneFixBody).toContain("Reopen it"); + expect(supersededBody([prFix(), commitFix(41751)], "main")).toContain("#41750 was fixed by #41767 and #41751 by commit 68c4c82ac9 on main"); + }); + + test("stays within the 25-word comment rule for one and two fixes", () => { + for (const fixes of [[prFix()], [commitFix()], [prFix(), commitFix(41751)]]) { + const words = supersededBody(fixes, "main").replace(SUPERSEDED_MARKER, "").trim().split(/\s+/); + expect(words.length).toBeGreaterThanOrEqual(15); + expect(words.length).toBeLessThanOrEqual(25); + } + }); +}); + +describe("handleFixedIssue", () => { test("a real run posts one comment naming the pull request and the release", async () => { const { api, writes } = fakeApi(); - const verdict = await commentFixedIssue(api, config); - expect(verdict).toMatchObject({ kind: "commented", pullRequest: 41767, tag: "v1.103.0-rc.1" }); + const { comment, pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(comment).toMatchObject({ kind: "commented", pullRequest: 41767, tag: "v1.103.0-rc.1" }); + expect(pullRequests).toEqual([]); expect(writes).toHaveLength(1); expect(writes[0]).toContain("POST /repos/BerriAI/litellm/issues/41750/comments"); expect(writes[0]).toContain("Fixed by #41767. This ships in v1.103.0-rc.1 and up"); }); - test("a dry run renders the comment and writes nothing", async () => { - const { api, writes } = fakeApi(); - const verdict = await commentFixedIssue(api, { ...config, dryRun: true }); - expect(verdict.kind).toBe("commented"); - expect(writes).toEqual([]); + test("every other open pull request linked to the fixed issue is commented on and then closed, a pause before every write", async () => { + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [openPr(41760), openPr(41761)]) }); + let pauses = 0; + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, async () => { + pauses += 1; + }); + expect(pullRequests.map((pullRequest) => pullRequest.kind)).toEqual(["closed", "closed"]); + expect(writes).toEqual([ + expect.stringContaining("POST /repos/BerriAI/litellm/issues/41750/comments"), + `POST /repos/BerriAI/litellm/issues/41760/comments ${JSON.stringify({ body: oneFixBody })}`, + 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}', + expect.stringContaining("POST /repos/BerriAI/litellm/issues/41761/comments"), + 'PATCH /repos/BerriAI/litellm/pulls/41761 {"state":"closed"}', + ]); + expect(pauses).toBe(4); }); - test("an issue that already carries the comment is not commented twice", async () => { + test("the fixed-in comment and the closing are gated separately: a close dry run still posts the comment and closes nothing", async () => { + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [openPr(41760)]) }); + let pauses = 0; + const outcome = await handleFixedIssue(api, { ...config, closeDryRun: true }, ISSUE, async () => { + pauses += 1; + }); + expect(outcome.comment.kind).toBe("commented"); + expect(outcome.pullRequests).toEqual([{ kind: "closed", number: 41760, body: oneFixBody }]); + expect(writes).toHaveLength(1); + expect(writes[0]).toContain("/issues/41750/comments"); + expect(pauses).toBe(0); + }); + + test("a comment dry run still closes the pull requests for real", async () => { + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [openPr(41760)]) }); + const outcome = await handleFixedIssue(api, { ...config, commentDryRun: true }, ISSUE, noPause); + expect(outcome.comment.kind).toBe("commented"); + expect(writes).toEqual([expect.stringContaining("/issues/41760/comments"), 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}']); + }); + + test("an issue that already carries the fixed-in comment is not commented twice, and its linked pull requests still get closed", async () => { const existing: Comment = { id: 1, body: `${FIXED_MARKER}\nFixed by #41767. This ships in v1.103.0-rc.1 and up.`, created_at: "2026-09-18T00:00:00Z", user: { type: "Bot", login: "github-actions[bot]" }, }; - const { api, writes } = fakeApi({ comments: [existing] }); - expect(await commentFixedIssue(api, config)).toEqual({ kind: "skip", reason: "already carries a fixed-in comment" }); + const { api, writes } = fakeApi({ comments: [existing], issue: closedBy(mergedPr, "CLOSED", [openPr(41760)]) }); + const outcome = await handleFixedIssue(api, config, ISSUE, noPause); + expect(outcome.comment).toEqual({ kind: "skip", reason: "already carries a fixed-in comment" }); + expect(writes).toEqual([expect.stringContaining("/issues/41760/comments"), 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}']); + }); + + test("a fix merged into the retired development branch or pushed as a commit counts once it is on the default branch", async () => { + const stagingPr = { ...mergedPr, baseRefName: "litellm_internal_staging" }; + const staging = openPr(41760, { baseRefName: "litellm_internal_staging", closingIssuesReferences: links(linkedIssue(ISSUE, stagingPr)) }); + const byCommit = openPr(41761, { closingIssuesReferences: links(linkedIssue(41751, commitCloser)) }); + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [staging, byCommit]) }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([ + { kind: "closed", number: 41760, body: oneFixBody }, + { kind: "closed", number: 41761, body: supersededBody([commitFix(41751)], "main") }, + ]); + expect(writes).toHaveLength(5); + expect(writes[3]).toContain("#41751 was fixed by commit 68c4c82ac9 on main"); + }); + + test("a fix whose commit never reached the default branch supersedes nothing", async () => { + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [openPr(41760)]), reachable: { main: [] } }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([{ kind: "skip", number: 41760, reason: "#41750 was fixed by #41767, which is not on main" }]); + expect(writes).toHaveLength(1); + expect(writes[0]).toContain("/issues/41750/comments"); + }); + + test("the default branch comes from the config for the containment check and the comment alike", async () => { + const stagingConfig = { ...config, defaultBranch: "litellm_internal_staging" }; + const closer = { ...mergedPr, baseRefName: "litellm_internal_staging" }; + const { api, writes } = fakeApi({ + issue: closedBy(closer, "CLOSED", [openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE, closer)) })]), + reachable: { litellm_internal_staging: [MERGE_COMMIT] }, + }); + const { pullRequests } = await handleFixedIssue(api, stagingConfig, ISSUE, noPause); + expect(pullRequests).toEqual([{ kind: "closed", number: 41760, body: supersededBody([prFix()], "litellm_internal_staging") }]); + expect(writes[1]).toContain("on litellm_internal_staging, so this pull request is closed"); + }); + + test("the closer sits in the linked list as merged and gets neither a line nor a write", async () => { + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [openPr(41767, { state: "MERGED" }), openPr(41760)]) }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([{ kind: "closed", number: 41760, body: oneFixBody }]); + expect(writes.map((write) => write.split(" ")[1])).toEqual([ + "/repos/BerriAI/litellm/issues/41750/comments", + "/repos/BerriAI/litellm/issues/41760/comments", + "/repos/BerriAI/litellm/pulls/41760", + ]); + }); + + test("a pull request this workflow closed once and its author reopened stays open", async () => { + const reopened = openPr(41760, { reopens: reopenedAt("2026-09-19T00:00:00Z") }); + const { api, writes } = fakeApi({ + issue: closedBy(mergedPr, "CLOSED", [reopened, openPr(41761)]), + pullRequestComments: { 41760: [supersededComment] }, + }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests[0]).toEqual({ kind: "skip", number: 41760, reason: "was closed by this workflow once and reopened" }); + expect(pullRequests[1]?.kind).toBe("closed"); + expect(writes.filter((write) => write.includes("41760"))).toEqual([]); + }); + + test("a pull request whose comment landed but whose close failed is closed on the next run without a second comment", async () => { + const reopenedBeforeTheComment = openPr(41761, { reopens: reopenedAt("2026-09-17T00:00:00Z") }); + const { api, writes } = fakeApi({ + issue: closedBy(mergedPr, "CLOSED", [openPr(41760), reopenedBeforeTheComment]), + pullRequestComments: { 41760: [supersededComment], 41761: [supersededComment] }, + }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([ + { kind: "closed", number: 41760, body: supersededComment.body }, + { kind: "closed", number: 41761, body: supersededComment.body }, + ]); + expect(writes.filter((write) => write.includes("/4176"))).toEqual([ + 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}', + 'PATCH /repos/BerriAI/litellm/pulls/41761 {"state":"closed"}', + ]); + }); + + test("a superseded marker pasted by anyone but the workflow neither keeps a pull request open nor replaces its comment", async () => { + const forged: Comment = { ...supersededComment, id: 3, user: { type: "User", login: "someone" } }; + const { api, writes } = fakeApi({ + issue: closedBy(mergedPr, "CLOSED", [openPr(41760, { reopens: reopenedAt("2026-09-19T00:00:00Z") })]), + pullRequestComments: { 41760: [forged] }, + }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([{ kind: "closed", number: 41760, body: oneFixBody }]); + expect(writes.filter((write) => write.includes("/41760"))).toEqual([ + `POST /repos/BerriAI/litellm/issues/41760/comments ${JSON.stringify({ body: oneFixBody })}`, + 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}', + ]); + }); + + test("every page of linked pull requests is read, not just the first", async () => { + const { api } = fakeApi({ linkedPullRequests: [[openPr(41760)], [openPr(41761)], [openPr(41762)]] }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([ + { kind: "closed", number: 41760, body: oneFixBody }, + { kind: "closed", number: 41761, body: oneFixBody }, + { kind: "closed", number: 41762, body: oneFixBody }, + ]); + }); + + test("a linked pull request from a fork or one still tied to another open issue is reported, not closed", async () => { + const fork = openPr(1, { repository: { nameWithOwner: "someone/litellm" } }); + const busy = openPr(41762, { closingIssuesReferences: links(linkedIssue(ISSUE), linkedIssue(41751, null, "OPEN")) }); + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "CLOSED", [fork, busy]) }); + const { pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(pullRequests).toEqual([ + { kind: "skip", number: 1, reason: "lives in someone/litellm" }, + { kind: "skip", number: 41762, reason: "still linked to open #41751" }, + ]); + expect(writes).toHaveLength(1); + }); + + test("a hand-closed issue gets no comment and leaves its linked pull requests open with the reason on each", async () => { + const byHand = openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE, null)) }); + const { api, writes } = fakeApi({ issue: closedBy(null, "CLOSED", [byHand]) }); + const outcome = await handleFixedIssue(api, config, ISSUE, noPause); + expect(outcome.comment).toEqual({ kind: "skip", reason: "closed by hand, not by a pull request" }); + expect(outcome.pullRequests).toEqual([{ kind: "skip", number: 41760, reason: `#${ISSUE} was closed by hand` }]); expect(writes).toEqual([]); }); - test("a hand-closed issue never reaches the release lookup or the API writes", async () => { - const { api, writes } = fakeApi({ issue: closedBy(null) }); - expect((await commentFixedIssue(api, config)).kind).toBe("skip"); + test("an issue closed by a commit on the default branch gets no comment but still closes its linked pull requests", async () => { + const byCommit = openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE, commitCloser)) }); + const { api, writes } = fakeApi({ issue: closedBy(commitCloser, "CLOSED", [byCommit]) }); + const { comment, pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(comment).toEqual({ kind: "skip", reason: "closed by commit 68c4c82ac9, not by a pull request" }); + expect(pullRequests).toEqual([{ kind: "closed", number: 41760, body: supersededBody([commitFix()], "main") }]); + expect(writes).toEqual([expect.stringContaining("/issues/41760/comments"), 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}']); + expect(writes[0]).toContain("#41750 was fixed by commit 68c4c82ac9 on main"); + }); + + test("an issue closed from the retired development branch gets no comment but still closes its linked pull requests once the fix is on the default branch", async () => { + const stagingPr = { ...mergedPr, baseRefName: "litellm_internal_staging" }; + const staging = openPr(41760, { closingIssuesReferences: links(linkedIssue(ISSUE, stagingPr)) }); + const { api, writes } = fakeApi({ issue: closedBy(stagingPr, "CLOSED", [staging]) }); + const { comment, pullRequests } = await handleFixedIssue(api, config, ISSUE, noPause); + expect(comment).toEqual({ kind: "skip", reason: "#41767 merged into litellm_internal_staging, not main" }); + expect(pullRequests).toEqual([{ kind: "closed", number: 41760, body: oneFixBody }]); + expect(writes.map((write) => write.split(" ")[1])).toEqual(["/repos/BerriAI/litellm/issues/41760/comments", "/repos/BerriAI/litellm/pulls/41760"]); + }); + + test("an issue that is open again gets no comment and its linked pull requests are neither read nor touched", async () => { + const { api, writes } = fakeApi({ issue: closedBy(mergedPr, "OPEN", [openPr(41760)]) }); + const outcome = await handleFixedIssue(api, config, ISSUE, noPause); + expect(outcome).toEqual({ comment: { kind: "skip", reason: "the issue is open again" }, pullRequests: [] }); expect(writes).toEqual([]); }); test("a number that is not an issue in the repository is a skip", async () => { const { api, writes } = fakeApi({ issue: null }); - expect(await commentFixedIssue(api, config)).toEqual({ kind: "skip", reason: "not an issue in this repository" }); + const outcome = await handleFixedIssue(api, config, ISSUE, noPause); + expect(outcome.comment).toEqual({ kind: "skip", reason: "not an issue in this repository" }); + expect(writes).toEqual([]); + }); +}); + +describe("sweep", () => { + test("walks every page of open pull requests and closes the ones whose linked issues were all fixed", async () => { + const unlinked = openPr(41700, { closingIssuesReferences: links() }); + const busy = openPr(41701, { closingIssuesReferences: links(linkedIssue(41751, null, "OPEN")) }); + const { api, writes } = fakeApi({ openPullRequests: [[unlinked, openPr(41760)], [busy, openPr(41761)]] }); + const outcome = await sweep(api, { ...config, commentDryRun: true }, noPause); + expect(outcome.considered).toBe(4); + expect(outcome.pullRequests).toEqual([ + { kind: "closed", number: 41760, body: oneFixBody }, + { kind: "skip", number: 41701, reason: "still linked to open #41751" }, + { kind: "closed", number: 41761, body: oneFixBody }, + ]); + expect(writes).toEqual([ + expect.stringContaining("POST /repos/BerriAI/litellm/issues/41760/comments"), + 'PATCH /repos/BerriAI/litellm/pulls/41760 {"state":"closed"}', + expect.stringContaining("POST /repos/BerriAI/litellm/issues/41761/comments"), + 'PATCH /repos/BerriAI/litellm/pulls/41761 {"state":"closed"}', + ]); + }); + + test("a sweep dry run lists what it would close and writes nothing", async () => { + const { api, writes } = fakeApi({ openPullRequests: [[openPr(41760)]] }); + const outcome = await sweep(api, { ...config, closeDryRun: true }, noPause); + expect(outcome.pullRequests.map((pullRequest) => pullRequest.kind)).toEqual(["closed"]); expect(writes).toEqual([]); }); }); @@ -218,10 +588,24 @@ describe("commentFixedIssue", () => { describe("readConfig", () => { const env = { GITHUB_TOKEN: "t", GITHUB_REPOSITORY: "BerriAI/litellm", ISSUE_NUMBER: "41750", DEFAULT_BRANCH: "main" }; - test("reads the four inputs and treats anything but the literal true as a real run", () => { - expect(readConfig(env)).toEqual({ token: "t", repo: "BerriAI/litellm", issueNumber: 41750, defaultBranch: "main", dryRun: false }); - expect(readConfig({ ...env, DRY_RUN: "true" }).dryRun).toBe(true); - expect(readConfig({ ...env, DRY_RUN: "false" }).dryRun).toBe(false); + test("reads the inputs and treats anything but the literal true as a real run for each gate", () => { + expect(readConfig(env)).toEqual({ + token: "t", + repo: "BerriAI/litellm", + defaultBranch: "main", + commentDryRun: false, + closeDryRun: false, + run: { kind: "issue", number: 41750 }, + }); + expect(readConfig({ ...env, DRY_RUN: "true" })).toMatchObject({ commentDryRun: true, closeDryRun: false }); + expect(readConfig({ ...env, CLOSE_PRS_DRY_RUN: "true" })).toMatchObject({ commentDryRun: false, closeDryRun: true }); + expect(readConfig({ ...env, DRY_RUN: "false", CLOSE_PRS_DRY_RUN: "false" })).toMatchObject({ commentDryRun: false, closeDryRun: false }); + }); + + test("a sweep needs no issue number and anything but the literal true is an issue run", () => { + expect(readConfig({ ...env, ISSUE_NUMBER: undefined, SWEEP: "true" }).run).toEqual({ kind: "sweep" }); + expect(readConfig({ ...env, SWEEP: "false" }).run).toEqual({ kind: "issue", number: 41750 }); + expect(() => readConfig({ ...env, ISSUE_NUMBER: "", SWEEP: "false" })).toThrow("dispatch with an issue_number or with sweep ticked"); }); test("refuses a missing token, repo, branch or a bad issue number", () => { @@ -232,3 +616,31 @@ describe("readConfig", () => { expect(() => readConfig({ ...env, ISSUE_NUMBER: "abc" })).toThrow("ISSUE_NUMBER"); }); }); + +describe("step summary", () => { + const closed = { kind: "closed" as const, number: 41760, body: oneFixBody }; + const left = { kind: "skip" as const, number: 41762, reason: "still linked to open #41751" }; + const commented = { kind: "commented" as const, pullRequest: 41767, tag: "v1.103.0-rc.1", body: fixedBody(41767, { tag: "v1.103.0-rc.1", shipped: false }) }; + + test("an issue run names the comment, each close, and each pull request left open", () => { + const summary = describeIssue(config, ISSUE, { comment: commented, pullRequests: [closed, left] }); + expect(summary).toContain("#41750: commented, fixed by #41767 in v1.103.0-rc.1"); + expect(summary).toContain("#41760: closed with: #41750 was fixed by #41767 on main"); + expect(summary).toContain("#41762: left open, still linked to open #41751"); + expect(summary).not.toContain("DRY RUN"); + }); + + test("a close dry run names the repo variable that turns closing on", () => { + const summary = describeIssue({ ...config, closeDryRun: true }, ISSUE, { comment: commented, pullRequests: [closed] }); + expect(summary).toContain("ISSUE_FIXED_CLOSE_PRS_ENABLED"); + expect(summary).toContain("#41760: DRY RUN, would close with: #41750 was fixed by #41767 on main"); + }); + + test("a sweep summary counts what it saw and lists only the closes", () => { + const summary = describeSweep(config, { considered: 3522, pullRequests: [closed, left] }); + expect(summary).toContain("Swept 3522 open pull requests, 2 linked to an issue, 1 closed"); + expect(summary).toContain("#41760: closed with:"); + expect(summary).not.toContain("#41762"); + expect(describeSweep({ ...config, closeDryRun: true }, { considered: 3522, pullRequests: [closed] })).toContain("1 would be closed, DRY RUN, set the ISSUE_FIXED_CLOSE_PRS_ENABLED"); + }); +}); diff --git a/scripts/comment-fixed-issue.ts b/scripts/comment-fixed-issue.ts index 480b5e90249..450d530d90c 100644 --- a/scripts/comment-fixed-issue.ts +++ b/scripts/comment-fixed-issue.ts @@ -6,35 +6,66 @@ declare const process: { readonly env: Readonly base.startsWith("release/") || base.includes("stable"); + +const CLOSURE_FRAGMENT = `fragment Closure on Issue { + state + timelineItems(last: 1, itemTypes: [CLOSED_EVENT]) { + nodes { + ... on ClosedEvent { + closer { + __typename + ... on PullRequest { number merged baseRefName repository { nameWithOwner } mergeCommit { oid } } + ... on Commit { oid repository { nameWithOwner } } } } } } }`; +const LINKED_PULL_REQUEST_FRAGMENT = `fragment Linked on PullRequest { + number + state + baseRefName + repository { nameWithOwner } + closingIssuesReferences(first: ${MAX_LINKED_ISSUES}) { totalCount nodes { number repository { nameWithOwner } ...Closure } } + reopens: timelineItems(last: 1, itemTypes: [REOPENED_EVENT]) { nodes { ... on ReopenedEvent { createdAt } } } +}`; + +export const CLOSER_QUERY = `query($owner: String!, $name: String!, $number: Int!, $after: String) { + repository(owner: $owner, name: $name) { + issue(number: $number) { + ...Closure + closedByPullRequestsReferences(first: ${MAX_LINKED_PULL_REQUESTS}, after: $after) { + pageInfo { hasNextPage endCursor } + nodes { ...Linked } + } + } + } +} +${CLOSURE_FRAGMENT} +${LINKED_PULL_REQUEST_FRAGMENT}`; + +export const OPEN_PULL_REQUESTS_QUERY = `query($owner: String!, $name: String!, $after: String) { + repository(owner: $owner, name: $name) { + pullRequests(states: OPEN, first: ${SWEEP_PAGE_SIZE}, after: $after) { + pageInfo { hasNextPage endCursor } + nodes { ...Linked } + } + } +} +${CLOSURE_FRAGMENT} +${LINKED_PULL_REQUEST_FRAGMENT}`; + const skip = (reason: string): { readonly kind: "skip"; readonly reason: string } => ({ kind: "skip", reason }); -export function closerOf(issue: ClosedIssue, defaultBranch: string): Closer { +export function closerOf(issue: IssueClosure, repo: string, defaultBranch: string): Closer { if (issue.state !== "CLOSED") { - return skip("the issue is open again"); + return skip(OPEN_AGAIN); } const closer = issue.timelineItems.nodes[0]?.closer ?? null; if (closer === null) { @@ -94,6 +192,9 @@ export function closerOf(issue: ClosedIssue, defaultBranch: string): Closer { if (closer.__typename === "Commit") { return skip(`closed by commit ${closer.oid.slice(0, 10)}, not by a pull request`); } + if (closer.repository.nameWithOwner !== repo) { + return skip(`closed by ${closer.repository.nameWithOwner}#${closer.number}, a pull request in another repository`); + } if (!closer.merged || closer.mergeCommit === null) { return skip(`closed by #${closer.number}, which is not merged`); } @@ -121,8 +222,8 @@ async function tagExists(api: GitHubApi, repo: string, tag: string): Promise ref.ref === `refs/tags/${tag}`); } -async function tagContains(api: GitHubApi, repo: string, tag: string, sha: string): Promise { - const comparison = await api.request("GET", `/repos/${repo}/compare/${tag}...${sha}`); +async function refContains(api: GitHubApi, repo: string, ref: string, sha: string): Promise { + const comparison = await api.request("GET", `/repos/${repo}/compare/${ref}...${sha}`); return comparison.status === "behind" || comparison.status === "identical"; } @@ -139,7 +240,7 @@ async function firstReleaseWith( if (!(await tagExists(api, repo, tag))) { return { kind: "release", tag, shipped: false }; } - if (await tagContains(api, repo, tag, sha)) { + if (await refContains(api, repo, tag, sha)) { return { kind: "release", tag, shipped: true }; } if (bumpsLeft === 0) { @@ -164,21 +265,13 @@ export function fixedBody(pullRequest: number, release: { readonly tag: string; return `${FIXED_MARKER}\nFixed by #${pullRequest}. ${availability}`; } -export async function commentFixedIssue(api: GitHubApi, config: FixedConfig): Promise { - const [owner, name] = config.repo.split("/"); - const response = await api.request("POST", "/graphql", { - query: CLOSER_QUERY, - variables: { owner, name, number: config.issueNumber }, - }); - const issue = response.data?.repository?.issue ?? null; - if (issue === null) { - return skip("not an issue in this repository"); - } - const closer = closerOf(issue, config.defaultBranch); - if (closer.kind === "skip") { - return closer; - } - const issuePath = `/repos/${config.repo}/issues/${config.issueNumber}`; +export async function commentFixedIssue( + api: GitHubApi, + config: FixedConfig, + issueNumber: number, + closer: { readonly number: number; readonly mergeCommit: string }, +): Promise { + const issuePath = `/repos/${config.repo}/issues/${issueNumber}`; const comments = await listAll(api, `${issuePath}/comments`); if (comments.some((comment) => comment.body.includes(FIXED_MARKER))) { return skip("already carries a fixed-in comment"); @@ -188,37 +281,259 @@ export async function commentFixedIssue(api: GitHubApi, config: FixedConfig): Pr return release; } const body = fixedBody(closer.number, release); - if (!config.dryRun) { + if (!config.commentDryRun) { await api.request("POST", `${issuePath}/comments`, { body }); } return { kind: "commented", pullRequest: closer.number, tag: release.tag, body }; } -export function readConfig(env: Readonly>): FixedConfig & { readonly token: string } { +export function fixOf(issue: IssueClosure, repo: string): FixVerdict { + if (issue.state !== "CLOSED") { + return skip("is open again"); + } + const closer = issue.timelineItems.nodes[0]?.closer ?? null; + if (closer === null) { + return skip("was closed by hand"); + } + if (closer.repository.nameWithOwner !== repo) { + return skip(`was closed from ${closer.repository.nameWithOwner}`); + } + if (closer.__typename === "Commit") { + return { kind: "commit", oid: closer.oid }; + } + if (!closer.merged || closer.mergeCommit === null) { + return skip(`was closed by #${closer.number}, which is not merged`); + } + return { kind: "pull_request", number: closer.number, oid: closer.mergeCommit.oid }; +} + +export function closeVerdict(pullRequest: LinkedPullRequest, config: FixedConfig): CloseVerdict { + if (pullRequest.repository.nameWithOwner !== config.repo) { + return skip(`lives in ${pullRequest.repository.nameWithOwner}`); + } + if (pullRequest.state !== "OPEN") { + return skip(`is ${pullRequest.state.toLowerCase()}`); + } + if (isReleaseLine(pullRequest.baseRefName)) { + return skip(`targets the release line ${pullRequest.baseRefName}`); + } + const { totalCount, nodes: linked } = pullRequest.closingIssuesReferences; + if (linked.length === 0) { + return skip("links no issue"); + } + if (totalCount > linked.length) { + return skip(`links ${totalCount} issues, more than the ${MAX_LINKED_ISSUES} this workflow reads`); + } + const foreign = linked.find((issue) => issue.repository.nameWithOwner !== config.repo); + if (foreign !== undefined) { + return skip(`links ${foreign.repository.nameWithOwner}#${foreign.number}`); + } + const stillOpen = linked.find((issue) => issue.state === "OPEN"); + if (stillOpen !== undefined) { + return skip(`still linked to open #${stillOpen.number}`); + } + const verdicts = linked.map((issue) => ({ issue: issue.number, fix: fixOf(issue, config.repo) })); + for (const { issue, fix } of verdicts) { + if (fix.kind === "skip") { + return skip(`#${issue} ${fix.reason}`); + } + } + return { + kind: "candidate", + fixes: verdicts.flatMap(({ issue, fix }) => (fix.kind === "skip" ? [] : [{ issue, source: fix }])), + }; +} + +function describeSource(source: FixSource): string { + return source.kind === "pull_request" ? `#${source.number}` : `commit ${source.oid.slice(0, 10)}`; +} + +async function fixOffDefaultBranch(api: GitHubApi, config: FixedConfig, fixes: readonly Fix[]): Promise { + const onBranch = await Promise.all(fixes.map((fix) => refContains(api, config.repo, config.defaultBranch, fix.source.oid))); + return fixes.find((_, index) => !onBranch[index]); +} + +export function supersededBody(fixes: readonly Fix[], defaultBranch: string): string { + const pairs = fixes + .map((fix, index) => `#${fix.issue} ${index === 0 ? "was fixed by" : "by"} ${describeSource(fix.source)}`) + .join(" and "); + return `${SUPERSEDED_MARKER}\n${pairs} on ${defaultBranch}, so this pull request is closed. Reopen it if something was missed.`; +} + +function reopenedAfter(pullRequest: LinkedPullRequest, comment: Comment): boolean { + const reopen = pullRequest.reopens.nodes[0]; + return reopen !== undefined && Date.parse(reopen.createdAt) > Date.parse(comment.created_at); +} + +async function closePullRequest( + api: GitHubApi, + config: FixedConfig, + pullRequest: LinkedPullRequest, + pause: () => Promise, +): Promise { + const verdict = closeVerdict(pullRequest, config); + if (verdict.kind === "skip") { + return { kind: "skip", number: pullRequest.number, reason: verdict.reason }; + } + const offBranch = await fixOffDefaultBranch(api, config, verdict.fixes); + if (offBranch !== undefined) { + const fix = describeSource(offBranch.source); + return { kind: "skip", number: pullRequest.number, reason: `#${offBranch.issue} was fixed by ${fix}, which is not on ${config.defaultBranch}` }; + } + const issuePath = `/repos/${config.repo}/issues/${pullRequest.number}`; + const comments = await listAll(api, `${issuePath}/comments`); + const marker = comments.find((comment) => comment.user.login === WORKFLOW_LOGIN && comment.body.includes(SUPERSEDED_MARKER)); + if (marker !== undefined && reopenedAfter(pullRequest, marker)) { + return { kind: "skip", number: pullRequest.number, reason: "was closed by this workflow once and reopened" }; + } + const body = marker?.body ?? supersededBody(verdict.fixes, config.defaultBranch); + if (config.closeDryRun) { + return { kind: "closed", number: pullRequest.number, body }; + } + if (marker === undefined) { + await pause(); + await api.request("POST", `${issuePath}/comments`, { body }); + } + await pause(); + await api.request("PATCH", `/repos/${config.repo}/pulls/${pullRequest.number}`, { state: "closed" }); + return { kind: "closed", number: pullRequest.number, body }; +} + +export function closePullRequests( + api: GitHubApi, + config: FixedConfig, + candidates: readonly LinkedPullRequest[], + pause: () => Promise, +): Promise { + return candidates.reduce>( + async (previous, candidate) => [...(await previous), await closePullRequest(api, config, candidate, pause)], + Promise.resolve([]), + ); +} + +type NextPage = (after: string | null) => Promise; + +async function collectPages(page: PullRequestsPage, nextPage: NextPage): Promise { + if (!page.pageInfo.hasNextPage) { + return page.nodes; + } + return [...page.nodes, ...(await collectPages(await nextPage(page.pageInfo.endCursor), nextPage))]; +} + +async function closedIssue(api: GitHubApi, config: FixedConfig, issueNumber: number, after: string | null): Promise { + const [owner, name] = config.repo.split("/"); + const response = await api.request("POST", "/graphql", { + query: CLOSER_QUERY, + variables: { owner, name, number: issueNumber, after }, + }); + return response.data?.repository?.issue ?? null; +} + +export async function handleFixedIssue( + api: GitHubApi, + config: FixedConfig, + issueNumber: number, + pause: () => Promise, +): Promise { + const issue = await closedIssue(api, config, issueNumber, null); + if (issue === null) { + return { comment: skip("not an issue in this repository"), pullRequests: [] }; + } + if (issue.state !== "CLOSED") { + return { comment: skip(OPEN_AGAIN), pullRequests: [] }; + } + const closer = closerOf(issue, config.repo, config.defaultBranch); + const comment = closer.kind === "skip" ? closer : await commentFixedIssue(api, config, issueNumber, closer); + const nextPage: NextPage = async (after) => { + const more = await closedIssue(api, config, issueNumber, after); + if (more === null) { + throw new Error(`#${issueNumber} came back without data while reading its linked pull requests after cursor ${after}`); + } + return more.closedByPullRequestsReferences; + }; + const linked = await collectPages(issue.closedByPullRequestsReferences, nextPage); + const open = linked.filter((pullRequest) => pullRequest.state === "OPEN"); + const pullRequests = await closePullRequests(api, config, open, pause); + return { comment, pullRequests }; +} + +async function openPullRequests(api: GitHubApi, config: FixedConfig): Promise { + const [owner, name] = config.repo.split("/"); + const nextPage: NextPage = async (after) => { + const response = await api.request("POST", "/graphql", { + query: OPEN_PULL_REQUESTS_QUERY, + variables: { owner, name, after }, + }); + const page = response.data?.repository?.pullRequests; + if (page === undefined) { + throw new Error(`open pull requests after cursor ${after} came back without data: ${JSON.stringify(response)}`); + } + return page; + }; + return collectPages(await nextPage(null), nextPage); +} + +export async function sweep(api: GitHubApi, config: FixedConfig, pause: () => Promise): Promise { + const open = await openPullRequests(api, config); + const linked = open.filter((pullRequest) => pullRequest.closingIssuesReferences.nodes.length > 0); + return { considered: open.length, pullRequests: await closePullRequests(api, config, linked, pause) }; +} + +export function readConfig( + env: Readonly>, +): FixedConfig & { readonly token: string; readonly run: Run } { const token = env.GITHUB_TOKEN; const repo = env.GITHUB_REPOSITORY; const defaultBranch = env.DEFAULT_BRANCH; if (!token || !repo || !/^[\w.-]+\/[\w.-]+$/.test(repo) || !defaultBranch) { throw new Error("GITHUB_TOKEN, GITHUB_REPOSITORY (owner/repo) and DEFAULT_BRANCH are required"); } + const config = { token, repo, defaultBranch, commentDryRun: env.DRY_RUN === "true", closeDryRun: env.CLOSE_PRS_DRY_RUN === "true" }; + if (env.SWEEP === "true") { + return { ...config, run: { kind: "sweep" } }; + } const issueNumber = Number(env.ISSUE_NUMBER); if (!Number.isInteger(issueNumber) || issueNumber <= 0) { - throw new Error(`ISSUE_NUMBER must be a positive integer, got "${env.ISSUE_NUMBER}"`); + throw new Error(`ISSUE_NUMBER must be a positive integer, got "${env.ISSUE_NUMBER}": dispatch with an issue_number or with sweep ticked`); } - return { token, repo, issueNumber, defaultBranch, dryRun: env.DRY_RUN === "true" }; + return { ...config, run: { kind: "issue", number: issueNumber } }; } -function describe(config: FixedConfig, verdict: FixedVerdict): string { - if (verdict.kind === "skip") { - return `#${config.issueNumber}: skipped, ${verdict.reason}`; +const CLOSE_DRY_RUN_HINT = "set the ISSUE_FIXED_CLOSE_PRS_ENABLED repo variable to true to close pull requests"; + +function describeClose(config: FixedConfig, outcome: CloseOutcome): string { + if (outcome.kind === "skip") { + return `#${outcome.number}: left open, ${outcome.reason}`; } - if (config.dryRun) { - return `#${config.issueNumber}: DRY RUN, set the ISSUE_FIXED_COMMENT_ENABLED repo variable to true to post this:\n\n${verdict.body}`; - } - return `#${config.issueNumber}: commented, fixed by #${verdict.pullRequest} in ${verdict.tag}`; + const text = outcome.body.replace(`${SUPERSEDED_MARKER}\n`, ""); + return config.closeDryRun ? `#${outcome.number}: DRY RUN, would close with: ${text}` : `#${outcome.number}: closed with: ${text}`; +} + +export function describeIssue(config: FixedConfig, issueNumber: number, outcome: IssueOutcome): string { + const comment = + outcome.comment.kind === "skip" + ? `#${issueNumber}: skipped, ${outcome.comment.reason}` + : config.commentDryRun + ? `#${issueNumber}: DRY RUN, set the ISSUE_FIXED_COMMENT_ENABLED repo variable to true to post this:\n\n${outcome.comment.body}` + : `#${issueNumber}: commented, fixed by #${outcome.comment.pullRequest} in ${outcome.comment.tag}`; + const hint = config.closeDryRun && outcome.pullRequests.some((pullRequest) => pullRequest.kind === "closed") ? [`Closing is a DRY RUN, ${CLOSE_DRY_RUN_HINT}`] : []; + return [comment, ...hint, ...outcome.pullRequests.map((pullRequest) => describeClose(config, pullRequest))].join("\n"); +} + +export function describeSweep(config: FixedConfig, outcome: SweepOutcome): string { + const closed = outcome.pullRequests.filter((pullRequest) => pullRequest.kind === "closed"); + const verb = config.closeDryRun ? `would be closed, DRY RUN, ${CLOSE_DRY_RUN_HINT}` : "closed"; + const header = `Swept ${outcome.considered} open pull requests, ${outcome.pullRequests.length} linked to an issue, ${closed.length} ${verb}`; + return [header, ...closed.map((pullRequest) => describeClose(config, pullRequest))].join("\n"); } if (import.meta.main) { - const { token, ...config } = readConfig(process.env); - console.log(describe(config, await commentFixedIssue(githubApi(token), config))); + const { token, run, ...config } = readConfig(process.env); + const api = githubApi(token); + const pause = (): Promise => new Promise((resolve) => setTimeout(resolve, CLOSE_PAUSE_MS)); + console.log( + run.kind === "sweep" + ? describeSweep(config, await sweep(api, config, pause)) + : describeIssue(config, run.number, await handleFixedIssue(api, config, run.number, pause)), + ); } diff --git a/terraform/litellm/aws/locals.tf b/terraform/litellm/aws/locals.tf index 778d31642c1..b89bd486d02 100644 --- a/terraform/litellm/aws/locals.tf +++ b/terraform/litellm/aws/locals.tf @@ -74,7 +74,7 @@ locals { "/v1/models*", "/models*", "/openai/*", "/engines/*", "/v1/messages*", "/messages*", - "/v1/skills/*", "/v1/a2a/*", + "/v1/skills/*", "/v1/a2a/*", "/api/event_logging*", "/v1/rerank*", "/v2/rerank*", "/rerank*", "/v1/ocr*", "/ocr*", "/v1/rag/*", "/rag/*", diff --git a/terraform/litellm/gcp/locals.tf b/terraform/litellm/gcp/locals.tf index d263c781449..e82892b27cb 100644 --- a/terraform/litellm/gcp/locals.tf +++ b/terraform/litellm/gcp/locals.tf @@ -43,7 +43,7 @@ locals { "/v1/models*", "/models*", "/openai/*", "/engines/*", "/v1/messages*", "/messages*", - "/v1/skills/*", "/v1/a2a/*", + "/v1/skills/*", "/v1/a2a/*", "/api/event_logging*", "/v1/rerank*", "/v2/rerank*", "/rerank*", "/v1/ocr*", "/ocr*", "/v1/rag/*", "/rag/*", diff --git a/terraform/provider/CHANGELOG.md b/terraform/provider/CHANGELOG.md index 8f40ed6dfb7..079bb7d8667 100644 --- a/terraform/provider/CHANGELOG.md +++ b/terraform/provider/CHANGELOG.md @@ -16,6 +16,7 @@ longer signal it. ### Added +- **key**: Computed `server_metadata` attribute on `litellm_key` exposing every metadata entry the proxy stores, so metadata created outside Terraform is visible in state and drift on it shows on refresh, while `metadata` keeps tracking only the declared entries and updates keep preserving undeclared ones - **team_member_add**: `tpm_limit`, `rpm_limit`, `budget_duration`, and `allowed_models` attributes on `litellm_team_member_add`, applied to every member of the resource; `budget_duration` and `allowed_models` ride on `/team/member_add`, while the limits are sent through `/team/member_update`, which is where the proxy accepts them - **team**: Optional `team_id` argument on `litellm_team`, so teams can be created with a stable, human-readable ID instead of a provider-generated UUID; changing it forces replacement - `litellm_jwt_key_mapping` accepts `token_id` as an alternative to `key`, so a diff --git a/terraform/provider/docs/resources/key.md b/terraform/provider/docs/resources/key.md index 0ef0688830f..af2f38b5352 100644 --- a/terraform/provider/docs/resources/key.md +++ b/terraform/provider/docs/resources/key.md @@ -120,6 +120,8 @@ In addition to all arguments above, the following attributes are exported: * `key` - The generated API key. This is the actual key value that will be used for authentication. +* `server_metadata` - Map of every metadata entry the proxy stores for this key, including entries not declared in `metadata`, so drift on them is visible on refresh. Entries already exposed as their own attributes (`model_rpm_limit`, `model_tpm_limit`, `tags`, `guardrails`, `enforced_params`, `allowed_passthrough_routes`, `rpm_limit_type`, `tpm_limit_type`, `prompts`) are omitted and non-string values are JSON encoded. Terraform never writes it; `metadata` still tracks only the entries declared in the configuration. + * `spend` - The current spend for this key. This reflects the total amount spent using this key so far. ## State Management diff --git a/terraform/provider/litellm/resource_key.go b/terraform/provider/litellm/resource_key.go index 39546d588df..b471cab73e8 100644 --- a/terraform/provider/litellm/resource_key.go +++ b/terraform/provider/litellm/resource_key.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "log" + "slices" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" @@ -61,6 +62,12 @@ func resourceKey() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "server_metadata": { + Type: schema.TypeMap, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Description: "Every metadata entry the proxy stores for this key, including ones not declared in metadata. Read-only, so drift on undeclared entries shows up on refresh without Terraform taking ownership of them. Entries the provider already exposes as their own attributes (model_rpm_limit, model_tpm_limit, tags, guardrails, enforced_params, allowed_passthrough_routes, rpm_limit_type, tpm_limit_type, prompts) are omitted, and non-string values are JSON encoded", + }, "tpm_limit": { Type: schema.TypeInt, Optional: true, @@ -304,6 +311,7 @@ func resourceKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) return nil } + d.Set("server_metadata", serverKeyMetadata(key.Metadata)) key.Metadata = declaredKeyMetadata(key.Metadata, d.Get("metadata").(map[string]interface{})) mapKeyToResourceData(d, key) return nil @@ -395,6 +403,25 @@ func declaredKeyMetadata(server, declared map[string]interface{}) map[string]int return result } +func serverKeyMetadata(server map[string]interface{}) map[string]string { + result := make(map[string]string, len(server)) + for k, v := range server { + if slices.Contains(keyFieldsStoredInMetadata, k) { + continue + } + if s, ok := v.(string); ok { + result[k] = s + continue + } + encoded, err := json.Marshal(v) + if err != nil { + continue + } + result[k] = string(encoded) + } + return result +} + func mergeKeyMetadata(server, oldDeclared, newDeclared map[string]interface{}) map[string]interface{} { result := make(map[string]interface{}, len(server)+len(newDeclared)) for k, v := range server { diff --git a/terraform/provider/litellm/resource_key_test.go b/terraform/provider/litellm/resource_key_test.go index fe708edd3d3..b6e67360ad0 100644 --- a/terraform/provider/litellm/resource_key_test.go +++ b/terraform/provider/litellm/resource_key_test.go @@ -600,6 +600,12 @@ func TestKeyUpdateWithoutMetadataChangePreservesServerMetadata(t *testing.T) { if got := newState.Attributes["metadata.a"]; got != "1" { t.Errorf("metadata.a = %q, want 1", got) } + if got := newState.Attributes["server_metadata.server_side"]; got != "x" { + t.Errorf("server_metadata.server_side = %q, want x", got) + } + if _, present := proxy.updates[0]["server_metadata"]; present { + t.Errorf("computed server_metadata was sent on /key/update: %v", proxy.updates[0]["server_metadata"]) + } } func TestKeyUpdateWithMetadataChangeMergesOverServerMetadata(t *testing.T) { @@ -654,6 +660,32 @@ func TestKeyReadKeepsOnlyDeclaredMetadata(t *testing.T) { } } +func TestKeyReadExposesUndeclaredMetadataInServerMetadata(t *testing.T) { + proxy := &fakeKeyProxy{metadata: map[string]interface{}{ + "a": "1", + "server_side": "x", + "model_rpm_limit": map[string]interface{}{"gpt-4o-mini": float64(5)}, + "nested": map[string]interface{}{"k": "v"}, + }} + srv := httptest.NewServer(proxy.handler()) + defer srv.Close() + client := NewClient(srv.URL, "test-key", true) + + d := newKeyResourceData(t, map[string]interface{}{"metadata": map[string]interface{}{"a": "1"}}) + d.SetId("hash-1") + if diags := resourceKeyRead(context.Background(), d, client); diags.HasError() { + t.Fatalf("Read returned error: %v", diags) + } + + if got, want := d.Get("metadata"), map[string]interface{}{"a": "1"}; !reflect.DeepEqual(got, want) { + t.Errorf("metadata in state = %v, want %v", got, want) + } + want := map[string]interface{}{"a": "1", "server_side": "x", "nested": `{"k":"v"}`} + if got := d.Get("server_metadata"); !reflect.DeepEqual(got, want) { + t.Errorf("server_metadata in state = %v, want %v", got, want) + } +} + func TestKeyUpdateSendsChangedDuration(t *testing.T) { proxy := &fakeKeyProxy{metadata: map[string]interface{}{}} srv := httptest.NewServer(proxy.handler()) diff --git a/tests/_process_helpers.py b/tests/_process_helpers.py new file mode 100644 index 00000000000..9f80c563fa9 --- /dev/null +++ b/tests/_process_helpers.py @@ -0,0 +1,57 @@ +"""Whether a killed process is really gone, for tests that kill whole process trees. + +A SIGKILLed grandchild whose parent died in the same ``killpg`` reparents to the +nearest subreaper or PID 1, and until that ancestor reaps it the pid is a zombie +that ``os.kill(pid, 0)`` still accepts. Reading its ``/proc`` state, and reaping +it when it landed on this process, keeps a runner that is slow to reap, or never +does, from turning a dead process into a failed assertion. The reap comes after +the liveness read so a child seen dying between the two is still collected on +the next poll instead of staying this process's own zombie. +""" + +import os +import time +from pathlib import Path +from typing import Final + +POLL_INTERVAL_S: Final = 0.05 + + +def _exists(pid: int) -> bool: + try: + os.kill(pid, 0) + except ProcessLookupError: + return False + return True + + +def _is_zombie(pid: int) -> bool: + try: + stat: Final = Path(f"/proc/{pid}/stat").read_text() + except OSError: + return False + return stat.rpartition(")")[2].split()[0] == "Z" + + +def _reap_if_ours(pid: int) -> None: + if os.name == "nt": + return + try: + os.waitpid(pid, os.WNOHANG) + except ChildProcessError: + pass + + +def _gone_now(pid: int) -> bool: + dead: Final = not _exists(pid) or _is_zombie(pid) + _reap_if_ours(pid) + return dead + + +def process_is_gone(pid: int, within_seconds: float) -> bool: + deadline: Final = time.monotonic() + within_seconds + while time.monotonic() < deadline: + if _gone_now(pid): + return True + time.sleep(POLL_INTERVAL_S) + return False diff --git a/tests/_vcr_conftest_common.py b/tests/_vcr_conftest_common.py index 4d5a73779ea..ab046674eb6 100644 --- a/tests/_vcr_conftest_common.py +++ b/tests/_vcr_conftest_common.py @@ -8,6 +8,7 @@ from __future__ import annotations import ast import atexit import hashlib +import inspect import json import os import re @@ -15,10 +16,18 @@ import socket import sys import threading from collections import defaultdict -from typing import Iterable +from collections.abc import Iterable, Iterator +from contextlib import contextmanager +from dataclasses import dataclass +from pathlib import Path +from typing import Final +from unittest import mock +import aiohttp import pytest +import vcr import vcr.matchers as _vcr_matchers +import vcr.patch as _vcr_patch from tests._vcr_redis_persister import ( MAX_EPISODES_PER_CASSETTE, @@ -127,9 +136,7 @@ def emit_vcr_diagnostic_log(terminalreporter) -> None: with open(path, "r", encoding="utf-8") as fh: content = fh.read() except OSError as exc: - read_errors.append( - f" [failed to read {name}: {type(exc).__name__}: {exc}]" - ) + read_errors.append(f" [failed to read {name}: {type(exc).__name__}: {exc}]") continue for line in content.splitlines(): if not line.strip(): @@ -142,9 +149,7 @@ def emit_vcr_diagnostic_log(terminalreporter) -> None: return terminalreporter.write_sep("=", "VCR DIAGNOSTIC LOG", bold=True) - terminalreporter.write_line( - f" source dir: {directory} (deduplicated; full log archived as a CI artifact)" - ) + terminalreporter.write_line(f" source dir: {directory} (deduplicated; full log archived as a CI artifact)") for line in read_errors: terminalreporter.write_line(line) @@ -235,9 +240,7 @@ def pin_httpx_multipart_boundary(monkeypatch) -> None: boundary = VCR_FIXED_MULTIPART_BOUNDARY.encode("ascii") return _original_init(self, data=data, files=files, boundary=boundary, **kwargs) - monkeypatch.setattr( - _httpx_multipart.MultipartStream, "__init__", _init_with_fixed_boundary - ) + monkeypatch.setattr(_httpx_multipart.MultipartStream, "__init__", _init_with_fixed_boundary) @pytest.fixture(scope="session", autouse=True) @@ -270,11 +273,7 @@ def _replace_b64_json_in_place(obj) -> bool: changed = False if isinstance(obj, dict): for key, value in obj.items(): - if ( - key == "b64_json" - and isinstance(value, str) - and len(value) > len(VCR_IMAGE_B64_PLACEHOLDER) - ): + if key == "b64_json" and isinstance(value, str) and len(value) > len(VCR_IMAGE_B64_PLACEHOLDER): obj[key] = VCR_IMAGE_B64_PLACEHOLDER changed = True elif _replace_b64_json_in_place(value): @@ -296,16 +295,12 @@ def _strip_image_b64_payloads(response): preserves all those checks while shrinking cassettes by ~99%. """ if not isinstance(response, dict): - vcr_diag_write_line( - f"[vcr-strip-b64] response is {type(response).__name__!r}, not " - "dict; skipping b64 scrub" - ) + vcr_diag_write_line(f"[vcr-strip-b64] response is {type(response).__name__!r}, not dict; skipping b64 scrub") return response body = response.get("body") if not isinstance(body, dict): vcr_diag_write_line( - f"[vcr-strip-b64] response['body'] is {type(body).__name__!r}, " - "not dict; skipping b64 scrub" + f"[vcr-strip-b64] response['body'] is {type(body).__name__!r}, not dict; skipping b64 scrub" ) return response raw = body.get("string") @@ -316,10 +311,7 @@ def _strip_image_b64_payloads(response): try: text = bytes(raw).decode("utf-8") except UnicodeDecodeError: - vcr_diag_write_line( - "[vcr-strip-b64] response body bytes are not valid UTF-8; " - "skipping b64 scrub" - ) + vcr_diag_write_line("[vcr-strip-b64] response body bytes are not valid UTF-8; skipping b64 scrub") return response was_bytes = True elif isinstance(raw, str): @@ -327,8 +319,7 @@ def _strip_image_b64_payloads(response): was_bytes = False else: vcr_diag_write_line( - f"[vcr-strip-b64] response['body']['string'] is " - f"{type(raw).__name__!r}, not bytes/str; skipping b64 scrub" + f"[vcr-strip-b64] response['body']['string'] is {type(raw).__name__!r}, not bytes/str; skipping b64 scrub" ) return response @@ -349,9 +340,7 @@ def _strip_image_b64_payloads(response): for key in list(headers): if str(key).lower() == "content-length": value = headers[key] - headers[key] = ( - [new_len_value] if isinstance(value, list) else new_len_value - ) + headers[key] = [new_len_value] if isinstance(value, list) else new_len_value return response @@ -409,15 +398,11 @@ def _canonical_body(request) -> tuple[bytes, str]: # selected. This mirrors the existing SigV4 / multipart-boundary / b64-image # normalizations already in this module, and means the already-bloated # cassettes start replaying immediately without a flush + re-record. -_VCR_UUID_RE = re.compile( - rb"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" -) +_VCR_UUID_RE = re.compile(rb"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}") _VCR_LITELLM_BATCH_JOB_RE = re.compile(rb"litellm-batch-[0-9a-fA-F]{8}") # ISO-8601 timestamps, e.g. ``2026-05-25T03:40:37.262045Z`` / # ``2026-05-25T03:40:37+00:00``. -_VCR_ISO_TS_RE = re.compile( - rb"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?" -) +_VCR_ISO_TS_RE = re.compile(rb"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?") # Unix epoch as 13-digit milliseconds, then 10-digit ``time.time()`` float, # then 10-digit integer seconds. Anchored to ``1`` + 9/12 digits, which keeps # them inside the 2001-2033 / 2001-2033 epoch windows and avoids matching @@ -639,10 +624,7 @@ def _should_drop_telemetry_record(request) -> bool: return False if not _is_telemetry_request(request): return False - if ( - _is_telemetry_export_request(request) - and not _current_test_replays_telemetry_export() - ): + if _is_telemetry_export_request(request) and not _current_test_replays_telemetry_export(): return True return not _current_test_records_telemetry() @@ -767,9 +749,7 @@ def _iter_header_values(headers, name: str): yield value -_AWS_SIGV4_CREDENTIAL_RE = re.compile( - r"AWS4-HMAC-SHA256\s+Credential=([^/\s,]+)/", re.IGNORECASE -) +_AWS_SIGV4_CREDENTIAL_RE = re.compile(r"AWS4-HMAC-SHA256\s+Credential=([^/\s,]+)/", re.IGNORECASE) # Google OAuth2 access tokens always start with ``ya29.`` regardless of how # they were minted (service account, metadata server, impersonation). @@ -891,9 +871,7 @@ def _normalize_multipart_boundary(request) -> None: return try: - headers[content_type_key] = content_type_value.replace( - match.group(0), fixed_param - ) + headers[content_type_key] = content_type_value.replace(match.group(0), fixed_param) except (TypeError, AttributeError): return @@ -985,8 +963,7 @@ def _materialize_iterable_body(request) -> None: uri = getattr(request, "uri", getattr(request, "url", "?")) first_type = type(chunks[0]).__name__ if chunks else "empty" vcr_diag_write_line( - f"[vcr-materialize] FALLBACK: {method} {uri} chunk type " - f"{first_type!r} not coerced to bytes; storing b''" + f"[vcr-materialize] FALLBACK: {method} {uri} chunk type {first_type!r} not coerced to bytes; storing b''" ) out = b"" @@ -1026,9 +1003,7 @@ def _key_fingerprint_matcher(r1, r2) -> None: return def _fp(req): - for value in _iter_header_values( - getattr(req, "headers", None), KEY_FINGERPRINT_HEADER - ): + for value in _iter_header_values(getattr(req, "headers", None), KEY_FINGERPRINT_HEADER): if value is None: continue return value if isinstance(value, str) else str(value) @@ -1159,13 +1134,11 @@ def _print_atexit_banner() -> None: _emit("VCR CASSETTE CACHE DEGRADED") if save_failures: _emit( - f" {save_failures} cassette save failure(s); last error: " - f"{health.get('save_failure_last_error', '')}" + f" {save_failures} cassette save failure(s); last error: {health.get('save_failure_last_error', '')}" ) if load_failures: _emit( - f" {load_failures} cassette load failure(s); last error: " - f"{health.get('load_failure_last_error', '')}" + f" {load_failures} cassette load failure(s); last error: {health.get('load_failure_last_error', '')}" ) if snapshot: _emit(_format_capacity_line(snapshot)) @@ -1276,11 +1249,7 @@ class _RespxUsageVisitor(ast.NodeVisitor): if isinstance(dec, ast.Call): dec = dec.func if isinstance(dec, ast.Attribute): - return ( - isinstance(dec.value, ast.Name) - and dec.value.id == "respx" - and dec.attr == "mock" - ) + return isinstance(dec.value, ast.Name) and dec.value.id == "respx" and dec.attr == "mock" return False def _is_pytest_mark_respx(self, dec: ast.expr) -> bool: @@ -1307,9 +1276,7 @@ class _RespxUsageVisitor(ast.NodeVisitor): # ``def test_foo(respx_mock): ...`` — pytest supplies the fixture # whenever the parameter name appears, regardless of marker. all_args = ( - list(args.args) - + list(args.kwonlyargs) - + (list(args.posonlyargs) if hasattr(args, "posonlyargs") else []) + list(args.args) + list(args.kwonlyargs) + (list(args.posonlyargs) if hasattr(args, "posonlyargs") else []) ) for a in all_args: if a.arg == "respx_mock": @@ -1566,9 +1533,7 @@ def _emit_outcome_payload( }, ) ) - node.user_properties.append( - (_USER_PROP_RECORDED_BY, os.environ.get("PYTEST_XDIST_WORKER", "")) - ) + node.user_properties.append((_USER_PROP_RECORDED_BY, os.environ.get("PYTEST_XDIST_WORKER", ""))) def aggregate_report_outcome(report) -> None: @@ -1616,9 +1581,7 @@ def aggregate_report_outcome(report) -> None: if verdict == VERDICT_MISS_OVERFLOW: _session_stats["overflow_tests"].append(nodeid) elif verdict == VERDICT_UNMARKED_LIVE_CALL: - _session_stats["unmarked_live_call_tests"].append( - (nodeid, list(outcome.get("live_call_hosts") or [])) - ) + _session_stats["unmarked_live_call_tests"].append((nodeid, list(outcome.get("live_call_hosts") or []))) skip_reason = outcome.get("skip_reason") if skip_reason: @@ -1635,9 +1598,7 @@ def session_stats_snapshot() -> dict: "overflow_tests": list(_session_stats["overflow_tests"]), "unmarked_live_call_tests": list(_session_stats["unmarked_live_call_tests"]), "skip_reason_counts": dict(_session_stats["skip_reason_counts"]), - "skip_reason_examples": { - k: list(v) for k, v in _session_stats["skip_reason_examples"].items() - }, + "skip_reason_examples": {k: list(v) for k, v in _session_stats["skip_reason_examples"].items()}, } @@ -1810,9 +1771,7 @@ def record_vcr_outcome(request, vcr) -> None: # Cassette is None ⇒ test wasn't VCR-marked. Honor the skip reason # we tagged at collection time, and pull live-call hosts captured by # the socket probe (if any). - skip_reason = getattr( - request.node, VCR_SKIP_REASON_USER_ATTR, SKIP_REASON_FILE_OPT_OUT - ) + skip_reason = getattr(request.node, VCR_SKIP_REASON_USER_ATTR, SKIP_REASON_FILE_OPT_OUT) _session_stats["skip_reason_counts"][skip_reason] += 1 hosts = getattr(request.node, _LIVE_CALL_BUFFER_KEY, []) or [] @@ -1837,9 +1796,7 @@ def record_vcr_outcome(request, vcr) -> None: live_call_hosts=hosts, ) if vcr_outcome_logging_enabled(): - request.node.user_properties.append( - (_USER_PROP_VERDICT_LINE, _format_verdict_line(verdict, None, extra)) - ) + request.node.user_properties.append((_USER_PROP_VERDICT_LINE, _format_verdict_line(verdict, None, extra))) def install_live_call_probe(request, vcr) -> None: @@ -1858,9 +1815,7 @@ def install_live_call_probe(request, vcr) -> None: # Track the current test for telemetry-leak suppression (applies to every # test, VCR-marked or not). See ``_should_drop_telemetry_record``. global _current_test_nodeid - _current_test_nodeid = str( - getattr(getattr(request, "node", None), "nodeid", "") or "" - ) + _current_test_nodeid = str(getattr(getattr(request, "node", None), "nodeid", "") or "") if vcr is not None or vcr_disabled(): return None probe = _LiveCallProbe() @@ -1876,10 +1831,7 @@ def _format_capacity_line(snapshot: dict) -> str: pct = float(snapshot.get("used_pct", 0.0) or 0.0) used_mb = used / (1024 * 1024) cap_mb = cap / (1024 * 1024) - return ( - f" Cassette Redis usage: {used_mb:.1f} MiB / {cap_mb:.1f} MiB " - f"({pct:.1f}% of maxmemory)" - ) + return f" Cassette Redis usage: {used_mb:.1f} MiB / {cap_mb:.1f} MiB ({pct:.1f}% of maxmemory)" def emit_vcr_classification_summary(terminalreporter) -> None: @@ -1940,14 +1892,10 @@ def emit_vcr_classification_summary(terminalreporter) -> None: total_leaks = sum(leak_counts.values()) terminalreporter.write_sep("-", "VCR COST LEAK CHECK", bold=True) if total_leaks: - rendered = ", ".join( - f"{verdict}={count}" for verdict, count in leak_counts.items() if count - ) + rendered = ", ".join(f"{verdict}={count}" for verdict, count in leak_counts.items() if count) terminalreporter.write_line(f" FAIL: {rendered}") else: - terminalreporter.write_line( - " PASS: no overflow, partial, not-persisted, or unmarked live-call verdicts" - ) + terminalreporter.write_line(" PASS: no overflow, partial, not-persisted, or unmarked live-call verdicts") overflow = snapshot["overflow_tests"] if overflow: @@ -2007,18 +1955,14 @@ def emit_cassette_cache_session_banner(terminalreporter) -> None: snapshot = cassette_cache_capacity_snapshot() if save_failures or load_failures: - terminalreporter.write_sep( - "=", "VCR CASSETTE CACHE DEGRADED", red=True, bold=True - ) + terminalreporter.write_sep("=", "VCR CASSETTE CACHE DEGRADED", red=True, bold=True) if save_failures: terminalreporter.write_line( - f" {save_failures} cassette save failure(s); last error: " - f"{health.get('save_failure_last_error', '')}" + f" {save_failures} cassette save failure(s); last error: {health.get('save_failure_last_error', '')}" ) if load_failures: terminalreporter.write_line( - f" {load_failures} cassette load failure(s); last error: " - f"{health.get('load_failure_last_error', '')}" + f" {load_failures} cassette load failure(s); last error: {health.get('load_failure_last_error', '')}" ) terminalreporter.write_line( " Tests still passed because cassette persistence is best-effort, " @@ -2031,9 +1975,7 @@ def emit_cassette_cache_session_banner(terminalreporter) -> None: return if snapshot and snapshot["used_pct"] >= CASSETTE_CACHE_HIGH_WATER_FRACTION * 100: - terminalreporter.write_sep( - "=", "VCR CASSETTE CACHE NEAR CAPACITY", yellow=True, bold=True - ) + terminalreporter.write_sep("=", "VCR CASSETTE CACHE NEAR CAPACITY", yellow=True, bold=True) terminalreporter.write_line(_format_capacity_line(snapshot)) terminalreporter.write_line( " No save failures yet, but Redis is approaching maxmemory. " @@ -2082,13 +2024,104 @@ class VerboseReporterState: if reporter is None: return verdict = next( - ( - v - for k, v in (report.user_properties or []) - if k == _USER_PROP_VERDICT_LINE - ), + (v for k, v in (report.user_properties or []) if k == _USER_PROP_VERDICT_LINE), None, ) if not verdict: return reporter.write_line(f"{verdict} :: {report.nodeid}") + + +@dataclass(frozen=True, slots=True) +class VcrPatchPoint: + owner: object + attribute: str + original: object + + @property + def name(self) -> str: + return f"{_patch_owner_name(self.owner)}.{self.attribute}" + + def current(self) -> object: + current: Final[object] = getattr(self.owner, self.attribute) + return current + + def is_patched(self) -> bool: + return self.current() is not self.original + + def restore(self) -> None: + setattr(self.owner, self.attribute, self.original) + + +def _patch_owner_name(owner: object) -> str: + if inspect.isclass(owner): + return f"{owner.__module__}.{owner.__qualname__}" + if inspect.ismodule(owner): + return owner.__name__ + return repr(owner) + + +def _vcr_patch_point(patcher: mock._patch[object]) -> VcrPatchPoint: + owner: Final[object] = patcher.getter() + return VcrPatchPoint(owner=owner, attribute=patcher.attribute, original=patcher.new) + + +_VCR_PATCH_POINTS: Final = ( + *(_vcr_patch_point(patcher) for patcher in _vcr_patch.reset_patchers()), + VcrPatchPoint(aiohttp.ClientSession, "_request", _vcr_patch._AiohttpClientSessionRequest), +) + + +@dataclass(frozen=True, slots=True) +class VcrPatchLeak: + patch_points: tuple[str, ...] + cassette_paths: tuple[str, ...] + + +def _cassette_paths_wrapped_into(fn: object) -> tuple[str, ...]: + if not inspect.isfunction(fn): + return () + cassette: Final = inspect.getclosurevars(fn).nonlocals.get("cassette") + own: Final = (str(cassette._path),) if isinstance(cassette, vcr.cassette.Cassette) else () + return own + _cassette_paths_wrapped_into(getattr(fn, "__wrapped__", None)) + + +def detect_vcr_patch_leak() -> VcrPatchLeak | None: + leaked: Final = tuple(point for point in _VCR_PATCH_POINTS if point.is_patched()) + if not leaked: + return None + return VcrPatchLeak( + patch_points=tuple(point.name for point in leaked), + cassette_paths=tuple( + dict.fromkeys(path for point in leaked for path in _cassette_paths_wrapped_into(point.current())) + ), + ) + + +def restore_vcr_patch_points() -> None: + for point in _VCR_PATCH_POINTS: + point.restore() + + +def guard_vcr_patch_points(item: pytest.Item, teardown_failed: bool) -> None: + leak: Final = detect_vcr_patch_leak() + if leak is None: + return + restore_vcr_patch_points() + if teardown_failed: + return + pytest.fail( + f"{item.nodeid} finished with a vcrpy cassette still patched into " + f"{', '.join(leak.patch_points)} (cassettes: {', '.join(leak.cassette_paths) or 'unknown'}); " + "the originals were restored so later tests are unaffected", + pytrace=False, + ) + + +@contextmanager +def rewound_new_episodes_cassette(cassette_dir: Path) -> Iterator[vcr.cassette.Cassette]: + cassette_path: Final = cassette_dir / "rewound_owner.yaml" + cassette_path.write_text("interactions: []\nversion: 1\n") + recorder: Final = vcr.VCR(cassette_library_dir=str(cassette_dir)) + with recorder.use_cassette(cassette_path.name, record_mode="new_episodes") as cassette: + yield cassette diff --git a/tests/capturing_transport.py b/tests/capturing_transport.py new file mode 100644 index 00000000000..496c286685c --- /dev/null +++ b/tests/capturing_transport.py @@ -0,0 +1,25 @@ +from __future__ import annotations + +from collections.abc import Mapping +from typing import Final + +import httpx +from pydantic import BaseModel, TypeAdapter + +_JSON_OBJECT: Final = TypeAdapter(Mapping[str, object]) + + +class CapturingTransport(httpx.AsyncBaseTransport, httpx.BaseTransport): + def __init__(self, response: BaseModel) -> None: + self._response: Final = response + self.request_bodies: tuple[Mapping[str, object], ...] = () + + def handle_request(self, request: httpx.Request) -> httpx.Response: + return self._respond(request.read()) + + async def handle_async_request(self, request: httpx.Request) -> httpx.Response: + return self._respond(await request.aread()) + + def _respond(self, body: bytes) -> httpx.Response: + self.request_bodies = (*self.request_bodies, _JSON_OBJECT.validate_json(body)) + return httpx.Response(200, json=self._response.model_dump(mode="json")) diff --git a/tests/code_coverage_tests/recursive_detector.py b/tests/code_coverage_tests/recursive_detector.py index b77348b5d73..dc1f8592612 100644 --- a/tests/code_coverage_tests/recursive_detector.py +++ b/tests/code_coverage_tests/recursive_detector.py @@ -69,6 +69,9 @@ IGNORE_FUNCTIONS = [ "_unqualified", # bounded by the qualifier depth of a static TypedDict annotation (Annotated, Required/NotRequired, ReadOnly around one type, no cycles possible). "_render_json", # bounded by the nesting depth of a pydantic-validated JsonValue from the operator's config (a finite JSON tree, no cycles possible). "completion_cost", # max depth 1: recursion only fires for mixed-tier Responses WS logging objects, and each split part carries a single service_tier so _split_responses_ws_logging_object_by_service_tier returns None. + "_string_leaves", # bounded by the nesting depth of a safe_json_structure output (a finite JSON tree, no cycles possible). + "_replace_string_leaves", # bounded by the nesting depth of a safe_json_structure output (a finite JSON tree, no cycles possible). + "_sort_processed_sets", # bounded by the nesting depth of the log-record extra it walks (a finite JSON tree, no cycles possible). ] diff --git a/tests/e2e/AGENTS.md b/tests/e2e/AGENTS.md index b00b7dfac95..94035cfe849 100644 --- a/tests/e2e/AGENTS.md +++ b/tests/e2e/AGENTS.md @@ -43,9 +43,10 @@ Each subdirectory under `tests/e2e/` is one suite, scoped to an endpoint family - `mcp/` - the MCP server surface over api_key auth against the real Datadog remote MCP server (see "MCP suite: real Datadog only" below); plus the gateway-managed OAuth (authorization_code) path exercised through `/chat/completions` in `test_mcp_chat_completion_oauth_e2e.py` and direct MCP protocol operations in `test_mcp_oauth_happy_path_e2e.py`, the one behavior Datadog's static-header auth cannot reach, seeding the per-user upstream token via the interactive authorize dance driven with the mcp SDK's own OAuth client (headless-browser consent from a saved session) and asserting the completion or protocol call lists and executes the server's tools with the stored per-user token - `logging/` - logging-integration delivery (datadog and friends) - `security/` - secret handling and log-leak protection -- `router/` - routing and reliability behavior (fallbacks, cooldowns) plus the memory regression test (`test_reliability_memory_e2e.py`: a few hundred failing requests with retries and fallbacks must not grow proxy RSS past a fixed budget nor store a request snapshot past a fixed size, the release-gate check for the v1.100.0 retry-breadcrumb leak) +- `router/` - routing and reliability behavior (fallbacks, cooldowns) plus the memory tests (`test_reliability_memory_e2e.py`: every worker's RSS as read at collection time, before any test traffic, must sit under a fixed idle budget, the release-gate check for a DB-backed boot that idles near the pod limit the way v1.100.x did; and a few hundred failing requests with retries and fallbacks must not grow proxy RSS past a fixed budget nor store a request snapshot past a fixed size, the release-gate check for the v1.100.0 retry-breadcrumb leak) - `load/` - performance-category tests, kept OUT of the main suite: throughput/load SLO tests are a different testing category from functional e2e (variance-driven, historically flaky) and live outside this suite until re-implemented as their own pipeline (LIT-5163); do not add a live load test that runs in the default collection. What lives here: the weekly session-anomaly test (`test_weekly_session_anomaly_e2e.py`, Claude Code-shaped multi-turn sessions against real providers with ceilings on error rate, cache read/write, turn time, and spend; marked `weekly` and deselected unless `E2E_WEEKLY_ANOMALY` is set, driven by `.github/workflows/weekly_load_anomaly.yml`), the Redis chaos test (`test_redis_chaos_e2e.py`, locust load against mock deployments split round robin over `/chat/completions` and `/v1/messages`, one endpoint per simulated user, with `CLIENT PAUSE ALL` on the proxy's Redis mid-run to simulate it being down outright, asserting zero failed requests on every endpoint, budgeting RSS and CPU-per-request as ratios against the same run's healthy phase, and holding p50/p90/p99 latency and log-bytes-per-request to flat ceilings (a ratio cannot bound those two: an open breaker skips Redis instead of waiting on it, so the chaos phase can measure cheaper than baseline while still being far slower than a user should see); needs a proxy booted from `gateway/redis_chaos_ci_config.yml` on the same host with `E2E_PROXY_PID` and `E2E_PROXY_LOG` set, marked `redis_chaos`, deselected unless `E2E_REDIS_CHAOS` is set and excluded from the per-PR selector like the rest of `load/`, driven by `.github/workflows/test-e2e-redis-chaos.yml` and by the Buildkite `e2e-redis-chaos` step in project-releaser, which runs the proxy, Postgres and Valkey co-located with pytest in one pod and sets the opt-in), and markerless harness unit tests for the locust, process-usage, and session-anomaly aggregation logic - `other/` - the holding-pen suite for the `other.*` registry cluster with no home of its own yet: the master-key auth gate, JWT auth (access tokens issued by a real Keycloak realm, `idp.py` plus `idp_realm.json`, whose JWKS the proxy's `JWT_PUBLIC_KEY_URL` points at; see CONTRIBUTING.md for the start command and config block), and the process-lifecycle health probes (liveness, public readiness, authenticated readiness diagnostics). Promote a cluster out once it is large/stable enough for its own suite +- `secret_manager/` - the gateway's `key_management_system` against a real secret manager: deployment keys resolved from it (`os.environ/` where the name exists only in the manager) and virtual keys written to and deleted from it. The tests are backend-agnostic and each backend is its own lane, because the setting is global to the proxy: `E2E_SECRET_MANAGER=` opts in and picks the backend from `secret_backends.BACKENDS`, the proxy is booted from `gateway/secret_manager__ci_config.yml` against the live manager, and the tests reach that manager through the backend's `SecretStore` (`secret_store_.py`). A test needing something not every backend does carries `requires_capability(...)` and is deselected on lanes that lack it. `secret_manager/backend.sh up ` runs a backend in Docker and writes the proxy's and the tests' env. Marked `secret_manager`, deselected unless `E2E_SECRET_MANAGER` is set, and kept out of the per-PR selector. Backends today: `hashicorp_vault` and `cyberark` (CyberArk Conjur, which cannot delete, so the delete test is Vault-only) - `gateway/` - proxy configuration only (`litellm-config.yml`); no tests - `claude_code/` - the Claude Code compatibility matrix: drives the real `claude` CLI (and HTTP probes) against a proxy for each feature x provider cell, reporting tagged-union outcomes via the `compat_result` fixture; ships its own driver/builder/publisher plus `_*_unit_tests/` trees. The HTTP probes ride the shared transport (`ProxyClient.count_tokens` / `ProxyClient.messages`); the CLI-driving path stays bespoke - `ui/` - the Admin UI browser suite: Playwright in TypeScript, driving the dashboard served by a live proxy on port 4000 (seeded postgres + mock LLM upstream; see its `run_e2e.sh`). It is a self-contained npm package with its own lockfile and does not use the Python harness, pytest markers, or the shared transport; the Python rules in this file (typed models, `Result` unions, basedpyright zero-error gate) do not apply inside it. Its only Python file, `fixtures/mock_llm_server/server.py`, is excluded from the e2e basedpyright gate via the root `pyrightconfig.json` @@ -97,7 +98,7 @@ Each suite provides its own `client` fixture (see `llm_translation/passthrough_c Request and response bodies are typed pydantic models in `models.py`; only the fields a test reads are modelled, and nothing passes raw dicts. Outcomes come back as a `Result[R]` tagged union (`Success`, `NetworkError`, `UnauthorizedError`, `RateLimitedError`, `ValidationError`, `UnknownApiError`). Handle them with `match`, or call `unwrap(...)` when a non-success should fail the test. The harness hard-fails and never skips: a test marked `e2e` fails when no proxy answers its liveness probe, and once a request reaches the proxy any wrong behavior is likewise a hard failure, so a missing proxy turns the run red instead of being mistaken for a pass -Mark live tests with `@pytest.mark.e2e` (on the class or the module). Use `scoped_key` for a fresh all-models key that auto-deletes, `resources` when you need to create and tear down more than a key, and `unique_marker()` from `e2e_config` to keep prompts, tags, and customer ids from colliding across concurrent runs and the shared response cache +Mark live tests with `@pytest.mark.e2e` (on the class or the module). Add `@pytest.mark.quiet_stack` to a test that measures the proxy itself (RSS, latency): the shared stack lock in `stack_lock.py` then runs it while no other test on the host is hitting the stack, marked or not, so the reading depends only on the test's own traffic. Use `scoped_key` for a fresh all-models key that auto-deletes, `resources` when you need to create and tear down more than a key, and `unique_marker()` from `e2e_config` to keep prompts, tags, and customer ids from colliding across concurrent runs and the shared response cache ## Record and replay fixtures @@ -191,7 +192,7 @@ reliability... behavior : fallback | retry | cooldown | timeout | routing | cache | circuit_breaker | perf variant : 5xx | context_window | content_policy | 429 | timeout simple_shuffle | usage_based | latency_based | cost_based | least_busy - latency | throughput | session_anomaly | memory (perf only; SLO/threshold assertion, not binary) + latency | throughput | session_anomaly | memory | idle_memory (perf only; SLO/threshold assertion, not binary) assertion : routes_to_fallback | succeeds_within_retries | picks_under_tpm | returns_cached | trips_then_recovers | under_slo e.g. reliability.fallback.context_window.routes_to_fallback exercised_on=[chat_completions] @@ -210,14 +211,15 @@ quota_management... chat_completions | stream | messages_bridge | embeddings | cache_hit | key_rollup | concurrent_burst | tags | end_user | per_model | failure | spend_calculate | pagination | key_attribution + | websearch_interception assertion : blocks_over_limit | resets_after_window | headers_report_remaining | picks_under_tpm | blocks_then_resets | resets_windows_independently | alerts_without_blocking | isolates_per_model | isolates_per_member | isolates_per_group | enforced_across_keys | routes_to_fallback | reseed_matches_db | reports_spend | logs_cost | zero_cost | matches_sum_of_logs | loses_no_spend | attributes_spend | writes_own_rows - | writes_failure_row | returns_cost | keeps_total | joins_key | reports_alias_and_email + | writes_failure_row | attributes_provider | returns_cost | keeps_total | joins_key | reports_alias_and_email | health_rows_keep_service_account | retrieve_batch_cost_joins_retrieving_key - | poller_batch_cost_joins_creating_key + | poller_batch_cost_joins_creating_key | bills_under_request_session e.g. quota_management.ratelimit.rpm.blocks_over_limit exercised_on=[chat_completions, messages] quota_management.budget.key.blocks_over_limit exercised_on=[chat_completions] ``` diff --git a/tests/e2e/CONTRIBUTING.md b/tests/e2e/CONTRIBUTING.md index 15c2d6763d6..7e1f516422e 100644 --- a/tests/e2e/CONTRIBUTING.md +++ b/tests/e2e/CONTRIBUTING.md @@ -105,7 +105,7 @@ A couple of logging destinations are configured on the proxy rather than by the ### The pull request check -Every same-repository PR that adds, modifies, or renames a `tests/e2e/**/test_*.py` file runs those changed files three times. A change to the harness itself, meaning a root-level `tests/e2e/*.py` file or `pytest.ini`, `tests/e2e/gateway/`, `.github/e2e-stack/`, or the workflow, also runs the `access_control` suite and both JWT suites as canaries, because those files have no test of their own that exercises the stack. `.github/e2e-stack/select_tests.py` applies both rules. The stack config at `tests/e2e/gateway/stage_mirror_ci_config.yml` must declare every model the selected suites use; a missing one shows up as a failed test id in the public log. The suite's own single rerun for network errors and 5xx responses (see `pytest.ini`) applies on every pass, so a transport blip does not fail the check while a race inside a test still does. The stage-mirror stack has a control-plane backend, two gateways behind nginx, Postgres, Keycloak, Jaeger, and TLS cluster-mode Valkey. Realm-only edits also trigger these canaries. The stack exports every gateway address in `LITELLM_PROXY_REPLICA_URLS`, so model registration waits until each gateway lists the new model rather than whichever one the load balancer answered from. Documentation, deleted-file, and application-only changes do not start the stack or request environment approval. The `ui/`, `claude_code/`, and `load/` directories, `batches/test_managed_files_enforcement_e2e.py`, `llm_translation/realtime/test_realtime_pipecat_audio_e2e.py`, and `guardrails/test_presidio_masking_e2e.py` remain outside this check because they use separate tooling or need a differently configured stack: the pipecat audio suite skips itself at import time unless the NLTK `punkt_tab` data is installed, and the presidio suite fails without the analyzer and anonymizer services this stack does not start. `logging/test_otel_v2_langfuse_generation_output_e2e.py` is marked `otel_v2` and deselects itself unless `E2E_OTEL_V2` is set, because it needs a gateway booted with `LITELLM_OTEL_V2=true` and Langfuse credentials, neither of which this stack provides, so run it with `E2E_OTEL_V2=1` against a local OTel v2 proxy. The Redis chaos test under `load/` needs a proxy it can pause the Redis of on the same host (`gateway/redis_chaos_ci_config.yml`), which `.github/workflows/test-e2e-redis-chaos.yml` boots, and which the Buildkite `e2e-redis-chaos` step in project-releaser runs co-located with Postgres and Valkey in one pod; it is deselected unless `E2E_REDIS_CHAOS` is set +Every same-repository PR that adds, modifies, or renames a `tests/e2e/**/test_*.py` file runs those changed files three times. A change to the harness itself, meaning a root-level `tests/e2e/*.py` file or `pytest.ini`, `tests/e2e/gateway/`, `.github/e2e-stack/`, or the workflow, also runs the `access_control` suite and both JWT suites as canaries, because those files have no test of their own that exercises the stack. `.github/e2e-stack/select_tests.py` applies both rules. The stack config at `tests/e2e/gateway/stage_mirror_ci_config.yml` must declare every model the selected suites use; a missing one shows up as a failed test id in the public log. The suite's own single rerun for network errors and 5xx responses (see `pytest.ini`) applies on every pass, so a transport blip does not fail the check while a race inside a test still does. The stage-mirror stack has a control-plane backend, two gateways behind nginx, Postgres, Keycloak, Jaeger, and TLS cluster-mode Valkey. Realm-only edits also trigger these canaries. The stack exports every gateway address in `LITELLM_PROXY_REPLICA_URLS`, so model registration waits until each gateway lists the new model rather than whichever one the load balancer answered from. Documentation, deleted-file, and application-only changes do not start the stack or request environment approval. The `ui/`, `claude_code/`, `load/`, and `secret_manager/` directories, `batches/test_managed_files_enforcement_e2e.py`, `llm_translation/realtime/test_realtime_pipecat_audio_e2e.py`, and `guardrails/test_presidio_masking_e2e.py` remain outside this check because they use separate tooling or need a differently configured stack: the pipecat audio suite skips itself at import time unless the NLTK `punkt_tab` data is installed, and the presidio suite fails without the analyzer and anonymizer services this stack does not start. `logging/test_otel_v2_langfuse_generation_output_e2e.py` is marked `otel_v2` and deselects itself unless `E2E_OTEL_V2` is set, because it needs a gateway booted with `LITELLM_OTEL_V2=true` and Langfuse credentials, neither of which this stack provides, so run it with `E2E_OTEL_V2=1` against a local OTel v2 proxy. The Redis chaos test under `load/` needs a proxy it can pause the Redis of on the same host (`gateway/redis_chaos_ci_config.yml`), which `.github/workflows/test-e2e-redis-chaos.yml` boots, and which the Buildkite `e2e-redis-chaos` step in project-releaser runs co-located with Postgres and Valkey in one pod; it is deselected unless `E2E_REDIS_CHAOS` is set. The `secret_manager/` lanes each need a proxy configured against their own secret manager (see Secret manager lanes below) Every selected file must execute at least one passing test in each pass, and any test failure, collection error, or entirely skipped or deselected file fails the check. A file whose tests are all marked skip therefore cannot pass this check, so unskip at least one of them, or add the file to `UNSUPPORTED` in `select_tests.py` with the reason, before changing one. A failed pass stops the run. The public log prints pytest's one-line summary for each pass, including the rerun count, and names each failed or errored test as `classname::name`, so a retried network error or a failing test is visible without the raw output. The final `e2e-changed-tests` job succeeds only when no supported test files changed or the approved run completed all three passes. Fork PRs with selected tests fail this gate until a maintainer brings the reviewed change onto a same-repository branch @@ -117,6 +117,31 @@ Fetched values of eight characters or more are masked before use, while shorter To reproduce the CI topology on a dedicated machine, `bash .github/e2e-stack/up.sh` reads `tests/e2e/.env`, writes `stack.env` under `${E2E_STACK_DIR:-/tmp/litellm-e2e-stack}`, and `bash .github/e2e-stack/down.sh` stops it. Keep this directory private and remove its credential files and logs after use +### Secret manager lanes + +`key_management_system` is global to the proxy, so the `secret_manager/` tests run once per backend, each against its own proxy. The backends are `hashicorp_vault` and `cyberark` (CyberArk Conjur). `E2E_SECRET_MANAGER` opts in and names the backend (a key of `secret_backends.BACKENDS`). The proxy boots from `gateway/secret_manager__ci_config.yml`, and the tests reach the same manager through that backend's `SecretStore`. The managers are enterprise features, so the proxy needs a license. `secret_manager/backend.sh` runs any backend in Docker and writes its env, so every lane runs the same way locally: + +```bash +bash tests/e2e/secret_manager/backend.sh up cyberark +(set -a; . ~/.cache/litellm-e2e-secret-manager/cyberark/proxy.env; set +a; env -u OPENAI_API_KEY LITELLM_LICENSE=... \ + LITELLM_MASTER_KEY=sk-1234 DATABASE_URL=... uv run litellm --config tests/e2e/gateway/secret_manager_cyberark_ci_config.yml --port 4000) +(set -a; . ~/.cache/litellm-e2e-secret-manager/cyberark/tests.env; set +a; OPENAI_API_KEY=... \ + uv run --group e2e-dev pytest tests/e2e/secret_manager/ -v) +bash tests/e2e/secret_manager/backend.sh down cyberark +``` + +`E2E_SECRET_MANAGER_PORT` moves the manager off its usual port (8200 for Vault, 8080 for Conjur), and `E2E_SECRET_MANAGER_DIR` moves the env files. Keep that directory private, because both files hold a working admin credential. Keep `OPENAI_API_KEY` out of the proxy's environment. The tests copy the runner's key into the manager under a fresh name per test, so a passing call proves the key came through the manager rather than the `os.environ` fallback `get_secret` takes when the manager errors + +A backend declares what it supports in its `SecretBackend.capabilities`, and a test that needs something not every backend does carries `@pytest.mark.requires_capability(...)`, so it is deselected, not failed or skipped, on the lanes that lack it. CyberArk has no `deletes_stored_keys`, because the proxy's delete answers `not_supported` and Conjur keeps the key, so the delete test runs only on the Vault lane + +To add a backend, leave the tests and markers alone and add: + +1. `secret_manager/secret_store_.py`: a `SecretStore` (`write`, `read` returning None when absent, idempotent `destroy`) over the manager's own API through `e2e_http`'s external helpers, read from `E2E__*` env vars, and a `SecretBackend` whose `system` is the litellm `KeyManagementSystem` value and whose `capabilities` lists what it supports +2. its entry in `secret_backends.BACKENDS` +3. `gateway/secret_manager__ci_config.yml`, a copy of an existing lane's with only `key_management_system` changed +4. an `up_` function in `secret_manager/backend.sh` that starts the manager and writes `proxy.env` and `tests.env` +5. a CI step that runs `backend.sh up ` (or the same containers as sidecars), boots the proxy with `proxy.env` and a license, and runs pytest with `tests.env` + ### Record and replay Record/replay scopes to the proxy's provider-bound traffic only. In `E2E_FIXTURE_MODE=record` the harness boots a local provider-edge server, edge-wired tests register their deployments with an `api_base` pointing at it, and every provider call the proxy makes is forwarded verbatim and written to a fixture bundle (default `tests/e2e/.fixtures`, override with `E2E_FIXTURE_DIR`). `E2E_FIXTURE_MODE=replay` runs the same tests against the same live proxy and database, but the edge answers the proxy's provider calls from the bundle instead of the provider, so the run makes zero provider calls and spends nothing while key auth, routing, cost calculation, and spend-log writes all still execute for real. Unset (or `live`) behaves exactly as before the knob existed. Both record and replay need the proxy up; only the provider is taken out of the loop diff --git a/tests/e2e/batches/COVERAGE.md b/tests/e2e/batches/COVERAGE.md index 1731b4c620d..862eef5c0f4 100644 --- a/tests/e2e/batches/COVERAGE.md +++ b/tests/e2e/batches/COVERAGE.md @@ -22,6 +22,7 @@ failures are hard test failures (see `tests/e2e/AGENTS.md`). | Bedrock | yes (unified only) | yes | yes | yes (unfiltered managed list) | yes (provider-transformed) | S3 (`s3_bucket_name` + `aws_*` + `AWS_BATCH_ROLE_ARN` on model) | | Bedrock GovCloud (`us-gov-west-1`) | yes (unified only) | yes | no | no | yes (provider-transformed) | S3 (`s3_bucket_name` + `aws_*` on model, resolved from `AWS_GOVCLOUD_ACCESS_KEY_ID` / `AWS_GOVCLOUD_SECRET_ACCESS_KEY` / `AWS_GOVCLOUD_BATCH_S3_BUCKET` / `AWS_GOVCLOUD_BATCH_ROLE_ARN`) | | Bedrock split S3 identity | no | no | no | no | yes (file upload, content, delete) | S3 signed with `s3_access_key_id` / `s3_secret_access_key` (`AWS_S3_ONLY_ACCESS_KEY_ID` / `AWS_S3_ONLY_SECRET_ACCESS_KEY`, object rights on `AWS_BATCH_S3_BUCKET` only) while `aws_*` is `AWS_BEDROCK_ONLY_ACCESS_KEY_ID` / `AWS_BEDROCK_ONLY_SECRET_ACCESS_KEY`, an identity with no S3 rights on that bucket | +| Bedrock blank S3 env | yes (unified only, on an owned gateway exporting `AWS_S3_ENCRYPTION_KEY_ID` / `AWS_S3_BUCKET_OWNER` as empty strings) | no | no | no | no | S3 (`s3_bucket_name` + `aws_*` + `AWS_BATCH_ROLE_ARN` in the gateway config); blank env vars must be treated as unset, not serialized | Bedrock cancel maps to `StopModelInvocationJob` and comes back `cancelling`; the lifecycle asserts it the same way it does for OpenAI (`_CANCEL_ASSERTED_PROVIDERS`). diff --git a/tests/e2e/batches/bedrock_env_gateway.py b/tests/e2e/batches/bedrock_env_gateway.py new file mode 100644 index 00000000000..fb3ec60c87c --- /dev/null +++ b/tests/e2e/batches/bedrock_env_gateway.py @@ -0,0 +1,145 @@ +"""An owned, source-built proxy whose process env exports AWS_S3_* vars blank. + +The shared fixture proxy inherits the harness env, which cannot reproduce a user +shell that exports AWS_S3_ENCRYPTION_KEY_ID / AWS_S3_BUCKET_OWNER as empty +strings. This gateway boots a second proxy with both vars present but blank, so +a batch create through it proves blank means unset, not an empty string. +""" + +from __future__ import annotations + +import os +import shutil +import socket +import subprocess +import sys +import tempfile +import time +from collections.abc import Mapping +from dataclasses import dataclass, field +from pathlib import Path +from typing import Final + +from e2e_config import unique_marker +from e2e_http import NoBody +from idp import stop_process_group +from proxy_client import ProxyClient, build_proxy_client +from pydantic import TypeAdapter + +STARTUP_TIMEOUT_SECONDS: Final = 240 +LOG_TAIL_BYTES: Final = 4000 +REPO_ROOT: Final = Path(__file__).resolve().parents[3] + +_CONFIG_YAML: Final = """model_list: + - model_name: bedrock-blank-s3-batch + litellm_params: + model: bedrock/us.anthropic.claude-haiku-4-5-20251001-v1:0 + aws_access_key_id: os.environ/AWS_ACCESS_KEY_ID + aws_secret_access_key: os.environ/AWS_SECRET_ACCESS_KEY + aws_region_name: os.environ/AWS_REGION + s3_region_name: os.environ/AWS_REGION + s3_bucket_name: os.environ/AWS_BATCH_S3_BUCKET + s3_access_key_id: os.environ/AWS_ACCESS_KEY_ID + s3_secret_access_key: os.environ/AWS_SECRET_ACCESS_KEY + aws_batch_role_arn: os.environ/AWS_BATCH_ROLE_ARN + +general_settings: + master_key: os.environ/LITELLM_MASTER_KEY + database_url: os.environ/DATABASE_URL +""" + + +def available_port() -> int: + with socket.socket() as listener: + listener.bind(("127.0.0.1", 0)) + return TypeAdapter(tuple[str, int]).validate_python(listener.getsockname())[1] + + +@dataclass(slots=True) +class BedrockEnvGateway: + base_url: str + master_key: str + proxy: ProxyClient + _environment: Mapping[str, str] = field(repr=False) + _command: tuple[str, ...] = field(repr=False) + _log_path: Path + _child: subprocess.Popen[bytes] | None = field(default=None, init=False, repr=False) + + @classmethod + def start(cls) -> BedrockEnvGateway: + assert os.environ.get("DATABASE_URL"), "DATABASE_URL is required for the blank-S3-env gateway" + port: Final = available_port() + base_url: Final = f"http://127.0.0.1:{port}" + master_key: Final = f"sk-e2e-blank-s3-{unique_marker()}" + directory: Final = Path(tempfile.mkdtemp(prefix="litellm-e2e-blank-s3-")) + config: Final = directory / "blank-s3-gateway.yaml" + config.write_text(_CONFIG_YAML) + environment: Final = { + **{key: value for key, value in os.environ.items() if not key.startswith("REDIS_")}, + "DATABASE_URL": os.environ["DATABASE_URL"], + "LITELLM_MASTER_KEY": master_key, + "STORE_MODEL_IN_DB": "False", + "PYTHONPATH": str(REPO_ROOT), + "AWS_S3_ENCRYPTION_KEY_ID": "", + "AWS_S3_BUCKET_OWNER": "", + } + gateway: Final = cls( + base_url=base_url, + master_key=master_key, + proxy=build_proxy_client( + base_url=base_url, + control_plane_base_url=base_url, + replica_urls=(base_url,), + master_key=master_key, + ), + _environment=environment, + _command=( + sys.executable, + "-m", + "litellm.proxy.proxy_cli", + "--config", + str(config), + "--port", + str(port), + "--host", + "127.0.0.1", + ), + _log_path=directory / "blank-s3-gateway.log", + ) + with gateway._log_path.open("ab") as log: + gateway._child = subprocess.Popen( + gateway._command, + env=dict(gateway._environment), + stdout=log, + stderr=log, + start_new_session=True, + cwd=REPO_ROOT, + ) + deadline: Final = time.monotonic() + STARTUP_TIMEOUT_SECONDS + while time.monotonic() < deadline: + assert gateway._child.poll() is None, ( + f"blank-S3-env gateway exited early; log tail:\n{gateway.log_tail()}" + ) + result = gateway.proxy.transport.probe("/health/liveliness", params=NoBody()) + if result.status_code == 200: + return gateway + time.sleep(0.5) + tail: Final = gateway.log_tail() + gateway.stop() + raise AssertionError( + f"blank-S3-env gateway did not become ready in {STARTUP_TIMEOUT_SECONDS}s; log tail:\n{tail}" + ) + + def log_tail(self) -> str: + if not self._log_path.exists(): + return "" + with self._log_path.open("rb") as log: + log.seek(0, 2) + size: Final = log.tell() + log.seek(max(0, size - LOG_TAIL_BYTES)) + return log.read().decode("utf-8", errors="replace") + + def stop(self) -> None: + if self._child is not None: + stop_process_group(self._child) + shutil.rmtree(self._log_path.parent, ignore_errors=True) diff --git a/tests/e2e/batches/test_bedrock_blank_s3_env_e2e.py b/tests/e2e/batches/test_bedrock_blank_s3_env_e2e.py new file mode 100644 index 00000000000..77eb8427e59 --- /dev/null +++ b/tests/e2e/batches/test_bedrock_blank_s3_env_e2e.py @@ -0,0 +1,109 @@ +"""Live e2e pin for Bedrock batch create with blank AWS_S3_* env vars. + +Owns its own file (not test_batches_e2e.py) so the PR changed-file e2e gate +stays a single tiny file: this class boots its own gateway with +AWS_S3_ENCRYPTION_KEY_ID and AWS_S3_BUCKET_OWNER exported empty, then runs the +unified target_model_names upload + batch create lifecycle against real Bedrock. +""" + +from __future__ import annotations + +import json +from typing import Final + +import pytest +from batch_cleanup import cleanup_batch, cleanup_file +from batch_client import BatchClient, BatchCreateBody, BatchObject, FileObject +from bedrock_env_gateway import BedrockEnvGateway +from capabilities import is_managed_id +from e2e_http import FileUploadForm, require_successful_call, unwrap +from lifecycle import ResourceManager +from models import KeyGenerateBody + +pytestmark = pytest.mark.e2e + +CREATED_BATCH_STATUSES = {"validating", "in_progress", "finalizing"} +BLANK_S3_RAW_MODEL: Final = "bedrock/us.anthropic.claude-haiku-4-5-20251001-v1:0" + + +def render_jsonl(model: str) -> bytes: + line = { + "custom_id": "req-1", + "method": "POST", + "url": "/v1/chat/completions", + "body": { + "model": model, + "messages": [{"role": "user", "content": "ping"}], + "max_tokens": 8, + }, + } + return (json.dumps(line) + "\n").encode() + + +def assert_file_object(file: FileObject, *, provider: str) -> None: + assert file.object == "file", f"file.object={file.object!r}" + assert file.purpose == "batch", f"file.purpose={file.purpose!r}" + assert file.bytes is not None, f"file.bytes={file.bytes!r}" + if provider != "bedrock": + assert file.bytes > 0, f"file.bytes={file.bytes!r}" + assert file.status, "file.status missing" + assert file.created_at is not None and file.created_at > 0, "file.created_at missing" + + +def assert_batch_object(batch: BatchObject) -> None: + assert batch.object == "batch", f"batch.object={batch.object!r}" + if batch.endpoint: + assert batch.endpoint == "/v1/chat/completions", f"batch.endpoint={batch.endpoint!r}" + assert batch.completion_window == "24h", f"window={batch.completion_window!r}" + assert batch.input_file_id, "batch.input_file_id missing" + assert batch.created_at is not None and batch.created_at > 0, "batch.created_at missing" + + +class TestBedrockBatchBlankS3EnvVars: + """Bedrock batch create with AWS_S3_* env vars exported but blank. + + Regression: a blank AWS_S3_ENCRYPTION_KEY_ID or AWS_S3_BUCKET_OWNER env var + resolved to "" and was serialized into the create-job request, which Bedrock + rejects. The owned gateway exports both vars empty, so the unified lifecycle + only passes when blank is treated as unset. + """ + + @pytest.mark.covers( + "llm.batches.bedrock.blank_s3_env.nonstream.works", + "llm.files.bedrock.upload.nonstream.works", + exercised_on=["batches", "files"], + ) + def test_unified_batch_create_ignores_blank_s3_env_vars(self, resources: ResourceManager) -> None: + gateway: Final = BedrockEnvGateway.start() + resources.defer(gateway.stop) + client: Final = BatchClient(proxy=gateway.proxy) + + key: Final = client.proxy.generate_key(KeyGenerateBody(models=[], user_id="e2e-test-user")) + resources.defer(lambda: client.proxy.delete_key(key)) + + file: Final = unwrap( + client.upload_file( + content=render_jsonl(BLANK_S3_RAW_MODEL), + form=FileUploadForm(purpose="batch", target_model_names="bedrock-blank-s3-batch"), + key=key, + ) + ) + resources.defer(lambda: cleanup_file(client, file.id, key=key)) + assert_file_object(file, provider="bedrock") + + created: Final = client.create_batch(body=BatchCreateBody(input_file_id=file.id), key=key) + assert created.status_code < 400, ( + f"blank AWS_S3_ENCRYPTION_KEY_ID / AWS_S3_BUCKET_OWNER must be treated as " + f"unset; Bedrock rejected the job: {created.body[:400]}" + ) + require_successful_call(created) + batch: Final = BatchObject.model_validate_json(created.body) + resources.defer(lambda: cleanup_batch(client, batch.id, key=key)) + + assert is_managed_id(batch.id), ( + f"blank-S3-env create via target_model_names must return a managed batch id, got {batch.id!r}" + ) + assert batch.status in CREATED_BATCH_STATUSES, ( + f"blank-S3-env batch has non-transitional status {batch.status!r}" + ) + assert_batch_object(batch) diff --git a/tests/e2e/claude_code/cron_vm/Dockerfile b/tests/e2e/claude_code/cron_vm/Dockerfile new file mode 100644 index 00000000000..623d6b1840a --- /dev/null +++ b/tests/e2e/claude_code/cron_vm/Dockerfile @@ -0,0 +1,41 @@ +FROM debian:bookworm-slim@sha256:3783cc01769c7b2b1b83a5c5ad96c815348e28ed7da68e2e3687004faa906251 + +ARG GH_VERSION=2.101.0 +ARG GH_SHA256=9bca2d1c16825f109907a23307628a2f0698fbf99662b73a5cf0b020293072b8 +ARG UV_VERSION=0.10.9 +ARG UV_SHA256=20d79708222611fa540b5c9ed84f352bcd3937740e51aacc0f8b15b271c57594 +ARG CLAUDE_CODE_VERSION=2.1.228 +ARG CLAUDE_CODE_SHA256=d535985e6941a3eb00179ccd7f52ceb0c6623a0305a518ebc4e6514f84a94c99 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN apt-get update \ + && apt-get install -y --no-install-recommends ca-certificates curl git jq procps iproute2 \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -fsSLo /tmp/gh.tar.gz "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz" \ + && echo "${GH_SHA256} /tmp/gh.tar.gz" | sha256sum -c - \ + && tar -xzf /tmp/gh.tar.gz -C /usr/local/bin --strip-components=2 "gh_${GH_VERSION}_linux_amd64/bin/gh" \ + && rm /tmp/gh.tar.gz + +RUN curl -fsSLo /tmp/uv.tar.gz "https://github.com/astral-sh/uv/releases/download/${UV_VERSION}/uv-x86_64-unknown-linux-gnu.tar.gz" \ + && echo "${UV_SHA256} /tmp/uv.tar.gz" | sha256sum -c - \ + && tar -xzf /tmp/uv.tar.gz -C /usr/local/bin --strip-components=1 uv-x86_64-unknown-linux-gnu/uv \ + && rm /tmp/uv.tar.gz + +RUN curl -fsSLo /tmp/claude "https://downloads.claude.ai/claude-code-releases/${CLAUDE_CODE_VERSION}/linux-x64/claude" \ + && echo "${CLAUDE_CODE_SHA256} /tmp/claude" | sha256sum -c - \ + && install -m 0755 /tmp/claude /usr/local/bin/claude \ + && rm /tmp/claude + +RUN groupadd --gid 1000 populator && useradd --uid 1000 --gid 1000 --create-home populator + +ENV HOME=/home/populator \ + LITELLM_REPO=/opt/litellm \ + DISABLE_AUTOUPDATER=1 + +COPY --chown=populator:populator . /opt/litellm/tests/e2e/ + +USER populator +WORKDIR /home/populator +CMD ["/opt/litellm/tests/e2e/claude_code/cron_vm/run_daily.sh"] diff --git a/tests/e2e/claude_code/cron_vm/README.md b/tests/e2e/claude_code/cron_vm/README.md index f120c30605b..ed2bf4ab436 100644 --- a/tests/e2e/claude_code/cron_vm/README.md +++ b/tests/e2e/claude_code/cron_vm/README.md @@ -1,66 +1,59 @@ -# Cron VM setup for the Claude Code compatibility-matrix populator +# Render cron job for the Claude Code compatibility-matrix populator -The populator runs daily on a dedicated GCP VM -(`litellm-compatibility-matrix-populator`) rather than as a GitHub -Action. Trade-offs: +The populator runs daily as the Render cron job `litellm-compat-matrix` +(Docker runtime, built from the `Dockerfile` in this directory) rather +than as a GitHub Action or on a dedicated VM. Trade-offs: -- ✅ Real VM means we can `gh auth login` against an account that's - already a collaborator on `BerriAI/litellm-docs`, instead of - provisioning a GitHub App with `pull-requests: write`. -- ✅ Persistent state (a single `~/litellm-cron-worktree/` and its `.venv`) - is reused across runs, so each daily run does a fast `git checkout` + - incremental `uv sync` rather than a fresh clone + cold sync. -- ✅ No Docker dependency — the proxy runs directly via `uv run litellm`. -- ⚠️ The VM has to actually be on. systemd's `Persistent=true` recovers - from short outages, but a multi-day outage means the matrix goes - stale until the VM is back. -- ⚠️ Provider credentials live on the VM filesystem - (`/etc/litellm-compat-matrix.env`) instead of GitHub secrets. Treat - the VM as an environment with comparable blast radius to a CI runner. - -This directory used to live at `tests/claude_code/cron_vm/` (paired with -the standalone `tests/claude_code/` suite); it now runs the maintained -`tests/e2e/claude_code/` suite instead. The pytest env interface changed -accordingly: the runner exports `LITELLM_PROXY_URL` / `LITELLM_MASTER_KEY` -(previously `LITELLM_PROXY_BASE_URL` / `LITELLM_PROXY_API_KEY`), the azure -column reads `AZURE_AI_API_KEY` / `AZURE_AI_API_BASE` (previously -`AZURE_FOUNDRY_*`), and the GPT columns need `OPENAI_API_KEY` and -`AZURE_API_BASE` / `AZURE_API_KEY` — see `litellm-compat-matrix.env.example`. +- ✅ No machine to keep on or patch. Render builds the image from this + directory on every push to `main` that touches `tests/e2e/**` and + runs it on the schedule. +- ✅ Credentials live in Render env vars and secret files, scoped to + this one service, instead of on a VM filesystem. +- ✅ The publish token still uses the `mateo-berri` account, which is a + collaborator on `BerriAI/litellm-docs`, so no GitHub App with + `pull-requests: write` has to be provisioned. +- ⚠️ The disk is ephemeral, so every run starts from a fresh (blobless) + clone of litellm plus a cold `uv sync`. That adds a few minutes on + top of the ~10 minute test run; the job's 12 hour ceiling is nowhere + near. +- ⚠️ The Claude Code CLI version under test is pinned in the + `Dockerfile` (`CLAUDE_CODE_VERSION` + its checksum). Bumping it is a + PR, see the gotchas below. ## Layout | File | Purpose | | --- | --- | -| `run_daily.sh` | The actual cron job. Resolves versions, updates the worktree, boots the proxy, runs pytest, builds the JSON, opens (or updates) a docs PR, sweeps stale compat-matrix PRs. | +| `Dockerfile` | The image Render builds: Debian bookworm-slim plus pinned, checksum-verified `gh`, `uv`, and the Claude Code CLI, with this `tests/e2e/` tree copied to `/opt/litellm/tests/e2e/`. Runs as the non-root user `populator` (uid/gid 1000, which is what Render's secret files are readable by). | +| `run_daily.sh` | The actual cron job. Resolves versions, clones the worktree, boots the proxy, runs pytest, builds the JSON, opens (or updates) a docs PR, sweeps stale compat-matrix PRs. | | `build_matrix.py` | Tiny Python CLI that wraps `claude_code.matrix_builder.build_from_paths`. Exists only because the bash script needs *some* way to render the per-cell aggregation, and the builder is already Python. | | `check_regressions.py` | Tiny Python CLI that wraps `claude_code.matrix_builder.find_regressions`. Diffs the freshly built matrix against the currently-published one and exits `3` if any cell flipped green→red, which gates auto-merge. | -| `litellm-compat-matrix.service` | systemd oneshot that invokes `run_daily.sh`. | -| `litellm-compat-matrix.timer` | `OnCalendar=*-*-* 06:00:00 UTC`, `Persistent=true`. | -| `litellm-compat-matrix.env.example` | Template for `/etc/litellm-compat-matrix.env`. | +| `litellm-compat-matrix.env.example` | The service's env vars, one per line, with what each is for. | ## What `run_daily.sh` does 1. **Resolves the latest LiteLLM final release tag** (newest bare `vX.Y.Z`, skipping `-rc.N`/`-dev.N` pre-releases) by paging the GitHub Releases API (`curl | jq`). -2. **Reads the local Claude Code CLI version** via `claude --version`. - The cron does not auto-upgrade the CLI — operators do that - out-of-band by running `npm install -g @anthropic-ai/claude-code@latest`. -3. **Updates the persistent worktree** at `~/litellm-cron-worktree/`: - `git fetch --tags --force`, `git reset --hard`, - `git clean -fdx -e .venv -e .uv-bin`, `git checkout --force `. - The `.venv` is preserved across runs so `uv sync --frozen` is - incremental. Then **shims the test suite**: `tests/e2e/` in the - worktree is rebuilt from the dev checkout — the `claude_code/` suite - plus the five shared transport helpers it imports (`proxy_client.py`, - `e2e_http.py`, `models.py`, `e2e_config.py`, `transport.py`) — so the - cron always runs *today's* tests against the latest stable proxy. The - tag's own `tests/e2e/` tree (including the EKS-harness `conftest.py`, - whose imports the stable venv doesn't install) is deliberately not - used. +2. **Reads the Claude Code CLI version** via `claude --version`. That + is whatever the `Dockerfile` pins; the job never upgrades it on its + own. +3. **Clones the worktree** at `~/litellm-cron-worktree/` (a + `--filter=blob:none` clone, so only the checked-out tag's blobs are + fetched), `git checkout --force `, then `uv sync --frozen + --no-install-project` against a uv-managed CPython 3.12 followed by + `uv pip install --no-build litellm==`, so the proxy under + test is the published PyPI wheel (what users install) rather than a + source build: the tag builds a Rust extension through maturin, and + the image ships no C or Rust toolchain. Then **shims the test suite**: + `tests/e2e/` in the worktree is replaced by the image's copy of this + whole tree, so the cron always runs *today's* tests against the + latest stable proxy, and pytest runs with `--confcutdir` pointed at + `claude_code/` so the tree's EKS-harness `conftest.py` (whose imports + the stable venv doesn't install) is never loaded. The tag's own + `tests/e2e/` is deliberately not used. 4. **Boots the proxy** as a `setsid` background process on port `4100` - (so it can't collide with a developer's `:4000`), then polls - `/health/liveliness` until it's up. + bound to loopback, then polls `/health/liveliness` until it's up. 5. **Runs pytest** on `tests/e2e/claude_code/` with `LITELLM_PROXY_URL` pointed at the proxy and `COMPAT_RESULTS_PATH` set so the conftest hook writes the per-test results artifact. Test failures become @@ -74,8 +67,9 @@ column reads `AZURE_AI_API_KEY` / `AZURE_AI_API_BASE` (previously `mateo-berri` token has write access, so this is a same-repo branch, not a fork), `gh pr create`. A re-run on the same day fast-forwards the existing branch and `gh pr create` no-ops ("a pull request for - branch ... already exists" is treated as success). These PRs are no - longer gated on a second human review. + branch ... already exists" is treated as success). If the JSON is + byte-identical to what `main` already publishes, the push is skipped + entirely. These PRs are not gated on a second human review. 8. **Gates auto-merge on a regression check**: before enabling auto-merge, `check_regressions.py` diffs the new matrix against the one currently on `main`. Auto-merge (`gh pr merge --auto --squash`) @@ -89,107 +83,155 @@ column reads `AZURE_AI_API_KEY` / `AZURE_AI_API_BASE` (previously human reviews before it lands on the public table. The check fails *closed*: if it errors, auto-merge is withheld. 9. **Sweeps stale compat-matrix PRs**: once today's PR exists, every - other open `compat-matrix/*` PR on the docs repo is closed (and its - bot-owned branch deleted), so at most one compat-matrix PR is ever - open — the newest. + other open `compat-matrix/*` PR that the publishing account opened + from a branch on the docs repo itself is closed (and its bot-owned + branch deleted), so at most one compat-matrix PR is ever open — the + newest. A contributor's PR under that prefix is never touched. -## One-time VM setup +## The Render service -Run as `mateo` on the cron VM: +Everything below is what the live service is set to; recreate it with +the same values if it ever has to be rebuilt. + +| Setting | Value | +| --- | --- | +| Workspace | Litellm (the one that already builds the other litellm services) | +| Type | Cron job, Docker runtime | +| Repo / branch | `BerriAI/litellm` @ `main` | +| Dockerfile path | `tests/e2e/claude_code/cron_vm/Dockerfile` | +| Docker build context | `tests/e2e` (the repo root `.dockerignore` excludes `tests`, so the context has to start below it) | +| Build filter | included paths `tests/e2e/**` | +| Schedule | `0 6 * * *` (06:00 UTC daily) | +| Plan / region | `4c-16g` (4 CPU, 16 GB, what the dashboard calls Pro Max; the suite fans out to ~75 concurrent CLI calls) / Oregon | +| Env vars | every key in `litellm-compat-matrix.env.example` | +| Secret files | `github-token` (the publish PAT, one line) and `vertex-service-account.json` (the Vertex service-account key) | + +Render mounts secret files at `/etc/secrets/`, which is where +`CREDENTIALS_DIRECTORY` and `GOOGLE_APPLICATION_CREDENTIALS` in the env +example point. Render also passes env vars to `docker build` as build +args, which is why the `Dockerfile` declares no `ARG` that could ever +be given a secret's name. + +Creating it through the API looks like this (fill `envVars` and +`secretFiles` from the env example and the two secrets; `ownerId` is +the workspace id from `GET /v1/owners`): ```bash -# 1. Toolchain -sudo apt-get update -sudo apt-get install -y git nodejs npm jq curl -curl -LsSf https://astral.sh/uv/install.sh | sh -sudo apt-get install -y gh # or follow https://cli.github.com/ - -# 2. Claude Code CLI (the cron does NOT auto-upgrade this; rerun this -# line out-of-band when you want a fresh CLI to be tested) -sudo npm install -g @anthropic-ai/claude-code@latest - -# 3. Litellm checkout. Used by systemd's WorkingDirectory and as the -# source of the .service / .timer files. The cron itself runs out -# of the separate worktree at ~/litellm-cron-worktree/. -mkdir -p ~/litellm -git clone https://github.com/BerriAI/litellm.git ~/litellm/litellm -git -C ~/litellm/litellm checkout litellm_internal_staging - -# 4. gh auth — must be a collaborator on BerriAI/litellm-docs. -gh auth login # follow prompts; pick HTTPS + token paste flow - -# 5. Provider credentials + the publish token. -sudo cp ~/litellm/litellm/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.env.example \ - /etc/litellm-compat-matrix.env -sudoedit /etc/litellm-compat-matrix.env # fill in real values -sudo chmod 0600 /etc/litellm-compat-matrix.env -# The mateo-berri PAT lives in its own file, mapped into the service via -# systemd LoadCredential so it stays out of the test processes' env -# (see the env.example comment for why). -sudo install -m 0600 /dev/null /etc/litellm-compat-matrix-github-token -sudoedit /etc/litellm-compat-matrix-github-token # single line: the PAT - -# 6. systemd units. -sudo cp ~/litellm/litellm/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.service /etc/systemd/system/ -sudo cp ~/litellm/litellm/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.timer /etc/systemd/system/ -sudo systemctl daemon-reload -sudo systemctl enable --now litellm-compat-matrix.timer +curl -fsS https://api.render.com/v1/services \ + -H "Authorization: Bearer ${RENDER_API_KEY}" \ + -H 'Content-Type: application/json' \ + -d '{ + "type": "cron_job", + "name": "litellm-compat-matrix", + "ownerId": "", + "repo": "https://github.com/BerriAI/litellm", + "branch": "main", + "autoDeploy": "yes", + "buildFilter": {"paths": ["tests/e2e/**"], "ignoredPaths": []}, + "envVars": [{"key": "ANTHROPIC_API_KEY", "value": "..."}], + "secretFiles": [{"name": "github-token", "content": "..."}, + {"name": "vertex-service-account.json", "content": "..."}], + "serviceDetails": { + "runtime": "docker", + "schedule": "0 6 * * *", + "plan": "4c-16g", + "region": "oregon", + "envSpecificDetails": { + "dockerfilePath": "tests/e2e/claude_code/cron_vm/Dockerfile", + "dockerContext": "tests/e2e" + } + } + }' ``` ## Operating it ```bash -# When does it run next? -systemctl list-timers litellm-compat-matrix.timer +# Trigger a real run right now (PRs to litellm-docs). The id is the +# service id (`crn-...`) from the dashboard URL or `GET /v1/services`. +curl -fsS -X POST "https://api.render.com/v1/cron-jobs/${CRON_ID}/runs" \ + -H "Authorization: Bearer ${RENDER_API_KEY}" -# Trigger a real run right now (PRs to litellm-docs). -sudo systemctl start litellm-compat-matrix.service +# Follow a run: the Logs tab on the service, or the API. +curl -fsS "https://api.render.com/v1/logs?ownerId=${OWNER_ID}&resource=${CRON_ID}&limit=100" \ + -H "Authorization: Bearer ${RENDER_API_KEY}" -# Trigger a run that does NOT open a PR (good for first-time validation). -SKIP_PUBLISH=1 ~/litellm/litellm/tests/e2e/claude_code/cron_vm/run_daily.sh +# Rebuild the image after a merge that touches tests/e2e/** (see the +# auto-deploy gotcha below). The deploy is done once its status is +# `live`; a run triggered before that still uses the previous image. +curl -fsS -X POST "https://api.render.com/v1/services/${CRON_ID}/deploys" \ + -H "Authorization: Bearer ${RENDER_API_KEY}" \ + -H 'Content-Type: application/json' -d '{"clearCache": "do_not_clear"}' +curl -fsS "https://api.render.com/v1/services/${CRON_ID}/deploys?limit=1" \ + -H "Authorization: Bearer ${RENDER_API_KEY}" -# Narrow to one cell while debugging. -SKIP_PUBLISH=1 PYTEST_K='basic_messaging_non_streaming and anthropic' \ - ~/litellm/litellm/tests/e2e/claude_code/cron_vm/run_daily.sh +# A run that does NOT open a PR (first-time validation, CLI bumps): +# set SKIP_PUBLISH=1 on the service, trigger a run, then remove it. +# The matrix JSON is printed at the end of the run's log (nothing on +# the container's disk outlives the run) and saved to +# ~/compatibility-matrix.json for a local docker run. +# PYTEST_K='basic_messaging_non_streaming and anthropic' narrows the +# run to one cell the same way. -# Watch the most recent run. -journalctl -u litellm-compat-matrix.service -f - -# Read older runs. -journalctl -u litellm-compat-matrix.service --since '2 days ago' - -# Disable until further notice (e.g. while debugging). -sudo systemctl disable --now litellm-compat-matrix.timer +# Build and run the image locally (docker on Apple silicon needs the +# platform flag; the context is tests/e2e, see the table above). +docker build --platform linux/amd64 \ + -f tests/e2e/claude_code/cron_vm/Dockerfile -t compat-matrix tests/e2e +docker run --rm --platform linux/amd64 \ + --env-file litellm-compat-matrix.env -e SKIP_PUBLISH=1 \ + -v "$PWD/secrets:/etc/secrets:ro" compat-matrix ``` ## Gotchas - **The venv is pinned to Python 3.12 (`CRON_PYTHON_VERSION`).** The - e2e suite uses PEP 695 `type` aliases, which the VM's system Python - (3.11) can't parse; `run_daily.sh` has uv fetch a managed CPython + e2e suite uses PEP 695 `type` aliases, which the image's Debian + Python can't parse; `run_daily.sh` has uv fetch a managed CPython into `~/litellm-cron-worktree/.uv-python/` and syncs the venv against - it. The first run after a version bump is a cold venv rebuild. -- **The proxy port is `4100`, not `4000`.** This is so a developer SSH'd - into the same VM with their own `:4000` proxy doesn't collide with a - cron run. Override with `PROXY_PORT=...` in `/etc/litellm-compat-matrix.env` - if you need to. + it. +- **The proxy port is `4100`, not `4000`.** Kept from the VM days so a + developer running the script locally next to their own `:4000` proxy + doesn't collide. Override with `PROXY_PORT=...`. - **`uv sync --frozen` requires the resolved tag to be tagged on - GitHub.** If the latest stable release was made but not pushed as a - git tag, the `git checkout` step fails. Push the tag, then rerun. + GitHub, and the wheel install requires it on PyPI.** If the latest + stable release was made but not pushed as a git tag, the `git + checkout` step fails; push the tag, then rerun. PyPI has had every + stable version days before its GitHub release so far (1.102.0 was + uploaded 2026-09-20, released on GitHub 2026-09-22), so the + `--no-build` install failing means the wheel is genuinely missing, + not late. +- **Pushes do not redeploy the service; deploy by hand.** `autoDeploy` + is `yes` on the service, but Render only hears about pushes through + its GitHub app, which is not installed on the `BerriAI` org (an org + admin step), so no push to the branch has ever started a deploy. + After a merge that changes anything under `tests/e2e/**`, run the + deploy command from the operating section (or "Manual Deploy" on the + dashboard) and wait for `live` before triggering a run, otherwise + the next scheduled run still executes the old image. - **Publish-token rotation is your problem.** The cron does not - refresh the token; if `mateo-berri`'s PAT in - `/etc/litellm-compat-matrix-github-token` expires, the run fails at - the `git push`/`gh pr create` step with a 401 ("Bad credentials" / - "Authentication failed"). Mint a fresh PAT and update that file. - The token needs write access to `BerriAI/litellm-docs` (classic - `repo` scope, or fine-grained Contents:RW + Pull requests:RW). It is - delivered via systemd `LoadCredential`, not the env file, so pytest, - the proxy, and the claude CLI never inherit it; manual runs export - `GITHUB_TOKEN` instead. -- **First run after upgrading the Claude Code CLI is the riskiest one.** - If the new CLI changes its wire format the matrix run can produce - systematic failures. Always run with `SKIP_PUBLISH=1` after a CLI - upgrade before letting the next scheduled fire happen. -- **Disk:** the worktree's `.venv` is ~1.3 GB and the `.git` directory - is ~1 GB. Plan for at least 5 GB free on the VM, otherwise - `uv sync` will fail mid-run and leave you with a half-installed venv. + refresh the token; if `mateo-berri`'s PAT in the `github-token` + secret file expires, the run fails at the `git push`/`gh pr create` + step with a 401 ("Bad credentials" / "Authentication failed"). Mint + a fresh PAT and replace the secret file on the service. The token + needs write access to `BerriAI/litellm-docs` (classic `repo` scope, + or fine-grained Contents:RW + Pull requests:RW). It is delivered as + a file, not an env var, so pytest, the proxy, and the claude CLI + never inherit it; manual runs export `GITHUB_TOKEN` instead. +- **Bumping the Claude Code CLI is a PR.** Change `CLAUDE_CODE_VERSION` + in the `Dockerfile` and set `CLAUDE_CODE_SHA256` to the `linux-x64` + checksum from + `https://downloads.claude.ai/claude-code-releases//manifest.json`. + The first run on a new CLI is the riskiest one: if the new CLI + changes its wire format the matrix run can produce systematic + failures, so trigger a `SKIP_PUBLISH=1` run before the next scheduled + fire. `gh` and `uv` bump the same way, with the checksum from the + release's `gh__checksums.txt` and the tarball's `.sha256` + sidecar respectively. +- **A local build on Apple silicon only proves the image assembles.** + Under QEMU the Claude Code binary (a Bun executable) dies with + `CPU lacks AVX support` and `gh` panics in the Go runtime, so + `claude --version` and a full run are verified with a + `SKIP_PUBLISH=1` run on Render, not locally. +- **Nothing persists between runs.** A failed run leaves no + half-installed venv behind, but also no cache: don't expect a rerun + to be faster than the first one. diff --git a/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.env.example b/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.env.example index d15561e96cd..579752f1ea8 100644 --- a/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.env.example +++ b/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.env.example @@ -1,9 +1,8 @@ -# Environment file consumed by `litellm-compat-matrix.service`. +# Environment variables of the Render cron job `litellm-compat-matrix`. # -# Install at `/etc/litellm-compat-matrix.env` and chmod 0600. -# `EnvironmentFile=-` in the unit means the service is allowed to start -# even if this file is missing, but the populator will fail at the -# first provider request without these credentials. +# Set every value here on the Render service (Environment tab, or the +# `envVars` list of the create-service call in README.md). A local run +# passes a filled-in copy with `docker run --env-file`. # Anthropic ANTHROPIC_API_KEY= @@ -17,11 +16,12 @@ AWS_BEARER_TOKEN_BEDROCK= AWS_REGION_NAME=us-east-1 # Vertex AI (vertex_ai + vertex_ai_gpt columns). -# On the GCP VM, the default service-account ADC from the metadata server -# is used -- no JSON key file is needed. If you ever need to run outside -# GCP, also export GOOGLE_APPLICATION_CREDENTIALS=/path/to/sa.json. +# The service-account key JSON is the Render secret file +# `vertex-service-account.json`, mounted at /etc/secrets, and +# GOOGLE_APPLICATION_CREDENTIALS points google-auth at it. VERTEXAI_PROJECT= VERTEXAI_LOCATION=global +GOOGLE_APPLICATION_CREDENTIALS=/etc/secrets/vertex-service-account.json # Azure AI Foundry (azure column — Claude models on Foundry) AZURE_AI_API_KEY= @@ -35,19 +35,20 @@ AZURE_API_BASE= AZURE_API_KEY= # The publish PAT (mateo-berri, write access on BerriAI/litellm-docs) -# deliberately does NOT live in this file. Everything here lands in the -# process environment of pytest, the proxy, and the model-driven claude -# CLI, where any same-UID reader can lift it from /proc//environ. -# Instead, install the token at /etc/litellm-compat-matrix-github-token -# (chmod 0600, single line); the service maps it in via systemd -# LoadCredential and run_daily.sh keeps it out of every child process -# env. Used to (a) resolve the latest stable release, (b) push the -# daily compat-matrix branch directly to BerriAI/litellm-docs, (c) open -# the same-repo PR, and (d) enable squash auto-merge on it. Scopes: +# deliberately is NOT an env var. Everything here lands in the process +# environment of pytest, the proxy, and the model-driven claude CLI, +# where any same-UID reader can lift it from /proc//environ. +# Instead, the token is the Render secret file `github-token` (single +# line), mounted under CREDENTIALS_DIRECTORY, and run_daily.sh reads it +# from there and keeps it out of every child process env. Used to +# (a) resolve the latest stable release, (b) push the daily +# compat-matrix branch directly to BerriAI/litellm-docs, (c) open the +# same-repo PR, and (d) enable squash auto-merge on it. Scopes: # classic `repo` + `workflow`, or fine-grained on BerriAI/litellm-docs # with Contents:RW + Pull requests:RW + Workflows:RW. # Manual runs export GITHUB_TOKEN instead, or skip publishing entirely # with SKIP_PUBLISH=1 (only writes the matrix JSON locally). +CREDENTIALS_DIRECTORY=/etc/secrets # Optional: the bedrock_mantle column is opt-in because the AWS account # needs the Mantle (OpenAI-on-Bedrock) models enabled. Without this the @@ -59,9 +60,9 @@ AZURE_API_KEY= # usually run them. Skipped cells are recorded as not_tested. # COMPAT_OPENAI_GPT_CELLS=1 -# Optional overrides; defaults are sensible for the cron VM. +# Optional overrides; defaults are sensible for the cron job. # PROXY_PORT=4100 -# LITELLM_WORKTREE=/home/mateo/litellm-cron-worktree +# LITELLM_WORKTREE=/home/populator/litellm-cron-worktree # DOCS_REPO=BerriAI/litellm-docs # DOCS_BRANCH=main # DOCS_TARGET_PATH=src/data/compatibility-matrix.json diff --git a/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.service b/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.service deleted file mode 100644 index 6c74b3b04bb..00000000000 --- a/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.service +++ /dev/null @@ -1,113 +0,0 @@ -# systemd service for the Claude Code compatibility-matrix populator. -# -# Triggered by `litellm-compat-matrix.timer`; not started directly. The -# unit is a `Type=oneshot` so the timer's `OnCalendar=` semantics -# describe "run once per day" cleanly — there's no long-lived daemon to -# supervise; each invocation runs the populator end-to-end and exits. -# -# Install -# ------- -# -# sudo cp tests/e2e/claude_code/cron_vm/litellm-compat-matrix.service /etc/systemd/system/ -# sudo cp tests/e2e/claude_code/cron_vm/litellm-compat-matrix.timer /etc/systemd/system/ -# sudo systemctl daemon-reload -# sudo systemctl enable --now litellm-compat-matrix.timer -# -# Paths are hard-coded to /home/mateo rather than using systemd's %h -# specifier. Why: in *system* units (this one), %h is expanded at -# parse time against the *manager's* home -- which is /root for PID 1 -# -- and *not* against the User= directive. That mismatch makes -# ReadWritePaths point at /root/.cache (which doesn't exist), causing -# the namespace setup to fail with status=226/NAMESPACE before the -# script ever runs. The runtime user (`User=mateo`) must: -# -# * have a checkout of `BerriAI/litellm` at `~/litellm/litellm` so the -# publisher module is importable; -# * have a uv venv at `~/litellm/litellm/.venv` (created by -# `uv sync --frozen` inside that checkout once); -# * have `gh` already authenticated against an account with -# `pull-requests: write` on `BerriAI/litellm-docs`; -# * have provider credentials exported in `/etc/litellm-compat-matrix.env` -# (see `litellm-compat-matrix.env.example` in this directory); -# * have the mateo-berri publish PAT at -# `/etc/litellm-compat-matrix-github-token` (chmod 0600, single -# line), delivered via `LoadCredential=` below. - -[Unit] -Description=Claude Code compatibility-matrix populator (oneshot) -Documentation=file:///home/mateo/litellm/litellm/tests/e2e/claude_code/cron_vm/README.md -Wants=network-online.target -After=network-online.target - -[Service] -Type=oneshot -User=mateo -Group=mateo - -# Provider credentials + any gh/PROXY_PORT overrides live here. Format -# is the standard `KEY=value` one line per env var. -EnvironmentFile=-/etc/litellm-compat-matrix.env - -# The mateo-berri publish PAT is mapped in via the credential store, NOT -# the EnvironmentFile, so it never lands in the process environment that -# pytest, the proxy, and the model-driven claude CLI inherit (any -# same-UID process can read /proc//environ). run_daily.sh reads -# ${CREDENTIALS_DIRECTORY}/github-token and hands it to gh per call. -# Unlike EnvironmentFile= above, this is deliberately NOT optional: a -# missing token file fails the unit at start instead of 30 minutes in. -LoadCredential=github-token:/etc/litellm-compat-matrix-github-token - -# systemd starts with a minimal PATH (~/usr/local/bin:/usr/bin:/bin). -# `uv` and `claude` are installed under the runtime user's `~/.local/bin` -# so we have to prepend it explicitly; otherwise run_daily.sh fails at -# the up-front command-presence check. -Environment=PATH=/home/mateo/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - -# `HOME` is auto-set to /home/mateo when User=mateo is honored, but be -# explicit so anything that reads $HOME (e.g. uv's cache lookup, the -# claude CLI's per-session dir) sees the right value even if a future -# refactor flips DynamicUser= or PrivateUsers= on. -Environment=HOME=/home/mateo - -WorkingDirectory=/home/mateo/litellm/litellm - -ExecStart=/home/mateo/litellm/litellm/tests/e2e/claude_code/cron_vm/run_daily.sh - -# 90 minutes is generous: cold runs do `git clone` + `uv sync` of a new -# tag's lockfile, which can take a couple of minutes on a 2-vCPU VM, -# plus the full feature x provider grid of pytest cells hitting several -# cloud providers. -TimeoutStartSec=90min - -# A failed run shouldn't restart automatically — the next timer fire is -# the right retry. Reruns of the same day's matrix are idempotent. -Restart=no - -# Security hardening: the populator only reads the litellm checkout and -# the env-file; everything else it writes lives in either the worktree -# (managed) or `/tmp` (cleaned up by tempfile). -# -# ReadWritePaths whitelist: -# * litellm-cron-worktree - the long-lived stable-tag checkout + -# its `.venv` (`uv sync` rewrites every -# run) + `.uv-bin` (pinned `uv` binary -# cache). -# * .cache - uv's wheel cache (~/.cache/uv) so we -# don't redownload pinned deps each run. -# * .claude - `claude` CLI's per-session state under -# `~/.claude/projects//`; created -# on every `claude --print` invocation. -# * .config/gh - `gh` CLI host config; technically not -# needed when we pass GH_TOKEN inline, -# but cheap to whitelist and prevents -# future regressions if a code path -# ever falls back to the host config. -# * /tmp - mktemp -d workdir + proxy logs. -NoNewPrivileges=true -ProtectSystem=strict -ProtectHome=read-only -ReadWritePaths=/home/mateo/litellm-cron-worktree /home/mateo/.cache /home/mateo/.claude /home/mateo/.config/gh /tmp -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.timer b/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.timer deleted file mode 100644 index ee22538c6ed..00000000000 --- a/tests/e2e/claude_code/cron_vm/litellm-compat-matrix.timer +++ /dev/null @@ -1,25 +0,0 @@ -# Daily timer for the compatibility-matrix populator. -# -# 06:00 UTC matches the original GitHub Actions cron schedule; chosen so -# operators in US/EU timezones see fresh PRs at the start of their work -# day. -# -# `Persistent=true` causes a missed run (VM was off / suspended) to -# fire the next time the timer is started, which is the property we -# want for a once-a-day job: the matrix should refresh as soon as the -# VM is reachable again, not wait another 24h. -# -# `RandomizedDelaySec=10min` smears load if multiple matrix-style -# pipelines are ever colocated on the same VM in the future. - -[Unit] -Description=Run the Claude Code compatibility-matrix populator daily - -[Timer] -OnCalendar=*-*-* 06:00:00 UTC -Persistent=true -RandomizedDelaySec=10min -Unit=litellm-compat-matrix.service - -[Install] -WantedBy=timers.target diff --git a/tests/e2e/claude_code/cron_vm/run_daily.sh b/tests/e2e/claude_code/cron_vm/run_daily.sh index e878007d8a3..172dd03b614 100755 --- a/tests/e2e/claude_code/cron_vm/run_daily.sh +++ b/tests/e2e/claude_code/cron_vm/run_daily.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # Daily Claude Code compatibility-matrix populator. # -# Runs from the GCP VM `litellm-compatibility-matrix-populator` via the -# systemd timer in this directory. The flow is: +# Runs daily as the Render cron job `litellm-compat-matrix`, built from +# the Dockerfile in this directory (see README.md). The flow is: # # 1. Resolve the latest LiteLLM final release tag from the GitHub # Releases API. @@ -33,12 +33,12 @@ # rather than spawning a new one. If the JSON is byte-identical to the # docs branch, we skip the push entirely. # -# Required commands on $PATH: git, uv, gh, jq, curl, claude, npm. +# Required commands on $PATH: git, uv, gh, jq, curl, claude. # Required state: a litellm checkout at $LITELLM_REPO (this file lives in -# it), $WORKTREE is created on first run, gh is already authenticated. +# it); $WORKTREE is created on first run. # -# Override any default by setting the matching env var; see the systemd -# unit for the production wiring. +# Override any default by setting the matching env var; see README.md +# for the production wiring. set -Eeuo pipefail @@ -52,12 +52,12 @@ DOCS_TARGET_PATH="${DOCS_TARGET_PATH:-src/data/compatibility-matrix.json}" SKIP_PUBLISH="${SKIP_PUBLISH:-0}" PYTEST_K="${PYTEST_K:-}" # The e2e suite uses PEP 695 `type` aliases, so the venv needs Python -# >= 3.12 (also what repo CI runs) even when the VM's system python is +# >= 3.12 (also what repo CI runs) even when the host's system python is # older. uv fetches a managed CPython of this version on first use -- # checksum-verified against the manifest baked into the pinned uv # binary -- and installs it under ${WORKTREE}/.uv-python (see -# UV_PYTHON_INSTALL_DIR below) so it lives inside the one tree the -# systemd sandbox lets us write to. +# UV_PYTHON_INSTALL_DIR below) so everything the run writes lives inside +# the worktree. CRON_PYTHON_VERSION="${CRON_PYTHON_VERSION:-3.12}" # Merge method for auto-merge. BerriAI/litellm-docs only allows squash # merges (merge-commit and rebase are disabled at the repo level), so @@ -113,9 +113,9 @@ for cmd in git uv gh jq curl claude; do done # Publishing pushes the branch straight to BerriAI/litellm-docs and opens -# the PR as mateo-berri, who has write access on the docs repo. Under -# systemd the PAT arrives as a file via LoadCredential=, NOT via the -# EnvironmentFile: several suite cells let the model-driven claude CLI +# the PR as mateo-berri, who has write access on the docs repo. On +# Render the PAT arrives as a secret file under ${CREDENTIALS_DIRECTORY}, +# NOT via an env var: several suite cells let the model-driven claude CLI # read arbitrary files as this user, and /proc//environ of the # script, pytest, and the proxy would hand an env-borne token to any # same-UID reader. Kept as an unexported shell variable and passed per @@ -125,13 +125,18 @@ done # quota. if [[ -z "${GITHUB_TOKEN:-}" && -n "${CREDENTIALS_DIRECTORY:-}" && -f "${CREDENTIALS_DIRECTORY}/github-token" ]]; then GITHUB_TOKEN="$(<"${CREDENTIALS_DIRECTORY}/github-token")" - log "publish token source: systemd credential store" + log "publish token source: ${CREDENTIALS_DIRECTORY}/github-token" elif [[ -n "${GITHUB_TOKEN:-}" ]]; then log "publish token source: process environment" fi if [[ "${SKIP_PUBLISH}" != "1" ]]; then [[ -n "${GITHUB_TOKEN:-}" ]] \ - || die "publish token required: /etc/litellm-compat-matrix-github-token via LoadCredential under systemd, or an exported GITHUB_TOKEN for manual runs (or set SKIP_PUBLISH=1)" + || die "publish token required: the github-token secret file under CREDENTIALS_DIRECTORY, or an exported GITHUB_TOKEN for manual runs (or set SKIP_PUBLISH=1)" + # The stale-PR sweep below closes only PRs this account opened, so the + # login is resolved from the token once rather than hardcoded. + PUBLISH_LOGIN="$(GH_TOKEN="${GITHUB_TOKEN}" gh api user --jq .login)" \ + || die "could not resolve the publishing account from the github token" + log "publishing as ${PUBLISH_LOGIN}" fi # --------------------------------------------------------------------------- @@ -205,7 +210,7 @@ log "local claude code: ${CLAUDE_CODE_VERSION}" if [[ ! -d "${WORKTREE}/.git" ]]; then log "first run: cloning litellm into ${WORKTREE}" mkdir -p "$(dirname "${WORKTREE}")" - git clone https://github.com/BerriAI/litellm.git "${WORKTREE}" + git clone --filter=blob:none https://github.com/BerriAI/litellm.git "${WORKTREE}" fi log "updating worktree to ${LITELLM_VERSION}" @@ -221,40 +226,27 @@ git -C "${WORKTREE}" clean -fdx -e .venv -e .uv-bin -e .uv-python git -C "${WORKTREE}" checkout --force "${LITELLM_VERSION}" # Always rebuild tests/e2e/ in the worktree from the dev checkout, -# regardless of what the resolved ${LITELLM_VERSION} tag ships. Two -# reasons: +# regardless of what the resolved ${LITELLM_VERSION} tag ships: the +# matrix populator's job is to exercise *today's* tests against the +# latest stable proxy, and the dev checkout carries the most recent +# test fixes that haven't yet rolled into a stable release. # -# * The matrix populator's job is to exercise *today's* tests against -# the latest stable proxy. The dev checkout carries the most recent -# test fixes that haven't yet rolled into a stable release, and we -# want every cron run to pick those up the moment they land on -# ${LITELLM_REPO}, not whenever the next stable release happens. -# * The tag's own tests/e2e/ ships the full EKS e2e harness, whose -# top-level conftest.py imports modules (e2e_db, lifecycle, -# otel_client, ...) that the stable venv does not install. Copying -# the whole tree would make pytest collection blow up on those -# imports. -# -# So the shim is a fresh `rm -rf` of tests/e2e/ followed by copying ONLY -# the claude_code suite plus the shared transport helpers it imports. +# The whole tree is copied rather than an allowlist of the helpers the +# suite imports: the helpers import each other (proxy_client -> +# e2e_config -> fixture_mode -> ...), so a new edge in that graph turned +# an allowlist into a ModuleNotFoundError at conftest load. The tree's +# top-level conftest.py pulls in the full EKS harness (e2e_db, +# lifecycle, ...), which the stable venv does not install, so the pytest +# run below points --confcutdir at claude_code/ and never loads it. # pytest puts tests/e2e/ itself on sys.path (it has no __init__.py, while # claude_code/ does), which is what resolves both the `claude_code.*` # and the bare `proxy_client` / `e2e_http` imports inside the suite. -E2E_HELPER_FILES=(proxy_client.py e2e_http.py models.py e2e_config.py transport.py) -if [[ ! -d "${LITELLM_REPO}/tests/e2e/claude_code" ]]; then - die "no shim source at ${LITELLM_REPO}/tests/e2e/claude_code" -fi -for helper in "${E2E_HELPER_FILES[@]}"; do - [[ -f "${LITELLM_REPO}/tests/e2e/${helper}" ]] \ - || die "missing shim helper: ${LITELLM_REPO}/tests/e2e/${helper}" -done -log "shimming tests/e2e/claude_code/ + helpers from ${LITELLM_REPO} (always-overwrite)" +[[ -d "${LITELLM_REPO}/tests/e2e/claude_code" ]] \ + || die "no shim source at ${LITELLM_REPO}/tests/e2e/claude_code" +log "shimming tests/e2e/ from ${LITELLM_REPO} (always-overwrite)" rm -rf "${WORKTREE}/tests/e2e" mkdir -p "${WORKTREE}/tests/e2e" -cp -r "${LITELLM_REPO}/tests/e2e/claude_code" "${WORKTREE}/tests/e2e/" -for helper in "${E2E_HELPER_FILES[@]}"; do - cp "${LITELLM_REPO}/tests/e2e/${helper}" "${WORKTREE}/tests/e2e/" -done +cp -r "${LITELLM_REPO}/tests/e2e/." "${WORKTREE}/tests/e2e/" # litellm pins an exact uv version in pyproject.toml's [tool.uv] # `required-version` field, so a system uv that's newer or older @@ -305,10 +297,18 @@ fi # actually serve. `--group proxy-dev` brings in pytest and the rest of # what tests/e2e/claude_code/ needs. `--python` pins the venv to # ${CRON_PYTHON_VERSION}; the first run after a version bump recreates -# the venv from scratch (a one-time cold sync). +# the venv from scratch (a one-time cold sync). `--no-install-project` +# leaves litellm itself out: the tag builds a Rust extension through +# maturin, which needs a C and Rust toolchain the image does not carry, +# so the published PyPI wheel (what users install) goes in right after, +# and every later `uv run` passes `--no-sync` so uv never tries to put +# the source build back. export UV_PYTHON_INSTALL_DIR="${WORKTREE}/.uv-python" -log "uv sync --frozen --group proxy-dev --extra proxy --python ${CRON_PYTHON_VERSION} (uv ${PINNED_UV_VERSION:-system})" -(cd "${WORKTREE}" && "${WORKTREE_UV}" sync --frozen --group proxy-dev --extra proxy --python "${CRON_PYTHON_VERSION}") +log "uv sync --frozen --group proxy-dev --extra proxy --no-install-project --python ${CRON_PYTHON_VERSION} (uv ${PINNED_UV_VERSION:-system})" +(cd "${WORKTREE}" && "${WORKTREE_UV}" sync --frozen --group proxy-dev --extra proxy --no-install-project --python "${CRON_PYTHON_VERSION}") +LITELLM_WHEEL_VERSION="${LITELLM_VERSION#v}" +log "installing the published litellm==${LITELLM_WHEEL_VERSION} wheel from PyPI" +"${WORKTREE_UV}" pip install --python "${WORKTREE}/.venv/bin/python" --no-deps --no-build "litellm==${LITELLM_WHEEL_VERSION}" PROXY_CONFIG="${WORKTREE}/tests/e2e/claude_code/test_config.yaml" [[ -f "${PROXY_CONFIG}" ]] || die "proxy config not found at ${PROXY_CONFIG} (shim incomplete?)" @@ -321,10 +321,10 @@ log "starting proxy on 127.0.0.1:${PROXY_PORT}" # Bind the proxy to loopback only. The populator proxy is talked to # exclusively by the pytest run on the same host (the health check and # the test env set `LITELLM_PROXY_URL=http://127.0.0.1:...`), -# so there's no reason to expose it on the VM's external interfaces. +# so there's no reason to expose it on the container's external interfaces. # Without `--host`, `litellm` defaults to 0.0.0.0, which combined with # the predictable default `LITELLM_MASTER_KEY=sk-cron-matrix` would -# allow anything that can reach :${PROXY_PORT} on the VM to authenticate +# allow anything that can reach :${PROXY_PORT} on the host to authenticate # and burn upstream provider credentials. # # `setsid` puts the proxy in its own session+pgroup so cleanup() can @@ -334,7 +334,7 @@ log "starting proxy on 127.0.0.1:${PROXY_PORT}" setsid env LITELLM_MASTER_KEY="${PROXY_API_KEY}" bash -c ' echo "$$" > "$0" cd "$1" - exec "$2" run litellm --config "$3" --host 127.0.0.1 --port "$4" + exec "$2" run --no-sync litellm --config "$3" --host 127.0.0.1 --port "$4" ' "${PROXY_PID_FILE}" "${WORKTREE}" "${WORKTREE_UV}" "${PROXY_CONFIG}" "${PROXY_PORT}" \ >"${WORKDIR}/proxy.log" 2>&1 & disown @@ -359,6 +359,7 @@ RESULTS_JSON="${WORKDIR}/compat-results.json" # the cron skips them if/when they land in the suite. PYTEST_ARGS=( tests/e2e/claude_code/ + --confcutdir=tests/e2e/claude_code "--ignore-glob=*_unit_tests*" ) if [[ -n "${PYTEST_K}" ]]; then @@ -373,7 +374,7 @@ set +e && LITELLM_PROXY_URL="http://127.0.0.1:${PROXY_PORT}" \ LITELLM_MASTER_KEY="${PROXY_API_KEY}" \ COMPAT_RESULTS_PATH="${RESULTS_JSON}" \ - "${WORKTREE_UV}" run pytest "${PYTEST_ARGS[@]}" + "${WORKTREE_UV}" run --no-sync pytest "${PYTEST_ARGS[@]}" ) PYTEST_EXIT=$? set -e @@ -392,7 +393,7 @@ MATRIX_JSON="${WORKDIR}/compatibility-matrix.json" log "building ${MATRIX_JSON}" ( cd "${WORKTREE}" \ - && "${WORKTREE_UV}" run python "${POPULATOR_DIR}/build_matrix.py" \ + && "${WORKTREE_UV}" run --no-sync python "${POPULATOR_DIR}/build_matrix.py" \ --manifest "${WORKTREE}/tests/e2e/claude_code/manifest.yaml" \ --results "${RESULTS_JSON}" \ --output "${MATRIX_JSON}" \ @@ -405,8 +406,9 @@ log "building ${MATRIX_JSON}" # --------------------------------------------------------------------------- if [[ "${SKIP_PUBLISH}" == "1" ]]; then - cp "${MATRIX_JSON}" "${LITELLM_REPO}/compatibility-matrix.json" - log "SKIP_PUBLISH=1; matrix written to ${LITELLM_REPO}/compatibility-matrix.json" + cp "${MATRIX_JSON}" "${HOME}/compatibility-matrix.json" + log "SKIP_PUBLISH=1; matrix saved to ${HOME}/compatibility-matrix.json and printed below" + cat "${MATRIX_JSON}" exit 0 fi @@ -415,7 +417,7 @@ BRANCH_NAME="compat-matrix/${LITELLM_VERSION}-${CLAUDE_CODE_VERSION}-${DATE_UTC} DOCS_CLONE="${WORKDIR}/litellm-docs" log "cloning ${DOCS_REPO}@${DOCS_BRANCH}" -gh repo clone "${DOCS_REPO}" "${DOCS_CLONE}" -- --depth 1 --branch "${DOCS_BRANCH}" +GH_TOKEN="${GITHUB_TOKEN}" gh repo clone "${DOCS_REPO}" "${DOCS_CLONE}" -- --depth 1 --branch "${DOCS_BRANCH}" cd "${DOCS_CLONE}" git config user.email "litellm-bot@berri.ai" @@ -452,7 +454,7 @@ log "checking for green->red regressions vs the published matrix" set +e REGRESSION_REPORT="$( cd "${WORKTREE}" \ - && "${WORKTREE_UV}" run python "${POPULATOR_DIR}/check_regressions.py" \ + && "${WORKTREE_UV}" run --no-sync python "${POPULATOR_DIR}/check_regressions.py" \ --old "${PUBLISHED_MATRIX}" \ --new "${MATRIX_JSON}" )" @@ -492,7 +494,7 @@ git commit -m "${COMMIT_MSG}" # # Plain --force (not --force-with-lease) is acceptable here: the # compat-matrix/* branch is bot-owned, only this script ever writes to -# it, and runs are serialized by the systemd timer. --force-with-lease +# it, and runs are serialized by the cron schedule. --force-with-lease # would require a fetch to populate the remote-tracking ref before each # push and adds no safety in this single-writer setup. PUBLISH_PUSH_URL="https://x-access-token:${GITHUB_TOKEN}@github.com/${DOCS_REPO}.git" @@ -553,7 +555,7 @@ Generated by \`tests/e2e/claude_code/cron_vm/run_daily.sh\`. Close without mergi EOF )" -log "opening PR from ${BRANCH_NAME} -> ${DOCS_REPO}:${DOCS_BRANCH} (as mateo-berri)" +log "opening PR from ${BRANCH_NAME} -> ${DOCS_REPO}:${DOCS_BRANCH} (as ${PUBLISH_LOGIN})" # GH_TOKEN is mateo-berri's write-scoped token, the same identity used # for release-listing above. The branch lives on ${DOCS_REPO} itself, so # --head is a bare branch name (a same-repo PR), not `OWNER:BRANCH`. @@ -644,15 +646,25 @@ fi # # Non-fatal: a sweep failure (rate limit, transient API error) leaves # stale PRs for the next run to retry; it must not fail the pipeline. +# +# The docs repo carries a few hundred open PRs, so the list has to page +# past gh's default 30 (and the earlier 100, which never reached a +# week-old compat-matrix PR and left it open for good). +# +# `compat-matrix/` is only a naming convention, so the prefix alone does +# not make a PR this job's: a contributor can open a fork PR under that +# name. Only PRs the publishing account itself opened from a branch on +# the docs repo qualify; anything else stays untouched. log "sweeping stale compat-matrix PRs (keeping ${BRANCH_NAME})" set +e STALE_PRS="$( GH_TOKEN="${GITHUB_TOKEN}" gh pr list \ --repo "${DOCS_REPO}" \ --state open \ - --limit 100 \ - --json number,headRefName \ - --jq '.[] | select(.headRefName | startswith("compat-matrix/")) | "\(.number)\t\(.headRefName)"' + --author "${PUBLISH_LOGIN}" \ + --limit 1000 \ + --json number,headRefName,isCrossRepository \ + --jq '.[] | select((.headRefName | startswith("compat-matrix/")) and (.isCrossRepository | not)) | "\(.number)\t\(.headRefName)"' )" while IFS=$'\t' read -r stale_pr stale_head; do [[ -z "${stale_pr}" ]] && continue @@ -660,7 +672,7 @@ while IFS=$'\t' read -r stale_pr stale_head; do GH_TOKEN="${GITHUB_TOKEN}" gh pr close "${stale_pr}" \ --repo "${DOCS_REPO}" \ --delete-branch \ - --comment "Superseded by the newer daily compat-matrix PR from \`${BRANCH_NAME}\`; the populator keeps only the most recent compat-matrix PR open." 2>&1 | sed 's/^/ /' + --comment "Superseded by the newer daily compat-matrix PR from \`${BRANCH_NAME}\`; the populator keeps only the most recent compat-matrix PR open" 2>&1 | sed 's/^/ /' if [[ ${PIPESTATUS[0]} -eq 0 ]]; then log "closed stale compat-matrix PR #${stale_pr} (${stale_head})" else diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py index ca0fbd84c35..603591006d9 100644 --- a/tests/e2e/conftest.py +++ b/tests/e2e/conftest.py @@ -30,11 +30,13 @@ from e2e_config import ( FIXTURE_MODE_RAW, MANAGED_FILES_OPT_IN_ENV, MCP_OAUTH_LIVE_OPT_IN_ENV, + OTEL_TLS_OPT_IN_ENV, OTEL_V2_OPT_IN_ENV, PROMPT_CACHING_OPT_IN_ENV, PROVIDER_EDGE_HOST_OPT_IN_ENV, PROXY_BASE_URL, REDIS_CHAOS_OPT_IN_ENV, + SECRET_MANAGER_OPT_IN_ENV, WEEKLY_ANOMALY_OPT_IN_ENV, unique_marker, ) @@ -45,13 +47,18 @@ from fixture_mode import pytest_fixture_setup as pytest_fixture_setup from idp import Identity, Keycloak, keycloak_from_env from junit_properties import attach_result_properties from lifecycle import ProxyClientProvider, ResourceManager +from memory_readings import RssCapture, read_rss_everywhere from models import TeamNewBody, UserNewBody, UserNewResponse from provider_cache_routing import LIVE_PROVIDER_REQUIRED from provider_edge import replay_leftover_error from proxy_client import ProxyClient, build_proxy_client +from stack_lock import stack_lock _E2E_TEST_RAN = pytest.StashKey[bool]() _CALL_PASSED = pytest.StashKey[bool]() +_IDLE_RSS = pytest.StashKey[RssCapture]() + +IDLE_RSS_READ_TIMEOUT_SECONDS: Final = 10.0 OPT_IN_MARKERS: Final = MappingProxyType( { @@ -63,6 +70,8 @@ OPT_IN_MARKERS: Final = MappingProxyType( "mcp_oauth_live": MCP_OAUTH_LIVE_OPT_IN_ENV, "provider_edge_host": PROVIDER_EDGE_HOST_OPT_IN_ENV, "otel_v2": OTEL_V2_OPT_IN_ENV, + "otel_tls": OTEL_TLS_OPT_IN_ENV, + "secret_manager": SECRET_MANAGER_OPT_IN_ENV, } ) @@ -142,6 +151,11 @@ def pytest_configure(config: pytest.Config) -> None: "redis_chaos: load test that pauses the proxy's Redis outright mid-run; needs a proxy booted from " "gateway/redis_chaos_ci_config.yml on the same host, and is deselected unless E2E_REDIS_CHAOS is set", ) + config.addinivalue_line( + "markers", + "quiet_stack: measures the proxy itself, so it runs while no other test on this host is hitting the stack; " + "every other test waits for it to finish", + ) config.addinivalue_line( "markers", "mcp_oauth_live: real Linear OAuth consent via a captured browser session; deselected unless " @@ -156,15 +170,22 @@ def pytest_configure(config: pytest.Config) -> None: "markers", "otel_v2: needs a proxy running with LITELLM_OTEL_V2=true; deselected unless E2E_OTEL_V2 is set", ) + config.addinivalue_line( + "markers", + "otel_tls: needs a stack whose gateway exports OTLP over TLS signed by the CA in SSL_CERT_FILE; deselected unless E2E_OTEL_EXPORTER_ENDPOINT is set", + ) + config.addinivalue_line( + "markers", + "secret_manager: needs a proxy booted from gateway/secret_manager__ci_config.yml against that live " + "secret manager; deselected unless E2E_SECRET_MANAGER names the backend (see secret_manager/secret_backends.py)", + ) def pytest_sessionstart(session: pytest.Session) -> None: """Abort before collection when E2E_FIXTURE_MODE can never work: an unknown mode value, or replay against a missing, unreadable, or stale bundle (the stale message names the bundle's age). Live and record modes pass through.""" - reason = fixture_mode_collection_error( - FIXTURE_MODE_RAW, FIXTURE_DIR, now=datetime.now(timezone.utc) - ) + reason = fixture_mode_collection_error(FIXTURE_MODE_RAW, FIXTURE_DIR, now=datetime.now(timezone.utc)) if reason is not None: raise pytest.UsageError(reason) @@ -180,6 +201,16 @@ def _needs_unset_opt_in(item: pytest.Item) -> bool: ) +def _reaches_proxy(item: pytest.Item) -> bool: + """True for a live test that talks to the shared proxy: `e2e`-marked and not a + `migration_startup` test, which boots its own container instead.""" + return item.get_closest_marker("e2e") is not None and item.get_closest_marker("migration_startup") is None + + +def _uses_idle_rss(item: pytest.Item) -> bool: + return isinstance(item, pytest.Function) and "idle_rss" in item.fixturenames + + def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item]) -> None: """Deselect every test behind an opt-in marker whose env var is unset (see OPT_IN_MARKERS): those tests need a proxy configured differently from the @@ -209,6 +240,20 @@ def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item items.sort(key=lambda item: item.get_closest_marker("load") is not None) +@pytest.hookimpl(tryfirst=True) +def pytest_collection_finish(session: pytest.Session) -> None: + """When a selected test asks for the `idle_rss` fixture and this is not a + `--collect-only` run, read every replica's RSS once, right here at the end of + collection and before this process sends any traffic. tryfirst keeps the read + ahead of xdist's own collection-finish report, and the controller schedules no + test until every worker has reported, so this is the idle footprint of a stack + that just passed its readiness gate. The fixture hands the capture to the + idle-budget test in router/test_reliability_memory_e2e.py.""" + if session.config.getoption("collectonly") or not any(_uses_idle_rss(item) for item in session.items): + return + session.config.stash[_IDLE_RSS] = read_rss_everywhere(build_proxy_client(), timeout=IDLE_RSS_READ_TIMEOUT_SECONDS) + + def _liveness_reason(label: str, base_url: str) -> str | None: """None if `base_url` answers its liveness probe, else a failure reason.""" try: @@ -233,6 +278,12 @@ def _proxy_fail_reason() -> str | None: return None +@pytest.hookimpl(wrapper=True) +def pytest_runtest_protocol(item: pytest.Item, nextitem: pytest.Item | None) -> Generator[None, object, object]: + with stack_lock(exclusive=item.get_closest_marker("quiet_stack") is not None): + return (yield) + + @pytest.hookimpl(tryfirst=True) def pytest_runtest_setup(item: pytest.Item) -> None: """Hard-fail `e2e`-marked tests unless a proxy answers its liveness probe. @@ -240,7 +291,9 @@ def pytest_runtest_setup(item: pytest.Item) -> None: run even when none is up. Never skip for a missing proxy. Replay mode needs the proxy too: only provider-bound traffic replays from the bundle.""" LIVE_PROVIDER_REQUIRED.set(item.get_closest_marker("provider_live") is not None) - if item.get_closest_marker("e2e") is None or item.get_closest_marker("migration_startup") is not None: + if _uses_idle_rss(item): + item.user_properties.extend(item.config.stash[_IDLE_RSS].junit_properties) + if not _reaches_proxy(item): return if isinstance(item, pytest.Function) and "oauth_gateway" in item.fixturenames: return @@ -255,7 +308,7 @@ def pytest_runtest_call(item: pytest.Item) -> None: guard before truncating the spend-log DB. Tests under `tests/e2e/` without the `e2e` marker (pure unit coverage for the harness itself) never hit the proxy, so they must not arm the destructive DB truncate.""" - if item.get_closest_marker("e2e") is None or item.get_closest_marker("migration_startup") is not None: + if not _reaches_proxy(item): return item.session.stash[_E2E_TEST_RAN] = True @@ -290,9 +343,7 @@ def pytest_runtest_teardown(item: pytest.Item) -> Generator[None, None, None]: LIVE_PROVIDER_REQUIRED.set(False) if not item.stash.get(_CALL_PASSED, False): return result - reason = replay_leftover_error( - mode_raw=FIXTURE_MODE_RAW, bundle_dir=FIXTURE_DIR, test_key=item.nodeid - ) + reason = replay_leftover_error(mode_raw=FIXTURE_MODE_RAW, bundle_dir=FIXTURE_DIR, test_key=item.nodeid) if reason is not None: pytest.fail(reason) return result @@ -319,6 +370,13 @@ def proxy() -> ProxyClient: return build_proxy_client() +@pytest.fixture(scope="session") +def idle_rss(request: pytest.FixtureRequest) -> RssCapture: + """Every replica's RSS as read once at the end of collection, before this process + sent any traffic (see pytest_collection_finish).""" + return request.config.stash[_IDLE_RSS] + + @pytest.fixture def resources(client: ProxyClientProvider) -> Iterator[ResourceManager]: """init -> run -> teardown: create a manager, run the test, release resources. diff --git a/tests/e2e/coverage_registry/guardrail.yaml b/tests/e2e/coverage_registry/guardrail.yaml index ae1fd8a8f9b..920a288aea6 100644 --- a/tests/e2e/coverage_registry/guardrail.yaml +++ b/tests/e2e/coverage_registry/guardrail.yaml @@ -10,6 +10,7 @@ - {id: guardrail.litellm_content_filter.pre_call.blocks, module: guardrail, tier: P0, hook_point: pre_call, assertions: [blocks], exercised_on: [chat_completions], source: "test_team_disable_global_guardrail_e2e.py", rationale: "Local content-filter default-on blocks banned keyword pre-call"} - {id: guardrail.litellm_content_filter.pre_call.blocks_video, module: guardrail, tier: P0, hook_point: pre_call, assertions: [blocks], exercised_on: [videos], source: "test_key_guardrail_video_e2e.py", fail_before_fix: proven, rationale: "A content-filter guardrail attached to a key (metadata.guardrails) blocks a banned prompt on POST /v1/videos before the provider is called; before the fix the route's call type was unknown to the unified guardrail hook and the prompt went to the provider unscanned (LIT-6685)"} - {id: guardrail.litellm_content_filter.pre_call.allows, module: guardrail, tier: P0, hook_point: pre_call, assertions: [allows], exercised_on: [chat_completions], source: "test_team_disable_global_guardrail_e2e.py", rationale: "Team disable_global_guardrails bypasses default-on content filter"} +- {id: guardrail.litellm_content_filter.pre_call.returns_guardrail_information, module: guardrail, tier: P0, hook_point: pre_call, assertions: [allows], exercised_on: [chat_completions], source: "guardrails/test_guardrail_information_response_e2e.py", rationale: "Opt-in chat responses expose successful guardrail execution details"} - {id: guardrail.litellm_content_filter.apply_endpoint.blocks, module: guardrail, tier: P0, hook_point: apply_endpoint, assertions: [blocks], exercised_on: [chat_completions], source: "guardrail_endpoints.py:apply_guardrail", rationale: "POST /guardrails/apply_guardrail blocks banned content for customers that call the apply surface directly"} - {id: guardrail.litellm_content_filter.apply_endpoint.allows, module: guardrail, tier: P0, hook_point: apply_endpoint, assertions: [allows], exercised_on: [chat_completions], source: "guardrail_endpoints.py:apply_guardrail", rationale: "POST /guardrails/apply_guardrail returns clean text for allowed input"} - {id: guardrail.bedrock.during.blocks, module: guardrail, tier: P0, hook_point: during, assertions: [blocks], exercised_on: [chat_completions], source: "guardrail_hooks/bedrock_guardrails.py", rationale: "During-call moderation for streaming"} diff --git a/tests/e2e/coverage_registry/llm_nonconversational.yaml b/tests/e2e/coverage_registry/llm_nonconversational.yaml index c58c8af44ff..3e389acc2a9 100644 --- a/tests/e2e/coverage_registry/llm_nonconversational.yaml +++ b/tests/e2e/coverage_registry/llm_nonconversational.yaml @@ -24,6 +24,7 @@ - {id: llm.batches.bedrock.basic.nonstream.works, module: llm, tier: P0, subject_endpoint: batches, route: bedrock_converse, capability: basic, streaming: nonstream, assertions: [works], source: "batches/capabilities.py:98", rationale: "Bedrock batches (encoded/unified only)"} - {id: llm.batches.bedrock.assume_role.nonstream.works, module: llm, tier: P0, subject_endpoint: batches, route: bedrock_converse, capability: assume_role, streaming: nonstream, assertions: [works], source: "test_batches_e2e.py", rationale: "Bedrock batch create under STS assume-role credentials"} - {id: llm.batches.bedrock.govcloud_partition.nonstream.works, module: llm, tier: P0, subject_endpoint: batches, route: bedrock_converse, capability: govcloud_partition, streaming: nonstream, assertions: [works], source: "test_batches_e2e.py", rationale: "Bedrock batch create in the us-gov-west-1 partition"} +- {id: llm.batches.bedrock.blank_s3_env.nonstream.works, module: llm, tier: P0, subject_endpoint: batches, route: bedrock_converse, capability: blank_s3_env, streaming: nonstream, assertions: [works], source: "test_bedrock_blank_s3_env_e2e.py", rationale: "Bedrock batch create treats blank AWS_S3_ENCRYPTION_KEY_ID / AWS_S3_BUCKET_OWNER env vars as unset instead of serializing empty strings"} - {id: llm.batches.bedrock.cancel.nonstream.works, module: llm, tier: P0, subject_endpoint: batches, route: bedrock_converse, capability: basic, streaming: nonstream, assertions: [works], source: "test_batches_e2e.py", rationale: "Bedrock batch cancel (StopModelInvocationJob) returns the same id with a cancelling/cancelled status"} - {id: llm.batches.bedrock.list.nonstream.works, module: llm, tier: P0, subject_endpoint: batches, route: bedrock_converse, capability: basic, streaming: nonstream, assertions: [works], source: "test_batches_e2e.py", rationale: "A Bedrock managed batch is present in the GET /v1/batches list envelope"} - {id: llm.batches.hosted_vllm.basic.nonstream.works, module: llm, tier: P1, subject_endpoint: batches, route: hosted_vllm, capability: basic, streaming: nonstream, assertions: [works], source: "test_batches_e2e.py", rationale: "hosted_vllm OpenAI-compatible batch create"} diff --git a/tests/e2e/coverage_registry/logging.yaml b/tests/e2e/coverage_registry/logging.yaml index 1f2f1d64711..7c83e4d3aea 100644 --- a/tests/e2e/coverage_registry/logging.yaml +++ b/tests/e2e/coverage_registry/logging.yaml @@ -13,6 +13,7 @@ - {id: logging.otel.failure.exports_metric, module: logging, tier: P0, event: failure, assertions: [exports_metric], exercised_on: [chat_completions, messages], source: "integrations/otel/logger.py", rationale: "Error spans for observability continuity"} - {id: logging.braintrust.success.logs_spend, module: logging, tier: P1, event: success, assertions: [logs_spend], exercised_on: [chat_completions, messages], source: "integrations/braintrust_logging.py", rationale: "Evals platform spend"} - {id: logging.langsmith.success.logs_spend, module: logging, tier: P1, event: success, assertions: [logs_spend], exercised_on: [chat_completions, messages], source: "integrations/langsmith.py", rationale: "LangChain ecosystem"} +- {id: logging.langsmith.success.serializes_non_native_metadata, module: logging, tier: P1, event: success, assertions: [serializes_non_native_metadata], exercised_on: [sdk], source: "integrations/langsmith.py", rationale: "datetime/Decimal/UUID metadata used to TypeError in json.dumps and drop the whole batch (LIT-8310)"} - {id: logging.arize.success.logs_spend, module: logging, tier: P1, event: success, assertions: [logs_spend], exercised_on: [chat_completions, embeddings], source: "integrations/arize/arize.py", rationale: "ML-ops observability"} - {id: logging.mlflow.success.logs_spend, module: logging, tier: P1, event: success, assertions: [logs_spend], exercised_on: [chat_completions], source: "integrations/mlflow.py", rationale: "Experiment tracking cost/run"} - {id: logging.opik.success.logs_spend, module: logging, tier: P1, event: success, assertions: [logs_spend], exercised_on: [chat_completions], source: "integrations/opik/opik.py", rationale: "Eval platform spend/case"} diff --git a/tests/e2e/coverage_registry/mgmt.yaml b/tests/e2e/coverage_registry/mgmt.yaml index 85fbd0acd91..e1a840b1239 100644 --- a/tests/e2e/coverage_registry/mgmt.yaml +++ b/tests/e2e/coverage_registry/mgmt.yaml @@ -94,6 +94,10 @@ - {id: mgmt.mcp_toolset.update.persists, module: mgmt, tier: P0, surface: api, assertions: [persists], source: "mcp_management_endpoints.py:3098", rationale: "Narrowing the tools to one entry reads back exactly that entry"} - {id: mgmt.mcp_toolset.update.clear_persists, module: mgmt, tier: P0, surface: api, assertions: [clear_persists], source: "mcp_management_endpoints.py:3098", fail_before_fix: proven, rationale: "An explicit null clears the stored description; the update used to drop null and keep the old value"} - {id: mgmt.mcp_toolset.delete.persists, module: mgmt, tier: P0, surface: api, assertions: [persists], source: "mcp_management_endpoints.py:3149", rationale: "A deleted toolset is gone by id and from the list on every replica"} +- {id: mgmt.key.delete.audit_logged, module: mgmt, tier: P0, surface: api, assertions: [audit_logged], source: "key_management_endpoints.py:3981", rationale: "Every hard key deletion writes one LiteLLM_VerificationToken deleted audit row, whether the key is addressed by key or by alias"} +- {id: mgmt.team.member_delete.audit_logs_keys, module: mgmt, tier: P0, surface: api, assertions: [audit_logs_keys], source: "team_endpoints.py:3563", rationale: "Removing a team member hard-deletes their keys and each deleted key writes a deleted audit row"} +- {id: mgmt.team.delete.audit_logs_keys, module: mgmt, tier: P0, surface: api, assertions: [audit_logs_keys], source: "team_endpoints.py:4344", rationale: "Deleting a team hard-deletes its keys and each deleted key writes a deleted audit row"} +- {id: mgmt.user.delete.audit_logs_keys, module: mgmt, tier: P0, surface: api, assertions: [audit_logs_keys], source: "internal_user_endpoints.py:2369", rationale: "Deleting a user hard-deletes their keys and each deleted key writes a deleted audit row"} - {id: mgmt.user.jwt.database_roles, module: mgmt, tier: P0, surface: api, assertions: [database_roles], source: "auth/handle_jwt.py", rationale: "User-only JWT subjects retain their seeded database roles and memberships"} - {id: mgmt.key.jwt.viewer_denied, module: mgmt, tier: P0, surface: api, assertions: [viewer_denied], source: "auth/route_checks.py", rationale: "An admin viewer can read a key but cannot update it or change stored state"} diff --git a/tests/e2e/coverage_registry/other.yaml b/tests/e2e/coverage_registry/other.yaml index 1706b2f8f25..f695af3cb11 100644 --- a/tests/e2e/coverage_registry/other.yaml +++ b/tests/e2e/coverage_registry/other.yaml @@ -40,7 +40,10 @@ - {id: other.config.runtime_update.applies_at_runtime, module: other, tier: P0, area: config, assertions: [applies_at_runtime], source: "proxy_server.py:14014-14060", rationale: "/config/update persists to DB + invalidates cache"} - {id: other.config.passthrough.headers_forwarded, module: other, tier: P0, area: config, assertions: [headers_forwarded], source: "passthrough/utils.py forward_headers_from_request", rationale: "Custom pass-through static headers and x-pass-* client headers reach the upstream"} - {id: other.config.general_settings.alert_webhook_side_effect, module: other, tier: P1, area: config, assertions: [alert_webhook_side_effect], source: "proxy_server.py:14215", rationale: "alert_to_webhook_url auto-enables slack alerting"} -- {id: other.config.secret_resolution.kms_integration, module: other, tier: P1, area: config, assertions: [kms_integration], source: "proxy_server.py:3984-4010", rationale: "Resolves secrets from Vault/KMS at startup"} +- {id: other.config.secret_resolution.kms_integration, module: other, tier: P1, area: config, assertions: [kms_integration], source: "secret_managers/main.py get_secret / secret_manager/test_secret_manager_e2e.py", rationale: "A deployment whose api_key is os.environ/ gets its key from the configured secret manager when that name exists only in the manager"} +- {id: other.config.secret_resolution.manager_value_used, module: other, tier: P1, area: config, assertions: [manager_value_used], source: "secret_managers/main.py get_secret / secret_manager/test_secret_manager_e2e.py", rationale: "The value the manager holds is what reaches the provider: a bogus key in the manager is rejected by the provider with 401, so a passing resolution test cannot be an env fallback"} +- {id: other.config.secret_manager.virtual_key_stored, module: other, tier: P1, area: config, assertions: [virtual_key_stored], source: "key_management_event_hooks.py _store_virtual_key_in_secret_manager", rationale: "With store_virtual_keys, /key/generate writes the new key under prefix_for_stored_virtual_keys + key_alias in the manager"} +- {id: other.config.secret_manager.virtual_key_deleted, module: other, tier: P1, area: config, assertions: [virtual_key_deleted], source: "key_management_event_hooks.py _delete_virtual_keys_from_secret_manager", rationale: "/key/delete removes the stored key from the manager, so a revoked key does not linger there"} - {id: other.config.overrides.audit_logged, module: other, tier: P1, area: config, assertions: [audit_logged], source: "config_override_endpoints.py:67-100", rationale: "Config override mutations audit-logged, values redacted"} - {id: other.key_mgmt.regenerate.grace_period_honored, module: other, tier: P1, area: auth, assertions: [grace_period_honored], source: "key_management_endpoints.py:4503-4560", rationale: "Old key valid during grace_period then revoked"} - {id: other.key_mgmt.spend_reset.resets_to_value, module: other, tier: P1, area: auth, assertions: [resets_to_value], source: "key_management_endpoints.py:4841", rationale: "reset_spend resets accumulated spend"} diff --git a/tests/e2e/coverage_registry/quota_management.yaml b/tests/e2e/coverage_registry/quota_management.yaml index ad0914d455b..5740a878608 100644 --- a/tests/e2e/coverage_registry/quota_management.yaml +++ b/tests/e2e/coverage_registry/quota_management.yaml @@ -10,6 +10,7 @@ - {id: quota_management.ratelimit.redis_backed.blocks_over_limit, module: quota_management, tier: P0, behavior: ratelimit, variant: redis_backed, assertions: [blocks_over_limit], exercised_on: [chat_completions], source: "parallel_request_limiter_v3.py", rationale: "With Redis configured, RPM still enforces 429 across the shared limiter path customers run multi-replica"} - {id: quota_management.ratelimit.rpm.resets_after_window, module: quota_management, tier: P1, behavior: ratelimit, variant: rpm, assertions: [resets_after_window], exercised_on: [chat_completions], source: "parallel_request_limiter_v3.py", rationale: "Rate-limit window (LITELLM_RATE_LIMIT_WINDOW_SIZE, 60s default) expires; a blocked key serves again in the next window"} - {id: quota_management.ratelimit.rpm.headers_report_remaining, module: quota_management, tier: P1, behavior: ratelimit, variant: rpm, assertions: [headers_report_remaining], exercised_on: [chat_completions], source: "parallel_request_limiter_v3.py async_post_call_success_hook", rationale: "Successful responses carry x-ratelimit-api_key-{limit,remaining}-{requests,tokens} so clients can pace"} +- {id: quota_management.ratelimit.model_group_alias.shares_bucket, module: quota_management, tier: P1, behavior: ratelimit, variant: model_group_alias, assertions: [shares_bucket], exercised_on: [chat_completions], source: "parallel_request_limiter_v3.py:_add_model_per_key_rate_limit_descriptor", rationale: "A model_group_alias draws on the same per-key deployment rpm bucket as the resolved model group, so alias plus real-name traffic cannot exceed the configured limit"} - {id: quota_management.ratelimit.priority_generous.picks_under_tpm, module: quota_management, tier: P1, behavior: ratelimit, variant: priority_generous, assertions: [picks_under_tpm], exercised_on: [chat_completions, messages], source: "dynamic_rate_limiter_v3.py:36-52", rationale: "Generous mode (<80% sat) allows priority borrowing"} - {id: quota_management.ratelimit.priority_strict.picks_under_tpm, module: quota_management, tier: P1, behavior: ratelimit, variant: priority_strict, assertions: [picks_under_tpm], exercised_on: [chat_completions, messages], source: "dynamic_rate_limiter_v3.py:53-71", rationale: "Strict mode (>=80% sat) enforces priority fairness"} - {id: quota_management.budget.key.blocks_over_limit, module: quota_management, tier: P0, behavior: budget, variant: key, assertions: [blocks_over_limit], exercised_on: [chat_completions], source: "proxy/auth/auth_checks.py", rationale: "A key's max_budget blocks further paid calls once spend crosses it"} @@ -45,10 +46,13 @@ - {id: quota_management.spend_tracking.cache_hit.zero_cost, module: quota_management, tier: P1, behavior: spend_tracking, variant: cache_hit, assertions: [zero_cost], exercised_on: [chat_completions], source: "proxy/spend_tracking/spend_tracking_utils.py", rationale: "A response-cache hit logs at zero cost with the cache-hit marker"} - {id: quota_management.spend_tracking.key_rollup.matches_sum_of_logs, module: quota_management, tier: P1, behavior: spend_tracking, variant: key_rollup, assertions: [matches_sum_of_logs], exercised_on: [chat_completions], source: "proxy/db/db_spend_update_writer.py", rationale: "A key's rolled-up spend equals the sum of its log rows"} - {id: quota_management.spend_tracking.concurrent_burst.loses_no_spend, module: quota_management, tier: P1, behavior: spend_tracking, variant: concurrent_burst, assertions: [loses_no_spend], exercised_on: [chat_completions], source: "proxy/db/db_spend_update_writer.py", rationale: "Concurrent calls all land as spend; no row lost to write contention"} +- {id: quota_management.spend_tracking.surface_consistency.matches_every_surface, module: quota_management, tier: P1, behavior: spend_tracking, variant: surface_consistency, assertions: [matches_every_surface], exercised_on: [chat_completions], source: "proxy/db/db_spend_update_writer.py", rationale: "One priced request lands the same response_cost on the spend log row, /key/info, /team/info, the usage export's /user/daily/activity/aggregated row, and the litellm_spend_metric Prometheus sample; each is a separate writer, so a rounding, dropped, or double-counted write on one drifts it from the rest (LIT-3620, LIT-5045)"} - {id: quota_management.spend_tracking.tags.attributes_spend, module: quota_management, tier: P1, behavior: spend_tracking, variant: tags, assertions: [attributes_spend], exercised_on: [chat_completions], source: "proxy/spend_tracking/spend_tracking_utils.py", rationale: "Request tags round-trip to spend rows and tag rollups match tagged logs"} - {id: quota_management.spend_tracking.end_user.attributes_spend, module: quota_management, tier: P1, behavior: spend_tracking, variant: end_user, assertions: [attributes_spend], exercised_on: [chat_completions], source: "proxy/spend_tracking/spend_tracking_utils.py", rationale: "user= attribution lands the end-user id on the spend row"} - {id: quota_management.spend_tracking.per_model.writes_own_rows, module: quota_management, tier: P2, behavior: spend_tracking, variant: per_model, assertions: [writes_own_rows], exercised_on: [chat_completions], source: "proxy/spend_tracking/spend_tracking_utils.py", rationale: "Each model on a shared key gets its own spend row"} - {id: quota_management.spend_tracking.failure.writes_failure_row, module: quota_management, tier: P1, behavior: spend_tracking, variant: failure, assertions: [writes_failure_row], exercised_on: [chat_completions], source: "proxy/spend_tracking/spend_log_error_logger.py", rationale: "A failed call writes a failure-status spend row"} +- {id: quota_management.spend_tracking.failure.writes_normalized_error, module: quota_management, tier: P1, behavior: spend_tracking, variant: failure, assertions: [writes_normalized_error], exercised_on: [chat_completions], source: "litellm_core_utils/error_normalization.py", rationale: "Failure rows carry a stable metadata.error_information.normalized_error key next to the unchanged error_message, so two upstream auth failures with different provider wording share one cluster key a dashboard can group by"} +- {id: quota_management.spend_tracking.failure.attributes_provider, module: quota_management, tier: P1, behavior: spend_tracking, variant: failure, assertions: [attributes_provider], exercised_on: [chat_completions], source: "proxy/utils.py", rationale: "A request rejected in pre_call_hook (rate limit, guardrail) still lands its single deployment's provider and model_id on the failure spend row"} - {id: quota_management.spend_tracking.spend_calculate.returns_cost, module: quota_management, tier: P2, behavior: spend_tracking, variant: spend_calculate, assertions: [returns_cost], exercised_on: [spend_calculate], source: "proxy/spend_tracking/spend_management_endpoints.py", rationale: "/spend/calculate prices a hypothetical request at nonzero cost"} - {id: quota_management.spend_tracking.pagination.keeps_total, module: quota_management, tier: P2, behavior: spend_tracking, variant: pagination, assertions: [keeps_total], exercised_on: [chat_completions], source: "proxy/spend_tracking/spend_management_endpoints.py", rationale: "Spend-logs v2 pagination caps page size without losing the total"} - {id: quota_management.spend_tracking.cache_write.bills_cache_creation_rate, module: quota_management, tier: P1, behavior: spend_tracking, variant: cache_write, assertions: [bills_cache_creation_rate], exercised_on: [chat_completions], source: "litellm_core_utils/llm_cost_calc/utils.py", rationale: "OpenAI cache-write tokens land on the spend row as cache-creation tokens billed at the cache-creation rate, not silently at the input rate (#34046)"} @@ -58,6 +62,7 @@ - {id: quota_management.spend_tracking.service_tier.bills_tier_rates, module: quota_management, tier: P1, behavior: spend_tracking, variant: service_tier, assertions: [bills_tier_rates], exercised_on: [chat_completions], source: "cost_calculator.py", rationale: "A priority service_tier call bills input, output, and reasoning at the deployment's *_priority rates and records the tier on the row (#35923, #35925)"} - {id: quota_management.spend_tracking.cost_headers.additive_components, module: quota_management, tier: P1, behavior: spend_tracking, variant: cost_headers, assertions: [additive_components], exercised_on: [chat_completions], source: "proxy/common_request_processing.py", rationale: "The x-litellm-response-cost-* component headers sum to the total, input covers only fresh tokens, and reasoning stays a subset of output (#36965)"} - {id: quota_management.spend_tracking.passthrough_stream.injects_usage_cost, module: quota_management, tier: P1, behavior: spend_tracking, variant: passthrough_stream, assertions: [injects_usage_cost], exercised_on: [openai_passthrough], source: "proxy/pass_through_endpoints/streaming_handler.py", rationale: "With include_cost_in_streaming_usage on, the /openai passthrough's final streaming usage frame carries the proxy-computed cost (#36503). Uncovered: the flag is only settable in litellm_settings, and the shared e2e stack does not turn it on yet"} +- {id: quota_management.spend_tracking.websearch_interception.bills_under_request_session, module: quota_management, tier: P1, behavior: spend_tracking, variant: websearch_interception, assertions: [bills_under_request_session], exercised_on: [messages], source: "integrations/websearch_interception/handler.py", fail_before_fix: proven, rationale: "A web_search server tool the proxy intercepts into litellm.asearch writes its own asearch spend row, and that row carries the parent request's session_id so the session view counts the search and its cost next to the turn that triggered it (LIT-8063)"} - {id: quota_management.spend_tracking.key_attribution.joins_key, module: quota_management, tier: P1, behavior: spend_tracking, variant: key_attribution, assertions: [joins_key], exercised_on: [chat_completions, messages, responses, embeddings, batches, files, google_native, rust_control_plane], source: "proxy/spend_tracking/spend_tracking_utils.py", rationale: "Every spend row a virtual key writes across chat, queued chat, messages, responses, embeddings, the Gemini passthrough, file upload, batch create, and a replayed callback log carries api_key equal to the key's token hash and the key alias, the join the usage APIs depend on; a re-hashed token shows up as an unattributed key-hash-* row (#39568, #39572)"} - {id: quota_management.spend_tracking.key_attribution.reports_alias_and_email, module: quota_management, tier: P1, behavior: spend_tracking, variant: key_attribution, assertions: [reports_alias_and_email], exercised_on: [chat_completions, messages, responses, embeddings, batches, files, google_native, rust_control_plane], source: "proxy/management_endpoints/internal_user_endpoints.py", rationale: "/spend/logs?api_key= returns every one of the key's rows with its alias and /user/daily/activity aggregates them under the key's token with key_alias and user_email; /spend/logs carries no email field, so the email is asserted on daily activity only"} - {id: quota_management.spend_tracking.key_attribution.health_rows_keep_service_account, module: quota_management, tier: P1, behavior: spend_tracking, variant: key_attribution, assertions: [health_rows_keep_service_account], exercised_on: [chat_completions], source: "proxy/health_check.py", rationale: "A /health probe's spend row stays keyed by the literal litellm-internal-health-check service account rather than a hash of it, so health spend never appears as an unattributed key"} diff --git a/tests/e2e/coverage_registry/reliability.yaml b/tests/e2e/coverage_registry/reliability.yaml index 334780eda53..5040f5f4dcf 100644 --- a/tests/e2e/coverage_registry/reliability.yaml +++ b/tests/e2e/coverage_registry/reliability.yaml @@ -9,6 +9,7 @@ - {id: reliability.retry.auth.succeeds_within_retries, module: reliability, tier: P1, behavior: retry, variant: auth, assertions: [succeeds_within_retries], exercised_on: [chat_completions], source: "get_retry_from_policy.py:42", rationale: "Transient auth glitch retry"} - {id: reliability.retry.context_window.succeeds_within_retries, module: reliability, tier: P1, behavior: retry, variant: context_window, assertions: [succeeds_within_retries], exercised_on: [chat_completions], source: "get_retry_from_policy.py:51", fail_before_fix: proven, rationale: "A context-window 400 under BadRequestErrorRetries retries onto a sibling deployment in the same model group, instead of coming straight back as the 400 the deployment that just refused it returned"} - {id: reliability.cooldown.5xx.trips_then_recovers, module: reliability, tier: P0, behavior: cooldown, variant: "5xx", assertions: [trips_then_recovers], exercised_on: [chat_completions], source: "cooldown_handlers.py:40", rationale: "Deployment cools after repeated 5xx, recovers after cooldown_time"} +- {id: reliability.cooldown.sibling_replica.serves_backup_within_read_interval, module: reliability, tier: P1, behavior: cooldown, variant: sibling_replica, assertions: [serves_backup_within_read_interval], exercised_on: [chat_completions], source: "cooldown_cache.py:44", fail_before_fix: proven, rationale: "A bench taken on one gateway reaches a sibling that already holds the key's read timer within the 1s Redis read interval plus margin, so its next call lands on the backup"} - {id: reliability.cooldown.429.trips_then_recovers, module: reliability, tier: P0, behavior: cooldown, variant: "429", assertions: [trips_then_recovers], exercised_on: [chat_completions], source: "cooldown_handlers.py:69", rationale: "Cools on 429, avoids hammering exhausted provider"} - {id: reliability.cooldown.auth.trips_then_recovers, module: reliability, tier: P1, behavior: cooldown, variant: auth, assertions: [trips_then_recovers], exercised_on: [chat_completions], source: "cooldown_handlers.py:74", rationale: "Cools on 401 auth error"} - {id: reliability.cooldown.timeout.trips_then_recovers, module: reliability, tier: P1, behavior: cooldown, variant: timeout, assertions: [trips_then_recovers], exercised_on: [chat_completions], source: "cooldown_handlers.py:77", rationale: "Cools on 408 timeout"} @@ -37,4 +38,5 @@ - {id: reliability.timeout.stream_timeout.exceeds_deadline, module: reliability, tier: P1, behavior: timeout, variant: stream_timeout, assertions: [exceeds_deadline], exercised_on: [chat_completions], source: "litellm/router.py:551", rationale: "Streaming chunk-delivery timeout"} - {id: reliability.perf.throughput.under_slo, module: reliability, tier: P1, behavior: perf, variant: throughput, assertions: [under_slo], exercised_on: [chat_completions, messages], source: grammar, rationale: "Throughput SLO under load"} - {id: reliability.perf.memory.under_slo, module: reliability, tier: P1, behavior: perf, variant: memory, assertions: [under_slo], exercised_on: [chat_completions], source: grammar, rationale: "Proxy RSS and the stored request snapshot stay within fixed budgets across a few hundred failing requests with retries and fallbacks, the v1.100.0 retry-breadcrumb leak shape (MAT-335)"} +- {id: reliability.perf.idle_memory.under_slo, module: reliability, tier: P1, behavior: perf, variant: idle_memory, assertions: [under_slo], exercised_on: [], source: grammar, rationale: "Every worker's RSS as read right after the readiness gate and before any test traffic stays under a fixed idle budget; a DB-backed v1.100.x worker idled at 886 MB against a 2 GiB pod limit where v1.101.0rc1 idled at 544 MB"} - {id: reliability.perf.session_anomaly.under_slo, module: reliability, tier: P1, behavior: perf, variant: session_anomaly, assertions: [under_slo], exercised_on: [messages], source: grammar, rationale: "Weekly Claude Code-shaped multi-turn session load against real providers; ceilings on error rate, warm-turn cache read/write, p95 turn time, and gateway-recorded spend (LIT-4562)"} diff --git a/tests/e2e/coverage_registry/schema.py b/tests/e2e/coverage_registry/schema.py index f3ac1ef8a83..e009b02b69c 100644 --- a/tests/e2e/coverage_registry/schema.py +++ b/tests/e2e/coverage_registry/schema.py @@ -65,6 +65,7 @@ LlmCapability = Literal[ "assume_role", "basic", "batch_deployment", + "blank_s3_env", "count_tokens", "govcloud_partition", "split_s3_credentials", diff --git a/tests/e2e/e2e_config.py b/tests/e2e/e2e_config.py index 311c944eeb4..ca3b74281ae 100644 --- a/tests/e2e/e2e_config.py +++ b/tests/e2e/e2e_config.py @@ -34,7 +34,7 @@ CONTROL_PLANE_BASE_URL = os.environ.get( def parse_replica_urls(raw: str, fallback: str) -> tuple[str, ...]: - urls: Final = tuple(url.strip().rstrip("/") for url in raw.split(",") if url.strip()) + urls: Final = tuple(dict.fromkeys(url.strip().rstrip("/") for url in raw.split(",") if url.strip())) return urls or (fallback,) @@ -58,6 +58,7 @@ LINEAR_READONLY_TOOL: Final = "list_teams" # as listed by tools/list on mcp.lin # service in docker-compose.yml maps it to host 16686). Trace-completeness tests # read exported spans back through it. OTEL_QUERY_URL = os.environ.get("E2E_OTEL_QUERY_URL", "http://localhost:16686").rstrip("/") +OTEL_EXPORTER_ENDPOINT = os.environ.get("E2E_OTEL_EXPORTER_ENDPOINT", "") # Real-DataDog read-back (no local sink - destination fakes cannot be deployed # on the cluster): the proxy delivers with DD_API_KEY as in production, and the @@ -148,6 +149,8 @@ CLI_DETERMINISM_OPT_IN_ENV = "E2E_CLI_DETERMINISM" MCP_OAUTH_LIVE_OPT_IN_ENV: Final = "E2E_MCP_OAUTH_LIVE" PROVIDER_EDGE_HOST_OPT_IN_ENV: Final = "E2E_PROVIDER_EDGE_HOST_REACHABLE" OTEL_V2_OPT_IN_ENV: Final = "E2E_OTEL_V2" +OTEL_TLS_OPT_IN_ENV: Final = "E2E_OTEL_EXPORTER_ENDPOINT" +SECRET_MANAGER_OPT_IN_ENV: Final = "E2E_SECRET_MANAGER" ANOMALY_SESSIONS = int(os.environ.get("E2E_ANOMALY_SESSIONS", "6")) ANOMALY_TURNS_PER_SESSION = int(os.environ.get("E2E_ANOMALY_TURNS_PER_SESSION", "6")) ANOMALY_TURN_ATTEMPTS = int(os.environ.get("E2E_ANOMALY_TURN_ATTEMPTS", "3")) @@ -171,6 +174,7 @@ MEMORY_CONCURRENCY = int(os.environ.get("E2E_MEMORY_CONCURRENCY", "4")) MEMORY_RSS_SETTLE_SAMPLES = int(os.environ.get("E2E_MEMORY_RSS_SETTLE_SAMPLES", "15")) MEMORY_RSS_SAMPLE_INTERVAL_SECONDS = float(os.environ.get("E2E_MEMORY_RSS_SAMPLE_INTERVAL_SECONDS", "1")) MEMORY_RSS_BUDGET_MB = float(os.environ.get("E2E_MEMORY_RSS_BUDGET_MB", "48")) +MEMORY_IDLE_RSS_BUDGET_MB = float(os.environ.get("E2E_MEMORY_IDLE_RSS_BUDGET_MB", "768")) MEMORY_STORED_REQUEST_BUDGET_KB = float(os.environ.get("E2E_MEMORY_STORED_REQUEST_BUDGET_KB", "64")) diff --git a/tests/e2e/e2e_http.py b/tests/e2e/e2e_http.py index 97f1e1671f8..022caddd42a 100644 --- a/tests/e2e/e2e_http.py +++ b/tests/e2e/e2e_http.py @@ -49,6 +49,7 @@ class AnthropicHeaders(AuthHeaders): on its own internal calls.""" anthropic_version: str = Field(default="2023-06-01", alias="anthropic-version") + x_litellm_session_id: str | None = Field(default=None, serialization_alias="x-litellm-session-id") class PartialBody(BaseModel): @@ -128,9 +129,9 @@ class ProbeResult(BaseModel): class ExternalWrite(BaseModel): - """Outcome of a write to a non-proxy API (an identity provider's admin API) - that answers with a status and, on create, a Location header naming the new - resource rather than a JSON body.""" + """Outcome of a call to a non-proxy API (an identity provider's admin API, a + secret manager) that answers with a status, on create a Location header naming + the new resource, and a body kept as text rather than parsed as JSON.""" status_code: int location: str = "" @@ -344,6 +345,50 @@ def request_with_retry[T: RetryableResponse]( return issue() +PROVIDER_RATE_LIMIT_MARKER: Final = "litellm.RateLimitError" +PROVIDER_RATE_LIMIT_ATTEMPTS: Final = 4 +PROVIDER_RATE_LIMIT_BACKOFF_SECONDS: Final = 5.0 + + +def tolerate_provider_rate_limit[R: BaseModel]( + issue: Callable[[], Result[R]], + *, + attempts: int = PROVIDER_RATE_LIMIT_ATTEMPTS, + sleep: Callable[[float], None] = time.sleep, +) -> Result[R]: + """Retry a call up to `attempts` times while the proxy relays the provider's own 429; + any other outcome, the proxy's own 429 included, comes back at once.""" + for attempt in range(1, attempts): + match issue(): + case RateLimitedError(body=body, retry_after_seconds=retry_after) if PROVIDER_RATE_LIMIT_MARKER in body: + delay = retry_after or PROVIDER_RATE_LIMIT_BACKOFF_SECONDS * (1 << (attempt - 1)) + print( + f"e2e-http: provider rate limit relayed by the proxy; retry {attempt}/{attempts - 1} in {delay}s", + flush=True, + ) + sleep(delay) + case result: + return result + return issue() + + +class ProxyErrorDetail(BaseModel): + message: str + type: str + code: str + + +class _ProxyErrorBody(BaseModel): + error: ProxyErrorDetail + + +def relayed_provider_rate_limit(outcome: RateLimitedError) -> ProxyErrorDetail | None: + """The provider's own 429 as the proxy relayed it, or None when the 429 is the proxy's own.""" + if PROVIDER_RATE_LIMIT_MARKER not in outcome.body: + return None + return _ProxyErrorBody.model_validate_json(outcome.body).error + + class ClassifiableResponse(Protocol): """What classifying an outcome reads off a response. requests.Response satisfies it, and so does a fake, so the classification rules are testable on their own.""" @@ -490,6 +535,30 @@ def post_json_external( ) +def send_text_external( + method: Literal["GET", "POST", "PATCH"], + url: str, + *, + headers: BaseModel, + content: str | None = None, + timeout: float = 30.0, +) -> ExternalWrite: + """Send an absolute URL outside the proxy a raw text body (or none) and keep the + answer as text, for an API that takes and returns neither JSON nor forms: CyberArk + Conjur takes a secret value or a YAML policy and returns a secret as its raw value.""" + try: + resp = requests.request( + method, + url, + headers=_headers(headers), + data=content.encode() if content is not None else None, + timeout=timeout, + ) + except requests.RequestException as exc: + return ExternalWrite(status_code=-1, body=str(exc)) + return ExternalWrite(status_code=resp.status_code, body=resp.text) + + def delete_external(url: str, *, headers: BaseModel, timeout: float = 30.0) -> ExternalWrite: try: resp = requests.delete(url, headers=_headers(headers), timeout=timeout) @@ -906,7 +975,10 @@ class PreparedForward: def prepare_forward( - method: str, url: str, headers: dict[str, str], body: bytes | None, + method: str, + url: str, + headers: dict[str, str], + body: bytes | None, ) -> PreparedForward | NetworkError: try: with requests.Session() as session: @@ -925,7 +997,8 @@ def forward_prepared_stream(prepared: PreparedForward, timeout: float) -> Stream except requests.RequestException as exc: return NetworkError(message=str(exc)) return StreamHead( - resp.status_code, {name.lower(): value for name, value in resp.headers.items()}, + resp.status_code, + {name.lower(): value for name, value in resp.headers.items()}, primed_steps(_stream_steps(resp)), ) diff --git a/tests/e2e/gateway/record_replay_ci_config.yml b/tests/e2e/gateway/record_replay_ci_config.yml index 5b3db0ff530..bc1f3f10562 100644 --- a/tests/e2e/gateway/record_replay_ci_config.yml +++ b/tests/e2e/gateway/record_replay_ci_config.yml @@ -2,3 +2,6 @@ general_settings: master_key: os.environ/LITELLM_MASTER_KEY store_model_in_db: true disable_model_info_refresh: true + +litellm_settings: + callbacks: ["prometheus"] diff --git a/tests/e2e/gateway/secret_manager_cyberark_ci_config.yml b/tests/e2e/gateway/secret_manager_cyberark_ci_config.yml new file mode 100644 index 00000000000..32602783b02 --- /dev/null +++ b/tests/e2e/gateway/secret_manager_cyberark_ci_config.yml @@ -0,0 +1,8 @@ +general_settings: + master_key: os.environ/LITELLM_MASTER_KEY + store_model_in_db: true + key_management_system: cyberark + key_management_settings: + access_mode: read_and_write + store_virtual_keys: true + prefix_for_stored_virtual_keys: litellm-e2e/virtual-keys/ diff --git a/tests/e2e/gateway/secret_manager_hashicorp_vault_ci_config.yml b/tests/e2e/gateway/secret_manager_hashicorp_vault_ci_config.yml new file mode 100644 index 00000000000..8e6b7e74f8e --- /dev/null +++ b/tests/e2e/gateway/secret_manager_hashicorp_vault_ci_config.yml @@ -0,0 +1,8 @@ +general_settings: + master_key: os.environ/LITELLM_MASTER_KEY + store_model_in_db: true + key_management_system: hashicorp_vault + key_management_settings: + access_mode: read_and_write + store_virtual_keys: true + prefix_for_stored_virtual_keys: litellm-e2e/virtual-keys/ diff --git a/tests/e2e/gateway/stage_mirror_ci_config.yml b/tests/e2e/gateway/stage_mirror_ci_config.yml index 2d02fedddae..02a131f60ae 100644 --- a/tests/e2e/gateway/stage_mirror_ci_config.yml +++ b/tests/e2e/gateway/stage_mirror_ci_config.yml @@ -32,7 +32,10 @@ litellm_settings: - host: 127.0.0.1 port: 6379 ssl: true - callbacks: ["arize_phoenix", "datadog", "smtp_email", "prometheus", "otel"] + callbacks: ["arize_phoenix", "datadog", "smtp_email", "prometheus", "otel", "websearch_interception"] + websearch_interception_params: + enabled_providers: ["bedrock"] + search_tool_name: e2e-search require_auth_for_metrics_endpoint: false router_settings: @@ -40,6 +43,8 @@ router_settings: num_retries: 3 allowed_fails: 5 cooldown_time: 30 + model_group_alias: + e2e-alias-rl-alias: e2e-alias-rl-target model_list: - model_name: gpt-5.5 @@ -60,11 +65,22 @@ model_list: litellm_params: model: gemini/gemini-2.5-flash api_key: os.environ/GEMINI_API_KEY + - model_name: e2e-alias-rl-target + litellm_params: + model: anthropic/claude-haiku-4-5 + api_key: os.environ/ANTHROPIC_API_KEY + default_api_key_rpm_limit: 3 - model_name: openai-text-embedding-3-small litellm_params: model: openai/text-embedding-3-small api_key: os.environ/OPENAI_API_KEY +search_tools: + - search_tool_name: e2e-search + litellm_params: + search_provider: perplexity + api_key: os.environ/PERPLEXITY_API_KEY + files_settings: - custom_llm_provider: openai api_key: os.environ/OPENAI_API_KEY diff --git a/tests/e2e/guardrails/guardrails_client.py b/tests/e2e/guardrails/guardrails_client.py index da6fb0d410e..1f4fc43355b 100644 --- a/tests/e2e/guardrails/guardrails_client.py +++ b/tests/e2e/guardrails/guardrails_client.py @@ -17,6 +17,7 @@ from models import ( AnthropicMessagesResponse, ChatBody, ChatMessage, + ChatMetadata, ChatResponse, ChatTool, KeyGenerateBody, @@ -143,6 +144,31 @@ class GuardrailCreateResponse(BaseModel): guardrail_id: str +class PolicyConditionBody(BaseModel): + model: str + + +class PolicyCreateBody(BaseModel): + policy_name: str + inherit: str | None = None + guardrails_add: list[str] + condition: PolicyConditionBody | None = None + + +class PolicyCreateResponse(BaseModel): + policy_id: str + policy_name: str + + +class PolicyAttachmentCreateBody(BaseModel): + policy_name: str + tags: list[str] + + +class PolicyAttachmentCreateResponse(BaseModel): + attachment_id: str + + class ApplyGuardrailRequest(BaseModel): guardrail_name: str text: str @@ -254,6 +280,49 @@ class GuardrailsClient: response_type=NoBody, ) + def create_policy(self, body: PolicyCreateBody) -> str: + """Create a policy via POST /policies and return its name once every replica + can be expected to serve it (policies reach the data plane on the periodic + DB sync, same as guardrails).""" + created = unwrap( + self.proxy.transport.post( + "/policies", + headers=self.proxy.transport.master, + json=body, + response_type=PolicyCreateResponse, + ) + ) + settle_propagation(time.monotonic()) + return created.policy_name + + def delete_policy(self, policy_name: str) -> None: + _ = self.proxy.transport.delete( + f"/policies/name/{policy_name}/all-versions", + headers=self.proxy.transport.master, + json=NoBody(), + response_type=NoBody, + ) + + def attach_policy_to_tags(self, policy_name: str, tags: list[str]) -> str: + attachment_id = unwrap( + self.proxy.transport.post( + "/policies/attachments", + headers=self.proxy.transport.master, + json=PolicyAttachmentCreateBody(policy_name=policy_name, tags=tags), + response_type=PolicyAttachmentCreateResponse, + ) + ).attachment_id + settle_propagation(time.monotonic()) + return attachment_id + + def delete_policy_attachment(self, attachment_id: str) -> None: + _ = self.proxy.transport.delete( + f"/policies/attachments/{attachment_id}", + headers=self.proxy.transport.master, + json=NoBody(), + response_type=NoBody, + ) + def create_team_opted_out_of_global_guardrails(self, alias: str) -> str: team_id = unwrap( self.proxy.transport.post( @@ -302,6 +371,7 @@ class GuardrailsClient: text: str, *, guardrails: list[str] | None = None, + include_guardrail_response: bool | None = None, max_tokens: int = 16, tools: list[ChatTool] | None = None, ) -> Result[ChatResponse]: @@ -317,6 +387,7 @@ class GuardrailsClient: messages=[ChatMessage(role="user", content=text)], max_tokens=max_tokens, guardrails=guardrails, + include_guardrail_response=include_guardrail_response, tools=tools, ), ) @@ -331,11 +402,13 @@ class GuardrailsClient: max_tokens: int = 16, tools: list[ChatTool] | None = None, tool_choice: str | None = None, + tags: list[str] | None = None, ) -> StreamingResponse: """Drive /chat/completions returning the raw HTTP outcome, for the assertions a typed body cannot carry: the `x-litellm-applied-guardrails` response header, which is how an ALLOW scenario proves the guardrail ran - rather than being absent.""" + rather than being absent. `tags` land in `metadata.tags`, which is what a + tag-scoped policy attachment matches on.""" return self.proxy.transport.send( "/chat/completions", headers=self.proxy.transport.bearer(key), @@ -346,6 +419,7 @@ class GuardrailsClient: guardrails=guardrails, tools=tools, tool_choice=tool_choice, + metadata=ChatMetadata(tags=tags) if tags is not None else None, ), ) diff --git a/tests/e2e/guardrails/test_guardrail_information_response_e2e.py b/tests/e2e/guardrails/test_guardrail_information_response_e2e.py new file mode 100644 index 00000000000..9701ea35819 --- /dev/null +++ b/tests/e2e/guardrails/test_guardrail_information_response_e2e.py @@ -0,0 +1,118 @@ +"""Live e2e: an opted-in chat response includes the guardrail execution details.""" + +from __future__ import annotations + +import time +from typing import Final + +import pytest + +from e2e_config import unique_marker +from e2e_http import unwrap +from guardrails_client import ( + BlockedWordBody, + ContentFilterParamsBody, + GuardrailsClient, +) +from lifecycle import ResourceManager +from models import ChatResponse, GuardrailInformationEntry + +pytestmark = pytest.mark.e2e + +GUARDRAIL_PROPAGATION_DEADLINE_SECONDS: Final = 40.0 +GUARDRAIL_PROPAGATION_POLL_INTERVAL_SECONDS: Final = 5.0 + + +def _register_content_filter(client: GuardrailsClient, resources: ResourceManager, *, name: str) -> None: + guardrail_id = client.register( + name, + ContentFilterParamsBody( + mode="pre_call", + default_on=False, + blocked_words=[BlockedWordBody(keyword=f"never-match-{unique_marker()}", action="MASK")], + ), + ) + resources.defer(lambda: client.delete_guardrail(guardrail_id)) + + +def _opted_in_entries( + client: GuardrailsClient, + key: str, + model: str, + name: str, +) -> tuple[ChatResponse, tuple[GuardrailInformationEntry, ...]]: + response = unwrap( + client.chat( + key, + model, + "Reply with the single word OK.", + guardrails=[name], + include_guardrail_response=True, + max_tokens=16, + ) + ) + entries = tuple(entry for entry in response.guardrail_information or () if entry.guardrail_name == name) + return response, entries + + +class TestGuardrailInformationResponse: + @pytest.mark.covers( + "guardrail.litellm_content_filter.pre_call.returns_guardrail_information", + exercised_on=["chat_completions"], + ) + def test_flag_returns_guardrail_information_for_the_guardrail_that_ran( + self, client: GuardrailsClient, resources: ResourceManager, scoped_key: str + ) -> None: + name = f"e2e-guardrail-information-{unique_marker()}" + _register_content_filter(client, resources, name=name) + model = client.create_backend_model( + resources, + prefix="e2e-guardrail-info-backend", + backend="openai/gpt-4.1-mini", + api_key="os.environ/OPENAI_API_KEY", + ) + deadline = time.monotonic() + GUARDRAIL_PROPAGATION_DEADLINE_SECONDS + + while True: + response, entries = _opted_in_entries(client, scoped_key, model, name) + if len(entries) == 1: + entry = entries[0] + assert entry.guardrail_status == "success", ( + f"guardrail information should report a successful run, got {entry!r}; response: {response}" + ) + assert entry.duration is not None and entry.duration >= 0, ( + f"guardrail information should report a non-negative duration; response: {response}" + ) + return + if time.monotonic() >= deadline: + pytest.fail( + f"guardrail information did not report exactly one successful {name!r} entry within " + f"{GUARDRAIL_PROPAGATION_DEADLINE_SECONDS}s; response: {response}" + ) + time.sleep(GUARDRAIL_PROPAGATION_POLL_INTERVAL_SECONDS) + + def test_without_flag_response_has_no_guardrail_information( + self, client: GuardrailsClient, resources: ResourceManager, scoped_key: str + ) -> None: + name = f"e2e-guardrail-information-default-{unique_marker()}" + _register_content_filter(client, resources, name=name) + model = client.create_backend_model( + resources, + prefix="e2e-guardrail-info-backend", + backend="openai/gpt-4.1-mini", + api_key="os.environ/OPENAI_API_KEY", + ) + + response = unwrap( + client.chat( + scoped_key, + model, + "Reply with the single word OK.", + guardrails=[name], + max_tokens=16, + ) + ) + + assert "guardrail_information" not in response.model_fields_set, ( + f"guardrail information must remain absent without include_guardrail_response, got {response}" + ) diff --git a/tests/e2e/guardrails/test_policy_inherited_guardrail_e2e.py b/tests/e2e/guardrails/test_policy_inherited_guardrail_e2e.py new file mode 100644 index 00000000000..6298a1de038 --- /dev/null +++ b/tests/e2e/guardrails/test_policy_inherited_guardrail_e2e.py @@ -0,0 +1,127 @@ +"""Live e2e: a policy attached to a request keeps its inherited parent guardrails +when only the child's own `condition` fails to match the request model. + +The parent policy has no condition and adds a content filter. The child inherits +it, adds a second content filter, and carries a model condition. The attachment +points at the child only, so the parent is reachable through inheritance alone. +A request the child condition does not match must still be blocked by the +parent's filter; a request it does match must be blocked by both. + +Uses litellm_content_filter (keyword match, no external service) so the block is +deterministic and free, with the request model routed to a real provider. +""" + +from __future__ import annotations + +import pytest +from e2e_config import CHEAP_OPENAI_MODEL, unique_marker +from e2e_http import StreamingResponse +from guardrails_client import ( + GuardrailsClient, + PolicyConditionBody, + PolicyCreateBody, +) +from lifecycle import ResourceManager + +pytestmark = pytest.mark.e2e + +MODEL = CHEAP_OPENAI_MODEL + + +def _applied_guardrails(outcome: StreamingResponse) -> frozenset[str]: + return frozenset( + name.strip() for name in outcome.headers.get("x-litellm-applied-guardrails", "").split(",") if name.strip() + ) + + +def _setup_child_policy_attached_to_tag( + client: GuardrailsClient, + resources: ResourceManager, + *, + child_condition_model: str, + parent_banned: str, + child_banned: str, + tag: str, +) -> tuple[str, str]: + """Register parent and child content filters, a parent policy adding the parent + filter, a child policy inheriting it with `child_condition_model`, and attach + only the child to `tag`. Returns (parent_guardrail_name, child_guardrail_name).""" + parent_guardrail = f"e2e-parent-guard-{parent_banned}" + child_guardrail = f"e2e-child-guard-{child_banned}" + parent_guardrail_id = client.create_content_filter_guardrail(parent_guardrail, parent_banned, default_on=False) + resources.defer(lambda: client.delete_guardrail(parent_guardrail_id)) + child_guardrail_id = client.create_content_filter_guardrail(child_guardrail, child_banned, default_on=False) + resources.defer(lambda: client.delete_guardrail(child_guardrail_id)) + + parent_policy = client.create_policy( + PolicyCreateBody(policy_name=f"e2e-parent-policy-{parent_banned}", guardrails_add=[parent_guardrail]) + ) + resources.defer(lambda: client.delete_policy(parent_policy)) + child_policy = client.create_policy( + PolicyCreateBody( + policy_name=f"e2e-child-policy-{child_banned}", + inherit=parent_policy, + guardrails_add=[child_guardrail], + condition=PolicyConditionBody(model=child_condition_model), + ) + ) + resources.defer(lambda: client.delete_policy(child_policy)) + + attachment_id = client.attach_policy_to_tags(child_policy, [tag]) + resources.defer(lambda: client.delete_policy_attachment(attachment_id)) + return parent_guardrail, child_guardrail + + +class TestPolicyInheritedGuardrail: + def test_child_condition_miss_still_applies_inherited_parent_guardrail( + self, client: GuardrailsClient, resources: ResourceManager, scoped_key: str + ) -> None: + parent_banned = unique_marker() + child_banned = unique_marker() + tag = f"e2e-policy-tag-{unique_marker()}" + parent_guardrail, child_guardrail = _setup_child_policy_attached_to_tag( + client, + resources, + child_condition_model=f"never-matches-{unique_marker()}", + parent_banned=parent_banned, + child_banned=child_banned, + tag=tag, + ) + + outcome = client.chat_raw(scoped_key, MODEL, f"Reply with the single word OK. {parent_banned}", tags=[tag]) + + assert outcome.status_code == 400, ( + f"the inherited parent content filter must block the banned keyword even though the child " + f"policy's own model condition does not match {MODEL}; got {outcome.status_code}: {outcome.body[:300]}" + ) + assert parent_guardrail in _applied_guardrails(outcome), ( + f"x-litellm-applied-guardrails must name the inherited parent guardrail; got {outcome.headers}" + ) + assert child_guardrail not in _applied_guardrails(outcome), ( + f"the child's own guardrail must not run when its condition fails; got {outcome.headers}" + ) + + def test_child_condition_match_applies_child_and_inherited_parent_guardrails( + self, client: GuardrailsClient, resources: ResourceManager, scoped_key: str + ) -> None: + parent_banned = unique_marker() + child_banned = unique_marker() + tag = f"e2e-policy-tag-{unique_marker()}" + parent_guardrail, child_guardrail = _setup_child_policy_attached_to_tag( + client, + resources, + child_condition_model=MODEL, + parent_banned=parent_banned, + child_banned=child_banned, + tag=tag, + ) + + outcome = client.chat_raw(scoped_key, MODEL, f"Reply with the single word OK. {child_banned}", tags=[tag]) + + assert outcome.status_code == 400, ( + f"the child's own content filter must block its banned keyword when the condition matches {MODEL}; " + f"got {outcome.status_code}: {outcome.body[:300]}" + ) + assert {parent_guardrail, child_guardrail} <= _applied_guardrails(outcome), ( + f"both the child and inherited parent guardrails must run; got {outcome.headers}" + ) diff --git a/tests/e2e/llm_translation/realtime/realtime_client.py b/tests/e2e/llm_translation/realtime/realtime_client.py index 7c4a9cc4af9..7da7ceac4d3 100644 --- a/tests/e2e/llm_translation/realtime/realtime_client.py +++ b/tests/e2e/llm_translation/realtime/realtime_client.py @@ -286,7 +286,7 @@ def function_call_item(events: tuple[ReceivedEvent, ...]) -> OutputItem | None: # ---- session + client -------------------------------------------------- -def _as_text(message: str | bytes) -> str: +def as_text(message: str | bytes) -> str: return message.decode("utf-8") if isinstance(message, bytes) else message @@ -304,7 +304,7 @@ class RealtimeSession: collected: list[ReceivedEvent] = [] while time.monotonic() < deadline: try: - text = _as_text( + text = as_text( self.connection.recv(timeout=deadline - time.monotonic()) ) except TimeoutError: diff --git a/tests/e2e/llm_translation/realtime/test_realtime_e2e.py b/tests/e2e/llm_translation/realtime/test_realtime_e2e.py index f99fa8d86b3..d7870b26497 100644 --- a/tests/e2e/llm_translation/realtime/test_realtime_e2e.py +++ b/tests/e2e/llm_translation/realtime/test_realtime_e2e.py @@ -13,8 +13,9 @@ failure. See REALTIME_COVERAGE_MATRIX.md. """ import pytest +from lifecycle import ResourceManager +from models import LiteLLMParamsBody from pydantic import BaseModel - from realtime_client import ( PROVIDERS, ConversationItemCreate, @@ -27,14 +28,17 @@ from realtime_client import ( RealtimeProvider, ResponseCreate, ResponseDone, + ServerEnvelope, SessionConfig, SessionUpdate, + as_text, function_call_item, parse_last, realtime_model, transcript, user_message, ) +from websockets.exceptions import ConnectionClosedError pytestmark = pytest.mark.e2e @@ -147,3 +151,39 @@ def test_tool_call_round_trip( second = session.collect_until("response.done", timeout=60) assert "72" in transcript(second), "follow-up did not use the tool result" + + +_REFUSED_UPSTREAMS = ( + RealtimeProvider( + "azure-bad-key", + "azure-realtime-refused", + LiteLLMParamsBody( + model="azure/gpt-realtime", + api_key="invalid-e2e-key", + api_version="2025-08-28", + realtime_protocol="GA", + ), + ), +) + + +@pytest.mark.parametrize("provider", _REFUSED_UPSTREAMS, ids=[p.id for p in _REFUSED_UPSTREAMS]) +def test_upstream_handshake_refusal_is_an_error_event_and_policy_close( + client: RealtimeClient, + resources: ResourceManager, + scoped_key: str, + provider: RealtimeProvider, +) -> None: + model_name, model_id = client.provision(provider) + resources.defer(lambda: client.proxy.delete_model(model_id)) + + with client.connect(key=scoped_key, model=model_name) as session: + first = ServerEnvelope.model_validate_json( + as_text(session.connection.recv(timeout=15)) + ) + assert first.type == "error", first + with pytest.raises(ConnectionClosedError) as closed: + session.connection.recv(timeout=15) + + assert closed.value.rcvd is not None + assert closed.value.rcvd.code == 1008, closed.value diff --git a/tests/e2e/llm_translation/test_cache_control.py b/tests/e2e/llm_translation/test_cache_control.py index ceb3620183a..bec65144c9f 100644 --- a/tests/e2e/llm_translation/test_cache_control.py +++ b/tests/e2e/llm_translation/test_cache_control.py @@ -13,7 +13,13 @@ Each case asserts the feature actually happened, not just a 200. Coverage matrix call, so a never-seen prefix must come back cached on its very first call (Gemini's implicit caching cannot hit a cold prefix), the cached count must cover the marked block, and the spend row must be billed below the uncached - price of the prompt. + price of the cached tokens. Vertex's cache create is nondeterministic: + identical bodies come back 200 or with the minimum-token 400 ("The cached + content is of 1 tokens"), in failure bursts of 45 seconds and more, so up to + eight never-seen prefixes are tried with a pause after each rejection. The + billing check prices the cached tokens rather than prompt_tokens, which + Vertex reports inclusive of the cached prefix on some calls and exclusive + of it on others. - Anthropic (claude-haiku-4-5, direct): the same ``cache_control`` prefix over the OpenAI-compatible route; the second call must report cache-read tokens > 0. - OpenAI (gpt-5.6): automatic prompt caching needs no request marker, so the @@ -50,7 +56,8 @@ VERTEX_MODEL = "vertex_ai/gemini-2.5-flash" ANTHROPIC_MODEL = "anthropic/claude-haiku-4-5-20251001" OPENAI_MODEL = "openai/gpt-5.6" VERTEX_CACHE_TTL: Final = "300s" -VERTEX_COLD_CALL_ATTEMPTS: Final = 3 +VERTEX_COLD_CALL_ATTEMPTS: Final = 8 +VERTEX_COLD_CALL_PAUSE_SECONDS: Final = 15.0 VERTEX_MINIMUM_CACHED_TOKENS: Final = 1024 CACHED_SHARE_OF_PROMPT: Final = 0.9 VERTEX_CACHE_REJECTION_MARKER: Final = "minimum token count to start explicit caching" @@ -156,26 +163,36 @@ def _cold_cache_call(send: Callable[[str], Result[ChatResponse]]) -> ChatRespons return unwrap(result) +def _first_engaged_cold_call(send: Callable[[str], Result[ChatResponse]]) -> ChatResponse | None: + for attempt in range(1, VERTEX_COLD_CALL_ATTEMPTS + 1): + candidate = _cold_cache_call(send) + if candidate is not None and _cached_read_tokens(candidate.usage) >= VERTEX_MINIMUM_CACHED_TOKENS: + return candidate + if attempt < VERTEX_COLD_CALL_ATTEMPTS: + print( + f"cache_control: vertex did not engage the cache on cold attempt {attempt}/{VERTEX_COLD_CALL_ATTEMPTS}; " + f"pausing {VERTEX_COLD_CALL_PAUSE_SECONDS}s before the next never-seen prefix", + flush=True, + ) + time.sleep(VERTEX_COLD_CALL_PAUSE_SECONDS) + return None + + def _first_cold_call_reads_cache(model: str, send: Callable[[str], Result[ChatResponse]]) -> ChatResponse: - completion: Final = next( - ( - candidate - for candidate in (_cold_cache_call(send) for _ in range(VERTEX_COLD_CALL_ATTEMPTS)) - if candidate is not None and _cached_read_tokens(candidate.usage) >= VERTEX_MINIMUM_CACHED_TOKENS - ), - None, - ) + completion: Final = _first_engaged_cold_call(send) assert completion is not None, ( - f"{model}: {VERTEX_COLD_CALL_ATTEMPTS} never-seen prompts marked with cache_control were each either " - f"rejected by Vertex's minimum-token check or served with fewer than {VERTEX_MINIMUM_CACHED_TOKENS} " - "cached tokens on their first call; explicit context caching did not engage" + f"{model}: {VERTEX_COLD_CALL_ATTEMPTS} never-seen prompts marked with cache_control, spread over " + f"{VERTEX_COLD_CALL_PAUSE_SECONDS * (VERTEX_COLD_CALL_ATTEMPTS - 1):.0f}s, were each either rejected by " + f"Vertex's minimum-token check or served with fewer than {VERTEX_MINIMUM_CACHED_TOKENS} cached tokens on " + "their first call; explicit context caching did not engage" ) assert completion.choices, f"{model}: cached call returned no choices: {completion}" usage: Final = completion.usage cached: Final = _cached_read_tokens(usage) - assert usage and usage.prompt_tokens and cached >= CACHED_SHARE_OF_PROMPT * usage.prompt_tokens, ( - f"{model}: only {cached} of {usage.prompt_tokens if usage else None} prompt tokens were served from the " - "cache; the cache_control block was not cached whole" + assert usage and usage.prompt_tokens, f"{model}: cached completion carried no prompt_tokens: {usage}" + assert cached >= CACHED_SHARE_OF_PROMPT * usage.prompt_tokens, ( + f"{model}: only {cached} of {usage.prompt_tokens} prompt tokens were served from the cache; the " + "cache_control block was not cached whole" ) return completion @@ -196,10 +213,11 @@ def _assert_billed_below_uncached_prompt(client: PassthroughClient, model: str, assert row.prompt_tokens == usage.prompt_tokens, ( f"{model}: spend row prompt_tokens {row.prompt_tokens} != response prompt_tokens {usage.prompt_tokens}" ) - uncached_prompt_cost: Final = usage.prompt_tokens * _input_rate(client, model) - assert row.spend is not None and row.spend < uncached_prompt_cost, ( - f"{model}: spend {row.spend} is not below the uncached price of the prompt alone ({uncached_prompt_cost} for " - f"{usage.prompt_tokens} tokens); cache-read pricing was not applied" + cached: Final = _cached_read_tokens(usage) + uncached_read_cost: Final = cached * _input_rate(client, model) + assert row.spend is not None and row.spend < uncached_read_cost, ( + f"{model}: spend {row.spend} is not below the uncached price of the {cached} tokens read from the cache " + f"({uncached_read_cost}); cache-read pricing was not applied" ) diff --git a/tests/e2e/llm_translation/test_chat_completions_regression_e2e.py b/tests/e2e/llm_translation/test_chat_completions_regression_e2e.py index 363b2a7e02e..235856d7692 100644 --- a/tests/e2e/llm_translation/test_chat_completions_regression_e2e.py +++ b/tests/e2e/llm_translation/test_chat_completions_regression_e2e.py @@ -110,10 +110,11 @@ def _vision_messages() -> list[ChatMessage]: def _assert_describes_cat(response: ChatResponse) -> None: assert response.choices, f"vision returned no choices: {response}" - message = response.choices[0].message - content = (message.content if message else None) or "" + choice = response.choices[0] + content = (choice.message.content if choice.message else None) or "" assert any(term in content.lower() for term in ("cat", "feline", "kitten", "kitty")), ( - f"vision response did not describe the image: {content[:200]}" + f"vision response did not describe the image: {content[:200]!r} " + f"(finish_reason={choice.finish_reason!r}, usage={response.usage})" ) @@ -421,7 +422,11 @@ class TestVertexChatCompletions: model = self._register(client, resources, "e2e-vertex-vision") key = resources.key() - response = unwrap(client.proxy.chat(key, ChatBody(model=model, messages=_vision_messages(), max_tokens=32))) + response = unwrap( + client.proxy.chat( + key, ChatBody(model=model, messages=_vision_messages(), max_tokens=32, reasoning_effort="none") + ) + ) _assert_describes_cat(response) @pytest.mark.covers( diff --git a/tests/e2e/llm_translation/test_credential_messages_e2e.py b/tests/e2e/llm_translation/test_credential_messages_e2e.py index 52306ce3a7a..58e17f20bb8 100644 --- a/tests/e2e/llm_translation/test_credential_messages_e2e.py +++ b/tests/e2e/llm_translation/test_credential_messages_e2e.py @@ -49,5 +49,6 @@ class TestCredentialBackedMessages: extra_body=NO_PROXY_CACHE, ) assert message.role == "assistant", f"unexpected role: {message.role!r}" + assert message.usage.output_tokens > 0, f"/v1/messages billed no output tokens: {message.usage!r}" text = "".join(block.text for block in message.content if block.type == "text") assert text.strip(), f"/v1/messages returned no text: {message.content!r}" diff --git a/tests/e2e/llm_translation/test_ocr_rust_e2e.py b/tests/e2e/llm_translation/test_ocr_rust_e2e.py index c2560b199af..2f7fc74e650 100644 --- a/tests/e2e/llm_translation/test_ocr_rust_e2e.py +++ b/tests/e2e/llm_translation/test_ocr_rust_e2e.py @@ -11,16 +11,28 @@ well-formed OCR document comes back. Per the e2e hard-fail contract, a case fails when no proxy answers and also fails once a request reaches it: the proxy fetches each provider's referenced secrets, so a missing credential surfaces as a live provider error rather than silent green. + +The provider keys are shared with other pipelines, so a provider's rate limit can +hold across the bounded retries. The case then accepts the gateway's faithful relay +of that 429 (throttling_error, code 429) as its second expected outcome; any other +non-success still fails at once. """ from __future__ import annotations from dataclasses import dataclass -from typing import Protocol +from typing import Final, Protocol import pytest from e2e_config import unique_marker -from e2e_http import assert_client_error, unwrap +from e2e_http import ( + PROVIDER_RATE_LIMIT_ATTEMPTS, + RateLimitedError, + Success, + assert_client_error, + relayed_provider_rate_limit, + tolerate_provider_rate_limit, +) from lifecycle import ResourceManager from models import LiteLLMParamsBody, OcrBody, OcrDocument, OcrResponse from proxy_client import ProxyClient @@ -146,24 +158,36 @@ def _assert_ocr_document(response: OcrResponse) -> None: assert response.pages[0].markdown is not None, "first page has no markdown" +def _assert_provider_rate_limit_relayed(model: str, outcome: RateLimitedError) -> None: + detail: Final = relayed_provider_rate_limit(outcome) + assert detail is not None, f"{model}: the 429 is the gateway's own, not the provider's: {outcome.body}" + assert (detail.type, detail.code) == ("throttling_error", "429"), f"{model}: provider 429 relayed as {detail!r}" + print( + f"{model}: the provider's rate limit held across {PROVIDER_RATE_LIMIT_ATTEMPTS} attempts; " + f"the gateway relayed it as {detail.type} {detail.code}", + flush=True, + ) + + class TestRustOcrGateway: @pytest.mark.parametrize("case", RUST_OCR_CASES, ids=_CASE_IDS) - def test_rust_ocr_response( - self, proxy: ProxyClient, resources: ResourceManager, case: _OcrCase - ) -> None: + def test_rust_ocr_response(self, proxy: ProxyClient, resources: ResourceManager, case: _OcrCase) -> None: model = f"rust-ocr-{case.suffix}-{unique_marker()}" model_id = proxy.create_model(model, case.provider.litellm_params()) resources.defer(lambda: proxy.delete_model(model_id)) key = resources.key() - response = unwrap(proxy.ocr(key, OcrBody(model=model, document=case.document))) - _assert_ocr_document(response) + match tolerate_provider_rate_limit(lambda: proxy.ocr(key, OcrBody(model=model, document=case.document))): + case Success(data=response): + _assert_ocr_document(response) + case RateLimitedError() as outcome: + _assert_provider_rate_limit_relayed(model, outcome) + case outcome: + pytest.fail(f"{model}: {outcome!r}") @pytest.mark.skip(reason="stage red: product gap, /v1/ocr 500s (aocr TypeError) on missing document instead of 400") @pytest.mark.covers("llm.ocr.openai.input_validation.nonstream.works") - def test_missing_document_returns_error( - self, proxy: ProxyClient, resources: ResourceManager - ) -> None: + def test_missing_document_returns_error(self, proxy: ProxyClient, resources: ResourceManager) -> None: model = f"rust-ocr-val-{unique_marker()}" model_id = proxy.create_model(model, MistralOcr().litellm_params()) resources.defer(lambda: proxy.delete_model(model_id)) @@ -174,4 +198,3 @@ class TestRustOcrGateway: json=_OptionalOcrBody(model=model), ) assert_client_error(result, "ocr missing document") - diff --git a/tests/e2e/logging/test_langsmith_batch_serialization_e2e.py b/tests/e2e/logging/test_langsmith_batch_serialization_e2e.py new file mode 100644 index 00000000000..874b2b6a045 --- /dev/null +++ b/tests/e2e/logging/test_langsmith_batch_serialization_e2e.py @@ -0,0 +1,125 @@ +"""Live e2e: a LangSmith batch whose metadata holds non JSON-native Python values +(datetime, Decimal) must reach the real LangSmith API instead of dying in +json.dumps and dropping the whole batch. Only the SDK path can put such values +into the batch (the proxy JSON-decodes request metadata), so this test drives +litellm.acompletion in-process against the real OpenAI API with a LangsmithLogger +injected per request, flushes the batch, and reads the run back by id through +LangSmith's own API. Nothing is mocked. +""" + +from __future__ import annotations + +import asyncio +import datetime +import decimal +import os +import time +import uuid +from dataclasses import dataclass +from typing import Final + +import pytest +from e2e_config import CHEAP_OPENAI_MODEL, POLL_INTERVAL, POLL_TIMEOUT, unique_marker +from e2e_http import Headers, Success, get_external +from pydantic import BaseModel, ConfigDict, Field, JsonValue + +import litellm +from litellm.integrations.langsmith import LangsmithLogger + +pytestmark = pytest.mark.e2e + + +class LangsmithHeaders(Headers): + x_api_key: str = Field(serialization_alias="x-api-key") + + +class LangsmithRunExtra(BaseModel): + model_config = ConfigDict(extra="allow") + requester_metadata: dict[str, JsonValue] | None = None + + +class LangsmithRun(BaseModel): + id: str + session_name: str | None = None + extra: LangsmithRunExtra + + +@dataclass(frozen=True, slots=True) +class LangsmithCreds: + api_key: str + base_url: str + project: str + + +def load_langsmith_creds() -> LangsmithCreds: + api_key = os.getenv("LANGSMITH_API_KEY") + if not api_key: + pytest.fail("LangSmith e2e requires LANGSMITH_API_KEY; missing credentials is a hard failure, not a skip") + if os.getenv("LANGSMITH_MOCK"): + pytest.fail("LANGSMITH_MOCK is set; this e2e must hit the real LangSmith API") + return LangsmithCreds( + api_key=api_key, + base_url=(os.getenv("LANGSMITH_BASE_URL") or "https://api.smith.langchain.com").rstrip("/"), + project=os.getenv("LANGSMITH_PROJECT") or "litellm-e2e", + ) + + +def _fetch_run(creds: LangsmithCreds, run_id: uuid.UUID) -> LangsmithRun | None: + result = get_external( + f"{creds.base_url}/runs/{run_id}", + response_type=LangsmithRun, + headers=LangsmithHeaders(x_api_key=creds.api_key), + ) + match result: + case Success(data=run): + return run + case _: + return None + + +def _poll_run(creds: LangsmithCreds, run_id: uuid.UUID) -> LangsmithRun: + deadline: Final = time.monotonic() + POLL_TIMEOUT + while time.monotonic() < deadline: + run = _fetch_run(creds, run_id) + if run is not None: + return run + time.sleep(POLL_INTERVAL) + pytest.fail(f"LangSmith run {run_id} never appeared within {POLL_TIMEOUT}s; the batch flush dropped it") + + +class TestLangsmithBatchSerialization: + @pytest.mark.asyncio + @pytest.mark.covers("logging.langsmith.success.serializes_non_native_metadata") + async def test_non_json_native_metadata_reaches_langsmith(self) -> None: + creds: Final = load_langsmith_creds() + logger: Final = LangsmithLogger( + langsmith_api_key=creds.api_key, langsmith_project=creds.project, langsmith_base_url=creds.base_url + ) + assert not logger.is_mock_mode, "LangsmithLogger initialised in mock mode; this e2e needs the real API" + marker: Final = unique_marker() + run_id: Final = uuid.uuid4() + created_at: Final = datetime.datetime(2026, 1, 2, 3, 4, 5, tzinfo=datetime.timezone.utc) + spend: Final = decimal.Decimal("0.0042") + response: Final = await litellm.acompletion( + model=f"openai/{CHEAP_OPENAI_MODEL}", + messages=[{"role": "user", "content": f"Reply with the single word ok ({marker})"}], + max_completion_tokens=5, + callbacks=[logger], + metadata={"run_id": str(run_id), "metadata": {"marker": marker, "created_at": created_at, "spend": spend}}, + ) + assert isinstance(response, litellm.ModelResponse) and response.id, ( + "a non-streaming completion must return a ModelResponse before the batch flush is meaningful" + ) + enqueue_deadline: Final = time.monotonic() + POLL_TIMEOUT + while time.monotonic() < enqueue_deadline and len(logger.log_queue) == 0: + await asyncio.sleep(0.5) + assert len(logger.log_queue) == 1, ( + f"the completion must be queued for the LangSmith batch, got {len(logger.log_queue)} queued entries" + ) + await logger.async_send_batch() + run: Final = _poll_run(creds, run_id) + requester_metadata: Final = run.extra.requester_metadata + assert requester_metadata is not None, "the run must carry the caller metadata under extra.requester_metadata" + assert requester_metadata["marker"] == marker + assert requester_metadata["created_at"] == str(created_at) + assert requester_metadata["spend"] == str(spend) diff --git a/tests/e2e/logging/test_otel_trace_e2e.py b/tests/e2e/logging/test_otel_trace_e2e.py index 9f08fa6c4e7..8d154ca0837 100644 --- a/tests/e2e/logging/test_otel_trace_e2e.py +++ b/tests/e2e/logging/test_otel_trace_e2e.py @@ -12,21 +12,24 @@ commit 1bd603d1ac). Both halves of the contract are asserted: the recorded state (the proxy reports the OTEL v2 logger active via /health/readiness/details) and the enforced behavior (the complete span tree at the destination, read back through the -destination's own query API - never proxy-side "export succeeded" logs). +destination's own query API - never proxy-side "export succeeded" logs). The +TLS coverage requires the stack to export OTLP over HTTPS with a certificate +signed by the CA in SSL_CERT_FILE, and treats a missing or plaintext endpoint +as a stack misconfiguration rather than skipping the test. """ from __future__ import annotations import time +from typing import Final import pytest -from pydantic import BaseModel, ConfigDict, ValidationError - -from e2e_config import CHEAP_ANTHROPIC_MODEL, CHEAP_OPENAI_MODEL, unique_marker +from e2e_config import CHEAP_ANTHROPIC_MODEL, CHEAP_OPENAI_MODEL, OTEL_EXPORTER_ENDPOINT, unique_marker from lifecycle import ResourceManager from logging_client import INVALID_UPSTREAM_API_KEY, LoggingClient, first_ok, readiness_details_body from models import LiteLLMParamsBody from otel_client import JaegerSpan, JaegerTrace, OtelReader +from pydantic import BaseModel, ConfigDict, ValidationError pytestmark = pytest.mark.e2e @@ -312,6 +315,35 @@ class TestOtelTraceCompleteness: ) _assert_complete_trace(hits, route=route, genai_span=f"chat {MODEL}") + @pytest.mark.covers("logging.otel.success.exports_metric", exercised_on=["chat_completions"]) + @pytest.mark.otel_tls + def test_otel_export_over_tls_with_internal_ca_reaches_destination( + self, client: LoggingClient, otel_reader: OtelReader, resources: ResourceManager + ) -> None: + _assert_otel_destination_configured(client) + assert OTEL_EXPORTER_ENDPOINT.startswith("https://"), ( + "the stack must export OTLP over TLS signed by the CA in SSL_CERT_FILE " + "(E2E_OTEL_EXPORTER_ENDPOINT) for this test to prove anything; a " + "missing or plaintext value is a stack misconfiguration" + ) + + route: Final = "/chat/completions" + key: Final = client.key_with_alias(f"otel-trace-tls-{unique_marker()}", models=[MODEL]) + resources.defer(lambda: client.delete_key(key)) + + marker: Final = unique_marker() + outcome: Final = first_ok( + client, lambda: client.chat_raw(key, MODEL, f"reply with one word {marker}", max_tokens=16) + ) + assert outcome.call_id is not None, "success response must carry x-litellm-call-id" + + hits: Final = otel_reader.poll_traces_for_call( + call_id=outcome.call_id, + settled_names=_settled_names(route=route, genai_span=f"chat {MODEL}"), + settled_prefixes={DB_SPAN_PREFIX}, + ) + _assert_complete_trace(hits, route=route, genai_span=f"chat {MODEL}") + @pytest.mark.covers("logging.otel.success.exports_metric", exercised_on=["messages"]) def test_messages_exports_complete_trace( self, client: LoggingClient, otel_reader: OtelReader, resources: ResourceManager diff --git a/tests/e2e/management/management_client.py b/tests/e2e/management/management_client.py index 8470d318db8..7366695c0d1 100644 --- a/tests/e2e/management/management_client.py +++ b/tests/e2e/management/management_client.py @@ -25,6 +25,8 @@ from e2e_http import ( unwrap, ) from models import ( + AuditLogPage, + AuditLogParams, ChatBody, ChatMessage, ConnectionTestBody, @@ -35,6 +37,7 @@ from models import ( CustomerResponse, KeyBlockBody, KeyDeleteBody, + KeyDeleteByAliasBody, KeyGenerateBody, KeyGenerateResponse, KeyInfoParams, @@ -159,6 +162,31 @@ class ManagementClient: def update_key_models(self, key: str, models: list[str]) -> None: _ = unwrap(self.update_key(KeyUpdateBody(key=key, models=models))) + def delete_key_by_alias(self, key_alias: str) -> None: + _ = unwrap( + self.proxy.transport.post( + "/key/delete", + headers=self.proxy.management_headers(), + json=KeyDeleteByAliasBody(key_aliases=[key_alias]), + response_type=NoBody, + ) + ) + + def key_deleted_audit_logs(self, token_hash: str) -> AuditLogPage: + return unwrap( + self.proxy.transport.get( + "/audit", + headers=self.proxy.management_headers(), + params=AuditLogParams( + object_id=token_hash, + action="deleted", + table_name="LiteLLM_VerificationToken", + page_size=100, + ), + response_type=AuditLogPage, + ) + ) + def key_info_as(self, key: str, *, caller_key: str | None = None) -> Result[KeyInfoResponse]: return self.proxy.transport.get( "/key/info", diff --git a/tests/e2e/management/test_management_e2e.py b/tests/e2e/management/test_management_e2e.py index 476165b715d..da0fc37aff8 100644 --- a/tests/e2e/management/test_management_e2e.py +++ b/tests/e2e/management/test_management_e2e.py @@ -16,8 +16,8 @@ from typing import Final import pytest -from e2e_config import UI_PASSWORD, UI_USERNAME, unique_marker -from e2e_http import StreamingResponse, Success +from e2e_config import POLL_INTERVAL, POLL_TIMEOUT, UI_PASSWORD, UI_USERNAME, unique_marker +from e2e_http import StreamingResponse, Success, unwrap from lifecycle import ResourceManager from management_client import ( DASHBOARD_SESSION_TEAM_ID, @@ -26,7 +26,9 @@ from management_client import ( ManagementClient, ) from models import ( + AuditLogPage, KeyGenerateBody, + KeyGenerateResponse, KeyUpdateBody, LiteLLMParamsBody, ModelInfoEntry, @@ -40,6 +42,7 @@ from models import ( UserNewBody, UserUpdateBody, ) +from proxy_client import Converged, await_converged pytestmark = pytest.mark.e2e @@ -801,3 +804,128 @@ class TestCustomer: assert info.user_id == customer, ( f"/customer/info did not report the created end-user; got {info.user_id!r}" ) + + +def _await_deleted_audit_rows(client: ManagementClient, token_hash: str) -> AuditLogPage: + outcome = await_converged( + lambda: client.key_deleted_audit_logs(token_hash), + converged=lambda page: page.total >= 1, + timeout=POLL_TIMEOUT, + interval=POLL_INTERVAL, + now=time.monotonic, + sleep=time.sleep, + ) + return outcome.result if isinstance(outcome, Converged) else outcome.last_result + + +def _assert_single_deleted_row(page: AuditLogPage, token_hash: str) -> None: + assert page.total == 1, page + row = page.audit_logs[0] + assert row.action == "deleted", row + assert row.table_name == "LiteLLM_VerificationToken", row + assert row.object_id == token_hash, row + assert row.changed_by, row + + +def _assert_key_deleted(client: ManagementClient, key: str) -> None: + def gone() -> bool | None: + match client.key_info_as(key): + case Success(data=response): + return True if response.info.status == "deleted" else None + case _: + return True + + _ = _poll( + client, + gone, + "/key/info never reported status 'deleted' for a key whose deletion returned", + ) + + +def _token_of(created: KeyGenerateResponse) -> str: + assert created.token is not None, created + return created.token + + +def _generate_response( + client: ManagementClient, resources: ResourceManager, body: KeyGenerateBody +) -> KeyGenerateResponse: + created = unwrap(client.generate_key(body)) + resources.defer(lambda: client.delete_key_strict(created.key, missing_ok=True)) + return created + + +class TestKeyDeletionAuditLog: + @pytest.mark.covers("mgmt.key.delete.audit_logged") + def test_key_delete_by_key_writes_audit_row( + self, client: ManagementClient, resources: ResourceManager + ) -> None: + created = _generate_response(client, resources, KeyGenerateBody(key_alias=f"e2e-audit-{unique_marker()}")) + token = _token_of(created) + + client.delete_key_strict(created.key) + + _assert_key_deleted(client, created.key) + _assert_single_deleted_row(_await_deleted_audit_rows(client, token), token) + + @pytest.mark.covers("mgmt.key.delete.audit_logged") + def test_key_delete_by_alias_writes_audit_row( + self, client: ManagementClient, resources: ResourceManager + ) -> None: + alias = f"e2e-audit-{unique_marker()}" + created = _generate_response(client, resources, KeyGenerateBody(key_alias=alias)) + token = _token_of(created) + + client.delete_key_by_alias(alias) + + _assert_key_deleted(client, created.key) + _assert_single_deleted_row(_await_deleted_audit_rows(client, token), token) + + @pytest.mark.covers("mgmt.team.member_delete.audit_logs_keys") + def test_team_member_delete_writes_audit_row_for_member_keys( + self, client: ManagementClient, resources: ResourceManager + ) -> None: + team_id = _create_team(client, resources, f"e2e-audit-team-{unique_marker()}", []) + user_id = _create_user( + client, + resources, + UserNewBody(user_email=f"e2e-audit-{unique_marker()}@example.com", user_role="internal_user"), + ) + client.add_team_member(team_id, user_id) + created = _generate_response(client, resources, KeyGenerateBody(user_id=user_id, team_id=team_id)) + token = _token_of(created) + + client.delete_team_member(team_id, user_id) + + _assert_key_deleted(client, created.key) + _assert_single_deleted_row(_await_deleted_audit_rows(client, token), token) + + @pytest.mark.covers("mgmt.team.delete.audit_logs_keys") + def test_team_delete_writes_audit_row_for_team_keys( + self, client: ManagementClient, resources: ResourceManager + ) -> None: + team_id = _create_team(client, resources, f"e2e-audit-team-{unique_marker()}", []) + created = _generate_response(client, resources, KeyGenerateBody(team_id=team_id)) + token = _token_of(created) + + client.delete_team(team_id) + + _assert_key_deleted(client, created.key) + _assert_single_deleted_row(_await_deleted_audit_rows(client, token), token) + + @pytest.mark.covers("mgmt.user.delete.audit_logs_keys") + def test_user_delete_writes_audit_row_for_user_keys( + self, client: ManagementClient, resources: ResourceManager + ) -> None: + user_id = _create_user( + client, + resources, + UserNewBody(user_email=f"e2e-audit-{unique_marker()}@example.com", user_role="internal_user"), + ) + created = _generate_response(client, resources, KeyGenerateBody(user_id=user_id)) + token = _token_of(created) + + client.delete_user_strict(user_id) + + _assert_key_deleted(client, created.key) + _assert_single_deleted_row(_await_deleted_audit_rows(client, token), token) diff --git a/tests/e2e/memory_readings.py b/tests/e2e/memory_readings.py new file mode 100644 index 00000000000..37a27c455f8 --- /dev/null +++ b/tests/e2e/memory_readings.py @@ -0,0 +1,78 @@ +"""Per-worker RSS readings of the proxy through /debug/memory/summary. + +One read goes to every configured replica (PROXY_REPLICA_URLS) under the master +key and answers from whichever worker behind that address took the connection; +the release stack runs one worker per gateway replica, so a read per replica is +a read per worker. A reading keys its worker by replica address, hostname, and +pid, since pods in their own pid namespaces report the same pids. A replica that +gives no reading (unreachable, a non-2xx, or a summary without ram_usage_mb) is +kept as a failure reason rather than dropped, so a test can fail on it by name +instead of passing on the replicas that did answer. +""" + +from __future__ import annotations + +from collections.abc import Mapping +from dataclasses import dataclass +from typing import Final + +from e2e_http import Result, Success +from models import MemorySummaryResponse +from proxy_client import ProxyClient + +WorkerKey = tuple[str, str | None, int] + + +@dataclass(frozen=True, slots=True) +class RssReading: + replica: str + hostname: str | None + worker_pid: int + ram_usage_mb: float + + @property + def worker(self) -> WorkerKey: + return (self.replica, self.hostname, self.worker_pid) + + @property + def where(self) -> str: + return f"worker pid {self.worker_pid} on {self.hostname or 'an unnamed host'} behind {self.replica}" + + +@dataclass(frozen=True, slots=True) +class RssCapture: + readings: tuple[RssReading, ...] + failures: tuple[str, ...] + + @property + def heaviest(self) -> RssReading | None: + return max(self.readings, key=lambda reading: reading.ram_usage_mb, default=None) + + @property + def junit_properties(self) -> tuple[tuple[str, object], ...]: + heaviest: Final = self.heaviest + if heaviest is None: + return () + return (("idle_rss_heaviest_mb", heaviest.ram_usage_mb), ("idle_rss_heaviest_worker", heaviest.where)) + + +def _outcome(replica: str, result: Result[MemorySummaryResponse]) -> RssReading | str: + match result: + case Success(data=body) if body.memory.ram_usage_mb is not None: + return RssReading(replica, body.hostname, body.worker_pid, body.memory.ram_usage_mb) + case Success(data=body): + return f"{replica} answered /debug/memory/summary without ram_usage_mb: {body.memory.error}" + case _: + return f"{replica} gave no /debug/memory/summary reading: {result}" + + +def rss_capture(summaries: Mapping[str, Result[MemorySummaryResponse]]) -> RssCapture: + outcomes: Final = tuple(_outcome(replica, result) for replica, result in summaries.items()) + return RssCapture( + readings=tuple(outcome for outcome in outcomes if isinstance(outcome, RssReading)), + failures=tuple(outcome for outcome in outcomes if isinstance(outcome, str)), + ) + + +def read_rss_everywhere(proxy: ProxyClient, *, timeout: float | None = None) -> RssCapture: + return rss_capture(proxy.memory_summary_everywhere(timeout=timeout)) diff --git a/tests/e2e/models.py b/tests/e2e/models.py index 5278dbd287a..bd7f5171172 100644 --- a/tests/e2e/models.py +++ b/tests/e2e/models.py @@ -124,6 +124,32 @@ class KeyDeleteBody(BaseModel): keys: list[str] +class KeyDeleteByAliasBody(BaseModel): + key_aliases: list[str] + + +class AuditLogParams(BaseModel): + object_id: str + action: str + table_name: str + page_size: int + + +class AuditLogEntry(BaseModel): + id: str + changed_by: str | None = None + changed_by_api_key: str | None = None + action: str + table_name: str + object_id: str + before_value: object | None = None + + +class AuditLogPage(BaseModel): + audit_logs: list[AuditLogEntry] + total: int + + class KeyInfoParams(BaseModel): key: str @@ -308,6 +334,7 @@ class ChatBody(BaseModel): tools: Sequence[ChatTool | McpChatTool] | None = None tool_choice: str | None = None guardrails: list[str] | None = None + include_guardrail_response: bool | None = None response_format: dict[str, object] | None = None chat_template_kwargs: dict[str, bool] | None = None cache: dict[str, bool] | None = {"no-cache": True} @@ -422,6 +449,14 @@ class Usage(BaseModel): completion_tokens_details: CompletionTokensDetails | None = None +class GuardrailInformationEntry(BaseModel): + guardrail_name: str + guardrail_status: str + guardrail_mode: object | None = None + guardrail_response: object | None = None + duration: float | None = None + + class ChatResponse(BaseModel): id: str | None = None object: str | None = None @@ -429,6 +464,7 @@ class ChatResponse(BaseModel): choices: list[ChatChoice] = [] usage: Usage | None = None service_tier: str | None = None + guardrail_information: list[GuardrailInformationEntry] | None = None # ---------- anthropic /v1/messages + count_tokens ---------- @@ -901,10 +937,18 @@ class GuardrailRunRecord(BaseModel): guardrail_response: object | None = None +class SpendLogErrorInformation(BaseModel): + error_code: str | None = None + error_class: str | None = None + error_message: str | None = None + normalized_error: str | None = None + + class SpendLogMetadata(BaseModel): user_api_key_alias: str | None = None applied_guardrails: list[str] | None = None guardrail_information: list[GuardrailRunRecord] | None = None + error_information: SpendLogErrorInformation | None = None class SpendLogRow(BaseModel): @@ -916,6 +960,7 @@ class SpendLogRow(BaseModel): cache_hit: str | None = None call_type: str | None = None custom_llm_provider: str | None = None + model_id: str | None = None team_id: str | None = None user: str | None = None end_user: str | None = None @@ -923,6 +968,7 @@ class SpendLogRow(BaseModel): completion_tokens: int | None = None total_tokens: int | None = None request_tags: list[str] | None = None + session_id: str | None = None metadata: SpendLogMetadata | None = None proxy_server_request: JsonValue = None response: JsonValue = None @@ -959,6 +1005,15 @@ class SpendLogsPageParams(BaseModel): api_key: str | None = None +class SessionSpendLogsParams(BaseModel): + """Query for /spend/logs/session/ui, the session view the Admin UI logs page + opens: every row whose session_id equals the given one, newest first.""" + + session_id: str + page: int = 1 + page_size: int = 100 + + class SpendLogsPage(BaseModel): data: list[SpendLogRow] = [] total: int diff --git a/tests/e2e/proxy_client.py b/tests/e2e/proxy_client.py index f1981e0aa5e..51ea9fbe7bd 100644 --- a/tests/e2e/proxy_client.py +++ b/tests/e2e/proxy_client.py @@ -87,6 +87,7 @@ from models import ( RouterSettingsResponse, SearchToolCreateBody, SearchToolCreateResponse, + SessionSpendLogsParams, SpendLogRow, SpendLogs, SpendLogsPage, @@ -507,13 +508,16 @@ class ProxyClient: ) ).info - def memory_summary_everywhere(self) -> Mapping[str, Result[MemorySummaryResponse]]: + def memory_summary_everywhere( + self, *, timeout: float | None = None + ) -> Mapping[str, Result[MemorySummaryResponse]]: return { url: transport.get( "/debug/memory/summary", headers=self.management_headers(transport=transport), params=NoBody(), response_type=MemorySummaryResponse, + timeout=timeout, ) for url, transport in self.replicas.items() } @@ -1004,19 +1008,26 @@ class ProxyClient: response_type=CountTokensResponse, ) - def messages(self, key: str, body: AnthropicMessagesBody) -> Result[AnthropicMessagesResponse]: + def messages( + self, key: str, body: AnthropicMessagesBody, *, session_id: str | None = None + ) -> Result[AnthropicMessagesResponse]: """POST /v1/messages (Anthropic-native). The response is either the Anthropic-shape passthrough (`content`) or the OpenAI-normalized shape - (`choices`); AnthropicMessagesResponse models both.""" + (`choices`); AnthropicMessagesResponse models both. `session_id` goes out + as the `x-litellm-session-id` header, the way Claude Code sends it through + ANTHROPIC_CUSTOM_HEADERS, so every spend row the call produces shares it.""" return self.transport.post( "/v1/messages", - headers=self._anthropic_headers(key), + headers=self._anthropic_headers(key, session_id=session_id), json=body, response_type=AnthropicMessagesResponse, ) - def _anthropic_headers(self, key: str) -> AnthropicHeaders: - return AnthropicHeaders(authorization=self.transport.bearer(key).authorization) + def _anthropic_headers(self, key: str, *, session_id: str | None = None) -> AnthropicHeaders: + return AnthropicHeaders( + authorization=self.transport.bearer(key).authorization, + x_litellm_session_id=session_id, + ) # ---- spend read-back ------------------------------------------------ @@ -1060,6 +1071,27 @@ class ProxyClient: ) -> list[SpendLogRow]: return self._poll(lambda: self.spend_logs(SpendLogsParams(api_key=key)), min_rows, predicate) + def session_spend_logs(self, session_id: str) -> list[SpendLogRow]: + """GET /spend/logs/session/ui, the per-session view the Admin UI logs page + opens when a session id is clicked.""" + return unwrap( + self.transport.get( + "/spend/logs/session/ui", + headers=self.management_headers(), + params=SessionSpendLogsParams(session_id=session_id), + response_type=SpendLogsPage, + ) + ).data + + def poll_logs_for_session( + self, + session_id: str, + *, + min_rows: int = 1, + predicate: RowsPredicate | None = None, + ) -> list[SpendLogRow]: + return self._poll(lambda: self.session_spend_logs(session_id), min_rows, predicate) + def poll_logs_for_request_id( self, request_id: str, diff --git a/tests/e2e/pytest.ini b/tests/e2e/pytest.ini index 6f9f57d333e..d01caeff3ea 100644 --- a/tests/e2e/pytest.ini +++ b/tests/e2e/pytest.ini @@ -12,6 +12,9 @@ markers = prompt_caching_stack: needs a proxy running with router_settings.optional_pre_call_checks including prompt_caching; deselected unless E2E_PROMPT_CACHING_STACK is set cli_determinism: drives the real claude CLI for several seconds; deselected unless E2E_CLI_DETERMINISM is set redis_chaos: load test that pauses the proxy's Redis outright mid-run; needs a proxy booted from gateway/redis_chaos_ci_config.yml on the same host, and is deselected unless E2E_REDIS_CHAOS is set + quiet_stack: measures the proxy itself, so it runs while no other test on this host is hitting the stack; every other test waits for it to finish mcp_oauth_live: real Linear OAuth consent via a captured browser session; deselected unless E2E_MCP_OAUTH_LIVE is set provider_edge_host: routes provider traffic through the pytest host's edge in every fixture mode, so the gateway must reach the pytest host; deselected unless E2E_PROVIDER_EDGE_HOST_REACHABLE is set otel_v2: needs a proxy running with LITELLM_OTEL_V2=true; deselected unless E2E_OTEL_V2 is set + otel_tls: needs a stack whose gateway exports OTLP over TLS signed by the CA in SSL_CERT_FILE; deselected unless E2E_OTEL_EXPORTER_ENDPOINT is set + secret_manager: needs a proxy booted from gateway/secret_manager__ci_config.yml against that live secret manager; deselected unless E2E_SECRET_MANAGER names the backend (see secret_manager/secret_backends.py) diff --git a/tests/e2e/quota_management/ratelimit/test_model_group_alias_rate_limit_e2e.py b/tests/e2e/quota_management/ratelimit/test_model_group_alias_rate_limit_e2e.py new file mode 100644 index 00000000000..1c3fff47b78 --- /dev/null +++ b/tests/e2e/quota_management/ratelimit/test_model_group_alias_rate_limit_e2e.py @@ -0,0 +1,85 @@ +"""Live e2e: a model group alias must share its per-key deployment rate-limit +bucket with the model group it resolves to. + +Covers quota_management.ratelimit.model_group_alias.shares_bucket: the proxy +config declares `e2e-alias-rl-target` (a cheap Anthropic deployment) with +`default_api_key_rpm_limit: 3` and `router_settings.model_group_alias` mapping +`e2e-alias-rl-alias` -> `e2e-alias-rl-target`. Both spellings must draw on +one per-key rpm bucket, so a key that exhausts the limit on one spelling is +blocked on the other spelling inside the same window; each test in this file +exhausts the budget on one name and asserts the other name 429s. + +All calls of one test must land inside a single window +(LITELLM_RATE_LIMIT_WINDOW_SIZE, 60s default), which real chat latency +comfortably allows. +""" + +from __future__ import annotations + +import time + +import pytest +from e2e_config import unique_marker +from e2e_http import StreamingResponse, require_successful_call +from quota_client import QuotaClient + +pytestmark = pytest.mark.e2e + +MODEL_GROUP = "e2e-alias-rl-target" +MODEL_ALIAS = "e2e-alias-rl-alias" +RPM_LIMIT = 3 +WINDOW_SECONDS = 60 +LAST_CALL_LATENCY_MARGIN_SECONDS = 10 + + +def _chat(client: QuotaClient, key: str, model: str) -> StreamingResponse: + return client.chat(key, model, f"reply with one word {unique_marker()}") + + +def _exhaust_rpm(client: QuotaClient, key: str, model: str) -> float: + """Send RPM_LIMIT successful calls on `model`, opening the rate-limit + window; returns the send timestamp of the first call as a lower bound on + the window start. A fresh key may briefly 401 until the data plane's auth + cache picks it up, so retry on 401 to a deadline; a 401 never reaches the + rate limiter.""" + deadline = time.monotonic() + client.proxy.poll_timeout + first_sent_at: float | None = None + sent = 0 + while sent < RPM_LIMIT: + if first_sent_at is None: + first_sent_at = time.monotonic() + outcome = _chat(client, key, model) + if outcome.status_code == 401 and time.monotonic() < deadline: + time.sleep(client.proxy.poll_interval) + continue + require_successful_call(outcome) + sent += 1 + assert first_sent_at is not None + return first_sent_at + + +def _assert_blocked_inside_window( + client: QuotaClient, key: str, model: str, window_opened_at: float +) -> StreamingResponse: + assert time.monotonic() < window_opened_at + WINDOW_SECONDS - LAST_CALL_LATENCY_MARGIN_SECONDS, ( + f"the {RPM_LIMIT} exhaust calls took too long; the follow-up call could land in the " + "next window and mask a shared-bucket regression" + ) + outcome = _chat(client, key, model) + assert outcome.status_code == 429, ( + f"{model} must share its rpm bucket with the model group/alias that was already " + f"exhausted, expected a 429 but got {outcome.status_code}: {outcome.body[:300]}" + ) + return outcome + + +class TestModelGroupAliasRateLimit: + @pytest.mark.covers("quota_management.ratelimit.model_group_alias.shares_bucket") + def test_alias_shares_rpm_bucket_with_model_group(self, client: QuotaClient, scoped_key: str) -> None: + opened_at = _exhaust_rpm(client, scoped_key, MODEL_GROUP) + _assert_blocked_inside_window(client, scoped_key, MODEL_ALIAS, opened_at) + + @pytest.mark.covers("quota_management.ratelimit.model_group_alias.shares_bucket") + def test_model_group_shares_rpm_bucket_with_alias(self, client: QuotaClient, scoped_key: str) -> None: + opened_at = _exhaust_rpm(client, scoped_key, MODEL_ALIAS) + _assert_blocked_inside_window(client, scoped_key, MODEL_GROUP, opened_at) diff --git a/tests/e2e/quota_management/spend_tracking/spend_e2e_client.py b/tests/e2e/quota_management/spend_tracking/spend_e2e_client.py index b7f59fe5f89..8b63b063e14 100644 --- a/tests/e2e/quota_management/spend_tracking/spend_e2e_client.py +++ b/tests/e2e/quota_management/spend_tracking/spend_e2e_client.py @@ -12,9 +12,10 @@ helpers from one place. from __future__ import annotations import time -from collections.abc import Callable +from collections.abc import Callable, Mapping from dataclasses import dataclass from datetime import datetime, timedelta, timezone +from types import MappingProxyType from typing import Final from e2e_config import unique_marker @@ -48,6 +49,7 @@ from models import ( SpendLogsPageParams, SpendTagsResponse, TagSpend, + TeamInfoParams, UserDeleteBody, UserDeleteResponse, UserNewBody, @@ -57,6 +59,8 @@ from models import ( from proxy_client import Converged, ProxyClient, await_converged from pydantic import BaseModel, Field +METRICS_PATH: Final = "/metrics/" + __all__ = [ "BatchCreateBody", "CallbackLogMetadata", @@ -189,6 +193,7 @@ class DailyActivityKeyMetadata(BaseModel): class DailyActivityKeyMetrics(BaseModel): api_requests: int = 0 + spend: float = 0.0 class DailyActivityKeyBreakdown(BaseModel): @@ -209,6 +214,14 @@ class DailyActivityResponse(BaseModel): results: list[DailyActivityRow] = [] +class TeamInfoSpend(BaseModel): + spend: float | None = None + + +class TeamInfoSpendResponse(BaseModel): + team_info: TeamInfoSpend + + def _chat_body( model: str, content: str, @@ -334,6 +347,42 @@ class SpendClient: time.sleep(self.proxy.poll_interval) return spend + def team_spend(self, team_id: str) -> float: + return ( + unwrap( + self.proxy.transport.get( + "/team/info", + headers=self.proxy.transport.master, + params=TeamInfoParams(team_id=team_id), + response_type=TeamInfoSpendResponse, + ) + ).team_info.spend + or 0.0 + ) + + def poll_team_spend(self, team_id: str, *, minimum: float = 0.0) -> float: + outcome: Final = await_converged( + lambda: self.team_spend(team_id), + converged=lambda spend: spend > minimum, + timeout=self.proxy.poll_timeout, + interval=self.proxy.poll_interval, + now=time.monotonic, + sleep=time.sleep, + ) + return outcome.result if isinstance(outcome, Converged) else outcome.last_result + + def scrape_metrics(self) -> Mapping[str, ProbeResult]: + """GET /metrics/ on every replica in PROXY_REPLICA_URLS, keyed by replica. The + counter is per pod, so the union of the replicas is the fleet's exposition; the + trailing slash is the mounted app's own path, since bare /metrics answers a 307 + whose Location drops the port behind a Host-rewriting balancer.""" + return MappingProxyType( + { + replica: transport.probe(METRICS_PATH, params=NoBody()) + for replica, transport in self.proxy.replicas.items() + } + ) + def spend_logs_page( self, *, api_key: str | None, page: int, page_size: int ) -> SpendLogsPage: @@ -500,9 +549,21 @@ class SpendClient: return self.proxy.transport.probe("/health", params=HealthParams(model=model)) def daily_activity_for_key(self, token: str, *, start: datetime, end: datetime) -> DailyActivityKeyBreakdown | None: + return self._key_breakdown("/user/daily/activity", token, start=start, end=end) + + def usage_export_row_for_key( + self, token: str, *, start: datetime, end: datetime + ) -> DailyActivityKeyBreakdown | None: + """The key's row on /user/daily/activity/aggregated, the response the + dashboard's Export Usage Data CSV serializes.""" + return self._key_breakdown("/user/daily/activity/aggregated", token, start=start, end=end) + + def _key_breakdown( + self, route: str, token: str, *, start: datetime, end: datetime + ) -> DailyActivityKeyBreakdown | None: response: Final = unwrap( self.proxy.transport.get( - "/user/daily/activity", + route, headers=self.proxy.transport.master, params=DailyActivityParams( start_date=start.strftime("%Y-%m-%d"), @@ -519,9 +580,21 @@ class SpendClient: def poll_daily_activity_for_key( self, token: str, *, start: datetime, end: datetime, min_requests: int + ) -> DailyActivityKeyBreakdown | None: + return self._poll_key_breakdown(lambda: self.daily_activity_for_key(token, start=start, end=end), min_requests) + + def poll_usage_export_row_for_key( + self, token: str, *, start: datetime, end: datetime, min_requests: int + ) -> DailyActivityKeyBreakdown | None: + return self._poll_key_breakdown( + lambda: self.usage_export_row_for_key(token, start=start, end=end), min_requests + ) + + def _poll_key_breakdown( + self, fetch: Callable[[], DailyActivityKeyBreakdown | None], min_requests: int ) -> DailyActivityKeyBreakdown | None: outcome: Final = await_converged( - lambda: self.daily_activity_for_key(token, start=start, end=end), + fetch, converged=lambda found: found is not None and found.metrics.api_requests >= min_requests, timeout=self.proxy.poll_timeout, interval=self.proxy.poll_interval, diff --git a/tests/e2e/quota_management/spend_tracking/test_spend_surface_consistency_e2e.py b/tests/e2e/quota_management/spend_tracking/test_spend_surface_consistency_e2e.py new file mode 100644 index 00000000000..9033b9d75c4 --- /dev/null +++ b/tests/e2e/quota_management/spend_tracking/test_spend_surface_consistency_e2e.py @@ -0,0 +1,161 @@ +"""One priced request must land the same response_cost on every spend surface. + +A customer reconciles the bill from whichever surface they look at: the spend +log row, the key's and the team's rolled-up spend on /key/info and /team/info, +the usage page's Export Usage Data CSV (the dashboard serializes the +/user/daily/activity/aggregated rows it already holds; there is no server-side +CSV endpoint), and the litellm_spend_metric counter Prometheus scrapes. Each is +written by a different writer (the spend log insert, the key and team rollups in +db_spend_update_writer, the daily spend tables, the Prometheus success callback), +so one of them can drift without the others noticing: the cause of the +key-versus-log mismatch in LIT-3620 and the export-versus-console mismatch in +LIT-5045. The deployment carries its own per-token rates, so the expected cost +is computed from the returned usage rather than read off any one surface, and +every surface is held to that number. + +/metrics is per pod, so every replica the stack exports (PROXY_REPLICA_URLS) is +scraped directly and the samples merged; a stack that exports only its balancer +is scraped there until the pod that served the call answers. The request itself +is sent once. +""" + +from __future__ import annotations + +import time +from collections.abc import Mapping +from datetime import datetime, timedelta, timezone +from itertools import groupby +from math import isclose +from types import MappingProxyType +from typing import Final + +import pytest +from e2e_config import provider_edge_base, unique_marker +from e2e_http import ProbeResult +from lifecycle import ResourceManager +from models import ChatBody, ChatMessage, KeyGenerateBody, LiteLLMParamsBody, TeamNewBody +from prometheus_client.parser import text_string_to_metric_families +from proxy_client import Converged, await_converged +from spend_e2e_client import SpendClient, unwrap +from spend_reconciliation import INPUT_RATE, OUTPUT_RATE + +pytestmark = pytest.mark.e2e + +SPEND_METRIC: Final = "litellm_spend_metric_total" +KEY_HASH_LABEL: Final = "hashed_api_key" +TEAM_LABEL: Final = "team" + +SeriesLabels = tuple[tuple[str, str], ...] + + +def _spend_series_for_key(scrapes: Mapping[str, ProbeResult], token: str) -> Mapping[SeriesLabels, float]: + samples: Final = sorted( + (tuple(sorted(sample.labels.items())), sample.value) + for scrape in scrapes.values() + if scrape.status_code == 200 + for family in text_string_to_metric_families(scrape.body) + for sample in family.samples + if sample.name == SPEND_METRIC and sample.labels.get(KEY_HASH_LABEL) == token + ) + return MappingProxyType( + {labels: sum(value for _, value in group) for labels, group in groupby(samples, key=lambda sample: sample[0])} + ) + + +def _poll_spend_series_for_key(client: SpendClient, token: str) -> Mapping[SeriesLabels, float]: + outcome: Final = await_converged( + client.scrape_metrics, + converged=lambda scrapes: bool(_spend_series_for_key(scrapes, token)), + timeout=client.proxy.poll_timeout, + interval=client.proxy.poll_interval, + now=time.monotonic, + sleep=time.sleep, + ) + scrapes: Final = outcome.result if isinstance(outcome, Converged) else outcome.last_result + assert _spend_series_for_key(scrapes, token), ( + f"{SPEND_METRIC} never exposed a series for {KEY_HASH_LABEL}={token} on any replica; " + f"last scrape status per replica: {({replica: scrape.status_code for replica, scrape in scrapes.items()})}" + ) + return _spend_series_for_key(scrapes, token) + + +def _same_spend(actual: float | None, expected: float) -> bool: + return actual is not None and isclose(actual, expected, rel_tol=1e-6, abs_tol=1e-9) + + +class TestSpendSurfaceConsistency: + @pytest.mark.replayable + @pytest.mark.covers("quota_management.spend_tracking.surface_consistency.matches_every_surface") + def test_one_request_lands_the_same_spend_on_every_surface( + self, client: SpendClient, resources: ResourceManager + ) -> None: + started: Final = datetime.now(timezone.utc) + marker: Final = unique_marker() + base: Final = provider_edge_base("openai") + model: Final = f"e2e-spend-surfaces-{marker}" + model_id: Final = client.proxy.create_model( + model, + LiteLLMParamsBody( + model="openai/gpt-5.6-luna", + api_key="os.environ/OPENAI_API_KEY", + api_base=None if base is None else f"{base}/v1", + input_cost_per_token=INPUT_RATE, + output_cost_per_token=OUTPUT_RATE, + ), + ) + resources.defer(lambda: client.proxy.delete_model(model_id)) + team_id: Final = client.proxy.create_team(TeamNewBody(team_alias=f"e2e-spend-surfaces-{marker}")) + resources.defer(lambda: client.proxy.delete_team(team_id)) + record: Final = client.generate_key_record( + KeyGenerateBody(team_id=team_id, models=[model], key_alias=f"e2e-spend-surfaces-{marker}") + ) + resources.defer(lambda: client.proxy.delete_key(record.key)) + assert record.token, "/key/generate answered without the key's token hash" + token: Final = record.token + + response: Final = unwrap( + client.proxy.chat( + record.key, + ChatBody( + model=model, + messages=[ChatMessage(role="user", content=f"Reply with one word. {marker}")], + max_completion_tokens=128, + ), + ) + ) + usage: Final = response.usage + assert response.id, "successful response must have an ID" + assert usage is not None and usage.prompt_tokens and usage.completion_tokens, f"no billable usage: {usage}" + expected: Final = usage.prompt_tokens * INPUT_RATE + usage.completion_tokens * OUTPUT_RATE + + rows: Final = client.proxy.poll_logs_for_request_id(response.id) + assert len(rows) == 1, f"expected one spend row for {response.id}, saw {len(rows)}: {rows}" + row: Final = rows[0] + assert row.api_key == token, f"spend row keyed by {row.api_key}, not the key's token hash {token}" + assert row.team_id == team_id, f"spend row attributed to team {row.team_id}, not {team_id}" + assert row.status == "success", f"spend row status {row.status}" + + key_spend: Final = client.poll_key_spend(record.key, minimum=expected * 0.999999) + team_spend: Final = client.poll_team_spend(team_id, minimum=expected * 0.999999) + export_row: Final = client.poll_usage_export_row_for_key( + token, start=started - timedelta(days=1), end=datetime.now(timezone.utc), min_requests=1 + ) + assert export_row is not None, f"/user/daily/activity/aggregated never listed key {token} under api_keys" + series: Final = _poll_spend_series_for_key(client, token) + off_team: Final = tuple(labels for labels in series if dict(labels).get(TEAM_LABEL) != team_id) + assert not off_team, f"{SPEND_METRIC} series for the key carry a team other than {team_id}: {off_team}" + + observed: Final = MappingProxyType( + { + "/spend/logs row": row.spend, + "/key/info spend": key_spend, + "/team/info spend": team_spend, + "usage export row (/user/daily/activity/aggregated)": export_row.metrics.spend, + SPEND_METRIC: sum(series.values()), + } + ) + drifted: Final = tuple(surface for surface, spend in observed.items() if not _same_spend(spend, expected)) + assert not drifted, ( + f"response_cost {expected} (usage {usage.prompt_tokens}x{INPUT_RATE} + " + f"{usage.completion_tokens}x{OUTPUT_RATE}) drifted on {drifted}; every surface: {dict(observed)}" + ) diff --git a/tests/e2e/quota_management/spend_tracking/test_spend_tracking_e2e.py b/tests/e2e/quota_management/spend_tracking/test_spend_tracking_e2e.py index 8a91e53e7d7..286421e2e3f 100644 --- a/tests/e2e/quota_management/spend_tracking/test_spend_tracking_e2e.py +++ b/tests/e2e/quota_management/spend_tracking/test_spend_tracking_e2e.py @@ -21,9 +21,9 @@ from math import isclose from typing import Final import pytest -from e2e_http import Success +from e2e_http import RateLimitedError, Success from lifecycle import ResourceManager -from models import LiteLLMParamsBody, SpendLogs, SpendLogsParams +from models import KeyGenerateBody, LiteLLMParamsBody, SpendLogs, SpendLogsParams from spend_e2e_client import SpendClient, SpendLogRow, is_ok, unique_marker, unwrap pytestmark = pytest.mark.e2e @@ -43,6 +43,7 @@ def _summarize(rows: list[SpendLogRow]) -> list[dict[str, object]]: "cache_hit", "call_type", "custom_llm_provider", + "model_id", "prompt_tokens", "completion_tokens", "total_tokens", @@ -498,6 +499,88 @@ def test_failure_call_writes_failure_status_row( assert (failure_row.spend or 0) == 0.0, "failed call must not be charged" +@pytest.mark.covers("quota_management.spend_tracking.failure.writes_normalized_error") +def test_failure_rows_share_normalized_error_across_provider_wording( + client: SpendClient, resources: ResourceManager, scoped_key: str +) -> None: + """Two upstream auth failures with different provider wording land as failure rows + whose metadata.error_information keeps each provider's own error_message and + carries the same stable normalized_error cluster key.""" + marker = unique_marker() + deployments: Final = ( + (f"e2e-norm-openai-{marker}", "openai/gpt-5.5"), + (f"e2e-norm-anthropic-{marker}", "anthropic/claude-haiku-4-5"), + ) + for name, provider_model in deployments: + model_id = client.proxy.create_model( + name, LiteLLMParamsBody(model=provider_model, api_key=f"sk-invalid-{marker}") + ) + resources.defer(lambda model_id=model_id: client.proxy.delete_model(model_id)) + result = client.chat(scoped_key, name, f"normalize failure {marker}", max_tokens=1) + assert not is_ok(result), f"{name}: invalid upstream key must fail the call, got {result}" + + rows = client.poll_logs_for_key( + scoped_key, + min_rows=2, + predicate=lambda rs: sum(1 for r in rs if r.status == "failure") >= 2, + ) + failure_rows = [r for r in rows if r.status == "failure"] + assert len(failure_rows) == 2, f"expected one failure row per deployment: {_summarize(rows)}" + + infos = [r.metadata.error_information if r.metadata else None for r in failure_rows] + assert all(info is not None for info in infos), ( + f"failure rows must carry metadata.error_information: {[r.model_dump() for r in failure_rows]}" + ) + messages = {info.error_message for info in infos if info is not None} + assert len(messages) == 2, f"provider wording must stay distinct in error_message: {messages}" + normalized = {info.normalized_error for info in infos if info is not None} + assert normalized == {"401_AUTHENTICATION_FAILED"}, ( + f"both auth failures must share one normalized_error cluster key; saw {normalized} " + f"for messages {messages}" + ) + + +@pytest.mark.covers("quota_management.spend_tracking.failure.attributes_provider") +def test_pre_call_rejection_row_attributes_provider_and_model_id( + client: SpendClient, resources: ResourceManager +) -> None: + """A request the proxy rejects before the router picks a deployment (here the + key's rpm limit, a pre_call_hook 429) never reaches the code that stamps the + deployment onto the log. The failure row must still carry the provider and + model_id of the model group's only deployment, so per-provider failure reports + can count it.""" + model = f"e2e-spend-precall-{unique_marker()}" + model_id = client.proxy.create_model( + model, LiteLLMParamsBody(model="openai/gpt-5.5", api_key="os.environ/OPENAI_API_KEY") + ) + resources.defer(lambda: client.proxy.delete_model(model_id)) + key = client.proxy.generate_key(KeyGenerateBody(models=[model], rpm_limit=1)) + resources.defer(lambda: client.proxy.delete_key(key)) + + unwrap(client.chat(key, model, f"reply with one word {unique_marker()}", max_tokens=8)) + rejected = client.chat(key, model, f"over the rpm limit {unique_marker()}", max_tokens=8) + assert isinstance(rejected, RateLimitedError), ( + f"the second call on an rpm_limit=1 key must be rejected with 429 before routing, got {rejected}" + ) + + rows = client.poll_logs_for_key( + key, + min_rows=2, + predicate=lambda rs: {r.status for r in rs} >= {"success", "failure"}, + ) + success_row = _require_row(rows, lambda r: r.status == "success", "for the served call") + failure_row = _require_row(rows, lambda r: r.status == "failure", "for the rate-limited call") + + assert failure_row.custom_llm_provider == success_row.custom_llm_provider, ( + f"rejected call lost its provider: failure row {failure_row.custom_llm_provider!r} vs " + f"served row {success_row.custom_llm_provider!r}; {_summarize(rows)}" + ) + assert failure_row.model_id == model_id, ( + f"rejected call lost its deployment: failure row model_id {failure_row.model_id!r} vs " + f"registered {model_id!r}; {_summarize(rows)}" + ) + + @pytest.mark.covers("quota_management.spend_tracking.spend_calculate.returns_cost") def test_spend_calculate_returns_nonzero_cost(client: SpendClient) -> None: cost = client.calculate_spend( diff --git a/tests/e2e/quota_management/spend_tracking/test_websearch_interception_session_e2e.py b/tests/e2e/quota_management/spend_tracking/test_websearch_interception_session_e2e.py new file mode 100644 index 00000000000..89d0beec414 --- /dev/null +++ b/tests/e2e/quota_management/spend_tracking/test_websearch_interception_session_e2e.py @@ -0,0 +1,102 @@ +"""Intercepted web searches are billed under the LLM request's session. + +The websearch_interception callback turns an Anthropic ``web_search`` server tool +into a ``litellm.asearch`` call against a configured search tool, so each search is +its own spend row (call_type ``asearch``) next to the ``anthropic_messages`` row for +the turn that asked for it. Claude Code and the Admin UI group spend by +``session_id``, so the search row has to carry the same session as the turn that +triggered it; before the fix it landed under a session of its own and the session +view under-counted both requests and spend (LIT-8063). + +Needs a proxy booted with the callback and a real search backend, which +``gateway/stage_mirror_ci_config.yml`` carries as the ``e2e-search`` Perplexity tool. +""" + +from typing import Final + +import pytest +from e2e_config import unique_marker +from e2e_http import unwrap +from lifecycle import ResourceManager +from models import ( + AnthropicMessagesBody, + AnthropicWebSearchTool, + ChatMessage, + LiteLLMParamsBody, + SpendLogRow, +) +from proxy_client import ProxyClient + +pytestmark = pytest.mark.e2e + +BEDROCK_INVOKE_BACKEND: Final = "bedrock/invoke/us.anthropic.claude-haiku-4-5-20251001-v1:0" +SEARCH_CALL_TYPE: Final = "asearch" + + +def _has_search_row(rows: list[SpendLogRow]) -> bool: + return any(row.call_type == SEARCH_CALL_TYPE for row in rows) + + +class TestWebSearchInterceptionSession: + @pytest.mark.covers( + "quota_management.spend_tracking.websearch_interception.bills_under_request_session", + exercised_on=("messages",), + ) + def test_intercepted_search_is_billed_under_the_request_session( + self, proxy: ProxyClient, resources: ResourceManager + ) -> None: + """One /v1/messages turn that runs an intercepted web search must produce an + ``asearch`` spend row in the same session as its ``anthropic_messages`` row, + billed separately and with its own request id.""" + marker: Final = unique_marker() + model: Final = f"e2e-websearch-session-{marker}" + model_id: Final = proxy.create_model( + model, LiteLLMParamsBody(model=BEDROCK_INVOKE_BACKEND, aws_region_name="us-east-1") + ) + resources.defer(lambda: proxy.delete_model(model_id)) + key: Final = resources.key(models=[model]) + session_id: Final = f"e2e-websearch-session-{marker}" + + response: Final = unwrap( + proxy.messages( + key, + AnthropicMessagesBody( + model=model, + max_tokens=512, + tools=[AnthropicWebSearchTool(type="web_search_20250305", name="web_search", max_uses=1)], + messages=[ + ChatMessage( + role="user", + content=f"Use web search to find one recent news headline about Anthropic ({marker}).", + ) + ], + ), + session_id=session_id, + ) + ) + block_types: Final = tuple(block.type for block in response.content or ()) + assert "web_search_tool_result" in block_types, ( + f"precondition: the turn never ran an intercepted search, so there is no search row to attribute. " + f"blocks={block_types}" + ) + + rows: Final = proxy.poll_logs_for_session(session_id, min_rows=2, predicate=_has_search_row) + by_call_type: Final = {row.call_type or "" for row in rows} + assert SEARCH_CALL_TYPE in by_call_type, ( + f"session {session_id} has no {SEARCH_CALL_TYPE} row, so the intercepted search was billed under a " + f"different session and the session view misses its cost. call_types={sorted(by_call_type)} " + f"rows={[(row.call_type, row.request_id, row.spend) for row in rows]}" + ) + search_rows: Final = tuple(row for row in rows if row.call_type == SEARCH_CALL_TYPE) + turn_rows: Final = tuple(row for row in rows if row.call_type != SEARCH_CALL_TYPE) + assert turn_rows, f"session {session_id} carries only search rows: {rows!r}" + assert all(row.session_id == session_id for row in rows), ( + f"session view returned rows outside {session_id}: {[row.session_id for row in rows]}" + ) + assert all((row.spend or 0.0) > 0 for row in search_rows), ( + f"an intercepted search must stay a separately billed row: {[row.spend for row in search_rows]}" + ) + assert {row.request_id for row in search_rows}.isdisjoint({row.request_id for row in turn_rows}), ( + "a search row reused its parent turn's request_id instead of keeping its own: " + f"{[(row.call_type, row.request_id) for row in rows]}" + ) diff --git a/tests/e2e/router/reliability_support.py b/tests/e2e/router/reliability_support.py index 3d5b76f6408..5984d5645d8 100644 --- a/tests/e2e/router/reliability_support.py +++ b/tests/e2e/router/reliability_support.py @@ -15,13 +15,15 @@ reliability behavior. from __future__ import annotations -from collections.abc import Sequence +from collections.abc import Mapping, Sequence +from typing import Final -from pydantic import ValidationError +from pydantic import BaseModel, ValidationError from proxy_client import ProxyClient from e2e_config import CHEAP_OPENAI_MODEL, PROXY_BASE_URL, unique_marker from e2e_http import NetworkError, StreamHead, StreamingResponse +from transport import Transport from models import ( CacheControl, ChatMessage, @@ -274,9 +276,36 @@ def chat_turns_override( ) -> StreamingResponse: """POST /chat/completions with an optional per-request router_settings_override, returning the raw outcome so tests read status, body, and reliability headers.""" - return proxy.transport.send( + return chat_turns_override_via( + proxy.transport, key, model, turns, override=override, stream=stream, cache=cache, max_tokens=max_tokens + ) + + +def chat_override_via( + transport: Transport, + key: str, + model: str, + content: str, + override: RouterSettingsOverride | None = None, +) -> StreamingResponse: + """`chat_override` aimed at one replica's transport (from `proxy.replicas`) instead of + the client's default, for cells that must know which gateway took the call.""" + return chat_turns_override_via(transport, key, model, [ChatMessage(role="user", content=content)], override=override) + + +def chat_turns_override_via( + transport: Transport, + key: str, + model: str, + turns: Sequence[ChatMessage], + override: RouterSettingsOverride | None = None, + stream: bool = False, + cache: dict[str, bool] | None = {"no-cache": True}, + max_tokens: int = 512, +) -> StreamingResponse: + return transport.send( "/chat/completions", - headers=proxy.transport.bearer(key), + headers=transport.bearer(key), json=ReliabilityChatBody( model=model, messages=turns, @@ -339,6 +368,26 @@ def model_id_of(resp: StreamingResponse) -> str | None: return resp.headers.get("x-litellm-model-id") +class _AzurePromptFilterResult(BaseModel): + content_filter_results: Mapping[str, object] | None = None + + +class _AzureAnnotatedChatBody(BaseModel): + prompt_filter_results: Sequence[_AzurePromptFilterResult] | None = None + + +def azure_prompt_filter_skipped(resp: StreamingResponse) -> bool: + """True when Azure's 200 recorded no prompt-filter verdict (every `content_filter_results` + empty), so the prompt has to be sent again.""" + try: + annotated: Final = _AzureAnnotatedChatBody.model_validate_json(resp.body) + except ValidationError: + return False + if not annotated.prompt_filter_results: + return False + return all(not entry.content_filter_results for entry in annotated.prompt_filter_results) + + def _parsed(resp: StreamingResponse) -> ChatResponse | None: try: return ChatResponse.model_validate_json(resp.body) diff --git a/tests/e2e/router/test_reliability_cooldowns_e2e.py b/tests/e2e/router/test_reliability_cooldowns_e2e.py index 769971e1533..ce3bce32880 100644 --- a/tests/e2e/router/test_reliability_cooldowns_e2e.py +++ b/tests/e2e/router/test_reliability_cooldowns_e2e.py @@ -6,21 +6,33 @@ way (a 500, a 429, a 401, or a timeout) holding all of the group's shuffle weigh with an `allowed_fails_policy` of zero for that error class and a short `cooldown_time`, plus a healthy backup at weight 0. The first call, retries off, surfaces the failure to the customer as-is and benches the deployment. The proxy -records the bench off the request path, and a sibling replica only sees it on -its next read of the cooldown keys from Redis, which the cooldown cache does at -most every 1s (DEFAULT_COOLDOWN_REDIS_READ_INTERVAL_SECONDS). So for +writes the bench to Redis before it answers that failure, and a sibling replica +only sees it on its next read of the cooldown keys from Redis, which the +cooldown cache does at most once per COOLDOWN_REDIS_READ_INTERVAL_SECONDS per +key (DEFAULT_COOLDOWN_REDIS_READ_INTERVAL_SECONDS, 1s). So for REPLICA_PROPAGATION_SECONDS after the trip, a window kept far wider than that -so this cell asserts the trip and the recovery rather than how fast siblings -catch up, every answer has to be either the deployment's own failure or a 200 -from the backup, which the proxy names in x-litellm-model-id, and at least one -replica has to have served from the backup by then. From then until shortly -before the cooldown can lapse, every call has to land on the backup whichever -replica takes it. Then the test polls until the weighted shuffle opens on the -failing deployment again and the same failure comes back (or, for the 429 pair, -its own 200 once the key's rpm window has reset): that is the recovery, since a -benched deployment is one the router will try again, not one it forgot. Its -deadline counts from the last failure a stale replica caused, because every -failure re-arms the cooldown. +so the trip-then-recover cells assert the trip and the recovery rather than how +fast siblings catch up, every answer has to be either the deployment's own +failure or a 200 from the backup, which the proxy names in x-litellm-model-id, +and at least one replica has to have served from the backup by then. From then +until shortly before the cooldown can lapse, every call has to land on the +backup whichever replica takes it. Then the test polls until the weighted +shuffle opens on the failing deployment again and the same failure comes back +(or, for the 429 pair, its own 200 once the key's rpm window has reset): that +is the recovery, since a benched deployment is one the router will try again, +not one it forgot. Its deadline counts from the last failure a stale replica +caused, because every failure re-arms the cooldown. + +The sibling cell is the one that asserts the speed. It addresses two gateways +from PROXY_REPLICA_URLS by name, warms the second with a healthy call so its +router has already read the failing deployment's cooldown key from Redis and +started the read interval on it, trips the deployment through the first, waits +the interval plus a margin, and then sends the second replica exactly one call, +which has to come back from the backup. One call, because a poll that reached +the failing deployment through the second replica would bench it there too and +hide whether the first replica's bench ever travelled. A stack addressed only +through its load balancer cannot pin which replica takes a call, so the cell is +skipped at collection unless LITELLM_PROXY_REPLICA_URLS names at least two. The failures are the same real ones the retry tests use: a 1ms deadline and a bogus key on the real backend, and this proxy standing in as the upstream for @@ -37,7 +49,7 @@ from dataclasses import dataclass import pytest from complexity_router_client import ComplexityRouterClient -from e2e_config import CHEAP_OPENAI_MODEL, unique_marker +from e2e_config import CHEAP_OPENAI_MODEL, PROXY_REPLICA_URLS, unique_marker from e2e_http import StreamingResponse from lifecycle import ResourceManager from models import KeyGenerateBody, RouterSettingsOverride @@ -45,6 +57,7 @@ from reliability_support import ( COOLDOWN_SECONDS, REPLICA_PROPAGATION_SECONDS, chat_override, + chat_override_via, create_always_5xx_deployment, create_always_rate_limited_deployment, create_always_timing_out_deployment, @@ -54,12 +67,15 @@ from reliability_support import ( model_id_of, spend_only_request_of, ) +from transport import Transport pytestmark = pytest.mark.e2e RECOVERY_GRACE_SECONDS = 10 PROPAGATION_POLL_SECONDS = 0.25 BENCH_MARGIN_SECONDS = 4.0 +COOLDOWN_REDIS_READ_INTERVAL_SECONDS = 1.0 +SIBLING_READ_MARGIN_SECONDS = 1.0 def _call_without_retries(client: ComplexityRouterClient, key: str, group: str) -> StreamingResponse: @@ -68,6 +84,31 @@ def _call_without_retries(client: ComplexityRouterClient, key: str, group: str) ) +def _call_replica_without_retries(transport: Transport, key: str, group: str) -> StreamingResponse: + return chat_override_via( + transport, key, group, f"say hi {unique_marker()}", override=RouterSettingsOverride(num_retries=0) + ) + + +@dataclass(frozen=True, slots=True) +class _Replica: + url: str + transport: Transport + + +def _two_replicas(client: ComplexityRouterClient) -> tuple[_Replica, _Replica]: + first, second, *_ = (_Replica(url, transport) for url, transport in client.proxy.replicas.items()) + return first, second + + +def _warm_cooldown_reads(replica: _Replica, key: str) -> None: + warmed = chat_override_via(replica.transport, key, CHEAP_OPENAI_MODEL, f"say hi {unique_marker()}") + assert warmed.status_code == 200, ( + f"{replica.url} should have answered a healthy {CHEAP_OPENAI_MODEL} call before the trip, got " + f"{warmed.status_code}: {warmed.body[:300]}" + ) + + def _assert_served_by_backup(resp: StreamingResponse, backup: str, when: str) -> None: assert resp.status_code == 200, ( f"{when} the group should have served from the backup, got {resp.status_code}: {resp.body[:300]}" @@ -176,6 +217,47 @@ class TestReliabilityCooldowns: _assert_trips_then_recovers(client, scoped_key, group, failing, backup, failure_status=500) + @pytest.mark.covers("reliability.cooldown.sibling_replica.serves_backup_within_read_interval") + @pytest.mark.skipif( + len(PROXY_REPLICA_URLS) < 2, + reason=( + "this cell trips a deployment through one gateway and reads the bench from another, so " + f"LITELLM_PROXY_REPLICA_URLS has to name at least two distinct gateways, got {PROXY_REPLICA_URLS}" + ), + ) + def test_sibling_replica_serves_backup_within_redis_read_interval( + self, client: ComplexityRouterClient, resources: ResourceManager, scoped_key: str + ) -> None: + tripping, sibling = _two_replicas(client) + + upstream = f"reliability-cooldown-sibling-upstream-{unique_marker()}" + upstream_id = create_bad_base_deployment(client.proxy, upstream) + resources.defer(lambda: client.proxy.delete_model(upstream_id)) + + group = f"reliability-cooldown-sibling-{unique_marker()}" + failing = create_always_5xx_deployment( + client.proxy, group, upstream, scoped_key, cooldown_time=COOLDOWN_SECONDS + ) + resources.defer(lambda: client.proxy.delete_model(failing)) + backup = create_zero_weight_backup_deployment(client.proxy, group) + resources.defer(lambda: client.proxy.delete_model(backup)) + + _warm_cooldown_reads(sibling, scoped_key) + + tripped = _call_replica_without_retries(tripping.transport, scoped_key, group) + assert tripped.status_code == 500, ( + f"the first call through {tripping.url} should have surfaced the deployment's own 500, got " + f"{tripped.status_code}: {tripped.body[:300]}" + ) + tripped_at = time.monotonic() + + time.sleep(COOLDOWN_REDIS_READ_INTERVAL_SECONDS + SIBLING_READ_MARGIN_SECONDS) + _assert_served_by_backup( + _call_replica_without_retries(sibling.transport, scoped_key, group), + backup, + f"{time.monotonic() - tripped_at:.1f}s after {tripping.url} benched {failing}, on {sibling.url}", + ) + @pytest.mark.covers("reliability.cooldown.429.trips_then_recovers") def test_429_trips_cooldown_then_recovers( self, client: ComplexityRouterClient, resources: ResourceManager, scoped_key: str diff --git a/tests/e2e/router/test_reliability_fallbacks_e2e.py b/tests/e2e/router/test_reliability_fallbacks_e2e.py index 8bc60f2829b..54c11b163d0 100644 --- a/tests/e2e/router/test_reliability_fallbacks_e2e.py +++ b/tests/e2e/router/test_reliability_fallbacks_e2e.py @@ -16,10 +16,16 @@ failure: the provider refuses the prompt itself, on length or on policy, and reroute those, not `fallbacks`. The policy refusal is a real one, from an Azure OpenAI content filter rejecting a jailbreak prompt, and a control call first proves the refusal reaches the customer as a 400 when no reroute is configured. +Azure intermittently answers without running its prompt filter at all (the +body's prompt_filter_results carry no verdict), which is not a pass, so both +calls send the prompt again, a bounded number of times, until the filter ran. """ from __future__ import annotations +from collections.abc import Callable +from typing import Final + import pytest from complexity_router_client import ComplexityRouterClient @@ -29,6 +35,7 @@ from lifecycle import ResourceManager from models import RouterSettingsOverride from reliability_support import ( CONTENT_POLICY_PROMPT, + azure_prompt_filter_skipped, chat_override, completion_tokens_of, content_of, @@ -64,6 +71,28 @@ def _assert_served_by_fallback(resp: StreamingResponse) -> None: assert int(attempted) >= 1, f"x-litellm-attempted-fallbacks should be >= 1, got {attempted!r}" +AZURE_FILTER_ATTEMPTS: Final = 3 + + +def _chat_once_azure_runs_its_filter(send: Callable[[], StreamingResponse]) -> StreamingResponse: + for attempt in range(1, AZURE_FILTER_ATTEMPTS): + resp = send() + if not azure_prompt_filter_skipped(resp): + return resp + print( + "e2e: azure answered without running its prompt filter; sending the jailbreak prompt again " + f"({attempt}/{AZURE_FILTER_ATTEMPTS - 1})", + flush=True, + ) + return send() + + +def _filter_verdict(resp: StreamingResponse) -> str: + if azure_prompt_filter_skipped(resp): + return "azure skipped its prompt filter on every attempt" + return "the filter ran and let the prompt through" + + class TestReliabilityFallbacks: @pytest.mark.covers("reliability.fallback.5xx.routes_to_fallback") def test_5xx_routes_to_fallback( @@ -124,17 +153,21 @@ class TestReliabilityFallbacks: model_id = create_content_filtered_deployment(client.proxy, primary) resources.defer(lambda: client.proxy.delete_model(model_id)) - refused = chat_override(client.proxy, scoped_key, primary, f"{CONTENT_POLICY_PROMPT} {unique_marker()}") + refused = _chat_once_azure_runs_its_filter( + lambda: chat_override(client.proxy, scoped_key, primary, f"{CONTENT_POLICY_PROMPT} {unique_marker()}") + ) assert refused.status_code == 400, ( - f"the content filter should have refused the jailbreak prompt with a 400, got {refused.status_code}: " - f"{refused.body[:300]}" + f"the content filter should have refused the jailbreak prompt with a 400, got {refused.status_code} " + f"({_filter_verdict(refused)}): {refused.body[:300]}" ) - resp = chat_override( - client.proxy, - scoped_key, - primary, - f"{CONTENT_POLICY_PROMPT} {unique_marker()}", - override=RouterSettingsOverride(content_policy_fallbacks=[{primary: ["gpt-5.5"]}]), + resp = _chat_once_azure_runs_its_filter( + lambda: chat_override( + client.proxy, + scoped_key, + primary, + f"{CONTENT_POLICY_PROMPT} {unique_marker()}", + override=RouterSettingsOverride(content_policy_fallbacks=[{primary: ["gpt-5.5"]}]), + ) ) _assert_served_by_fallback(resp) diff --git a/tests/e2e/router/test_reliability_memory_e2e.py b/tests/e2e/router/test_reliability_memory_e2e.py index 17e3e1a1996..77d3a68cae5 100644 --- a/tests/e2e/router/test_reliability_memory_e2e.py +++ b/tests/e2e/router/test_reliability_memory_e2e.py @@ -38,6 +38,20 @@ size budget: the deterministic catch for a breadcrumb that copies the whole request. It runs before the phases because the leaking writer drops its own rows under the phases' traffic (a queue budget hit, a recursion limit on the nested copies), which would turn the size check into a missing-row check. + +A second, cheaper check holds the idle footprint: every worker's RSS as the harness +read it at collection time, before this pytest process sent any traffic (see +conftest.pytest_collection_finish), must sit under a fixed budget. On the +release gate that is a fresh stack right after its readiness gate, one worker per +gateway replica, so the reading is what a DB-backed boot costs on its own. A +v1.100.x worker with a database idled at 886 MB RSS where v1.101.0rc1 idled at +544 MB on the same database (1.3 GB against 560 MB at the pod level, under a +2 GiB limit): the generated Prisma client at prisma-client-py's default recursive +type depth, 91k TypedDict classes that v1.101.0 cut to 19k with +recursive_type_depth = -1. The budget starts at the rc1 reading plus headroom and +E2E_MEMORY_IDLE_RSS_BUDGET_MB overrides it; a later session on the same stack (the +changed-files workflow's repeat passes, a developer's local loop) measures a proxy +already warmed by traffic, which that headroom also has to cover. """ from __future__ import annotations @@ -55,6 +69,7 @@ import pytest from complexity_router_client import ComplexityRouterClient from e2e_config import ( MEMORY_CONCURRENCY, + MEMORY_IDLE_RSS_BUDGET_MB, MEMORY_REQUESTS_PER_PHASE, MEMORY_RETRIES_PER_REQUEST, MEMORY_RSS_BUDGET_MB, @@ -62,15 +77,16 @@ from e2e_config import ( MEMORY_RSS_SETTLE_SAMPLES, MEMORY_STORED_REQUEST_BUDGET_KB, MEMORY_TRANSCRIPT_TURNS, + PROXY_REPLICA_URLS, unique_marker, ) -from e2e_http import unwrap from lifecycle import ResourceManager +from memory_readings import RssCapture, RssReading, WorkerKey, read_rss_everywhere from models import ChatMessage, RouterSettingsOverride, SpendLogRow from proxy_client import ProxyClient from reliability_support import chat_override, create_never_benched_refusing_deployment -pytestmark = pytest.mark.e2e +pytestmark = [pytest.mark.e2e, pytest.mark.quiet_stack] DEPLOYMENTS_PER_GROUP: Final = 2 RSS_SAMPLE_CAP: Final = 4 * MEMORY_RSS_SETTLE_SAMPLES @@ -84,21 +100,6 @@ class FailedCall: call_id: str | None -WorkerKey = tuple[str, str | None, int] - - -@dataclass(frozen=True, slots=True) -class RssReading: - replica: str - hostname: str | None - worker_pid: int - ram_usage_mb: float - - @property - def worker(self) -> WorkerKey: - return (self.replica, self.hostname, self.worker_pid) - - @dataclass(frozen=True, slots=True) class WorkerGrowth: warm: RssReading @@ -143,12 +144,12 @@ def _fail_many(proxy: ProxyClient, key: str, model: str, override: RouterSetting def _read_rss_everywhere_after_pause(proxy: ProxyClient) -> tuple[RssReading, ...]: time.sleep(MEMORY_RSS_SAMPLE_INTERVAL_SECONDS) - return tuple( - RssReading(replica, body.hostname, body.worker_pid, body.memory.ram_usage_mb) - for replica, result in proxy.memory_summary_everywhere().items() - for body in (unwrap(result),) - if body.memory.ram_usage_mb is not None + capture: Final = read_rss_everywhere(proxy) + assert not capture.failures, ( + f"{len(capture.failures)} replica(s) gave no RSS reading mid-checkpoint, so their workers cannot be " + f"compared with themselves: {'; '.join(capture.failures)}" ) + return capture.readings def _readings_until_no_new_worker( @@ -220,6 +221,26 @@ def _stored_request_kb(proxy: ProxyClient, call: FailedCall) -> float: class TestReliabilityMemory: + @pytest.mark.covers("reliability.perf.idle_memory.under_slo") + def test_workers_idle_under_rss_budget_before_traffic(self, idle_rss: RssCapture) -> None: + assert not idle_rss.failures, ( + f"{len(idle_rss.failures)} replica(s) gave no RSS reading when the session started, so their idle " + f"footprint went unmeasured: {'; '.join(idle_rss.failures)}" + ) + unmeasured: Final = frozenset(PROXY_REPLICA_URLS) - frozenset(reading.replica for reading in idle_rss.readings) + assert not unmeasured, ( + f"{len(unmeasured)} of {len(PROXY_REPLICA_URLS)} replica(s) gave neither an RSS reading nor a failure " + f"reason when the session started, so their idle footprint went unmeasured: {', '.join(sorted(unmeasured))}" + ) + heaviest: Final = idle_rss.heaviest + assert heaviest is not None, "no replica was configured to read, so nothing was measured" + assert heaviest.ram_usage_mb <= MEMORY_IDLE_RSS_BUDGET_MB, ( + f"{heaviest.where} sat at {heaviest.ram_usage_mb:.0f} MB RSS when the session started, before it sent " + f"any traffic, past the {MEMORY_IDLE_RSS_BUDGET_MB:.0f} MB idle budget; a DB-backed v1.100.x worker idled " + f"at 886 MB where v1.101.0rc1 idled at 544 MB, and at that size the release stack's 2 GiB pod limit " + f"leaves the worker little room for traffic" + ) + @pytest.mark.covers("reliability.perf.memory.under_slo") def test_failing_requests_do_not_grow_rss_or_stored_request( self, client: ComplexityRouterClient, resources: ResourceManager, scoped_key: str diff --git a/tests/e2e/secret_manager/backend.sh b/tests/e2e/secret_manager/backend.sh new file mode 100755 index 00000000000..70272c237c5 --- /dev/null +++ b/tests/e2e/secret_manager/backend.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash +set -euo pipefail +umask 077 + +usage() { + local systems + systems=$(declare -F | sed -n 's/^declare -f up_//p' | paste -sd '|' -) + echo "usage: $0 up|down $systems" >&2 + exit 2 +} + +action=${1:-} +system=${2:-} +dir=${E2E_SECRET_MANAGER_DIR:-$HOME/.cache/litellm-e2e-secret-manager}/$system +name=litellm-e2e-$system + +wait_for() { + local url=$1 + for _ in $(seq 1 90); do + if curl -sf -o /dev/null "$url"; then + return 0 + fi + sleep 2 + done + echo "$system did not answer at $url" >&2 + return 1 +} + +down() { + docker rm -f "$name" "$name-db" >/dev/null 2>&1 || true + docker network rm "$name" >/dev/null 2>&1 || true + rm -rf "$dir" +} + +up_hashicorp_vault() { + local port=${E2E_SECRET_MANAGER_PORT:-8200} + local token + token=e2e-$(openssl rand -hex 16) + docker run -d --name "$name" -p "127.0.0.1:$port:8200" --cap-add IPC_LOCK \ + -e VAULT_DEV_ROOT_TOKEN_ID="$token" hashicorp/vault:1.20 >/dev/null + wait_for "http://127.0.0.1:$port/v1/sys/health" + printf 'HCP_VAULT_ADDR=http://127.0.0.1:%s\nHCP_VAULT_TOKEN=%s\n' "$port" "$token" >"$dir/proxy.env" + printf 'E2E_VAULT_ADDR=http://127.0.0.1:%s\nE2E_VAULT_TOKEN=%s\n' "$port" "$token" >"$dir/tests.env" +} + +up_cyberark() { + local port=${E2E_SECRET_MANAGER_PORT:-8080} + local data_key api_key + docker network create "$name" >/dev/null + docker run -d --name "$name-db" --network "$name" -e POSTGRES_HOST_AUTH_METHOD=trust postgres:15 >/dev/null + data_key=$(docker run --rm cyberark/conjur:1.24 data-key generate) + docker run -d --name "$name" --network "$name" -p "127.0.0.1:$port:80" \ + -e DATABASE_URL="postgres://postgres@$name-db/postgres" -e CONJUR_DATA_KEY="$data_key" \ + -e CONJUR_AUTHENTICATORS=authn cyberark/conjur:1.24 server >/dev/null + wait_for "http://127.0.0.1:$port/" + docker exec "$name" conjurctl account create --name default >/dev/null + api_key=$(docker exec "$name" conjurctl role retrieve-key default:user:admin | tr -d '\r\n') + printf 'CYBERARK_API_BASE=http://127.0.0.1:%s\nCYBERARK_ACCOUNT=default\nCYBERARK_USERNAME=admin\nCYBERARK_API_KEY=%s\n' \ + "$port" "$api_key" >"$dir/proxy.env" + printf 'E2E_CYBERARK_API_BASE=http://127.0.0.1:%s\nE2E_CYBERARK_ACCOUNT=default\nE2E_CYBERARK_USERNAME=admin\nE2E_CYBERARK_API_KEY=%s\n' \ + "$port" "$api_key" >"$dir/tests.env" +} + +[[ $# -eq 2 && -n $system ]] && declare -F "up_$system" >/dev/null || usage + +case $action in + up) + down + mkdir -p "$dir" + "up_$system" + echo "E2E_SECRET_MANAGER=$system" >>"$dir/tests.env" + echo "$system is up; env in $dir/proxy.env (proxy) and $dir/tests.env (pytest)" + ;; + down) down ;; + *) usage ;; +esac diff --git a/tests/e2e/secret_manager/conftest.py b/tests/e2e/secret_manager/conftest.py new file mode 100644 index 00000000000..46ef598d711 --- /dev/null +++ b/tests/e2e/secret_manager/conftest.py @@ -0,0 +1,57 @@ +from __future__ import annotations + +import os +from dataclasses import dataclass +from typing import Final + +import pytest + +from e2e_config import SECRET_MANAGER_OPT_IN_ENV +from proxy_client import ProxyClient +from secret_backends import BACKENDS, selected_backend +from secret_store import SecretBackend, SecretStore + +REQUIRES_CAPABILITY: Final = "requires_capability" + + +def pytest_configure(config: pytest.Config) -> None: + config.addinivalue_line( + "markers", + f"{REQUIRES_CAPABILITY}(capability): secret_manager test deselected when the backend " + f"{SECRET_MANAGER_OPT_IN_ENV} names lacks the capability (secret_store.Capability)", + ) + + +def _lacks_capability(item: pytest.Item, backend: SecretBackend) -> bool: + marker: Final = item.get_closest_marker(REQUIRES_CAPABILITY) + return marker is not None and marker.args[0] not in backend.capabilities + + +def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item]) -> None: + backend: Final = BACKENDS.get(os.environ.get(SECRET_MANAGER_OPT_IN_ENV, "").strip()) + if backend is None: + return + deselected: Final = [item for item in items if _lacks_capability(item, backend)] + if deselected: + config.hook.pytest_deselected(items=deselected) + items[:] = [item for item in items if not _lacks_capability(item, backend)] + + +@dataclass(frozen=True, slots=True) +class SecretManagerClient: + proxy: ProxyClient + + +@pytest.fixture(scope="session") +def client(proxy: ProxyClient) -> SecretManagerClient: + return SecretManagerClient(proxy) + + +@pytest.fixture(scope="session") +def backend() -> SecretBackend: + return selected_backend() + + +@pytest.fixture(scope="session") +def store(backend: SecretBackend) -> SecretStore: + return backend.from_env() diff --git a/tests/e2e/secret_manager/secret_backends.py b/tests/e2e/secret_manager/secret_backends.py new file mode 100644 index 00000000000..578b56970a3 --- /dev/null +++ b/tests/e2e/secret_manager/secret_backends.py @@ -0,0 +1,25 @@ +from __future__ import annotations + +import os +from types import MappingProxyType +from typing import Final + +import pytest + +from e2e_config import SECRET_MANAGER_OPT_IN_ENV +from secret_store import SecretBackend +from secret_store_cyberark import CYBERARK +from secret_store_hashicorp_vault import HASHICORP_VAULT + +BACKENDS: Final = MappingProxyType({backend.system: backend for backend in (HASHICORP_VAULT, CYBERARK)}) + + +def selected_backend() -> SecretBackend: + system: Final = os.environ.get(SECRET_MANAGER_OPT_IN_ENV, "").strip() + backend: Final = BACKENDS.get(system) + if backend is None: + pytest.fail( + f"{SECRET_MANAGER_OPT_IN_ENV}={system!r} names no secret manager backend; " + f"set it to one of {sorted(BACKENDS)}" + ) + return backend diff --git a/tests/e2e/secret_manager/secret_store.py b/tests/e2e/secret_manager/secret_store.py new file mode 100644 index 00000000000..cff5005b73a --- /dev/null +++ b/tests/e2e/secret_manager/secret_store.py @@ -0,0 +1,29 @@ +from __future__ import annotations + +from collections.abc import Callable +from dataclasses import dataclass +from typing import Final, Literal, Protocol + +SECRET_MANAGER_CONFIG_DIR: Final = "gateway" + + +class SecretStore(Protocol): + def write(self, name: str, value: str) -> None: ... + + def read(self, name: str) -> str | None: ... + + def destroy(self, name: str) -> None: ... + + +Capability = Literal["deletes_stored_keys"] + + +@dataclass(frozen=True, slots=True) +class SecretBackend: + system: str + from_env: Callable[[], SecretStore] + capabilities: frozenset[Capability] + + @property + def proxy_config(self) -> str: + return f"{SECRET_MANAGER_CONFIG_DIR}/secret_manager_{self.system}_ci_config.yml" diff --git a/tests/e2e/secret_manager/secret_store_cyberark.py b/tests/e2e/secret_manager/secret_store_cyberark.py new file mode 100644 index 00000000000..87bcd2ffb1c --- /dev/null +++ b/tests/e2e/secret_manager/secret_store_cyberark.py @@ -0,0 +1,118 @@ +from __future__ import annotations + +import base64 +import os +from dataclasses import dataclass, field +from typing import Final, Literal +from urllib.parse import quote + +import pytest +import yaml +from e2e_http import ExternalWrite, Headers, send_text_external +from pydantic import Field + +from secret_store import SecretBackend + +CYBERARK_API_BASE_ENV: Final = "E2E_CYBERARK_API_BASE" +CYBERARK_ACCOUNT_ENV: Final = "E2E_CYBERARK_ACCOUNT" +CYBERARK_USERNAME_ENV: Final = "E2E_CYBERARK_USERNAME" +CYBERARK_API_KEY_ENV: Final = "E2E_CYBERARK_API_KEY" + +# The same defaults CyberArkSecretManager falls back to for CYBERARK_*. +DEFAULT_API_BASE: Final = "http://127.0.0.1:8080" +DEFAULT_ACCOUNT: Final = "default" +DEFAULT_USERNAME: Final = "admin" + +SYSTEM: Final = "cyberark" + +_START_HINT: Final = ( + f"Start one with `bash tests/e2e/secret_manager/backend.sh up {SYSTEM}`, which writes the env for " + f"the proxy (booted from gateway/secret_manager_{SYSTEM}_ci_config.yml) and for the tests" +) + + +class ConjurHeaders(Headers): + authorization: str = Field(repr=False) + content_type: str | None = Field(default=None, serialization_alias="Content-Type") + + +def _policy_scalar(name: str) -> str: + # Quoted the way CyberArkSecretManager._ensure_variable_exists quotes it. + return yaml.safe_dump(name, default_style='"').strip() + + +@dataclass(frozen=True, slots=True) +class Conjur: + base_url: str + account: str + username: str + api_key: str = field(repr=False) + + def _fail_unless_reached(self, result: ExternalWrite, action: str) -> None: + if result.status_code == -1: + pytest.fail(f"No live Conjur at {self.base_url}: {result.body}. {_START_HINT}") + if result.status_code == 401: + pytest.fail(f"Conjur rejected {self.username}'s credentials while trying to {action}. {_START_HINT}") + + def _headers(self, content_type: str | None = None) -> ConjurHeaders: + # Tokens last about eight minutes, so each call authenticates afresh rather than + # letting a long session outlive a cached one. + auth: Final = send_text_external( + "POST", + f"{self.base_url}/authn/{self.account}/{quote(self.username, safe='')}/authenticate", + headers=Headers(), + content=self.api_key, + ) + self._fail_unless_reached(auth, "authenticate") + if not auth.ok: + pytest.fail(f"Conjur refused to authenticate {self.username}: HTTP {auth.status_code} {auth.body[:300]}") + token: Final = base64.b64encode(auth.body.encode()).decode() + return ConjurHeaders(authorization=f'Token token="{token}"', content_type=content_type) + + def _secret_url(self, name: str) -> str: + return f"{self.base_url}/secrets/{self.account}/variable/{quote(name, safe='')}" + + def _update_root_policy(self, method: Literal["POST", "PATCH"], policy: str, action: str) -> None: + result: Final = send_text_external( + method, + f"{self.base_url}/policies/{self.account}/policy/root", + headers=self._headers(content_type="application/x-yaml"), + content=policy, + ) + self._fail_unless_reached(result, action) + if not result.ok: + pytest.fail(f"Conjur refused to {action}: HTTP {result.status_code} {result.body[:300]}") + + def write(self, name: str, value: str) -> None: + self._update_root_policy("POST", f"- !variable {_policy_scalar(name)}\n", f"declare {name}") + result: Final = send_text_external("POST", self._secret_url(name), headers=self._headers(), content=value) + self._fail_unless_reached(result, f"write {name}") + if not result.ok: + pytest.fail(f"Conjur refused to write {name}: HTTP {result.status_code} {result.body[:300]}") + + def read(self, name: str) -> str | None: + result: Final = send_text_external("GET", self._secret_url(name), headers=self._headers()) + self._fail_unless_reached(result, f"read {name}") + if result.status_code == 404: + return None + if not result.ok: + pytest.fail(f"Conjur refused to read {name}: HTTP {result.status_code} {result.body[:300]}") + return result.body + + def destroy(self, name: str) -> None: + self._update_root_policy("PATCH", f"- !delete\n record: !variable {_policy_scalar(name)}\n", f"destroy {name}") + + +def conjur_from_env() -> Conjur: + api_key: Final = os.environ.get(CYBERARK_API_KEY_ENV, "").strip() + if not api_key: + pytest.fail(f"The {SYSTEM} lane needs {CYBERARK_API_KEY_ENV} to reach its Conjur. {_START_HINT}") + return Conjur( + base_url=os.environ.get(CYBERARK_API_BASE_ENV, "").strip().rstrip("/") or DEFAULT_API_BASE, + account=os.environ.get(CYBERARK_ACCOUNT_ENV, "").strip() or DEFAULT_ACCOUNT, + username=os.environ.get(CYBERARK_USERNAME_ENV, "").strip() or DEFAULT_USERNAME, + api_key=api_key, + ) + + +CYBERARK: Final = SecretBackend(system=SYSTEM, from_env=conjur_from_env, capabilities=frozenset()) diff --git a/tests/e2e/secret_manager/secret_store_hashicorp_vault.py b/tests/e2e/secret_manager/secret_store_hashicorp_vault.py new file mode 100644 index 00000000000..ccf8cefe716 --- /dev/null +++ b/tests/e2e/secret_manager/secret_store_hashicorp_vault.py @@ -0,0 +1,113 @@ +from __future__ import annotations + +import os +from dataclasses import dataclass, field +from typing import Final + +import pytest +from e2e_http import ( + Headers, + NetworkError, + Success, + UnknownApiError, + delete_external, + get_external, + post_json_external, +) +from pydantic import BaseModel, Field + +from secret_store import SecretBackend + +VAULT_ADDR_ENV: Final = "E2E_VAULT_ADDR" +VAULT_TOKEN_ENV: Final = "E2E_VAULT_TOKEN" +VAULT_MOUNT_ENV: Final = "E2E_VAULT_MOUNT_NAME" + +DEFAULT_VAULT_ADDR: Final = "http://127.0.0.1:8200" +DEFAULT_MOUNT: Final = "secret" + +SYSTEM: Final = "hashicorp_vault" + +_START_HINT: Final = ( + f"Start one with `bash tests/e2e/secret_manager/backend.sh up {SYSTEM}`, which writes the env for " + f"the proxy (booted from gateway/secret_manager_{SYSTEM}_ci_config.yml) and for the tests" +) + + +class VaultHeaders(Headers): + x_vault_token: str = Field(serialization_alias="X-Vault-Token", repr=False) + + +class KvData(BaseModel): + key: str = Field(repr=False) + + +class KvWriteBody(BaseModel): + data: KvData + + +class KvReadData(BaseModel): + data: KvData + + +class KvReadResponse(BaseModel): + data: KvReadData + + +@dataclass(frozen=True, slots=True) +class Vault: + base_url: str + token: str = field(repr=False) + mount: str = DEFAULT_MOUNT + + def _headers(self) -> VaultHeaders: + return VaultHeaders(x_vault_token=self.token) + + def _data_url(self, name: str) -> str: + return f"{self.base_url}/v1/{self.mount}/data/{name}" + + def _metadata_url(self, name: str) -> str: + return f"{self.base_url}/v1/{self.mount}/metadata/{name}" + + def write(self, name: str, value: str) -> None: + write: Final = post_json_external( + self._data_url(name), headers=self._headers(), json=KvWriteBody(data=KvData(key=value)) + ) + if write.status_code == -1: + pytest.fail(f"No live Vault at {self.base_url}: {write.body}. {_START_HINT}") + if not write.ok: + pytest.fail(f"Vault refused to write {name}: HTTP {write.status_code} {write.body[:300]}") + + def read(self, name: str) -> str | None: + result: Final = get_external(self._data_url(name), headers=self._headers(), response_type=KvReadResponse) + match result: + case Success(data=body): + return body.data.data.key + case UnknownApiError(status_code=404): + return None + case NetworkError(message=message): + return pytest.fail(f"No live Vault at {self.base_url}: {message}. {_START_HINT}") + case _: + return pytest.fail(f"Vault refused to read {name}: {result}") + + def destroy(self, name: str) -> None: + write: Final = delete_external(self._metadata_url(name), headers=self._headers()) + if not write.ok and write.status_code != 404: + pytest.fail(f"Vault refused to destroy {name}: HTTP {write.status_code} {write.body[:300]}") + + +def vault_from_env() -> Vault: + token: Final = os.environ.get(VAULT_TOKEN_ENV, "").strip() + if not token: + pytest.fail(f"The hashicorp_vault lane needs {VAULT_TOKEN_ENV} to reach its Vault. {_START_HINT}") + return Vault( + base_url=os.environ.get(VAULT_ADDR_ENV, DEFAULT_VAULT_ADDR).rstrip("/"), + token=token, + mount=os.environ.get(VAULT_MOUNT_ENV, "").strip() or DEFAULT_MOUNT, + ) + + +HASHICORP_VAULT: Final = SecretBackend( + system=SYSTEM, + from_env=vault_from_env, + capabilities=frozenset({"deletes_stored_keys"}), +) diff --git a/tests/e2e/secret_manager/test_secret_manager_e2e.py b/tests/e2e/secret_manager/test_secret_manager_e2e.py new file mode 100644 index 00000000000..a9c9024718d --- /dev/null +++ b/tests/e2e/secret_manager/test_secret_manager_e2e.py @@ -0,0 +1,128 @@ +from __future__ import annotations + +import os +import time +from collections.abc import Callable +from typing import Final + +import pytest + +from e2e_config import unique_marker +from e2e_http import Result, Success, UnauthorizedError, unwrap +from lifecycle import ResourceManager +from models import ChatBody, ChatMessage, ChatResponse, KeyGenerateBody, LiteLLMParamsBody +from proxy_client import ProxyClient +from secret_store import SecretStore + +pytestmark = [pytest.mark.e2e, pytest.mark.secret_manager] + +BACKEND_MODEL: Final = "openai/gpt-4o-mini" +VIRTUAL_KEY_PREFIX: Final = "litellm-e2e/virtual-keys/" +PROVIDER_KEY_ENV: Final = "OPENAI_API_KEY" + + +# The proxy's env never holds OPENAI_API_KEY and each test seeds it under a fresh name, so a passing +# call proves the key came from the manager and not get_secret's os.environ fallback. +def _provider_key() -> str: + key: Final = os.environ.get(PROVIDER_KEY_ENV, "").strip() + if not key: + pytest.fail(f"The secret manager suite seeds the manager with the runner's {PROVIDER_KEY_ENV}, which is unset") + return key + + +def _seed(store: SecretStore, resources: ResourceManager, value: str) -> str: + name: Final = f"litellm-e2e-openai-{unique_marker()}" + store.write(name, value) + resources.defer(lambda: store.destroy(name)) + return name + + +def _deploy(proxy: ProxyClient, resources: ResourceManager, secret_name: str) -> str: + model_name: Final = f"secret-manager-backed-{unique_marker()}" + model_id: Final = proxy.create_model( + model_name, + LiteLLMParamsBody(model=BACKEND_MODEL, api_key=f"os.environ/{secret_name}"), + provider_live=True, + ) + resources.defer(lambda: proxy.delete_model(model_id)) + return model_name + + +def _chat(proxy: ProxyClient, key: str, model: str) -> Result[ChatResponse]: + return proxy.chat( + key, + ChatBody( + model=model, + messages=[ChatMessage(role="user", content=f"reply with one word {unique_marker()}")], + max_tokens=16, + ), + ) + + +def _eventually(proxy: ProxyClient, read: Callable[[], str | None], expected: str | None, context: str) -> None: + deadline: Final = time.monotonic() + proxy.poll_timeout + last: str | None = read() + while last != expected and time.monotonic() < deadline: + time.sleep(proxy.poll_interval) + last = read() + if last != expected: + pytest.fail( + f"{context}: the secret manager still holds {'a value' if last is not None else 'nothing'} after the deadline" + ) + + +class TestSecretManager: + @pytest.mark.covers("other.config.secret_resolution.kms_integration") + def test_deployment_key_resolves_from_the_manager( + self, proxy: ProxyClient, resources: ResourceManager, store: SecretStore, scoped_key: str + ) -> None: + model: Final = _deploy(proxy, resources, _seed(store, resources, _provider_key())) + + response: Final = unwrap(_chat(proxy, scoped_key, model)) + + assert response.choices, f"the manager-backed deployment answered with no choices: {response}" + + @pytest.mark.covers("other.config.secret_resolution.manager_value_used") + def test_deployment_uses_the_value_the_manager_holds( + self, proxy: ProxyClient, resources: ResourceManager, store: SecretStore, scoped_key: str + ) -> None: + bogus: Final = f"sk-litellm-e2e-not-a-key-{unique_marker()}" + model: Final = _deploy(proxy, resources, _seed(store, resources, bogus)) + + result: Final = _chat(proxy, scoped_key, model) + + match result: + case UnauthorizedError(body=body): + assert "AuthenticationError" in body, f"the 401 did not come from the provider: {body[:300]}" + case Success(): + pytest.fail("a deployment whose managed secret is not a real key still reached the provider") + case _: + pytest.fail(f"expected the provider to reject the manager-held key with 401, got {result}") + + @pytest.mark.covers("other.config.secret_manager.virtual_key_stored") + def test_generated_key_is_written_to_the_manager( + self, proxy: ProxyClient, resources: ResourceManager, store: SecretStore + ) -> None: + alias: Final = f"litellm-e2e-vk-{unique_marker()}" + secret_name: Final = f"{VIRTUAL_KEY_PREFIX}{alias}" + resources.defer(lambda: store.destroy(secret_name)) + key: Final = proxy.generate_key(KeyGenerateBody(key_alias=alias)) + resources.defer(lambda: proxy.delete_key(key)) + + _eventually(proxy, lambda: store.read(secret_name), key, f"the generated key {alias}") + + @pytest.mark.requires_capability("deletes_stored_keys") + @pytest.mark.covers("other.config.secret_manager.virtual_key_deleted") + def test_deleted_key_is_removed_from_the_manager( + self, proxy: ProxyClient, resources: ResourceManager, store: SecretStore + ) -> None: + alias: Final = f"litellm-e2e-vk-{unique_marker()}" + secret_name: Final = f"{VIRTUAL_KEY_PREFIX}{alias}" + resources.defer(lambda: store.destroy(secret_name)) + key: Final = proxy.generate_key(KeyGenerateBody(key_alias=alias)) + resources.defer(lambda: proxy.delete_key(key)) + _eventually(proxy, lambda: store.read(secret_name), key, f"the generated key {alias}") + + proxy.delete_key(key) + + _eventually(proxy, lambda: store.read(secret_name), None, f"the deleted key {alias}") diff --git a/tests/e2e/stack_lock.py b/tests/e2e/stack_lock.py new file mode 100644 index 00000000000..06df7a20b6a --- /dev/null +++ b/tests/e2e/stack_lock.py @@ -0,0 +1,45 @@ +"""Cross-process reader/writer lock over the proxy stack every xdist worker shares. +Every collected test holds it shared, marker or not, since the Claude Code cells and +other unmarked suites drive the same stack; a `quiet_stack` test holds it exclusive, +and the `gate` file makes a waiting exclusive holder win over readers that arrive +after it.""" + +from __future__ import annotations + +import fcntl +import hashlib +import tempfile +from collections.abc import Generator +from contextlib import ExitStack, contextmanager +from pathlib import Path +from typing import Final + +from e2e_config import PROXY_BASE_URL + +STACK_DIGEST: Final = hashlib.sha256(PROXY_BASE_URL.encode()).hexdigest()[:12] +LOCK_DIR: Final = Path(tempfile.gettempdir()) / f"litellm-e2e-stack-{STACK_DIGEST}" +GATE_FILE: Final = LOCK_DIR / "gate" +STACK_FILE: Final = LOCK_DIR / "stack" + + +@contextmanager +def _flock(path: Path, operation: int) -> Generator[None]: + with path.open("a") as handle: + fcntl.flock(handle, operation) + try: + yield + finally: + fcntl.flock(handle, fcntl.LOCK_UN) + + +@contextmanager +def stack_lock(exclusive: bool) -> Generator[None]: + LOCK_DIR.mkdir(parents=True, exist_ok=True) + if exclusive: + with _flock(GATE_FILE, fcntl.LOCK_EX), _flock(STACK_FILE, fcntl.LOCK_EX): + yield + return + with ExitStack() as held: + with _flock(GATE_FILE, fcntl.LOCK_SH): + held.enter_context(_flock(STACK_FILE, fcntl.LOCK_SH)) + yield diff --git a/tests/e2e/test_proxy_client.py b/tests/e2e/test_proxy_client.py index 0c4aed5bd65..a8f07ed6dd7 100644 --- a/tests/e2e/test_proxy_client.py +++ b/tests/e2e/test_proxy_client.py @@ -338,6 +338,10 @@ class TestParseReplicaUrls: def test_falls_back_to_the_data_plane_address_when_unset(self) -> None: assert parse_replica_urls("", "http://lb") == ("http://lb",) + def test_collapses_repeated_gateway_addresses_to_one_replica(self) -> None: + raw: Final = "http://127.0.0.1:4010,http://127.0.0.1:4010/,http://127.0.0.1:4011,http://127.0.0.1:4010" + assert parse_replica_urls(raw, "http://lb") == ("http://127.0.0.1:4010", "http://127.0.0.1:4011") + def _answers(answers: Iterable[str]) -> ReplicaRead[str]: it: Final = iter(answers) diff --git a/tests/e2e/test_stack_lock.py b/tests/e2e/test_stack_lock.py new file mode 100644 index 00000000000..af071d2cc18 --- /dev/null +++ b/tests/e2e/test_stack_lock.py @@ -0,0 +1,117 @@ +"""Cross-process behavior of the stack lock: readers share it, an exclusive holder waits for +every reader and keeps them out, and a reader arriving behind a waiting exclusive holder +queues behind it instead of starving it.""" + +from __future__ import annotations + +import fcntl +import os +import subprocess +import sys +import time +from contextlib import ExitStack +from pathlib import Path +from typing import Final + +import pytest + +from stack_lock import STACK_DIGEST + +HARNESS_DIR: Final = Path(__file__).resolve().parent +DEADLINE_SECONDS: Final = 30.0 +SETTLE_SECONDS: Final = 0.5 +HOLDER_SCRIPT: Final = """ +import sys, time +from pathlib import Path +from stack_lock import stack_lock +name, mode, release_path, log_path = sys.argv[1:] + + +def record(event): + with Path(log_path).open("a") as log: + log.write(f"{name} {event}\\n") + + +record("waiting") +with stack_lock(exclusive=mode == "exclusive"): + record("enter") + while not Path(release_path).exists(): + time.sleep(0.02) + record("exit") +""" + + +def _events(log_path: Path) -> tuple[str, ...]: + return tuple(log_path.read_text().splitlines()) if log_path.exists() else () + + +def _wait_for_event(log_path: Path, event: str) -> None: + deadline: Final = time.monotonic() + DEADLINE_SECONDS + while event not in _events(log_path): + if time.monotonic() > deadline: + pytest.fail(f"{event!r} never appeared; events so far: {_events(log_path)}") + time.sleep(0.02) + + +def _wait_until_gate_is_held_exclusively(gate_path: Path) -> None: + deadline: Final = time.monotonic() + DEADLINE_SECONDS + with gate_path.open("a") as handle: + while True: + try: + fcntl.flock(handle, fcntl.LOCK_SH | fcntl.LOCK_NB) + except BlockingIOError: + return + fcntl.flock(handle, fcntl.LOCK_UN) + if time.monotonic() > deadline: + pytest.fail("no exclusive holder ever took the gate") + time.sleep(0.02) + + +def _start_holder(held: ExitStack, tmp_path: Path, name: str, mode: str) -> subprocess.Popen[bytes]: + holder: Final = held.enter_context( + subprocess.Popen( + ( + sys.executable, + "-P", + "-c", + HOLDER_SCRIPT, + name, + mode, + str(tmp_path / f"release-{name}"), + str(tmp_path / "events"), + ), + cwd=HARNESS_DIR, + env={**os.environ, "TMPDIR": str(tmp_path), "PYTHONPATH": str(HARNESS_DIR)}, + ) + ) + held.callback(holder.kill) + return holder + + +def test_readers_share_exclusive_waits_and_a_waiting_exclusive_beats_later_readers(tmp_path: Path) -> None: + lock_dir: Final = tmp_path / f"litellm-e2e-stack-{STACK_DIGEST}" + lock_dir.mkdir() + log_path: Final = tmp_path / "events" + with ExitStack() as held: + first_reader: Final = _start_holder(held, tmp_path, "A", "shared") + _wait_for_event(log_path, "A enter") + second_reader: Final = _start_holder(held, tmp_path, "R", "shared") + _wait_for_event(log_path, "R enter") + (tmp_path / "release-R").touch() + _wait_for_event(log_path, "R exit") + writer: Final = _start_holder(held, tmp_path, "W", "exclusive") + _wait_until_gate_is_held_exclusively(lock_dir / "gate") + late_reader: Final = _start_holder(held, tmp_path, "B", "shared") + _wait_for_event(log_path, "B waiting") + time.sleep(SETTLE_SECONDS) + (tmp_path / "release-A").touch() + _wait_for_event(log_path, "W enter") + (tmp_path / "release-W").touch() + _wait_for_event(log_path, "B enter") + (tmp_path / "release-B").touch() + for holder in (first_reader, second_reader, writer, late_reader): + assert holder.wait(timeout=DEADLINE_SECONDS) == 0 + events: Final = _events(log_path) + assert events.index("R enter") < events.index("A exit") + assert events.index("W enter") > events.index("A exit") + assert events.index("B enter") > events.index("W exit") diff --git a/tests/e2e/transport.py b/tests/e2e/transport.py index a3eec815441..87aad0d08de 100644 --- a/tests/e2e/transport.py +++ b/tests/e2e/transport.py @@ -312,7 +312,11 @@ CONTROL_PLANE_PREFIXES: tuple[str, ...] = ( "/global", "/config", "/guardrails", + "/credentials", "/router/settings", + "/audit", + "/public", + "/v2/login", "/openapi.json", ) diff --git a/tests/integration/README.md b/tests/integration/README.md index f21e04f1ca5..628b6721514 100644 --- a/tests/integration/README.md +++ b/tests/integration/README.md @@ -12,9 +12,9 @@ The generated lifecycle models use 20 examples, eight steps, generation and shri Reuse the existing canned provider handlers through `_support/upstream.py`. It rejects internal request fields and exposes actual received requests for independent assertions. Register every created resource for cleanup immediately, keep expected values independent of production calculations, and assert readback plus the runtime effect of a change -The CircleCI workflow starts its own database and Redis, restricts test-phase egress to its owned services and writes JUnit plus an executed-node manifest. Missing setup, skipped tests, failed cleanup or a selected test without a passed call fail qualification. Existing GitHub Actions jobs do not own these tests +The CircleCI workflow starts its own database and Redis, restricts test-phase egress to its owned services and writes JUnit plus an executed-node manifest. Missing setup, failed cleanup or a selected test with neither a passed call nor a skip fail qualification. Skipped nodes are listed under `skipped` in `execution.json`, so the skip reasons double as the open bug list. Existing GitHub Actions jobs do not own these tests -Define integration contract IDs and their canonical test nodes in `contracts.json`. Every node must declare the same IDs with `covers`. The runner checks exact collected and passed selections against that mapping. These IDs belong to this CircleCI suite and must not be added to the separate E2E coverage registry. A manifest declaration alone does not mean a test passed +Define integration contract IDs and their canonical test nodes in `contracts.json`. Every node must declare the same IDs with `covers`. The runner checks exact collected and passed-or-skipped selections against that mapping. These IDs belong to this CircleCI suite and must not be added to the separate E2E coverage registry. A manifest declaration alone does not mean a test passed Provider sentinels currently use the controlled server, not live recordings. The provider shard also runs the existing strict replay controls for changed requests, exhausted interactions, leftover interactions and no provider connection. Future recorded scenarios must use that replay-only implementation; missing recordings cannot fall back to a real provider. The observation endpoint is destructive and the current selection runs serially against one owned upstream @@ -22,7 +22,7 @@ Fixtures must contain synthetic data only. Keep private incident records and sou Database cases own their temporary schemas, roles, constraints and proxy processes. They prove reader-versus-writer execution with PostgreSQL lock observations, exercise real transaction wait limits and verify rollback after a reached database failure -Accounting cases compare persisted input and output cost components against literal rates, including zero and default prices. Cache state models assert actual upstream calls, response identity and every persisted charge. Generated accounting tests have a 180-second test limit to accommodate the asynchronous spend writer; CircleCI keeps the whole shard capped at 11 minutes +Accounting cases compare persisted input and output cost components against literal rates, including zero and default prices. Cache state models assert actual upstream calls, response identity and every persisted charge. Generated accounting tests have a 180-second test limit to accommodate the asynchronous spend writer Provider contracts exercise actual TCP requests with synthetic credentials and local protocol peers. The S3 verifier uses independently implemented equations, a published known-answer vector, a fixed signing clock and deliberately invalid signed requests. Bedrock cases clear ambient AWS credential sources and check the literal model path, loaded role references, STS requests and bearer-only behavior diff --git a/tests/integration/_support/process.py b/tests/integration/_support/process.py index e0923c9d055..5c44beaa570 100644 --- a/tests/integration/_support/process.py +++ b/tests/integration/_support/process.py @@ -1,18 +1,18 @@ import os -import socket import signal +import socket import subprocess import sys import time import uuid from collections.abc import Iterator, Mapping from contextlib import contextmanager +from dataclasses import dataclass from pathlib import Path from typing import Final import httpx import psutil - from integration._support.client import Gateway @@ -45,12 +45,43 @@ def stop_root_process(process: subprocess.Popen[bytes]) -> bool: return True +@dataclass(frozen=True, slots=True) +class OwnedProxy: + gateway: Gateway + process: subprocess.Popen[bytes] + log: Path + + @contextmanager -def owned_proxy(gateway: Gateway, directory: Path, overrides: Mapping[str, str], *, config: Path | None = None, remove_environment: tuple[str, ...] = ()) -> Iterator[Gateway]: +def owned_proxy( + gateway: Gateway, + directory: Path, + overrides: Mapping[str, str], + *, + config: Path | None = None, + remove_environment: tuple[str, ...] = (), + workers: int = 1, +) -> Iterator[Gateway]: + with owned_proxy_process( + gateway, directory, overrides, config=config, remove_environment=remove_environment, workers=workers + ) as owned: + yield owned.gateway + + +@contextmanager +def owned_proxy_process( + gateway: Gateway, + directory: Path, + overrides: Mapping[str, str], + *, + config: Path | None = None, + remove_environment: tuple[str, ...] = (), + workers: int = 1, +) -> Iterator[OwnedProxy]: with socket.socket() as reserve: reserve.bind(("127.0.0.1", 0)) port: Final = reserve.getsockname()[1] - root: Final = Path(__file__).resolve().parents[3] + root: Final = Path(os.environ.get("INTEGRATION_PROXY_ROOT") or Path(__file__).resolve().parents[3]) environment: Final = { **{name: value for name, value in os.environ.items() if name not in remove_environment}, "LITELLM_MASTER_KEY": gateway.key, @@ -60,7 +91,8 @@ def owned_proxy(gateway: Gateway, directory: Path, overrides: Mapping[str, str], } output: Final = Path(os.environ.get("INTEGRATION_RESULTS_DIR", str(directory))) output.mkdir(parents=True, exist_ok=True) - with (output / f"owned-proxy-{uuid.uuid4().hex}.log").open("w") as log: + log_path: Final = output / f"owned-proxy-{uuid.uuid4().hex}.log" + with log_path.open("w") as log: process: Final = subprocess.Popen( [ sys.executable, @@ -73,7 +105,7 @@ def owned_proxy(gateway: Gateway, directory: Path, overrides: Mapping[str, str], "--port", str(port), "--num_workers", - "1", + str(workers), "--use_prisma_db_push", "--enforce_prisma_migration_check", ], @@ -95,7 +127,7 @@ def owned_proxy(gateway: Gateway, directory: Path, overrides: Mapping[str, str], pass assert time.monotonic() < deadline, "Owned proxy readiness deadline exceeded" time.sleep(0.1) - yield Gateway(client, gateway.key, gateway.upstream_url) + yield OwnedProxy(Gateway(client, gateway.key, gateway.upstream_url), process, log_path) finally: root_stopped: Final = stop_root_process(process) residual: Final = group_members(process.pid) diff --git a/tests/integration/_support/upstream.py b/tests/integration/_support/upstream.py index e9c50ea7966..eea539643d4 100644 --- a/tests/integration/_support/upstream.py +++ b/tests/integration/_support/upstream.py @@ -152,6 +152,31 @@ class Provider: ) return await chat_completions(request) + async def vector_store_search(self, request: Request) -> Response: + body: Final = JSON_OBJECT.validate_json(await request.body()) + self.observations.put(Observation(request.url.path, request.headers.get("authorization", ""), body)) + query: Final = body.get("query") + if not isinstance(query, str) or not query: + return JSONResponse({"error": {"message": "query is required"}}, status_code=400) + vector_store_id: Final = cast(str, request.path_params["vector_store_id"]) + return JSONResponse( + { + "object": "vector_store.search_results.page", + "search_query": query, + "data": [ + { + "file_id": f"file_{vector_store_id}", + "filename": "scripted.txt", + "score": 0.9, + "attributes": {}, + "content": [{"type": "text", "text": f"scripted context for {query}"}], + } + ], + "has_more": False, + "next_page": None, + } + ) + async def script(self, request: Request) -> Response: name: Final = cast(str, request.path_params["model"]) if request.method in {"DELETE", "GET"} and name not in self.scripts: @@ -338,6 +363,7 @@ class Provider: Route("/v1/completions", completions, methods=["POST"]), Route("/v1/embeddings", embeddings, methods=["POST"]), Route("/v1/moderations", moderations, methods=["POST"]), + Route("/vector_stores/{vector_store_id}/search", self.vector_store_search, methods=["POST"]), Route("/{path:path}", self.scripted, methods=["POST"]), Route("/{path:path}", self.scripted, methods=["GET"]), WebSocketRoute("/v1/realtime", self.realtime), diff --git a/tests/integration/_support/wire.py b/tests/integration/_support/wire.py index acc51dd4497..5052c34e021 100644 --- a/tests/integration/_support/wire.py +++ b/tests/integration/_support/wire.py @@ -1,11 +1,14 @@ from __future__ import annotations +import ssl import threading -from collections.abc import Callable, Iterator, Mapping +import time +from collections.abc import Callable, Generator, Mapping from contextlib import contextmanager from dataclasses import dataclass from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer from queue import SimpleQueue +from types import MappingProxyType from typing import Final @@ -25,6 +28,8 @@ class Reply: chunks: tuple[bytes, ...] | None = None abort_after: int | None = None gate_after_first: threading.Event | None = None + pause_between_chunks: float = 0 + headers: Mapping[str, str] = MappingProxyType({}) @dataclass(frozen=True, slots=True) @@ -38,7 +43,7 @@ class Wire: @contextmanager -def wire_server(respond: Callable[[Request], Reply]) -> Iterator[Wire]: +def wire_server(respond: Callable[[Request], Reply], tls: ssl.SSLContext | None = None) -> Generator[Wire, None, None]: """Owned TCP peer; requests traverse the real HTTP client and serialization.""" received: Final[SimpleQueue[Request]] = SimpleQueue() errors: Final[SimpleQueue[Exception]] = SimpleQueue() @@ -50,7 +55,8 @@ def wire_server(respond: Callable[[Request], Reply]) -> Iterator[Wire]: def respond(self) -> None: request: Final = Request( - self.command, self.path, + self.command, + self.path, {name.lower(): value for name, value in self.headers.items()}, self.rfile.read(int(self.headers.get("content-length", "0"))), ) @@ -62,6 +68,8 @@ def wire_server(respond: Callable[[Request], Reply]) -> Iterator[Wire]: reply = Reply(status=500) self.send_response(reply.status) self.send_header("content-type", reply.content_type) + for name, value in reply.headers.items(): + self.send_header(name, value) if reply.chunks is None: self.send_header("content-length", str(len(reply.body))) else: @@ -79,6 +87,8 @@ def wire_server(respond: Callable[[Request], Reply]) -> Iterator[Wire]: self.wfile.flush() if index == 0 and reply.gate_after_first is not None: assert reply.gate_after_first.wait(timeout=5), "Stream barrier was never released" + if reply.pause_between_chunks and index + 1 < len(reply.chunks): + time.sleep(reply.pause_between_chunks) else: self.wfile.write(b"0\r\n\r\n") self.wfile.flush() @@ -99,11 +109,20 @@ def wire_server(respond: Callable[[Request], Reply]) -> Iterator[Wire]: class OwnedHTTPServer(ThreadingHTTPServer): daemon_threads = False + def server_bind(self) -> None: + super().server_bind() + if tls is not None: + self.socket = tls.wrap_socket(self.socket, server_side=True) + with OwnedHTTPServer(("127.0.0.1", 0), Handler) as server: thread: Final = threading.Thread(target=server.serve_forever, kwargs={"poll_interval": 0.05}) thread.start() try: - yield Wire(f"http://127.0.0.1:{server.server_port}", received, disconnected) + yield Wire( + f"{'https' if tls is not None else 'http'}://127.0.0.1:{server.server_port}", + received, + disconnected, + ) finally: server.shutdown() thread.join(timeout=6) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index c54197c15e6..d5f0726f8b0 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -81,17 +81,22 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None: collected: Final = session.config.stash.get(COLLECTED, ()) reports: Final = tuple(report for report in session.config.stash[REPORTS] if report.nodeid in collected) passed: Final = tuple(report.nodeid for report in reports if report.when == "call" and report.passed) + skipped: Final = tuple(report.nodeid for report in reports if report.skipped) complete: Final = ( exitstatus == 0 and bool(collected) - and sorted(collected) == sorted(passed) - and all(report.passed for report in reports) + and sorted(collected) == sorted(passed + skipped) + and not any(report.failed for report in reports) ) output: Final = Path(destination) output.mkdir(parents=True, exist_ok=True) (output / "execution.json").write_text( json.dumps({ - "collected": collected, "passed": passed, "complete": complete, "exitstatus": exitstatus, + "collected": collected, + "passed": passed, + "skipped": skipped, + "complete": complete, + "exitstatus": exitstatus, "hypothesis_version": version("hypothesis"), "hypothesis_seed": session.config.getoption("hypothesis_seed"), "order_seed": session.config.getoption("integration_order_seed"), diff --git a/tests/integration/contracts.json b/tests/integration/contracts.json index b861d83ebd7..16b97fb47fa 100644 --- a/tests/integration/contracts.json +++ b/tests/integration/contracts.json @@ -159,6 +159,12 @@ "tests/integration/routing/test_redis_recovery.py::test_owned_redis_outage_recovers_requests_and_real_response_cache": [ "other.routing.redis.owned_outage_recovers_serving_and_response_cache" ], + "tests/integration/providers/test_anthropic_wire.py::test_anthropic_bare_string_content_item_is_rejected_as_client_error_before_the_wire[type_word]": [ + "other.provider_wire.anthropic.bare_string_content_item_is_client_error" + ], + "tests/integration/providers/test_anthropic_wire.py::test_anthropic_bare_string_content_item_is_rejected_as_client_error_before_the_wire[plain]": [ + "other.provider_wire.anthropic.bare_string_content_item_is_client_error" + ], "tests/integration/providers/test_anthropic_wire.py::test_anthropic_tool_history_and_cache_tokens_keep_wire_and_accounting_contracts": [ "other.provider_wire.anthropic.tool_history_system_cache_and_internal_fields", "quota_management.spend_tracking.cache_tokens.disjoint_classes_use_explicit_rates" @@ -169,6 +175,12 @@ "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_video_failed_result_reports_failed_status_and_fal_error": [ "other.provider_wire.fal_ai.video_failed_result_surfaces_fal_error" ], + "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_h3_auto_duration_omits_duration_and_queues": [ + "other.provider_wire.fal_ai.h3_auto_duration_omits_duration_and_queues" + ], + "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_h3_oversized_size_uses_top_resolution_tier_and_queues": [ + "other.provider_wire.fal_ai.h3_oversized_size_uses_top_resolution_tier" + ], "tests/integration/providers/test_fal_ai_image_wire.py::test_fal_gpt_image_25_generation_sends_quality_and_size_and_charges_keyed_row": [ "other.provider_wire.fal_ai.gpt_image_generation_quality_size_wire_and_keyed_pricing" ], @@ -184,6 +196,12 @@ "tests/integration/providers/test_fal_ai_passthrough_wire.py::test_fal_queue_submit_charges_and_polls_pass_through_free": [ "other.provider_wire.fal_ai.passthrough_queue_submit_charges_and_polls_do_not" ], + "tests/integration/providers/test_fal_ai_passthrough_wire.py::test_fal_queue_submit_prices_string_resolution_like_the_integer": [ + "other.provider_wire.fal_ai.passthrough_queue_submit_prices_string_resolution_like_integer" + ], + "tests/integration/providers/test_fal_ai_passthrough_wire.py::test_fal_queue_submit_to_catalog_key_the_pricer_cannot_price_is_rejected_not_forwarded": [ + "other.provider_wire.fal_ai.passthrough_queue_submit_rejects_unpriceable_catalog_key" + ], "tests/integration/providers/test_fal_ai_image_wire.py::test_fal_gpt_image_25_edit_inlines_upload_as_data_url_and_charges_keyed_row": [ "other.provider_wire.fal_ai.image_edit_json_data_urls_and_keyed_pricing" ], @@ -193,6 +211,12 @@ "tests/integration/providers/test_fal_ai_chat_wire.py::test_fal_moondream3_chat_sends_prompt_image_and_reasoning": [ "other.provider_wire.fal_ai.moondream3_chat_query_wire_and_token_pricing" ], + "tests/integration/providers/test_fal_ai_chat_wire.py::test_fal_moondream3_chat_rejects_non_string_reasoning_effort_before_the_wire": [ + "other.provider_wire.fal_ai.chat_non_string_reasoning_effort_rejected_before_wire" + ], + "tests/integration/providers/test_fal_ai_image_wire.py::test_fal_flux_dev_generation_without_deployment_api_base_uses_global_api_base": [ + "other.provider_wire.fal_ai.global_api_base_routes_image_generation" + ], "tests/integration/providers/test_xiaomi_mimo_wire.py::test_xiaomi_mimo_nonstream_surfaces_reasoning_and_charges_registry_price[mimo-v2.6-pro]": [ "other.provider_wire.xiaomi_mimo.reasoning_content_and_registry_pricing" ], @@ -208,6 +232,15 @@ "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_h3_video_create_uses_canonical_body_and_status_path": [ "other.provider_wire.fal_ai.video_queue_create_status_and_content_download" ], + "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_result_probe_carries_the_deployment_extra_headers": [ + "other.provider_wire.fal_ai.video_result_probe_forwards_extra_headers" + ], + "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_result_probe_reuses_the_ssl_verify_false_client": [ + "other.provider_wire.fal_ai.video_result_probe_honors_ssl_verify" + ], + "tests/integration/providers/test_fal_ai_video_wire.py::test_fal_provider_hanging_up_on_the_result_probe_keeps_the_completed_status": [ + "other.provider_wire.fal_ai.video_result_probe_hangup_stays_completed" + ], "tests/integration/mcp/test_mcp_lifecycle.py::test_saved_headers_reach_real_mcp_tool_and_survive_unrelated_edit": [ "mcp.call_tool.saved_headers.reach_actual_transport" ], @@ -221,6 +254,9 @@ "other.observability.callbacks.credentials_stay_out_of_event_bodies", "other.observability.callbacks.concurrent_results_join_complete_events_and_rows" ], + "tests/integration/observability/test_otel_text_completion_choices.py::test_otel_weave_output_keeps_text_completion_provider_fields_beside_the_synthesized_message": [ + "other.observability.otel.text_completion_choices_keep_provider_fields" + ], "tests/integration/observability/test_guardrail_effects.py::test_guardrail_rewrites_system_and_user_in_actual_anthropic_request": [ "other.observability.guardrails.rewrite_reaches_correct_anthropic_positions" ], @@ -245,6 +281,21 @@ "tests/integration/spend/test_filtered_ledger.py::test_rotated_keys_users_and_model_groups_preserve_success_failure_cache_ledger": [ "quota_management.spend_tracking.filtered_ledger_preserves_owner_identity_and_totals" ], + "tests/integration/spend/test_shutdown_flush.py::test_daily_spend_batch_cancelled_while_waiting_for_a_pool_connection_is_written_by_the_final_flush": [ + "quota_management.spend_tracking.shutdown_cancel_keeps_in_flight_daily_batch" + ], + "tests/integration/spend/test_shutdown_flush.py::test_daily_spend_batch_cancelled_while_waiting_for_a_row_lock_is_written_exactly_once": [ + "quota_management.spend_tracking.shutdown_cancel_keeps_in_flight_daily_batch" + ], + "tests/integration/spend/test_spend_calculate.py::test_spend_calculate_rejects_unpriced_model_with_400": [ + "quota_management.spend_tracking.spend_calculate.rejects_unpriced_model" + ], + "tests/integration/spend/test_spend_calculate.py::test_live_preview_entry_charges_cached_tokens_at_the_fresh_rate[gemini-live-2.5-flash-preview-native-audio-09-2025]": [ + "quota_management.spend_tracking.spend_calculate.live_preview_cached_tokens_cost_fresh_rate" + ], + "tests/integration/spend/test_spend_calculate.py::test_live_preview_entry_charges_cached_tokens_at_the_fresh_rate[gemini/gemini-live-2.5-flash-preview-native-audio-09-2025]": [ + "quota_management.spend_tracking.spend_calculate.live_preview_cached_tokens_cost_fresh_rate" + ], "tests/integration/management/test_partial_update_sequences.py::test_restricted_actor_cannot_detach_key_from_project": [ "mgmt.key.update.project_detach_denied_to_restricted_actor" ], @@ -1738,6 +1789,245 @@ "tests/integration/mcp/test_mcp_lifecycle.py::test_same_url_server_grants_scope_discovery_and_direct_or_virtual_execution[bearer]": [ "other.mcp.permissions.same_url_servers_enforce_discovery_and_execution" ], + "tests/integration/management/test_budget_updates.py::test_shortening_budget_duration_moves_reset_at_onto_the_new_schedule": [ + "mgmt.budget.update.duration_change_recomputes_reset_at" + ], + "tests/integration/management/test_organization_budget_clear.py::test_patch_organization_update_with_null_tpm_limit_clears_it_and_keeps_sibling_limits": [ + "mgmt.organization.update.null_clears_budget_limit" + ], + "tests/integration/management/test_team_budget_duration_defaults.py::test_team_new_explicit_null_budget_duration_is_not_replaced_by_default": [ + "mgmt.team.new.explicit_null_budget_duration_overrides_default" + ], + "tests/integration/management/test_team_member_budget_cache.py::test_team_member_default_budget_lands_in_redis_after_first_member_call": [ + "mgmt.team_member_budget.default_budget_is_cached_in_redis_as_json" + ], + "tests/integration/observability/test_callback_delivery.py::test_streamed_responses_success_callback_carries_provider_apim_request_id": [ + "other.observability.callbacks.streamed_responses_events_carry_provider_response_headers" + ], + "tests/integration/observability/test_guardrail_effects.py::test_bedrock_passthrough_converse_guardrail_ignores_denied_term_in_tool_definition": [ + "other.observability.guardrails.bedrock_passthrough_converse_scans_only_caller_content" + ], + "tests/integration/pricing/test_configured_prices.py::test_cost_estimate_reports_configured_prices_for_model_absent_from_cost_map": [ + "quota_management.cost_estimate.configured_price.reported_for_model_absent_from_cost_map" + ], + "tests/integration/pricing/test_configured_prices.py::test_saving_echoed_model_info_does_not_freeze_cost_map_price_into_deployment": [ + "pricing.model_update.echoed_cost_map_price_is_not_persisted_as_override" + ], + "tests/integration/pricing/test_databricks_cache_pricing.py::test_databricks_cached_prompt_tokens_bill_at_cache_rates_not_input_rate": [ + "pricing.databricks.cached_prompt_tokens_bill_at_cache_rates" + ], + "tests/integration/pricing/test_ocr_page_pricing.py::test_ocr_annotation_pages_are_billed_at_annotation_cost_per_page": [ + "pricing.ocr.annotation_pages_billed_at_annotation_rate" + ], + "tests/integration/pricing/test_service_tier_pricing.py::test_ultrafast_service_tier_bills_ultrafast_rates_and_keeps_pricing_off_the_wire": [ + "quota_management.spend_tracking.service_tier_pricing.ultrafast_bills_ultrafast_rates" + ], + "tests/integration/spend/test_batch_completion_accounting.py::test_completed_batch_spend_row_records_reasoning_tokens_and_error_file_failures": [ + "quota_management.spend_tracking.batch_costs.reasoning_tokens_and_error_file_failures_recorded" + ], + "tests/integration/spend/test_batch_observability.py::test_batch_retrieval_row_sums_reasoning_tokens_and_counts_output_and_error_file_failures": [ + "spend.batches.retrieval_row_aggregates_reasoning_tokens_and_per_request_counts" + ], + "tests/integration/spend/test_batch_poll_starvation.py::test_batches_gone_at_provider_do_not_starve_a_newer_batch_out_of_cost_polling": [ + "quota_management.spend_tracking.batch_costs.uncostable_rows_retire_so_newer_batches_are_costed" + ], + "tests/integration/spend/test_cache_and_quota.py::test_in_flight_count_tokens_does_not_reserve_key_budget_away_from_a_completion": [ + "quota_management.budget.key.in_flight_count_tokens_reserves_nothing_so_completion_reaches_provider" + ], + "tests/integration/spend/test_cache_and_quota.py::test_repeated_count_tokens_on_budgeted_key_does_not_reserve_budget_or_block_later_completion": [ + "quota_management.budget.key.count_tokens_reserves_nothing_so_completion_within_budget_succeeds" + ], + "tests/integration/spend/test_daily_rollup_retry.py::test_failed_daily_user_rollup_commit_is_retried_so_spend_report_and_daily_activity_agree": [ + "spend.daily_rollup.failed_user_commit_is_retried_until_report_and_daily_activity_agree" + ], + "tests/integration/spend/test_disconnected_bedrock_messages_stream_billing.py::test_client_disconnect_mid_bedrock_messages_stream_still_bills_terminal_usage": [ + "spend.anthropic_messages_stream.client_disconnect_bills_terminal_bedrock_usage" + ], + "tests/integration/spend/test_failed_dispatch_tokens.py::test_provider_500_after_dispatch_records_estimated_prompt_tokens_on_failure_row": [ + "spend.failed_dispatch.failure_row_records_estimated_input_tokens" + ], + "tests/integration/spend/test_model_router_selected_model.py::test_model_router_alias_without_router_in_name_keeps_selected_model_in_response_and_spend_log": [ + "spend.model_router.selected_model_is_returned_and_persisted_for_plain_alias" + ], + "tests/integration/spend/test_org_budget_cli_session_token.py::test_cli_session_token_without_org_id_charges_and_caps_the_team_organization": [ + "quota_management.organization_budget.cli_session_token_without_org_id_charges_team_organization" + ], + "tests/integration/spend/test_passthrough_budget_reservation.py::test_repeated_gemini_passthrough_calls_stay_served_while_key_spend_is_below_max_budget": [ + "spend.budget_reservation.gemini_passthrough_success_releases_reservation_from_spend_counter" + ], + "tests/integration/spend/test_team_daily_activity_aggregated.py::test_aggregated_team_activity_reports_the_whole_range_team_spend_in_one_page": [ + "quota_management.spend_tracking.team_daily_activity_aggregated_reports_whole_range_team_spend" + ], + "tests/integration/spend/test_team_member_spend.py::test_member_added_without_any_budget_is_charged_on_its_membership_row": [ + "spend.team_member.member_without_budget_gets_membership_row_and_spend" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_config_store_is_listed_beside_db_store_and_survives_listing": [ + "mgmt.vector_store.list.keeps_config_store_beside_db_stores" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_config_store_refuses_new_update_and_delete": [ + "mgmt.vector_store.write.config_store_is_read_only" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_db_store_lifecycle_is_unchanged_beside_config_store": [ + "mgmt.vector_store.write.db_store_lifecycle_unchanged_beside_config_store" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_chat_with_config_store_searches_upstream_and_injects_context_after_listing": [ + "other.vector_store.chat.config_store_search_reaches_upstream_after_listing" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_passthrough_search_on_config_store_uses_yaml_credentials_after_listing": [ + "other.vector_store.search.config_store_passthrough_uses_yaml_credentials_after_listing" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_non_admin_key_access_to_config_store_follows_grants_after_admin_listing": [ + "authz.vector_store.list.non_admin_key_access_to_config_store_follows_grants" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_peer_process_keeps_config_store_and_sees_db_store_created_elsewhere": [ + "mgmt.vector_store.list.peer_process_keeps_config_store_and_sees_db_store" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_concurrent_burst_keeps_config_store_and_refuses_every_config_write": [ + "mgmt.vector_store.chaos.concurrent_burst_keeps_config_store_across_workers" + ], + "tests/integration/management/test_vector_store_config_ownership.py::test_redis_outage_keeps_config_store_served_and_recovers": [ + "mgmt.vector_store.chaos.redis_outage_keeps_config_store_and_recovers" + ], + "tests/integration/providers/test_anthropic_advisor_wire.py::test_advisor_sub_call_reaches_the_router_deployment_with_its_key_instead_of_anthropic_unauthenticated": [ + "providers.anthropic_messages_advisor.sub_call_uses_the_configured_advisor_deployment" + ], + "tests/integration/providers/test_azure_ai_chat_wire.py::test_azure_ai_strips_thinking_blocks_and_cache_control_from_forwarded_messages": [ + "providers.azure_ai.anthropic_message_fields_are_stripped_before_foundry" + ], + "tests/integration/providers/test_azure_ai_flux2_image_wire.py::test_azure_flux2_flex_generation_hits_flex_provider_path_not_pro": [ + "other.provider_wire.azure_ai.flux2_flex_generation_targets_flex_path_with_bfl_body" + ], + "tests/integration/providers/test_azure_ai_rerank_auth_wire.py::test_azure_ai_rerank_with_entra_token_and_no_api_key_sends_bearer_to_provider": [ + "other.provider_wire.azure_ai.rerank_entra_token_without_api_key_reaches_provider" + ], + "tests/integration/providers/test_bedrock_auth_wire.py::test_client_anthropic_oauth_authorization_header_does_not_replace_bedrock_sigv4_signature": [ + "providers.bedrock_auth.client_anthropic_oauth_token_never_replaces_sigv4_authorization" + ], + "tests/integration/providers/test_bedrock_batch_files_wire.py::test_completions_and_responses_batch_records_upload_as_anthropic_user_messages": [ + "other.provider_wire.bedrock.batch_file_completions_and_responses_records_reach_s3_as_user_messages" + ], + "tests/integration/providers/test_bedrock_claude_thinking_wire.py::test_prefixed_opus_4_8_reasoning_effort_reaches_bedrock_as_adaptive_thinking_not_budget_tokens": [ + "other.provider_wire.bedrock.prefixed_opus_4_8_reasoning_effort_sends_adaptive_thinking" + ], + "tests/integration/providers/test_bedrock_converse_config_blocks_wire.py::test_guardrail_and_performance_config_are_not_duplicated_inside_inference_config": [ + "other.provider_wire.bedrock.converse_config_blocks_sent_once_at_top_level" + ], + "tests/integration/providers/test_bedrock_embedding_wire.py::test_cohere_embed_english_v3_accepts_encoding_format_and_dimensions": [ + "other.provider_wire.bedrock.cohere_embed_english_v3_accepts_encoding_format" + ], + "tests/integration/providers/test_bedrock_gpt5_reasoning_wire.py::test_gpt5_reasoning_effort_is_accepted_and_sent_as_converse_reasoning_effort": [ + "providers.bedrock_converse.gpt5_reasoning_effort_reaches_provider_as_reasoning_effort" + ], + "tests/integration/providers/test_bedrock_invoke_tool_search_wire.py::test_gen5_claude_bedrock_invoke_messages_tool_search_sends_bedrock_beta_field": [ + "providers.bedrock_invoke.tool_search_gen5_claude_sends_bedrock_beta_and_reports_support" + ], + "tests/integration/providers/test_bedrock_mantle_codex_input_wire.py::test_codex_agent_message_context_compaction_and_local_shell_call_reach_mantle_as_supported_items": [ + "other.provider_wire.bedrock_mantle.codex_history_items_reach_mantle_as_supported_types" + ], + "tests/integration/providers/test_bedrock_mantle_responses_wire.py::test_codex_agent_message_compaction_and_local_shell_items_are_rewritten_for_mantle": [ + "providers.bedrock_mantle.codex_history_items_reach_the_wire_as_supported_input_items" + ], + "tests/integration/providers/test_bedrock_mantle_wire.py::test_bedrock_mantle_context_overflow_returns_400_saying_prompt_is_too_long": [ + "other.provider_wire.bedrock_mantle.context_overflow_is_reported_as_prompt_too_long" + ], + "tests/integration/providers/test_bedrock_messages_web_search_replay_wire.py::test_replayed_intercepted_web_search_turn_reaches_bedrock_as_text_and_answers": [ + "providers.bedrock_messages.replayed_intercepted_web_search_turn_is_flattened_to_text" + ], + "tests/integration/providers/test_bedrock_passthrough_stream_wire.py::test_bedrock_passthrough_converse_stream_response_carries_event_stream_content_type": [ + "other.provider_wire.bedrock.passthrough_stream_keeps_event_stream_content_type" + ], + "tests/integration/providers/test_bedrock_rerank_wire.py::test_forwarded_client_header_on_rerank_is_excluded_from_the_sigv4_signature": [ + "providers.bedrock_rerank.forwarded_client_headers_are_sent_unsigned" + ], + "tests/integration/providers/test_bedrock_thinking_tokens_wire.py::test_bedrock_redacted_thinking_is_not_reported_as_zero_reasoning_tokens": [ + "other.provider_wire.bedrock.hidden_thinking_tokens_are_not_reported_as_text" + ], + "tests/integration/providers/test_dashscope_chat_wire.py::test_dashscope_chat_forwards_reasoning_effort_none_to_the_provider": [ + "other.provider_wire.dashscope.reasoning_effort_reaches_provider" + ], + "tests/integration/providers/test_databricks_chat_wire.py::test_databricks_stream_final_usage_chunk_reaches_client_and_spend_log": [ + "other.provider_wire.databricks.stream_usage_and_cache_reads_reach_client_and_spend_log" + ], + "tests/integration/providers/test_databricks_oauth_wire.py::test_databricks_ai_gateway_api_base_requests_oauth_token_from_workspace_origin": [ + "other.provider_wire.databricks.oauth_token_url_uses_workspace_origin_for_ai_gateway_api_base" + ], + "tests/integration/providers/test_deepseek_vision_wire.py::test_deepseek_vision_forwards_image_url_content_list_instead_of_collapsing_to_text": [ + "other.provider_wire.deepseek.vision_image_content_list_reaches_provider" + ], + "tests/integration/providers/test_fireworks_ai_router_slug_wire.py::test_fireworks_router_slug_chat_sends_router_resource_not_models_path": [ + "other.provider_wire.fireworks_ai.router_slug_chat_sends_router_resource_name" + ], + "tests/integration/providers/test_fireworks_ai_router_slug_wire.py::test_fireworks_router_slug_text_completion_sends_router_resource_not_models_path": [ + "other.provider_wire.fireworks_ai.router_slug_text_completion_sends_router_resource_name" + ], + "tests/integration/providers/test_openai_chat_wire.py::test_openai_chat_tool_choice_without_tools_is_not_forwarded": [ + "providers.openai_chat_wire.tool_choice_without_tools_is_dropped_before_the_wire" + ], + "tests/integration/providers/test_openai_image_edit_wire.py::test_openai_compatible_image_edit_forwards_seed_form_field_to_backend": [ + "other.provider_wire.openai.image_edit_forwards_provider_specific_form_fields" + ], + "tests/integration/providers/test_responses_bridge_incomplete.py::test_chat_over_responses_deployment_returns_length_when_output_tokens_run_out": [ + "other.provider_wire.responses_bridge.max_output_tokens_incomplete_maps_to_length" + ], + "tests/integration/providers/test_tencent_chat_wire.py::test_tencent_thinking_is_sent_in_provider_body_instead_of_failing_the_request[reasoning_effort_none]": [ + "other.provider_wire.tencent.thinking_reaches_provider_in_request_body" + ], + "tests/integration/providers/test_tencent_chat_wire.py::test_tencent_thinking_is_sent_in_provider_body_instead_of_failing_the_request[thinking_enabled]": [ + "other.provider_wire.tencent.thinking_reaches_provider_in_request_body" + ], + "tests/integration/providers/test_websearch_interception_wire.py::test_capped_websearch_interception_loop_ends_turn_instead_of_exposing_internal_tool_use": [ + "other.provider_wire.anthropic.websearch_interception_capped_loop_ends_turn_without_internal_tool_use" + ], + "tests/integration/providers/test_websearch_interception_wire.py::test_streamed_web_search_turn_capped_by_max_agentic_loops_ends_turn_with_snippets_and_ordered_blocks": [ + "other.provider_wire.bedrock.websearch_interception_streamed_capped_turn_ends_with_native_results" + ], + "tests/integration/providers/test_xai_web_search_wire.py::test_xai_chat_web_search_is_sent_to_responses_with_instructions_and_nested_filters": [ + "other.provider_wire.xai.chat_web_search_reaches_responses_with_instructions_and_filters" + ], + "tests/integration/routing/test_priority_rate_limit_headers.py::test_non_streaming_v1_messages_success_carries_v3_priority_rate_limit_headers": [ + "other.routing.priority_rate_limits.v1_messages_success_exposes_v3_priority_headers" + ], + "tests/integration/routing/test_stale_cost_map_boot.py::test_config_deployment_dropped_by_stale_boot_cost_map_is_restored_after_reload": [ + "other.routing.cost_map.config_deployment_dropped_by_stale_boot_map_is_restored_after_reload" + ], + "tests/integration/streaming/test_stream_contracts.py::test_messages_stream_completes_through_trailing_empty_choices_usage_chunk": [ + "other.streaming.messages_bridge.empty_choices_usage_chunk_completes_stream" + ], + "tests/integration/streaming/test_stream_contracts.py::test_perplexity_stream_with_cost_breakdown_object_completes_and_bills_total_cost": [ + "other.streaming.usage.provider_cost_object_completes_stream_and_bills_total_cost" + ], + "tests/integration/streaming/test_stream_contracts.py::test_primary_stream_with_empty_first_chunk_then_disconnect_falls_back_and_bills_the_fallback": [ + "other.streaming.fallback.empty_leading_chunk_then_disconnect_streams_fallback_with_usage_and_spend" + ], + "tests/integration/streaming/test_stream_contracts.py::test_responses_stream_completes_through_empty_choices_metadata_and_usage_chunks": [ + "other.streaming.responses_bridge.empty_choices_chunks_complete_stream" + ], + "tests/integration/streaming/test_stream_parallel_slot_release.py::test_failing_stream_logging_callback_does_not_leak_max_parallel_requests_slot": [ + "streaming.max_parallel_requests.slot_released_when_stream_logging_callback_fails" + ], + "tests/integration/streaming/test_ttft_keepalive.py::test_stream_emits_sse_ping_comments_before_the_first_data_frame_while_upstream_is_silent": [ + "streaming.keepalive.sse_pings_fill_silent_time_to_first_token" + ], + "tests/integration/observability/test_callback_delivery.py::test_response_survives_raising_success_deployment_hook[chat]": [ + "other.observability.callbacks.raising_success_deployment_hook_keeps_response" + ], + "tests/integration/observability/test_callback_delivery.py::test_response_survives_raising_success_deployment_hook[embeddings]": [ + "other.observability.callbacks.raising_success_deployment_hook_keeps_response" + ], + "tests/integration/observability/test_callback_delivery.py::test_response_survives_raising_success_deployment_hook[responses]": [ + "other.observability.callbacks.raising_success_deployment_hook_keeps_response" + ], + "tests/integration/observability/test_callback_delivery.py::test_response_survives_raising_success_deployment_hook[videos]": [ + "other.observability.callbacks.raising_success_deployment_hook_keeps_response" + ], + "tests/integration/management/test_user_updates_wedged_coordination_redis.py::test_user_budget_updates_return_promptly_while_coordination_redis_is_wedged": [ + "mgmt.user.update.budget_change_returns_promptly_with_wedged_coordination_redis", + "mgmt.user.bulk_update.budget_change_returns_promptly_with_wedged_coordination_redis", + "mgmt.customer.update.budget_change_returns_promptly_with_wedged_coordination_redis", + "mgmt.key.reset_spend.returns_promptly_with_wedged_coordination_redis", + "mgmt.auth_cache_invalidation.publish_parked_by_short_redis_wedge_lands_after_recovery", + "mgmt.auth_cache_invalidation.burst_with_worker_kill_keeps_serving_while_redis_wedged" + ], "tests/integration/observability/test_guardrail_effects.py::test_responses_pre_call_denial_streams_sse_with_typed_message_item": [ "other.observability.guardrails.responses_pre_call_denial_streams_typed_message" ], diff --git a/tests/integration/coordination_redis_proxy_config.yaml b/tests/integration/coordination_redis_proxy_config.yaml new file mode 100644 index 00000000000..30294c291bf --- /dev/null +++ b/tests/integration/coordination_redis_proxy_config.yaml @@ -0,0 +1,12 @@ +model_list: [] +general_settings: + master_key: os.environ/LITELLM_MASTER_KEY + database_url: os.environ/DATABASE_URL + store_model_in_db: true + disable_spend_logs: false + proxy_batch_write_at: 1 + coordination_redis: + host: os.environ/REDIS_HOST + port: os.environ/REDIS_PORT +router_settings: + disable_cooldowns: true diff --git a/tests/integration/management/test_budget_updates.py b/tests/integration/management/test_budget_updates.py new file mode 100644 index 00000000000..25d525bcaaa --- /dev/null +++ b/tests/integration/management/test_budget_updates.py @@ -0,0 +1,29 @@ +from datetime import datetime, timedelta, timezone +from typing import Final + +import pytest + +from tests.integration._support.client import Gateway, string_value +from tests.integration._support.database import read_rows + + +def _persisted_reset_at(budget_id: str) -> datetime: + rows: Final = read_rows( + 'SELECT budget_reset_at::text AS reset_at FROM "LiteLLM_BudgetTable" WHERE budget_id = %s', (budget_id,) + ) + assert len(rows) == 1, rows + reset_at: Final = datetime.fromisoformat(string_value(rows[0]["reset_at"])) + return reset_at if reset_at.tzinfo is not None else reset_at.replace(tzinfo=timezone.utc) + + +@pytest.mark.covers("mgmt.budget.update.duration_change_recomputes_reset_at") +def test_shortening_budget_duration_moves_reset_at_onto_the_new_schedule(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + budget_id: Final = scenario.budget(max_budget=10.0, budget_duration="10d") + ten_day_reset_at: Final = _persisted_reset_at(budget_id) + before: Final = datetime.now(timezone.utc) + response: Final = gateway.request("POST", "/budget/update", {"budget_id": budget_id, "budget_duration": "1d"}) + assert response.status_code == 200, response.text + updated: Final = _persisted_reset_at(budget_id) + assert updated < ten_day_reset_at, f"{updated} not before {ten_day_reset_at}" + assert before < updated <= before + timedelta(days=1, minutes=5), f"{updated} not within 1d of {before}" diff --git a/tests/integration/management/test_organization_budget_clear.py b/tests/integration/management/test_organization_budget_clear.py new file mode 100644 index 00000000000..8109dfd5a2d --- /dev/null +++ b/tests/integration/management/test_organization_budget_clear.py @@ -0,0 +1,59 @@ +import uuid +from typing import Final + +import pytest + +from tests.integration._support.client import Gateway, object_value, string_value +from tests.integration._support.database import read_rows + + +def _budget_rows(budget_id: str) -> list[dict[str, object]]: + return read_rows( + 'SELECT tpm_limit, rpm_limit, max_budget FROM "LiteLLM_BudgetTable" WHERE budget_id = %s', (budget_id,) + ) + + +@pytest.mark.covers("mgmt.organization.update.null_clears_budget_limit") +def test_patch_organization_update_with_null_tpm_limit_clears_it_and_keeps_sibling_limits(gateway: Gateway) -> None: + created: Final = gateway.post( + "/organization/new", + { + "organization_alias": f"integration-{uuid.uuid4().hex}", + "tpm_limit": 4000, + "rpm_limit": 40, + "max_budget": 12.5, + }, + ) + organization_id: Final = string_value(created["organization_id"]) + budget_id: Final = string_value(created["budget_id"]) + try: + assert _budget_rows(budget_id) == [{"tpm_limit": 4000, "rpm_limit": 40, "max_budget": 12.5}] + updated: Final = gateway.request( + "PATCH", "/organization/update", {"organization_id": organization_id, "tpm_limit": None} + ) + assert updated.status_code == 200, updated.text + updated_budget: Final = object_value(object_value(updated.json())["litellm_budget_table"]) + assert (updated_budget["tpm_limit"], updated_budget["rpm_limit"], updated_budget["max_budget"]) == ( + None, + 40, + 12.5, + ), updated.text + assert _budget_rows(budget_id) == [{"tpm_limit": None, "rpm_limit": 40, "max_budget": 12.5}] + info: Final = gateway.request("GET", "/organization/info", params={"organization_id": organization_id}) + assert info.status_code == 200, info.text + info_budget: Final = object_value(object_value(info.json())["litellm_budget_table"]) + assert (info_budget["tpm_limit"], info_budget["rpm_limit"], info_budget["max_budget"]) == ( + None, + 40, + 12.5, + ), info.text + finally: + deleted: Final = gateway.request("DELETE", "/organization/delete", {"organization_ids": [organization_id]}) + assert deleted.status_code == 200, deleted.text + gateway.post("/budget/delete", {"id": budget_id}) + assert ( + read_rows( + 'SELECT organization_id FROM "LiteLLM_OrganizationTable" WHERE organization_id = %s', (organization_id,) + ) + == [] + ) diff --git a/tests/integration/management/test_team_budget_duration_defaults.py b/tests/integration/management/test_team_budget_duration_defaults.py new file mode 100644 index 00000000000..fd459f6a7ef --- /dev/null +++ b/tests/integration/management/test_team_budget_duration_defaults.py @@ -0,0 +1,61 @@ +import uuid +from pathlib import Path +from typing import Final + +import pytest +import yaml +from pydantic import JsonValue + +from tests.integration._support.client import Gateway, string_value +from tests.integration._support.database import read_rows +from tests.integration._support.process import owned_proxy + + +def _budget_row(team_id: str) -> dict[str, JsonValue]: + rows: Final = read_rows( + 'SELECT max_budget, budget_duration, budget_reset_at::text FROM "LiteLLM_TeamTable" WHERE team_id = %s', + (team_id,), + ) + assert len(rows) == 1, rows + return rows[0] + + +@pytest.mark.covers("mgmt.team.new.explicit_null_budget_duration_overrides_default") +def test_team_new_explicit_null_budget_duration_is_not_replaced_by_default(gateway: Gateway, tmp_path: Path) -> None: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["litellm_settings"]["default_team_params"] = {"budget_duration": "30d"} + path: Final = tmp_path / "team-defaults.yaml" + path.write_text(yaml.safe_dump(config)) + with ( + owned_proxy(gateway, tmp_path, {"STORE_MODEL_IN_DB": "False"}, config=path) as candidate, + candidate.scenario() as scenario, + ): + never_resetting: Final = candidate.request( + "POST", + "/team/new", + {"team_alias": f"integration-{uuid.uuid4().hex}", "max_budget": 500, "budget_duration": None}, + ) + assert never_resetting.status_code == 200, never_resetting.text + never_resetting_id: Final = string_value(never_resetting.json()["team_id"]) + scenario.cleanups.callback(scenario.delete_team, never_resetting_id) + assert never_resetting.json()["max_budget"] == 500.0, never_resetting.text + assert never_resetting.json()["budget_duration"] is None, never_resetting.text + assert never_resetting.json()["budget_reset_at"] is None, never_resetting.text + assert _budget_row(never_resetting_id) == { + "max_budget": 500.0, + "budget_duration": None, + "budget_reset_at": None, + } + + inheriting: Final = candidate.request( + "POST", "/team/new", {"team_alias": f"integration-{uuid.uuid4().hex}", "max_budget": 500} + ) + assert inheriting.status_code == 200, inheriting.text + inheriting_id: Final = string_value(inheriting.json()["team_id"]) + scenario.cleanups.callback(scenario.delete_team, inheriting_id) + assert inheriting.json()["budget_duration"] == "30d", inheriting.text + assert inheriting.json()["budget_reset_at"] is not None, inheriting.text + inheriting_row: Final = _budget_row(inheriting_id) + assert inheriting_row["max_budget"] == 500.0, inheriting_row + assert inheriting_row["budget_duration"] == "30d", inheriting_row + assert inheriting_row["budget_reset_at"] is not None, inheriting_row diff --git a/tests/integration/management/test_team_member_budget_cache.py b/tests/integration/management/test_team_member_budget_cache.py new file mode 100644 index 00000000000..9c4181915c0 --- /dev/null +++ b/tests/integration/management/test_team_member_budget_cache.py @@ -0,0 +1,40 @@ +import os +from typing import Final + +import pytest +from pydantic import JsonValue, TypeAdapter +from redis import Redis + +from tests.integration._support.client import Gateway, eventually, object_value, string_value +from tests.integration._support.database import read_rows + +_CACHED_BUDGET: Final = TypeAdapter(dict[str, JsonValue]) + + +@pytest.mark.covers("mgmt.team_member_budget.default_budget_is_cached_in_redis_as_json") +def test_team_member_default_budget_lands_in_redis_after_first_member_call(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model() + user: Final = scenario.user() + team: Final = scenario.team(team_member_budget=25) + key: Final = scenario.key(team_id=team, user_id=user, models=[model]) + teams: Final = read_rows('SELECT metadata FROM "LiteLLM_TeamTable" WHERE team_id = %s', (team,)) + assert len(teams) == 1, teams + budget_id: Final = string_value(object_value(teams[0]["metadata"])["team_member_budget_id"]) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": "member budget cache"}]}, + key=key, + ) + assert response.status_code == 200, response.text + with Redis(host=os.environ["REDIS_HOST"], port=int(os.environ["REDIS_PORT"])) as cache: + cached: Final = eventually( + lambda: cache.get(f"team_member_default_budget:{budget_id}"), + lambda value: value is not None, + seconds=10, + ) + assert isinstance(cached, bytes), cached + budget: Final = _CACHED_BUDGET.validate_json(cached) + assert budget["budget_id"] == budget_id, cached + assert budget["max_budget"] == 25, cached diff --git a/tests/integration/management/test_user_updates_wedged_coordination_redis.py b/tests/integration/management/test_user_updates_wedged_coordination_redis.py new file mode 100644 index 00000000000..d8c84a70778 --- /dev/null +++ b/tests/integration/management/test_user_updates_wedged_coordination_redis.py @@ -0,0 +1,379 @@ +import os +import signal +import time +import uuid +from collections.abc import Callable, Mapping +from concurrent.futures import ThreadPoolExecutor +from pathlib import Path +from typing import Final +from urllib.parse import urlsplit, urlunsplit + +import psutil +import psycopg +import pytest +from psycopg import sql +from pydantic import JsonValue +from redis import Redis +from redis.client import PubSub + +from tests.integration._support.client import JSON_OBJECT, Gateway, eventually, object_value, string_value +from tests.integration._support.process import owned_proxy +from tests.integration._support.redis_process import owned_redis + +_USERS: Final = 60 +_BURST: Final = 30 +_HANDLER_BUDGET_SECONDS: Final = 0.75 +_BULK_BUDGET_SECONDS: Final = 2.0 +_CHANNEL: Final = "litellm_proxy.auth_cache_invalidation" + + +def _timed_post(candidate: Gateway, path: str, body: Mapping[str, JsonValue], timeout: float = 15) -> float: + started: Final = time.monotonic() + response: Final = candidate.client.request( + "POST", + path, + json=body, + headers={"Authorization": f"Bearer {candidate.key}"}, + timeout=timeout, + ) + elapsed: Final = time.monotonic() - started + assert response.status_code == 200, f"POST {path}: {response.status_code} {response.text} after {elapsed:.3f}s" + return elapsed + + +def _received(pubsub: PubSub) -> tuple[dict[str, JsonValue], ...]: + messages: list[dict[str, JsonValue]] = [] + while True: + message = pubsub.get_message(ignore_subscribe_messages=True, timeout=0) + if message is None: + return tuple(messages) + data = message.get("data") + if isinstance(data, (bytes, str)): + messages.append(JSON_OBJECT.validate_json(data)) + + +def _worker_pid(port: int) -> int: + for process in psutil.process_iter(): + parent = process.parent() + if parent is None: + continue + try: + cmdline = parent.cmdline() + own_cmdline = process.cmdline() + except (psutil.NoSuchProcess, psutil.AccessDenied): + continue + if ( + "integration._support.proxy" in cmdline + and "--port" in cmdline + and str(port) in cmdline + and not any("prisma" in part for part in own_cmdline) + ): + return process.pid + raise AssertionError(f"no uvicorn worker found under the owned proxy on port {port}") + + +def _burst_call( + index: int, users: tuple[str, ...], key: str, team_id: str, customer_id: str +) -> tuple[str, dict[str, JsonValue]]: + match index % 5: + case 0: + return "/user/update", {"user_id": users[index], "max_budget": 200.0 + index} + case 1: + return "/user/update", {"user_id": users[index], "tpm_limit": 1000 + index} + case 2: + return "/key/update", {"key": key, "max_budget": 7.0 + index} + case 3: + return "/team/update", {"team_id": team_id, "max_budget": 7.0 + index} + case _: + return "/customer/update", {"user_id": customer_id, "max_budget": 7.0 + index} + + +@pytest.mark.timeout(240) +@pytest.mark.covers( + "mgmt.user.update.budget_change_returns_promptly_with_wedged_coordination_redis", + "mgmt.user.bulk_update.budget_change_returns_promptly_with_wedged_coordination_redis", + "mgmt.customer.update.budget_change_returns_promptly_with_wedged_coordination_redis", + "mgmt.key.reset_spend.returns_promptly_with_wedged_coordination_redis", + "mgmt.auth_cache_invalidation.publish_parked_by_short_redis_wedge_lands_after_recovery", + "mgmt.auth_cache_invalidation.burst_with_worker_kill_keeps_serving_while_redis_wedged", +) +def test_user_budget_updates_return_promptly_while_coordination_redis_is_wedged( + gateway: Gateway, tmp_path: Path, record_property: Callable[[str, object], None] +) -> None: + original: Final = os.environ["DATABASE_URL"] + identity: Final = "integration_wedged_redis_" + uuid.uuid4().hex + parsed: Final = urlsplit(original) + database_url: Final = urlunsplit((parsed.scheme, parsed.netloc, "/" + identity, "", "")) + timings: dict[str, float] = {} + with psycopg.connect(original, autocommit=True) as admin: + admin.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(identity))) + try: + results_dir: Final = Path(os.environ.get("INTEGRATION_RESULTS_DIR", str(tmp_path))) + prior_logs: Final = frozenset(results_dir.glob("owned-proxy-*.log")) + with ( + owned_redis(tmp_path) as coordination, + owned_proxy( + gateway, + tmp_path, + { + "DATABASE_URL": database_url, + "REDIS_HOST": coordination.host, + "REDIS_PORT": str(coordination.port), + }, + config=Path("tests/integration/coordination_redis_proxy_config.yaml"), + workers=2, + ) as candidate, + Redis(host=coordination.host, port=coordination.port, socket_timeout=1) as subscriber_client, + ): + pubsub: Final = subscriber_client.pubsub() + pubsub.subscribe(_CHANNEL) + received: list[dict[str, JsonValue]] = [] + + def drained() -> tuple[dict[str, JsonValue], ...]: + received.extend(_received(pubsub)) + return tuple(received) + + eventually( + lambda: subscriber_client.pubsub_numsub(_CHANNEL)[0][1], + lambda count: count >= 3, + seconds=15, + ) + users: Final = tuple(f"{identity}_u{index}" for index in range(_USERS)) + for user_id in users: + candidate.post("/user/new", {"user_id": user_id, "auto_create_key": False, "max_budget": 10.0}) + key: Final = string_value( + candidate.post("/key/generate", {"user_id": users[0], "max_budget": 5.0})["key"] + ) + team_id: Final = string_value( + candidate.post("/team/new", {"team_alias": identity, "max_budget": 5.0})["team_id"] + ) + customer_id: Final = identity + "_cust" + candidate.post("/customer/new", {"user_id": customer_id, "max_budget": 5.0}) + drained() + timings["h1_healthy"] = _timed_post( + candidate, "/user/update", {"user_id": users[0], "max_budget": 11.0} + ) + assert timings["h1_healthy"] < _HANDLER_BUDGET_SECONDS, ( + f"healthy /user/update took {timings['h1_healthy']:.3f}s" + ) + eventually( + drained, + lambda messages: any(message.get("cache_key") == users[0] for message in messages), + seconds=10, + ) + timings["h2_healthy_control"] = _timed_post( + candidate, "/user/update", {"user_id": users[0], "tpm_limit": 1000} + ) + assert timings["h2_healthy_control"] < _HANDLER_BUDGET_SECONDS, ( + f"healthy control update took {timings['h2_healthy_control']:.3f}s" + ) + coordination.signal(signal.SIGSTOP) + try: + timings["s2_wedged_control"] = _timed_post( + candidate, "/user/update", {"user_id": users[0], "tpm_limit": 1000} + ) + assert timings["s2_wedged_control"] < _HANDLER_BUDGET_SECONDS, ( + f"control update without a cache-relevant field took {timings['s2_wedged_control']:.3f}s" + ) + timings["s1_user_update"] = _timed_post( + candidate, "/user/update", {"user_id": users[0], "max_budget": 98.0} + ) + assert timings["s1_user_update"] < _HANDLER_BUDGET_SECONDS, ( + f"/user/update with max_budget took {timings['s1_user_update']:.3f}s " + "with a wedged coordination Redis" + ) + timings["s3_bulk_update"] = _timed_post( + candidate, "/user/bulk_update", {"all_users": True, "user_updates": {"max_budget": 79.0}} + ) + assert timings["s3_bulk_update"] < _BULK_BUDGET_SECONDS, ( + f"/user/bulk_update over {_USERS} users took {timings['s3_bulk_update']:.3f}s " + "with a wedged coordination Redis" + ) + timings["s4_key_update"] = _timed_post( + candidate, "/key/update", {"key": key, "max_budget": 6.0}, timeout=60 + ) + assert timings["s4_key_update"] < 30, ( + f"/key/update hung for {timings['s4_key_update']:.3f}s with a wedged coordination Redis" + ) + timings["s5_team_update"] = _timed_post( + candidate, "/team/update", {"team_id": team_id, "max_budget": 6.0}, timeout=60 + ) + assert timings["s5_team_update"] < 30, ( + f"/team/update hung for {timings['s5_team_update']:.3f}s with a wedged coordination Redis" + ) + timings["s6_customer_update"] = _timed_post( + candidate, "/customer/update", {"user_id": customer_id, "max_budget": 6.0} + ) + assert timings["s6_customer_update"] < _HANDLER_BUDGET_SECONDS, ( + f"/customer/update took {timings['s6_customer_update']:.3f}s with a wedged coordination Redis" + ) + timings["s7_reset_spend"] = _timed_post(candidate, f"/key/{key}/reset_spend", {"reset_to": 0}) + assert timings["s7_reset_spend"] < _HANDLER_BUDGET_SECONDS, ( + f"/key//reset_spend took {timings['s7_reset_spend']:.3f}s with a wedged coordination Redis" + ) + missing_started: Final = time.monotonic() + missing: Final = candidate.request( + "POST", "/user/update", {"user_id": users[0], "max_budget": "not-a-number"} + ) + timings["s8_invalid_body"] = time.monotonic() - missing_started + assert missing.status_code // 100 == 4, ( + f"/user/update with an invalid body returned {missing.status_code} " + f"in {timings['s8_invalid_body']:.3f}s" + ) + assert timings["s8_invalid_body"] < _HANDLER_BUDGET_SECONDS, ( + f"/user/update with an invalid body took {timings['s8_invalid_body']:.3f}s" + ) + + def burst_request(path: str, body: Mapping[str, JsonValue]) -> tuple[object, float]: + started: Final = time.monotonic() + try: + response: Final = candidate.client.request( + "POST", + path, + json=body, + headers={"Authorization": f"Bearer {candidate.key}"}, + timeout=60, + ) + return response.status_code, time.monotonic() - started + except Exception as error: # noqa: BLE001 # the killed worker drops in-flight requests + return error, time.monotonic() - started + + port: Final = candidate.client.base_url.port + assert port is not None, f"owned proxy client has no port: {candidate.client.base_url}" + with ThreadPoolExecutor(_BURST) as pool: + futures: Final = [ + pool.submit( + burst_request, + *_burst_call(i, users, key, team_id, customer_id), + ) + for i in range(_BURST) + ] + os.kill(_worker_pid(port), signal.SIGKILL) + results: Final = [future.result() for future in futures] + responses: Final = [(status, elapsed) for status, elapsed in results if isinstance(status, int)] + failures: Final = [status for status, _elapsed in responses if status != 200] + assert not failures, f"burst responses that were not 200: {failures}" + transport_errors: Final = [status for status, _elapsed in results if not isinstance(status, int)] + assert len(transport_errors) <= 3, ( + f"{len(transport_errors)} requests raised transport errors: {transport_errors!r}" + ) + elapsed_sorted: Final = sorted( + elapsed for i, (status, elapsed) in enumerate(results) if i % 5 in (0, 1, 4) and status == 200 + ) + timings["c1_burst_p95"] = elapsed_sorted[int(len(elapsed_sorted) * 0.95) - 1] + assert timings["c1_burst_p95"] < _HANDLER_BUDGET_SECONDS, ( + f"burst p95 {timings['c1_burst_p95']:.3f}s" + ) + eventually( + lambda: candidate.request("GET", "/health/liveliness").status_code, + lambda status: status == 200, + seconds=15, + ) + timings["c1_survivor"] = _timed_post( + candidate, "/user/update", {"user_id": users[0], "tpm_limit": 2000} + ) + assert timings["c1_survivor"] < _HANDLER_BUDGET_SECONDS, ( + f"control update on the surviving worker took {timings['c1_survivor']:.3f}s" + ) + finally: + coordination.signal(signal.SIGCONT) + wedged_keys: Final = {users[i] for i in range(_BURST) if i % 5 == 0 and i != 0} | {f"team_id:{team_id}"} + + def proxy_log() -> str: + return "".join( + path.read_text() for path in results_dir.glob("owned-proxy-*.log") if path not in prior_logs + ) + + team_wedged_key: Final = f"team_id:{team_id}" + eventually( + proxy_log, + lambda text: ( + all( + f"publish for {wedged_key} failed" in text + for wedged_key in wedged_keys + if wedged_key != team_wedged_key + ) + and ( + f"publish for {team_wedged_key} failed" in text + or f"internal usage cache entry {team_wedged_key}" in text + ) + ), + seconds=45, + ) + marker: Final = len(received) + drained() + recovered_keys: Final = {str(message.get("cache_key")) for message in received[marker:]} + assert recovered_keys.isdisjoint(wedged_keys), ( + f"wedged publishes unexpectedly landed after recovery: {sorted(recovered_keys & wedged_keys)}" + ) + coordination.signal(signal.SIGSTOP) + try: + timings["r1b_short_wedge_a"] = _timed_post( + candidate, "/user/update", {"user_id": users[4], "max_budget": 15.0} + ) + assert timings["r1b_short_wedge_a"] < _HANDLER_BUDGET_SECONDS, ( + f"/user/update inside a short wedge took {timings['r1b_short_wedge_a']:.3f}s" + ) + timings["r1b_short_wedge_b"] = _timed_post( + candidate, "/user/update", {"user_id": users[5], "max_budget": 16.0} + ) + assert timings["r1b_short_wedge_b"] < _HANDLER_BUDGET_SECONDS, ( + f"/user/update inside a short wedge took {timings['r1b_short_wedge_b']:.3f}s" + ) + finally: + coordination.signal(signal.SIGCONT) + eventually( + drained, + lambda messages: {str(message.get("cache_key")) for message in messages} >= {users[4], users[5]}, + seconds=10, + ) + timings["r2_resumed"] = _timed_post( + candidate, "/user/update", {"user_id": users[1], "max_budget": 12.0} + ) + assert timings["r2_resumed"] < _HANDLER_BUDGET_SECONDS, ( + f"post-recovery /user/update took {timings['r2_resumed']:.3f}s" + ) + eventually( + drained, + lambda messages: any(message.get("cache_key") == users[1] for message in messages), + seconds=10, + ) + coordination.stop() + timings["f1_refused"] = _timed_post( + candidate, "/user/update", {"user_id": users[2], "max_budget": 13.0} + ) + assert timings["f1_refused"] < _HANDLER_BUDGET_SECONDS, ( + f"/user/update with refused coordination Redis took {timings['f1_refused']:.3f}s" + ) + coordination.start() + restarted_pubsub: Final = subscriber_client.pubsub() + restarted_pubsub.subscribe(_CHANNEL) + restarted_received: list[dict[str, JsonValue]] = [] + + def drained_after_restart() -> tuple[dict[str, JsonValue], ...]: + restarted_received.extend(_received(restarted_pubsub)) + return tuple(restarted_received) + + eventually( + lambda: subscriber_client.pubsub_numsub(_CHANNEL)[0][1], + lambda count: count >= 3, + seconds=30, + ) + timings["f2_restarted"] = _timed_post( + candidate, "/user/update", {"user_id": users[3], "max_budget": 14.0} + ) + assert timings["f2_restarted"] < _HANDLER_BUDGET_SECONDS, ( + f"/user/update after Redis restart took {timings['f2_restarted']:.3f}s" + ) + eventually( + drained_after_restart, + lambda messages: any(message.get("cache_key") == users[3] for message in messages), + seconds=10, + ) + info_last: Final = object_value(candidate.get("/user/info", {"user_id": users[-1]})["user_info"]) + assert info_last["max_budget"] == 79.0, info_last + info_user3: Final = object_value(candidate.get("/user/info", {"user_id": users[3]})["user_info"]) + assert info_user3["max_budget"] == 14.0, info_user3 + finally: + admin.execute(sql.SQL("DROP DATABASE {} WITH (FORCE)").format(sql.Identifier(identity))) + record_property("cell_elapsed_seconds", timings) diff --git a/tests/integration/management/test_vector_store_config_ownership.py b/tests/integration/management/test_vector_store_config_ownership.py new file mode 100644 index 00000000000..e1e7ac42472 --- /dev/null +++ b/tests/integration/management/test_vector_store_config_ownership.py @@ -0,0 +1,351 @@ +import os +import uuid +from collections.abc import Mapping +from concurrent.futures import ThreadPoolExecutor +from pathlib import Path +from typing import Final +from urllib.parse import urlsplit, urlunsplit + +import httpx +import psycopg +import pytest +from psycopg import sql +from pydantic import JsonValue + +from tests.integration._support.client import Gateway, eventually, object_value +from tests.integration._support.database import read_rows +from tests.integration._support.process import owned_proxy +from tests.integration._support.redis_process import owned_redis + +CONFIG_STORE_ID: Final = "vs_integration_config_store" +CONFIG_STORE_NAME: Final = "integration-config-store" +SEARCH_PATH: Final = f"/vector_stores/{CONFIG_STORE_ID}/search" +PROXY_CONFIG: Final = Path(__file__).resolve().parents[1] / "proxy_config.yaml" + + +def listed_rows(response: httpx.Response) -> tuple[dict[str, JsonValue], ...]: + rows: Final = object_value(response.json()).get("data") + assert isinstance(rows, list), response.text + return tuple(object_value(row) for row in rows) + + +def listed_store(gateway: Gateway, vector_store_id: str, *, key: str | None = None) -> dict[str, JsonValue]: + listed: Final = gateway.request("GET", "/vector_store/list", key=key) + assert listed.status_code == 200, listed.text + matches: Final = tuple(row for row in listed_rows(listed) if row["vector_store_id"] == vector_store_id) + assert len(matches) == 1, f"{vector_store_id} appears {len(matches)} times in {listed.text}" + return matches[0] + + +def listed_ids(gateway: Gateway) -> tuple[str, ...]: + rows: Final = gateway.get("/vector_store/list")["data"] + assert isinstance(rows, list) + return tuple(str(object_value(row)["vector_store_id"]) for row in rows) + + +def config_store_info(gateway: Gateway) -> dict[str, JsonValue]: + return object_value(gateway.post("/vector_store/info", {"vector_store_id": CONFIG_STORE_ID})["vector_store"]) + + +def store_rows(vector_store_id: str) -> list[dict[str, JsonValue]]: + return read_rows( + 'SELECT vector_store_id, vector_store_name FROM "LiteLLM_ManagedVectorStoresTable" WHERE vector_store_id = %s', + (vector_store_id,), + ) + + +def assert_config_write_refused(gateway: Gateway) -> None: + for path, body in ( + ("/vector_store/update", {"vector_store_id": CONFIG_STORE_ID, "vector_store_name": "renamed"}), + ("/vector_store/delete", {"vector_store_id": CONFIG_STORE_ID}), + ("/vector_store/new", {"vector_store_id": CONFIG_STORE_ID, "custom_llm_provider": "openai"}), + ): + refused = gateway.request("POST", path, body) + assert refused.status_code == 400, f"{path}: {refused.status_code} {refused.text}" + error = object_value(object_value(refused.json())["detail"]) + assert error["vector_store_id"] == CONFIG_STORE_ID, refused.text + assert "config file" in str(error["error"]), refused.text + + +def burst_list(gateway: Gateway) -> tuple[int, str]: + response: Final = gateway.request("GET", "/vector_store/list") + if response.status_code != 200: + return response.status_code, response.text + ids: Final = tuple(str(row["vector_store_id"]) for row in listed_rows(response)) + return response.status_code, "config" if CONFIG_STORE_ID in ids else response.text + + +def burst_post(gateway: Gateway, path: str, body: Mapping[str, JsonValue]) -> tuple[int, str]: + response: Final = gateway.request("POST", path, body) + return response.status_code, response.text + + +def upstream_requests(upstream: httpx.Client, marker: str) -> list[dict[str, JsonValue]]: + observed: Final = upstream.get("/__observations") + observed.raise_for_status() + requests: Final = object_value(observed.json())["requests"] + assert isinstance(requests, list), observed.text + return [object_value(value) for value in requests if marker in str(object_value(value)["body"])] + + +@pytest.mark.covers("mgmt.vector_store.list.keeps_config_store_beside_db_stores") +def test_config_store_is_listed_beside_db_store_and_survives_listing(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + db_store_id: Final = f"vs_db_{uuid.uuid4().hex}" + gateway.post("/vector_store/new", {"vector_store_id": db_store_id, "custom_llm_provider": "openai"}) + scenario.cleanups.callback(gateway.post, "/vector_store/delete", {"vector_store_id": db_store_id}) + before: Final = config_store_info(gateway) + assert before["vector_store_id"] == CONFIG_STORE_ID, before + + config_row: Final = listed_store(gateway, CONFIG_STORE_ID) + assert config_row["is_config"] is True, config_row + assert config_row["vector_store_name"] == CONFIG_STORE_NAME, config_row + assert object_value(config_row["litellm_params"])["api_key"] != "integration-provider-key", config_row + db_row: Final = listed_store(gateway, db_store_id) + assert db_row["is_config"] is False, db_row + + after: Final = config_store_info(gateway) + assert after["vector_store_id"] == CONFIG_STORE_ID, after + assert after["is_config"] is True, after + assert after["vector_store_description"] == "declared in tests/integration/proxy_config.yaml", after + assert store_rows(CONFIG_STORE_ID) == [], "config store must not need a database row" + assert listed_store(gateway, CONFIG_STORE_ID)["is_config"] is True + + +@pytest.mark.covers("mgmt.vector_store.write.config_store_is_read_only") +def test_config_store_refuses_new_update_and_delete(gateway: Gateway) -> None: + assert_config_write_refused(gateway) + row: Final = listed_store(gateway, CONFIG_STORE_ID) + assert row["vector_store_name"] == CONFIG_STORE_NAME, row + assert row["is_config"] is True, row + assert config_store_info(gateway)["vector_store_name"] == CONFIG_STORE_NAME + + +@pytest.mark.covers("mgmt.vector_store.write.db_store_lifecycle_unchanged_beside_config_store") +def test_db_store_lifecycle_is_unchanged_beside_config_store(gateway: Gateway) -> None: + incomplete: Final = gateway.request("POST", "/vector_store/new", {"custom_llm_provider": "openai"}) + assert incomplete.status_code == 400, incomplete.text + db_store_id: Final = f"vs_db_{uuid.uuid4().hex}" + created: Final = gateway.request( + "POST", + "/vector_store/new", + {"vector_store_id": db_store_id, "custom_llm_provider": "openai", "vector_store_name": "first"}, + ) + assert created.status_code == 200, created.text + assert store_rows(db_store_id) == [{"vector_store_id": db_store_id, "vector_store_name": "first"}] + updated: Final = gateway.post( + "/vector_store/update", {"vector_store_id": db_store_id, "vector_store_name": "second"} + ) + assert object_value(updated["vector_store"])["vector_store_name"] == "second", updated + assert store_rows(db_store_id) == [{"vector_store_id": db_store_id, "vector_store_name": "second"}] + row: Final = listed_store(gateway, db_store_id) + assert row["vector_store_name"] == "second" and row["is_config"] is False, row + info: Final = object_value(gateway.post("/vector_store/info", {"vector_store_id": db_store_id})["vector_store"]) + assert info["vector_store_name"] == "second" and info["is_config"] is False, info + gateway.post("/vector_store/delete", {"vector_store_id": db_store_id}) + assert store_rows(db_store_id) == [] + assert db_store_id not in listed_ids(gateway) + assert CONFIG_STORE_ID in listed_ids(gateway) + missing: Final = gateway.request("POST", "/vector_store/info", {"vector_store_id": db_store_id}) + assert missing.status_code == 404, missing.text + + +@pytest.mark.covers("other.vector_store.chat.config_store_search_reaches_upstream_after_listing") +def test_chat_with_config_store_searches_upstream_and_injects_context_after_listing(gateway: Gateway) -> None: + with ( + gateway.scenario() as scenario, + httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream, + ): + model: Final = scenario.model() + marker: Final = f"lit6337 {uuid.uuid4().hex}" + assert CONFIG_STORE_ID in listed_ids(gateway) + upstream.get("/__observations").raise_for_status() + completion: Final = gateway.post( + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": marker}], "vector_store_ids": [CONFIG_STORE_ID]}, + ) + assert object_value(completion["usage"])["total_tokens"] == 40, completion + requests: Final = upstream_requests(upstream, marker) + searches: Final = [value for value in requests if value["path"] == SEARCH_PATH] + assert len(searches) == 1, requests + assert object_value(searches[0]["body"])["query"] == marker, searches + assert searches[0]["authorization"] == "Bearer integration-provider-key", searches + chats: Final = [value for value in requests if value["path"] == "/v1/chat/completions"] + assert len(chats) == 1, requests + messages: Final = object_value(chats[0]["body"])["messages"] + assert isinstance(messages, list), chats + contents: Final = tuple(str(object_value(message)["content"]) for message in messages) + assert contents == (f"Context:\n\nscripted context for {marker}\n\n", marker), contents + + +@pytest.mark.covers("other.vector_store.search.config_store_passthrough_uses_yaml_credentials_after_listing") +def test_passthrough_search_on_config_store_uses_yaml_credentials_after_listing(gateway: Gateway) -> None: + with httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream: + marker: Final = f"lit6337 passthrough {uuid.uuid4().hex}" + assert CONFIG_STORE_ID in listed_ids(gateway) + upstream.get("/__observations").raise_for_status() + searched: Final = gateway.request("POST", f"/v1/vector_stores/{CONFIG_STORE_ID}/search", {"query": marker}) + assert searched.status_code == 200, searched.text + data: Final = listed_rows(searched) + assert len(data) == 1, searched.text + content: Final = data[0]["content"] + assert isinstance(content, list), searched.text + assert object_value(content[0])["text"] == f"scripted context for {marker}", searched.text + requests: Final = upstream_requests(upstream, marker) + assert [value["path"] for value in requests] == [SEARCH_PATH], requests + assert requests[0]["authorization"] == "Bearer integration-provider-key", requests + + +@pytest.mark.covers("authz.vector_store.list.non_admin_key_access_to_config_store_follows_grants") +def test_non_admin_key_access_to_config_store_follows_grants_after_admin_listing(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + granted: Final = scenario.key(object_permission={"vector_stores": [CONFIG_STORE_ID]}) + plain: Final = scenario.key() + assert CONFIG_STORE_ID in listed_ids(gateway) + row: Final = listed_store(gateway, CONFIG_STORE_ID, key=granted) + assert row["is_config"] is True and row["vector_store_name"] == CONFIG_STORE_NAME, row + unlisted: Final = gateway.request("GET", "/vector_store/list", key=plain) + assert unlisted.status_code == 200, unlisted.text + assert CONFIG_STORE_ID not in {value["vector_store_id"] for value in listed_rows(unlisted)}, unlisted.text + for key in (granted, plain): + info = gateway.request("POST", "/vector_store/info", {"vector_store_id": CONFIG_STORE_ID}, key=key) + assert info.status_code == 200, info.text + assert object_value(object_value(info.json())["vector_store"])["is_config"] is True, info.text + forbidden: Final = gateway.request( + "POST", "/vector_store/delete", {"vector_store_id": CONFIG_STORE_ID}, key=granted + ) + assert forbidden.status_code in {400, 401, 403}, forbidden.text + assert CONFIG_STORE_ID in listed_ids(gateway) + + +@pytest.mark.covers("mgmt.vector_store.list.peer_process_keeps_config_store_and_sees_db_store") +def test_peer_process_keeps_config_store_and_sees_db_store_created_elsewhere(gateway: Gateway, peer: Gateway) -> None: + with gateway.scenario() as scenario: + db_store_id: Final = f"vs_db_{uuid.uuid4().hex}" + gateway.post("/vector_store/new", {"vector_store_id": db_store_id, "custom_llm_provider": "openai"}) + scenario.cleanups.callback(gateway.request, "POST", "/vector_store/delete", {"vector_store_id": db_store_id}) + for side in (gateway, peer, gateway, peer): + assert listed_store(side, CONFIG_STORE_ID)["is_config"] is True + assert listed_store(side, db_store_id)["is_config"] is False + assert config_store_info(side)["is_config"] is True + assert_config_write_refused(side) + gateway.post("/vector_store/delete", {"vector_store_id": db_store_id}) + assert db_store_id not in listed_ids(peer) + assert CONFIG_STORE_ID in listed_ids(peer) + + +@pytest.mark.covers("mgmt.vector_store.chaos.concurrent_burst_keeps_config_store_across_workers") +def test_concurrent_burst_keeps_config_store_and_refuses_every_config_write(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model() + db_store_ids: Final = tuple(f"vs_db_{uuid.uuid4().hex}" for _ in range(6)) + for db_store_id in db_store_ids: + scenario.cleanups.callback( + gateway.request, "POST", "/vector_store/delete", {"vector_store_id": db_store_id} + ) + + def act(index: int) -> tuple[str, int, str]: + match index % 5: + case 0: + return ("list", *burst_list(gateway)) + case 1: + return ("info", *burst_post(gateway, "/vector_store/info", {"vector_store_id": CONFIG_STORE_ID})) + case 2: + return ( + "config-update", + *burst_post( + gateway, + "/vector_store/update", + {"vector_store_id": CONFIG_STORE_ID, "vector_store_name": str(index)}, + ), + ) + case 3: + return ( + "db-new", + *burst_post( + gateway, + "/vector_store/new", + { + "vector_store_id": db_store_ids[index % len(db_store_ids)], + "custom_llm_provider": "openai", + }, + ), + ) + case _: + return ( + "chat", + *burst_post( + gateway, + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": f"burst {index}"}], + "vector_store_ids": [CONFIG_STORE_ID], + }, + ), + ) + + with ThreadPoolExecutor(max_workers=10) as pool: + outcomes: Final = tuple(pool.map(act, range(30))) + expected: Final = {"list": 200, "info": 200, "config-update": 400, "db-new": 200, "chat": 200} + assert [(kind, status) for kind, status, _ in outcomes] == [ + (kind, expected[kind]) for kind, _, _ in outcomes + ], outcomes + assert all(detail == "config" for kind, _, detail in outcomes if kind == "list"), outcomes + assert listed_store(gateway, CONFIG_STORE_ID)["vector_store_name"] == CONFIG_STORE_NAME + assert config_store_info(gateway)["vector_store_name"] == CONFIG_STORE_NAME + assert store_rows(CONFIG_STORE_ID) == [] + assert all(len(store_rows(db_store_id)) == 1 for db_store_id in db_store_ids), "each DB store exactly once" + + +@pytest.mark.timeout(180) +@pytest.mark.covers("mgmt.vector_store.chaos.redis_outage_keeps_config_store_and_recovers") +def test_redis_outage_keeps_config_store_served_and_recovers( + gateway: Gateway, tmp_path: Path, monkeypatch: pytest.MonkeyPatch +) -> None: + original: Final = os.environ["DATABASE_URL"] + identity: Final = "integration_vs_outage_" + uuid.uuid4().hex + parsed: Final = urlsplit(original) + database_url: Final = urlunsplit((parsed.scheme, parsed.netloc, "/" + identity, "", "")) + with psycopg.connect(original, autocommit=True) as admin: + admin.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(identity))) + try: + with owned_redis(tmp_path) as cache, monkeypatch.context() as environment: + environment.setenv("DATABASE_URL", database_url) + overrides: Final = { + "DATABASE_URL": database_url, + "REDIS_HOST": cache.host, + "REDIS_PORT": str(cache.port), + "REDIS_CIRCUIT_BREAKER_RECOVERY_TIMEOUT": "1", + } + with owned_proxy(gateway, tmp_path, overrides, config=PROXY_CONFIG, workers=2) as candidate: + db_store_id: Final = f"vs_db_{uuid.uuid4().hex}" + for phase in ("before", "during", "after"): + if phase == "during": + cache.stop() + if phase == "after": + cache.start() + for _ in range(4): + assert listed_store(candidate, CONFIG_STORE_ID)["is_config"] is True, phase + assert config_store_info(candidate)["vector_store_name"] == CONFIG_STORE_NAME, phase + assert_config_write_refused(candidate) + created = candidate.request( + "POST", + "/vector_store/new", + {"vector_store_id": f"{db_store_id}_{phase}", "custom_llm_provider": "openai"}, + ) + assert created.status_code == 200, (phase, created.text) + assert eventually( + lambda phase=phase: store_rows(f"{db_store_id}_{phase}"), lambda rows: len(rows) == 1 + ), phase + assert f"{db_store_id}_{phase}" in listed_ids(candidate), phase + assert store_rows(CONFIG_STORE_ID) == [] + with psycopg.connect(database_url) as fresh: + counted: Final = fresh.execute( + 'SELECT count(*) FROM "LiteLLM_ManagedVectorStoresTable" WHERE vector_store_id LIKE %s', + (f"{db_store_id}%",), + ).fetchone() + assert counted is not None and counted[0] == 3, counted + finally: + admin.execute(sql.SQL("DROP DATABASE {} WITH (FORCE)").format(sql.Identifier(identity))) + assert admin.execute("SELECT datname FROM pg_database WHERE datname=%s", (identity,)).fetchall() == [] diff --git a/tests/integration/observability/test_callback_delivery.py b/tests/integration/observability/test_callback_delivery.py index c44c1f30b80..543e60da4a6 100644 --- a/tests/integration/observability/test_callback_delivery.py +++ b/tests/integration/observability/test_callback_delivery.py @@ -1,13 +1,15 @@ +import base64 import json import uuid +from collections.abc import Callable, Mapping from concurrent.futures import ThreadPoolExecutor +from dataclasses import dataclass from pathlib import Path from typing import Final import pytest import yaml - -from integration._support.client import Gateway, eventually +from integration._support.client import Gateway, JsonValue, eventually, object_value, string_value from integration._support.database import read_rows from integration._support.process import owned_proxy from integration._support.wire import Reply, Request, wire_server @@ -100,7 +102,7 @@ def test_concurrent_success_and_failure_join_callbacks_and_rows_without_credenti responses: Final = tuple(pool.map(request, tags)) assert tuple(response.status_code for response in responses) == (200, 400, 200, 400) assert len(provider.drain()) == 4 - batches = [] + batches: Final[list[Request]] = [] # mutable-ok: drain() consumes the queue, later polls must keep earlier batches def delivered() -> tuple[dict, ...]: batches.extend(endpoint.drain()) @@ -133,7 +135,7 @@ def test_concurrent_success_and_failure_join_callbacks_and_rows_without_credenti assert "synthetic callback failure" in json.dumps(event["error_information"]) rows: Final = eventually( lambda identity=event["id"]: read_rows( - 'SELECT request_id, spend, prompt_tokens, completion_tokens, request_tags ' + "SELECT request_id, spend, prompt_tokens, completion_tokens, request_tags " 'FROM "LiteLLM_SpendLogs" WHERE request_id=%s', (identity,), ), @@ -152,3 +154,275 @@ def test_concurrent_success_and_failure_join_callbacks_and_rows_without_credenti assert rows[0]["prompt_tokens"] == event["prompt_tokens"] else: assert event["prompt_tokens"] == event["completion_tokens"] == rows[0]["completion_tokens"] == 0 + + +def _responses_frames(identity: str, text: str) -> tuple[bytes, ...]: + output: Final = [ + { + "type": "message", + "id": f"msg_{identity}", + "status": "completed", + "role": "assistant", + "content": [{"type": "output_text", "text": text, "annotations": []}], + } + ] + completed: Final = { + "id": identity, + "object": "response", + "created_at": 1, + "status": "completed", + "model": "gpt-4o-mini", + "output": output, + "usage": { + "input_tokens": 11, + "output_tokens": 4, + "total_tokens": 15, + "input_tokens_details": {"cached_tokens": 0}, + "output_tokens_details": {"reasoning_tokens": 0}, + }, + } + events: Final = ( + {"type": "response.created", "response": {**completed, "status": "in_progress", "output": [], "usage": None}}, + { + "type": "response.output_text.delta", + "item_id": f"msg_{identity}", + "output_index": 0, + "content_index": 0, + "delta": text, + }, + {"type": "response.completed", "response": completed}, + ) + return tuple(f"event: {event['type']}\ndata: {json.dumps(event)}\n\n".encode() for event in events) + + +@pytest.mark.covers("other.observability.callbacks.streamed_responses_events_carry_provider_response_headers") +def test_streamed_responses_success_callback_carries_provider_apim_request_id(gateway: Gateway, tmp_path: Path) -> None: + marker: Final = "resp_" + uuid.uuid4().hex + correlation: Final = "azure-correlation-" + marker + region: Final = "East US 2" + secret: Final = "synthetic-provider-secret-" + marker + sink_secret: Final = "synthetic-sink-secret-" + marker + + def upstream(request: Request) -> Reply: + assert request.target.endswith("/responses"), request.target + assert request.headers["authorization"] == f"Bearer {secret}" + assert json.loads(request.body) == { + "model": "gpt-4o-mini", + "input": "header control " + marker, + "stream": True, + }, request.body + return Reply( + content_type="text/event-stream", + chunks=_responses_frames(marker, "streamed control"), + headers={"apim-request-id": correlation, "x-ms-region": region}, + ) + + def sink(request: Request) -> Reply: + assert request.headers["authorization"] == f"Bearer {sink_secret}" + return Reply() + + with wire_server(upstream) as provider, wire_server(sink) as endpoint: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["litellm_settings"].update({"callbacks": ["generic_api"], "DEFAULT_FLUSH_INTERVAL_SECONDS": 1}) + path: Final = tmp_path / "callbacks.yaml" + path.write_text(yaml.safe_dump(config)) + with ( + owned_proxy( + gateway, + tmp_path, + { + "GENERIC_LOGGER_ENDPOINT": endpoint.url, + "GENERIC_LOGGER_HEADERS": f"Authorization=Bearer {sink_secret}", + }, + config=path, + ) as candidate, + candidate.scenario() as scenario, + ): + model: Final = scenario.model(api_base=provider.url + "/v1", api_key=secret) + response: Final = candidate.request( + "POST", "/v1/responses", {"model": model, "input": "header control " + marker, "stream": True} + ) + assert response.status_code == 200, response.text + assert f'"item_id":"msg_{marker}"' in response.text, response.text + assert '"type":"response.completed"' in response.text, response.text + assert len(provider.drain()) == 1 + batches: Final[list[Request]] = [] # mutable-ok: drain() consumes the queue, later polls must keep earlier batches + + def delivered() -> tuple[dict, ...]: + batches.extend(endpoint.drain()) + return tuple( + event for batch in batches for event in json.loads(batch.body) if event.get("model_group") == model + ) + + events: Final = eventually(delivered, lambda values: len(values) == 1, seconds=10) + assert (events[0]["status"], events[0]["stream"], events[0]["call_type"]) == ("success", True, "aresponses") + additional_headers: Final = events[0]["hidden_params"]["additional_headers"] or {} + provider_headers: Final = { + name: value + for name, value in additional_headers.items() + if name in ("llm_provider-apim-request-id", "llm_provider-x-ms-region") + } + assert provider_headers == { + "llm_provider-apim-request-id": correlation, + "llm_provider-x-ms-region": region, + }, json.dumps(events[0]["hidden_params"]) + + +_RAISING_HOOK: Final = """ +from litellm.integrations.custom_logger import CustomLogger + + +class RaisingHook(CustomLogger): + async def async_post_call_success_deployment_hook(self, request_data, response, call_type): + raise RuntimeError(f"hook rejected {type(response).__name__} for {call_type}") + + +instance = RaisingHook() +""" + +_VIDEO_JOB: Final = { + "id": "video_hook_isolation", + "object": "video", + "status": "queued", + "model": "sora-2", + "seconds": "4", + "size": "720x1280", +} + +_UPSTREAM_REPLIES: Final[Mapping[str, Mapping[str, JsonValue]]] = { + "/v1/chat/completions": { + "id": "chatcmpl_hook_isolation", + "object": "chat.completion", + "created": 1, + "model": "gpt-5.6", + "choices": [{"index": 0, "message": {"role": "assistant", "content": "hi"}, "finish_reason": "stop"}], + "usage": {"prompt_tokens": 1, "completion_tokens": 1, "total_tokens": 2}, + }, + "/v1/embeddings": { + "object": "list", + "data": [{"object": "embedding", "index": 0, "embedding": [0.1, 0.2]}], + "model": "text-embedding-3-small", + "usage": {"prompt_tokens": 1, "total_tokens": 1}, + }, + "/v1/responses": { + "id": "resp_hook_isolation", + "object": "response", + "created_at": 1, + "status": "completed", + "model": "gpt-5.6", + "output": [ + { + "type": "message", + "id": "msg_hook_isolation", + "status": "completed", + "role": "assistant", + "content": [{"type": "output_text", "text": "hi", "annotations": []}], + } + ], + "parallel_tool_calls": False, + "tool_choice": "auto", + "tools": [], + "usage": {"input_tokens": 1, "output_tokens": 1, "total_tokens": 2}, + }, + "/v1/videos": _VIDEO_JOB, +} + + +def _item(value: JsonValue, index: int) -> JsonValue: + assert isinstance(value, list), f"Expected a list, received {type(value).__name__}" + return value[index] + + +def _chat_text(body: dict[str, JsonValue]) -> str: + return string_value(object_value(object_value(_item(body["choices"], 0))["message"])["content"]) + + +def _embedding_vector(body: dict[str, JsonValue]) -> JsonValue: + return object_value(_item(body["data"], 0))["embedding"] + + +def _responses_text(body: dict[str, JsonValue]) -> str: + return string_value(object_value(_item(object_value(_item(body["output"], 0))["content"], 0))["text"]) + + +def _video_job(body: dict[str, JsonValue]) -> tuple[str, str]: + encoded_id: Final = string_value(body["id"]).removeprefix("video_") + decoded: Final = base64.b64decode(encoded_id).decode() + return decoded.rsplit("video_id:", 1)[-1], string_value(body["status"]) + + +@dataclass(frozen=True, slots=True) +class _Surface: + route: str + upstream_model: str + body: Callable[[str], dict[str, JsonValue]] + observed: Callable[[dict[str, JsonValue]], JsonValue | tuple[str, str]] + expected: JsonValue | tuple[str, str] + + +_SURFACES: Final = ( + pytest.param( + _Surface( + "/v1/chat/completions", + "openai/gpt-5.6", + lambda model: {"model": model, "messages": [{"role": "user", "content": "hook isolation"}]}, + _chat_text, + "hi", + ), + id="chat", + ), + pytest.param( + _Surface( + "/v1/embeddings", + "openai/text-embedding-3-small", + lambda model: {"model": model, "input": "hook isolation"}, + _embedding_vector, + [0.1, 0.2], + ), + id="embeddings", + ), + pytest.param( + _Surface( + "/v1/responses", + "openai/gpt-5.6", + lambda model: {"model": model, "input": "hook isolation"}, + _responses_text, + "hi", + ), + id="responses", + ), + pytest.param( + _Surface( + "/v1/videos", + "openai/sora-2", + lambda model: {"model": model, "prompt": "a cat"}, + _video_job, + (_VIDEO_JOB["id"], _VIDEO_JOB["status"]), + ), + id="videos", + ), +) + + +@pytest.mark.covers("other.observability.callbacks.raising_success_deployment_hook_keeps_response") +@pytest.mark.parametrize("surface", _SURFACES) +def test_response_survives_raising_success_deployment_hook(gateway: Gateway, tmp_path: Path, surface: _Surface) -> None: + def upstream(request: Request) -> Reply: + assert request.target == surface.route, request.target + assert b"hook isolation" in request.body or b"a cat" in request.body, request.body[:300] + return Reply(body=json.dumps(_UPSTREAM_REPLIES[surface.route]).encode()) + + (tmp_path / "raising_hook.py").write_text(_RAISING_HOOK) + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["litellm_settings"].update({"callbacks": ["raising_hook.instance"]}) + path: Final = tmp_path / "hook.yaml" + path.write_text(yaml.safe_dump(config)) + with ( + wire_server(upstream) as provider, + owned_proxy(gateway, tmp_path, {}, config=path) as candidate, + candidate.scenario() as scenario, + ): + model: Final = scenario.model(model=surface.upstream_model, api_base=provider.url + "/v1") + response: Final = candidate.request("POST", surface.route, surface.body(model)) + assert response.status_code == 200, response.text + assert surface.observed(object_value(response.json())) == surface.expected, response.text diff --git a/tests/integration/observability/test_guardrail_effects.py b/tests/integration/observability/test_guardrail_effects.py index c4bb28d1a04..93665479c57 100644 --- a/tests/integration/observability/test_guardrail_effects.py +++ b/tests/integration/observability/test_guardrail_effects.py @@ -143,6 +143,104 @@ def test_guardrail_denial_prevents_provider_and_preserves_allowed_control(gatewa assert len(policy.drain()) == 2 +@pytest.mark.covers("other.observability.guardrails.bedrock_passthrough_converse_scans_only_caller_content") +def test_bedrock_passthrough_converse_guardrail_ignores_denied_term_in_tool_definition( + gateway: Gateway, tmp_path: Path +) -> None: + identity: Final = "guardrail" + uuid.uuid4().hex + denied: Final = "synthetic denied marker" + allowed: Final = "synthetic allowed weather question" + access_key: Final = "AKIASYNTHETICPASSTHROUGH" + tool_config: Final = { + "tools": [ + { + "toolSpec": { + "name": "lookup_weather", + "description": f"Look up the forecast, never answer a {denied}", + "inputSchema": { + "json": { + "type": "object", + "properties": {"city": {"type": "string", "enum": [denied]}}, + "required": ["city"], + } + }, + } + } + ] + } + + def guardrail(request: Request) -> Reply: + assert request.target == "/beta/litellm_basic_guardrail_api" + texts: Final = json.loads(request.body)["texts"] + result: Final = ( + {"action": "BLOCKED", "blocked_reason": "synthetic policy denial"} + if any(denied in text for text in texts) + else {"action": "NONE"} + ) + return Reply(body=json.dumps(result).encode()) + + def runtime(request: Request) -> Reply: + assert request.target == "/model/anthropic.claude-3-haiku-20240307-v1:0/converse" + assert request.headers["authorization"].startswith(f"AWS4-HMAC-SHA256 Credential={access_key}/"), ( + request.headers + ) + return Reply( + body=json.dumps( + { + "output": {"message": {"role": "assistant", "content": [{"text": "sunny passthrough control"}]}}, + "stopReason": "end_turn", + "usage": {"inputTokens": 11, "outputTokens": 4, "totalTokens": 15}, + "metrics": {"latencyMs": 1}, + } + ).encode() + ) + + with wire_server(guardrail) as policy, wire_server(runtime) as bedrock, gateway.scenario() as scenario: + model: Final = scenario.model( + model="bedrock/anthropic.claude-3-haiku-20240307-v1:0", + api_key=None, + api_base=bedrock.url, + aws_access_key_id=access_key, + aws_secret_access_key="synthetic-secret", + aws_region_name="us-east-1", + ) + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["guardrails"] = [ + { + "guardrail_name": identity, + "litellm_params": { + "guardrail": "generic_guardrail_api", + "mode": "pre_call", + "default_on": True, + "api_base": policy.url, + "api_key": "synthetic-guardrail-key", + }, + } + ] + path: Final = tmp_path / "bedrock-passthrough.yaml" + path.write_text(yaml.safe_dump(config)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate: + route: Final = f"/bedrock/model/{model}/converse" + passed: Final = candidate.request( + "POST", + route, + {"messages": [{"role": "user", "content": [{"text": allowed}]}], "toolConfig": tool_config}, + ) + assert passed.status_code == 200, passed.text + assert passed.json()["output"]["message"]["content"] == [{"text": "sunny passthrough control"}] + forwarded: Final = bedrock.drain() + assert len(forwarded) == 1, "the runtime peer must see exactly the allowed request" + assert json.loads(forwarded[0].body)["toolConfig"] == tool_config + blocked: Final = candidate.request( + "POST", + route, + {"messages": [{"role": "user", "content": [{"text": denied}]}], "toolConfig": tool_config}, + ) + assert blocked.status_code == 400 and "synthetic policy denial" in blocked.text, blocked.text + assert bedrock.drain() == () + assert [json.loads(request.body)["texts"] for request in policy.drain()] == [[allowed], [denied]] + + @pytest.mark.covers("other.mcp.guardrails.request_selection_blocks_resolved_tool_without_execution") def test_request_selected_mcp_guardrail_blocks_direct_and_virtual_calls(gateway: Gateway, tmp_path: Path) -> None: guardrail = "mcp-policy-" + uuid.uuid4().hex diff --git a/tests/integration/observability/test_otel_text_completion_choices.py b/tests/integration/observability/test_otel_text_completion_choices.py new file mode 100644 index 00000000000..70c104a61aa --- /dev/null +++ b/tests/integration/observability/test_otel_text_completion_choices.py @@ -0,0 +1,110 @@ +import json +import uuid +from pathlib import Path +from typing import Final + +import pytest +import yaml + +from integration._support.client import Gateway, eventually +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server + + +def _span_attributes(body: bytes) -> tuple[dict[str, object], ...]: + return tuple( + {attribute["key"]: attribute["value"] for attribute in span.get("attributes", ())} + for resource in json.loads(body)["resourceSpans"] + for scope in resource["scopeSpans"] + for span in scope["spans"] + ) + + +@pytest.mark.covers("other.observability.otel.text_completion_choices_keep_provider_fields") +def test_otel_weave_output_keeps_text_completion_provider_fields_beside_the_synthesized_message( + gateway: Gateway, tmp_path: Path +) -> None: + marker: Final = "otel-text-" + uuid.uuid4().hex + logprobs: Final = { + "tokens": ["Hello", " there"], + "token_logprobs": [-0.1, -0.2], + "top_logprobs": None, + "text_offset": [0, 5], + } + content_filter: Final = {"hate": {"filtered": False, "severity": "safe"}} + + def upstream(request: Request) -> Reply: + assert request.target.endswith("/completions"), request.target + return Reply( + body=json.dumps( + { + "id": marker, + "object": "text_completion", + "created": 1, + "model": "gpt-3.5-turbo-instruct", + "choices": [ + { + "index": 0, + "text": "Hello there", + "finish_reason": "stop", + "logprobs": logprobs, + "content_filter_results": content_filter, + } + ], + "usage": {"prompt_tokens": 3, "completion_tokens": 2, "total_tokens": 5}, + } + ).encode() + ) + + def sink(_request: Request) -> Reply: + return Reply() + + with wire_server(upstream) as provider, wire_server(sink) as collector: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["litellm_settings"].update({"callbacks": ["otel"]}) + config["callback_settings"] = { + "otel": { + "exporter": "http/json", + "endpoint": collector.url, + "mapper_names": ["genai", "openinference", "weave"], + "capture_message_content": "span_only", + "use_simple_processor": True, + } + } + path: Final = tmp_path / "otel.yaml" + path.write_text(yaml.safe_dump(config)) + with ( + owned_proxy(gateway, tmp_path, {"LITELLM_OTEL_V2": "1"}, config=path) as candidate, + candidate.scenario() as scenario, + ): + model: Final = scenario.model(model="openai/gpt-3.5-turbo-instruct", api_base=provider.url + "/v1") + response: Final = candidate.request( + "POST", "/v1/completions", {"model": model, "prompt": marker, "cache": {"no-cache": True}} + ) + assert response.status_code == 200, response.text + assert response.json()["choices"][0]["text"] == "Hello there" + batches = [] + + def outputs() -> tuple[list[dict[str, object]], ...]: + batches.extend(collector.drain()) + return tuple( + json.loads(attributes["weave.output"]["stringValue"]) + for batch in batches + for attributes in _span_attributes(batch.body) + if "weave.output" in attributes + and attributes.get("gen_ai.response.id", {}).get("stringValue") == marker + ) + + choices: Final = eventually(outputs, lambda values: len(values) == 1, seconds=20)[0] + assert len(choices) == 1, choices + choice: Final = choices[0] + assert choice["message"]["content"] == "Hello there", choice + assert "text" not in choice, choice + assert { + key: choice.get(key) for key in ("index", "finish_reason", "logprobs", "content_filter_results") + } == { + "index": 0, + "finish_reason": "stop", + "logprobs": logprobs, + "content_filter_results": content_filter, + }, choice diff --git a/tests/integration/pricing/test_configured_prices.py b/tests/integration/pricing/test_configured_prices.py index 655d74c1402..e39833516c2 100644 --- a/tests/integration/pricing/test_configured_prices.py +++ b/tests/integration/pricing/test_configured_prices.py @@ -1,10 +1,12 @@ -from collections.abc import Iterator, Mapping -from typing import Final -from pathlib import Path +import json import uuid +from collections.abc import Iterator, Mapping +from pathlib import Path +from typing import Final import pytest import yaml +from pydantic import JsonValue from tests.integration._support.client import Gateway, eventually, object_value, string_value from tests.integration._support.database import read_rows @@ -28,6 +30,31 @@ def test_custom_price_is_reported_and_charged(gateway: Gateway) -> None: assert params["output_cost_per_token"] == 0.002 +@pytest.mark.covers("quota_management.cost_estimate.configured_price.reported_for_model_absent_from_cost_map") +def test_cost_estimate_reports_configured_prices_for_model_absent_from_cost_map(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model( + model=f"openai/integration-on-prem-{uuid.uuid4().hex}", + input_cost_per_token=0.003, + output_cost_per_token=0.007, + ) + response: Final = gateway.request( + "POST", + "/cost/estimate", + {"model": model, "input_tokens": 1000, "output_tokens": 500, "num_requests_per_day": 10}, + ) + assert response.status_code == 200, response.text + body: Final = object_value(response.json()) + assert body["input_cost_per_token"] == pytest.approx(0.003), response.text + assert body["output_cost_per_token"] == pytest.approx(0.007), response.text + assert body["input_cost_per_request"] == pytest.approx(1000 * 0.003), response.text + assert body["output_cost_per_request"] == pytest.approx(500 * 0.007), response.text + margin: Final = body["margin_cost_per_request"] + assert isinstance(margin, float), response.text + assert body["cost_per_request"] == pytest.approx(1000 * 0.003 + 500 * 0.007 + margin), response.text + assert body["daily_cost"] == pytest.approx(10 * (1000 * 0.003 + 500 * 0.007 + margin)), response.text + + @pytest.mark.covers("quota_management.spend_tracking.default_prices.survive_nullable_sibling_reload") def test_default_prices_survive_nullable_sibling_and_reload(gateway: Gateway) -> None: for registration_order in (("custom", "omitted", "nullable"), ("nullable", "omitted", "custom")): @@ -103,6 +130,45 @@ def test_default_prices_survive_nullable_sibling_and_reload(gateway: Gateway) -> assert float(rows[0]["spend"]) == pytest.approx(expected, rel=1e-6) +COST_MAP_DISPLAY_PRICING_KEYS: Final = frozenset( + { + "input_cost_per_token", + "output_cost_per_token", + "cache_read_input_token_cost", + "cache_creation_input_token_cost", + } +) + + +def persisted_model_info(identity: str) -> dict[str, JsonValue]: + rows: Final = read_rows('SELECT model_info FROM "LiteLLM_ProxyModelTable" WHERE model_id = %s', (identity,)) + assert len(rows) == 1, f"Deployment {identity} has {len(rows)} rows" + stored: Final = rows[0]["model_info"] + return object_value(json.loads(stored) if isinstance(stored, str) else stored) + + +@pytest.mark.covers("pricing.model_update.echoed_cost_map_price_is_not_persisted_as_override") +def test_saving_echoed_model_info_does_not_freeze_cost_map_price_into_deployment(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model() + entries: Final = gateway.get("/model/info")["data"] + assert isinstance(entries, list) + target: Final = next(object_value(entry) for entry in entries if object_value(entry)["model_name"] == model) + displayed: Final = object_value(target["model_info"]) + identity: Final = string_value(displayed["id"]) + assert isinstance(displayed["input_cost_per_token"], float), displayed + assert isinstance(displayed["output_cost_per_token"], float), displayed + fresh: Final = persisted_model_info(identity) + assert {key: value for key, value in fresh.items() if key in COST_MAP_DISPLAY_PRICING_KEYS} == {}, fresh + saved: Final = gateway.request( + "PATCH", f"/model/{identity}/update", {"model_info": {**displayed, "description": "echoed ui save"}} + ) + assert saved.status_code == 200, saved.text + stored: Final = persisted_model_info(identity) + assert stored["description"] == "echoed ui save", stored + assert {key: value for key, value in stored.items() if key in COST_MAP_DISPLAY_PRICING_KEYS} == {}, stored + + @pytest.mark.covers("quota_management.spend_tracking.default_prices.loaded_router_preserves_cached_defaults") def test_loaded_router_preserves_cached_defaults_during_real_requests(gateway: Gateway, tmp_path: Path) -> None: from litellm import Router diff --git a/tests/integration/pricing/test_databricks_cache_pricing.py b/tests/integration/pricing/test_databricks_cache_pricing.py new file mode 100644 index 00000000000..b32076d1bf9 --- /dev/null +++ b/tests/integration/pricing/test_databricks_cache_pricing.py @@ -0,0 +1,89 @@ +import json +import uuid +from typing import Final + +import pytest + +from tests.integration._support.client import Gateway, eventually, object_value, string_value +from tests.integration._support.database import read_rows +from tests.integration._support.upstream import delete_scenario, register_scenario +from tests.integration.cost_calculation.cost_tracking_case import JsonResponse + +INPUT_RATE: Final = 0.001 +OUTPUT_RATE: Final = 0.002 +CACHE_CREATION_RATE: Final = 0.004 +CACHE_READ_RATE: Final = 0.0001 +UNCACHED_PROMPT_TOKENS: Final = 1000 +CACHE_CREATION_TOKENS: Final = 2000 +CACHE_READ_TOKENS: Final = 8000 +PROMPT_TOKENS: Final = UNCACHED_PROMPT_TOKENS + CACHE_CREATION_TOKENS + CACHE_READ_TOKENS +COMPLETION_TOKENS: Final = 500 + + +def databricks_cached_response() -> JsonResponse: + return JsonResponse( + content_type="application/json", + body={ + "id": "chatcmpl-$REQUEST_ID", + "object": "chat.completion", + "created": 1700000000, + "model": "databricks-claude-integration", + "choices": [ + {"index": 0, "message": {"role": "assistant", "content": "cached reply"}, "finish_reason": "stop"} + ], + "usage": { + "prompt_tokens": PROMPT_TOKENS, + "completion_tokens": COMPLETION_TOKENS, + "total_tokens": PROMPT_TOKENS + COMPLETION_TOKENS, + "cache_creation_input_tokens": CACHE_CREATION_TOKENS, + "cache_read_input_tokens": CACHE_READ_TOKENS, + }, + }, + ) + + +@pytest.mark.covers("pricing.databricks.cached_prompt_tokens_bill_at_cache_rates") +def test_databricks_cached_prompt_tokens_bill_at_cache_rates_not_input_rate(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + scenario_id: Final = f"databricks-cache-{uuid.uuid4().hex[:12]}" + handle: Final = register_scenario(scenario_id, databricks_cached_response()) + scenario.cleanups.callback(delete_scenario, handle) + model: Final = scenario.model( + model="databricks/databricks-claude-integration", + api_base=handle.api_base(), + input_cost_per_token=INPUT_RATE, + output_cost_per_token=OUTPUT_RATE, + cache_creation_input_token_cost=CACHE_CREATION_RATE, + cache_read_input_token_cost=CACHE_READ_RATE, + ) + response: Final = gateway.request( + "POST", "/v1/chat/completions", {"model": model, "messages": [{"role": "user", "content": "cache control"}]} + ) + assert response.status_code == 200, response.text + expected_prompt_cost: Final = ( + UNCACHED_PROMPT_TOKENS * INPUT_RATE + + CACHE_CREATION_TOKENS * CACHE_CREATION_RATE + + CACHE_READ_TOKENS * CACHE_READ_RATE + ) + expected_completion_cost: Final = COMPLETION_TOKENS * OUTPUT_RATE + assert float(response.headers["x-litellm-response-cost"]) == pytest.approx( + expected_prompt_cost + expected_completion_cost, rel=1e-6 + ), response.text + request_id: Final = string_value(object_value(response.json())["id"]) + rows: Final = eventually( + lambda: read_rows( + 'SELECT spend, metadata, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs" ' + "WHERE request_id = %s", + (request_id,), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert rows[0]["prompt_tokens"] == PROMPT_TOKENS + assert rows[0]["completion_tokens"] == COMPLETION_TOKENS + assert float(rows[0]["spend"]) == pytest.approx(expected_prompt_cost + expected_completion_cost, rel=1e-6) + metadata: Final = rows[0]["metadata"] + parsed: Final = json.loads(metadata) if isinstance(metadata, str) else object_value(metadata) + breakdown: Final = object_value(parsed["cost_breakdown"]) + assert float(breakdown["input_cost"]) == pytest.approx(expected_prompt_cost, rel=1e-6) + assert float(breakdown["output_cost"]) == pytest.approx(expected_completion_cost, rel=1e-6) diff --git a/tests/integration/pricing/test_ocr_page_pricing.py b/tests/integration/pricing/test_ocr_page_pricing.py new file mode 100644 index 00000000000..65f94ea673e --- /dev/null +++ b/tests/integration/pricing/test_ocr_page_pricing.py @@ -0,0 +1,59 @@ +import uuid +from typing import Final + +import pytest + +from tests.integration._support.client import Gateway, eventually, string_value +from tests.integration._support.database import read_rows +from tests.integration._support.upstream import delete_scenario, register_scenario +from tests.integration.cost_calculation.cost_tracking_case import JsonResponse + + +@pytest.mark.covers("pricing.ocr.annotation_pages_billed_at_annotation_rate") +def test_ocr_annotation_pages_are_billed_at_annotation_cost_per_page(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + scenario_id: Final = f"ocr-annotation-{uuid.uuid4().hex[:12]}" + handle: Final = register_scenario( + scenario_id, + JsonResponse( + content_type="application/json", + body={ + "pages": [{"index": index, "markdown": f"page {index}"} for index in range(3)], + "model": "integration-ocr", + "document_annotation": '{"title": "annotated"}', + "usage_info": {"pages_processed": 3, "pages_processed_annotation": 2, "doc_size_bytes": 4096}, + }, + ), + ) + scenario.cleanups.callback(delete_scenario, handle) + model: Final = scenario.model( + model=f"mistral/integration-ocr-{scenario_id}", + api_base=f"{handle.api_base()}/v1", + ocr_cost_per_page=0.002, + annotation_cost_per_page=0.01, + ) + response: Final = gateway.request( + "POST", + "/v1/ocr", + { + "model": model, + "document": {"type": "document_url", "document_url": "https://example.com/annotated.pdf"}, + "document_annotation_format": {"type": "json_schema", "json_schema": {"name": "title"}}, + }, + ) + assert response.status_code == 200, response.text + assert response.json()["usage_info"] == { + "pages_processed": 3, + "pages_processed_annotation": 2, + "credits": None, + "doc_size_bytes": 4096, + }, response.text + expected: Final = 3 * 0.002 + 2 * 0.01 + assert float(response.headers["x-litellm-response-cost"]) == pytest.approx(expected), response.text + request_id: Final = string_value(response.headers["x-litellm-call-id"]) + rows: Final = eventually( + lambda: read_rows('SELECT spend FROM "LiteLLM_SpendLogs" WHERE request_id=%s', (request_id,)), + lambda values: len(values) == 1, + seconds=70, + ) + assert float(rows[0]["spend"]) == pytest.approx(expected) diff --git a/tests/integration/pricing/test_service_tier_pricing.py b/tests/integration/pricing/test_service_tier_pricing.py new file mode 100644 index 00000000000..e0d26392f7f --- /dev/null +++ b/tests/integration/pricing/test_service_tier_pricing.py @@ -0,0 +1,71 @@ +import json +from typing import Final + +import httpx +import pytest + +from tests.integration._support.client import JSON_OBJECT, Gateway, eventually, object_value, string_value +from tests.integration._support.database import read_rows + +STANDARD_INPUT_RATE: Final = 0.001 +STANDARD_OUTPUT_RATE: Final = 0.002 +ULTRAFAST_INPUT_RATE: Final = 0.01 +ULTRAFAST_OUTPUT_RATE: Final = 0.02 + + +def assert_chat_bills_rates( + gateway: Gateway, model: str, service_tier: str | None, input_rate: float, output_rate: float +) -> None: + with httpx.Client(base_url=gateway.upstream_url, trust_env=False) as upstream: + upstream.get("/__observations").raise_for_status() + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": f"service tier {service_tier} control"}], + **({} if service_tier is None else {"service_tier": service_tier}), + }, + ) + assert response.status_code == 200, response.text + expected: Final = 20 * input_rate + 20 * output_rate + assert float(response.headers["x-litellm-response-cost"]) == pytest.approx(expected, rel=1e-6), response.text + observations: Final = JSON_OBJECT.validate_json(upstream.get("/__observations").content)["requests"] + assert isinstance(observations, list) + assert len(observations) == 1 + body: Final = object_value(object_value(observations[0])["body"]) + assert body == { + "model": "gpt-4o-mini", + "messages": [{"role": "user", "content": f"service tier {service_tier} control"}], + **({} if service_tier is None else {"service_tier": service_tier}), + }, response.text + request_id: Final = string_value(object_value(response.json())["id"]) + rows: Final = eventually( + lambda: read_rows( + 'SELECT spend, metadata, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs" WHERE request_id = %s', + (request_id,), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert rows[0]["prompt_tokens"] == 20 + assert rows[0]["completion_tokens"] == 20 + assert float(rows[0]["spend"]) == pytest.approx(expected, rel=1e-6) + metadata: Final = rows[0]["metadata"] + parsed: Final = json.loads(metadata) if isinstance(metadata, str) else object_value(metadata) + breakdown: Final = object_value(parsed["cost_breakdown"]) + assert float(breakdown["input_cost"]) == pytest.approx(20 * input_rate, rel=1e-6) + assert float(breakdown["output_cost"]) == pytest.approx(20 * output_rate, rel=1e-6) + + +@pytest.mark.covers("quota_management.spend_tracking.service_tier_pricing.ultrafast_bills_ultrafast_rates") +def test_ultrafast_service_tier_bills_ultrafast_rates_and_keeps_pricing_off_the_wire(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model( + input_cost_per_token=STANDARD_INPUT_RATE, + output_cost_per_token=STANDARD_OUTPUT_RATE, + input_cost_per_token_ultrafast=ULTRAFAST_INPUT_RATE, + output_cost_per_token_ultrafast=ULTRAFAST_OUTPUT_RATE, + ) + assert_chat_bills_rates(gateway, model, "ultrafast", ULTRAFAST_INPUT_RATE, ULTRAFAST_OUTPUT_RATE) + assert_chat_bills_rates(gateway, model, None, STANDARD_INPUT_RATE, STANDARD_OUTPUT_RATE) diff --git a/tests/integration/providers/test_anthropic_advisor_wire.py b/tests/integration/providers/test_anthropic_advisor_wire.py new file mode 100644 index 00000000000..77fa27cd2a9 --- /dev/null +++ b/tests/integration/providers/test_anthropic_advisor_wire.py @@ -0,0 +1,113 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +_ADVISOR_KEY: Final = "synthetic-advisor-key" +_QUESTION: Final = "which index should this query use" +_ADVICE: Final = "use the composite index on (tenant_id, created_at)" +_FINAL_ANSWER: Final = "done, the composite index is the right one" + + +_ADVISOR_CALL_MESSAGE: Final = { + "role": "assistant", + "content": None, + "tool_calls": [ + { + "id": "advisor-call", + "type": "function", + "function": {"name": "advisor", "arguments": json.dumps({"question": _QUESTION})}, + } + ], +} +_FINAL_MESSAGE: Final = {"role": "assistant", "content": _FINAL_ANSWER} + + +def _chat_completion(identity: str, message: dict[str, object], finish_reason: str) -> Reply: + return Reply( + body=json.dumps( + { + "id": f"chatcmpl-{identity}", + "object": "chat.completion", + "created": 1, + "model": "llama-3.3-70b-versatile", + "choices": [{"index": 0, "message": message, "finish_reason": finish_reason}], + "usage": {"prompt_tokens": 10, "completion_tokens": 4, "total_tokens": 14}, + } + ).encode() + ) + + +def _executor_reply(body: dict[str, object], identity: str) -> Reply: + messages: Final = body["messages"] + assert isinstance(messages, list) + if any(message.get("role") == "tool" for message in messages): + assert messages[-1]["content"] == _ADVICE + return _chat_completion(identity, _FINAL_MESSAGE, "stop") + tools: Final = body["tools"] + assert isinstance(tools, list) + assert tools[0]["function"]["name"] == "advisor" + return _chat_completion(identity, _ADVISOR_CALL_MESSAGE, "tool_calls") + + +@pytest.mark.covers("providers.anthropic_messages_advisor.sub_call_uses_the_configured_advisor_deployment") +def test_advisor_sub_call_reaches_the_router_deployment_with_its_key_instead_of_anthropic_unauthenticated( + gateway: Gateway, +) -> None: + identity: Final = "advisor-wire-" + uuid.uuid4().hex + + def respond(request: Request) -> Reply: + body: Final = json.loads(request.body) + if request.target == "/v1/chat/completions": + assert request.headers["authorization"] == "Bearer integration-provider-key" + return _executor_reply(body, identity) + assert request.target == "/v1/messages" + assert request.headers["x-api-key"] == _ADVISOR_KEY + assert body["model"] == "claude-opus-4-1-20250805" + assert body["messages"] == [ + {"role": "user", "content": "please plan the migration"}, + {"role": "user", "content": _QUESTION}, + ] + assert "tools" not in body + return Reply( + body=json.dumps( + { + "id": f"msg-{identity}", + "type": "message", + "role": "assistant", + "model": "claude-opus-4-1-20250805", + "content": [{"type": "text", "text": _ADVICE}], + "stop_reason": "end_turn", + "stop_sequence": None, + "usage": {"input_tokens": 12, "output_tokens": 6}, + } + ).encode() + ) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + executor: Final = scenario.model(model="hosted_vllm/llama-3.3-70b", api_base=wire.url + "/v1") + advisor: Final = scenario.model( + model="anthropic/claude-opus-4-1-20250805", api_base=wire.url, api_key=_ADVISOR_KEY + ) + response: Final = gateway.request( + "POST", + "/v1/messages", + { + "model": executor, + "max_tokens": 64, + "messages": [{"role": "user", "content": "please plan the migration"}], + "tools": [{"type": "advisor_20260301", "name": "advisor", "model": advisor}], + }, + ) + assert response.status_code == 200, response.text + body: Final = response.json() + assert body["content"] == [{"type": "text", "text": _FINAL_ANSWER}], response.text + assert body["stop_reason"] == "end_turn", response.text + assert [request.target for request in wire.drain()] == [ + "/v1/chat/completions", + "/v1/messages", + "/v1/chat/completions", + ] diff --git a/tests/integration/providers/test_anthropic_wire.py b/tests/integration/providers/test_anthropic_wire.py index 64160fa85aa..27895440712 100644 --- a/tests/integration/providers/test_anthropic_wire.py +++ b/tests/integration/providers/test_anthropic_wire.py @@ -3,7 +3,6 @@ import uuid from typing import Final import pytest - from integration._support.client import Gateway, eventually, object_value from integration._support.database import read_rows from integration._support.wire import Reply, Request, wire_server @@ -59,3 +58,26 @@ def test_anthropic_tool_history_and_cache_tokens_keep_wire_and_accounting_contra parsed: Final = json.loads(metadata) if isinstance(metadata, str) else object_value(metadata) assert parsed["cost_breakdown"]["input_cost"] == pytest.approx(0.0245) assert parsed["cost_breakdown"]["output_cost"] == pytest.approx(0.008) + + +@pytest.mark.covers("other.provider_wire.anthropic.bare_string_content_item_is_client_error") +@pytest.mark.parametrize( + "text", [pytest.param("what type of file is this?", id="type_word"), pytest.param("hello", id="plain")] +) +def test_anthropic_bare_string_content_item_is_rejected_as_client_error_before_the_wire( + gateway: Gateway, text: str +) -> None: + def respond(request: Request) -> Reply: + raise AssertionError(f"upstream must not be reached: {request.target}") + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model="anthropic/claude-sonnet-4-5-20250929", api_base=wire.url, api_key="synthetic-anthropic-key" + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "max_tokens": 16, "timeout": 5, "messages": [{"role": "system", "content": [text]}]}, + ) + assert response.status_code == 400, response.text + assert wire.drain() == () diff --git a/tests/integration/providers/test_azure_ai_chat_wire.py b/tests/integration/providers/test_azure_ai_chat_wire.py new file mode 100644 index 00000000000..57acb9773b9 --- /dev/null +++ b/tests/integration/providers/test_azure_ai_chat_wire.py @@ -0,0 +1,85 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_BACKEND: Final = "kimi-k2-thinking" +_API_KEY: Final = "synthetic-azure-ai-key" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) +_THINKING_BLOCK: Final[JsonValue] = { + "type": "thinking", + "thinking": "The user wants the sum of 17 and 26.", + "signature": "synthetic-signature", +} +_HISTORY_WITH_ANTHROPIC_FIELDS: Final[JsonValue] = [ + { + "role": "system", + "content": "You are a calculator.", + "cache_control": {"type": "ephemeral"}, + }, + {"role": "user", "content": "What is 17 + 26?"}, + { + "role": "assistant", + "content": "43", + "thinking_blocks": [_THINKING_BLOCK], + "provider_specific_fields": {"citations": None}, + }, + {"role": "user", "content": "And doubled?"}, +] +_HISTORY_AS_OPENAI_SPEC: Final[JsonValue] = [ + {"role": "system", "content": "You are a calculator."}, + {"role": "user", "content": "What is 17 + 26?"}, + {"role": "assistant", "content": "43"}, + {"role": "user", "content": "And doubled?"}, +] + + +def _completion(identity: str) -> bytes: + return json.dumps( + { + "id": identity, + "object": "chat.completion", + "created": 1, + "model": _BACKEND, + "choices": [{"index": 0, "message": {"role": "assistant", "content": "86"}, "finish_reason": "stop"}], + "usage": {"prompt_tokens": 31, "completion_tokens": 2, "total_tokens": 33}, + } + ).encode() + + +@pytest.mark.covers("providers.azure_ai.anthropic_message_fields_are_stripped_before_foundry") +def test_azure_ai_strips_thinking_blocks_and_cache_control_from_forwarded_messages(gateway: Gateway) -> None: + identity: Final = f"azure-ai-strip-{uuid.uuid4().hex}" + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/chat/completions" + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["model"] == _BACKEND + assert body["messages"] == _HISTORY_AS_OPENAI_SPEC + return Reply(body=_completion(identity)) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"azure_ai/{_BACKEND}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": _HISTORY_WITH_ANTHROPIC_FIELDS}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["id"] == identity + assert payload["choices"] == [ + { + "finish_reason": "stop", + "index": 0, + "message": {"role": "assistant", "content": "86"}, + "provider_specific_fields": {}, + } + ] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/chat/completions")] diff --git a/tests/integration/providers/test_azure_ai_flux2_image_wire.py b/tests/integration/providers/test_azure_ai_flux2_image_wire.py new file mode 100644 index 00000000000..59f125463a6 --- /dev/null +++ b/tests/integration/providers/test_azure_ai_flux2_image_wire.py @@ -0,0 +1,48 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_FLEX_MODEL: Final = "azure_ai/FLUX.2-flex" +_PROMPT: Final = "a red fox in the snow" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +@pytest.mark.covers("other.provider_wire.azure_ai.flux2_flex_generation_targets_flex_path_with_bfl_body") +def test_azure_flux2_flex_generation_hits_flex_provider_path_not_pro(gateway: Gateway) -> None: + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/providers/blackforestlabs/v1/flux-2-flex?api-version=preview" + assert request.headers["api-key"] == "synthetic-azure-key" + assert _JSON_OBJECT.validate_json(request.body) == { + "model": "FLUX.2-flex", + "prompt": _PROMPT, + "num_images": 2, + "width": 1536, + "height": 1024, + "guidance": 4.5, + "steps": 32, + } + return Reply(body=json.dumps({"data": [{"b64_json": "aW1n"}, {"b64_json": "aW1n"}]}).encode()) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=_FLEX_MODEL, api_base=wire.url, api_key="synthetic-azure-key", api_version="preview" + ) + response: Final = gateway.request( + "POST", + "/v1/images/generations", + {"model": model, "prompt": _PROMPT, "n": 2, "size": "1536x1024", "guidance": 4.5, "steps": 32}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["data"] == [ + {"url": None, "b64_json": "aW1n", "revised_prompt": None, "provider_specific_fields": None}, + {"url": None, "b64_json": "aW1n", "revised_prompt": None, "provider_specific_fields": None}, + ] + assert [(request.method, request.target) for request in wire.drain()] == [ + ("POST", "/providers/blackforestlabs/v1/flux-2-flex?api-version=preview") + ] diff --git a/tests/integration/providers/test_azure_ai_rerank_auth_wire.py b/tests/integration/providers/test_azure_ai_rerank_auth_wire.py new file mode 100644 index 00000000000..bc700b9a628 --- /dev/null +++ b/tests/integration/providers/test_azure_ai_rerank_auth_wire.py @@ -0,0 +1,46 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +MODEL: Final = "azure_ai/Cohere-rerank-v4.0-fast" +ENTRA_TOKEN: Final = "synthetic-entra-access-token" +QUERY: Final = "which document mentions the gateway" +DOCUMENTS: Final = ("the gateway proxies rerank calls", "unrelated synthetic text") +RESPONSE: Final = json.dumps( + { + "id": "synthetic-rerank-id", + "results": [{"index": 0, "relevance_score": 0.91}, {"index": 1, "relevance_score": 0.03}], + "meta": {"api_version": {"version": "2"}, "billed_units": {"search_units": 1}}, + } +).encode() + + +def entra_rerank_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/providers/cohere/v2/rerank" + assert request.headers["authorization"] == f"Bearer {ENTRA_TOKEN}" + assert "api-key" not in request.headers + body: Final = json.loads(request.body) + assert body == {"model": "Cohere-rerank-v4.0-fast", "query": QUERY, "documents": list(DOCUMENTS), "top_n": 2} + return Reply(body=RESPONSE) + + +@pytest.mark.covers("other.provider_wire.azure_ai.rerank_entra_token_without_api_key_reaches_provider") +def test_azure_ai_rerank_with_entra_token_and_no_api_key_sends_bearer_to_provider(gateway: Gateway) -> None: + with wire_server(entra_rerank_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, + api_key=None, + api_base=f"{wire.url}/providers/cohere/v2", + azure_ad_token=ENTRA_TOKEN, + model_info={"mode": "rerank"}, + ) + response: Final = gateway.request( + "POST", "/v1/rerank", {"model": model, "query": QUERY, "documents": list(DOCUMENTS), "top_n": 2} + ) + assert response.status_code == 200, response.text + body: Final = response.json() + assert [(result["index"], result["relevance_score"]) for result in body["results"]] == [(0, 0.91), (1, 0.03)] + assert len(wire.drain()) == 1, "Expected exactly one provider rerank call" diff --git a/tests/integration/providers/test_bedrock_auth_wire.py b/tests/integration/providers/test_bedrock_auth_wire.py index bd24dc171ba..0dc2dfbf581 100644 --- a/tests/integration/providers/test_bedrock_auth_wire.py +++ b/tests/integration/providers/test_bedrock_auth_wire.py @@ -7,18 +7,22 @@ from typing import Final import pytest import yaml - from integration._support.client import Gateway from integration._support.process import owned_proxy from integration._support.wire import Reply, Request, wire_server MODEL: Final = "bedrock/converse/anthropic.claude-3-haiku-20240307-v1:0" TOKEN: Final = "synthetic-bedrock-bearer" -RESPONSE: Final = json.dumps({ - "output": {"message": {"role": "assistant", "content": [{"text": "bedrock wire control"}]}}, - "stopReason": "end_turn", "usage": {"inputTokens": 11, "outputTokens": 4, "totalTokens": 15}, - "metrics": {"latencyMs": 1}, -}).encode() +ACCESS_KEY: Final = "AKIAINTEGRATION000002" +CLIENT_OAUTH_TOKEN: Final = "Bearer sk-ant-oat01-synthetic-client-subscription-token" +RESPONSE: Final = json.dumps( + { + "output": {"message": {"role": "assistant", "content": [{"text": "bedrock wire control"}]}}, + "stopReason": "end_turn", + "usage": {"inputTokens": 11, "outputTokens": 4, "totalTokens": 15}, + "metrics": {"latencyMs": 1}, + } +).encode() def bearer_peer(request: Request) -> Reply: @@ -34,31 +38,58 @@ def bearer_peer(request: Request) -> Reply: @pytest.mark.covers("other.provider_wire.bedrock.bearer_sdk_skips_credential_chain") -async def test_bearer_only_sdk_sync_async_requests_do_not_require_aws_credentials(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None: +async def test_bearer_only_sdk_sync_async_requests_do_not_require_aws_credentials( + monkeypatch: pytest.MonkeyPatch, tmp_path: Path +) -> None: import litellm empty: Final = tmp_path / "empty-aws-config" empty.write_text("") for name in tuple(name for name in os.environ if name.startswith("AWS_")): monkeypatch.delenv(name, raising=False) - for name, value in {"AWS_CONFIG_FILE": str(empty), "AWS_SHARED_CREDENTIALS_FILE": str(empty), "AWS_EC2_METADATA_DISABLED": "true", "LITELLM_RUST": "false"}.items(): + for name, value in { + "AWS_CONFIG_FILE": str(empty), + "AWS_SHARED_CREDENTIALS_FILE": str(empty), + "AWS_EC2_METADATA_DISABLED": "true", + "LITELLM_RUST": "false", + }.items(): monkeypatch.setenv(name, value) with wire_server(bearer_peer) as wire: with pytest.raises(litellm.APIConnectionError, match=r"config profile .* could not be found"): - await asyncio.to_thread(litellm.completion, model=MODEL, aws_profile_name="integration-profile-must-not-be-read", aws_region_name="us-east-1", aws_bedrock_runtime_endpoint=wire.url, messages=[{"role": "user", "content": "synthetic credential control"}], timeout=5, num_retries=0) + await asyncio.to_thread( + litellm.completion, + model=MODEL, + aws_profile_name="integration-profile-must-not-be-read", + aws_region_name="us-east-1", + aws_bedrock_runtime_endpoint=wire.url, + messages=[{"role": "user", "content": "synthetic credential control"}], + timeout=5, + num_retries=0, + ) assert wire.drain() == () for source in ("argument", "environment"): if source == "environment": monkeypatch.setenv("AWS_BEARER_TOKEN_BEDROCK", TOKEN) parameters: Final = { - "model": MODEL, "api_key": TOKEN if source == "argument" else None, - "aws_region_name": "us-east-1", "aws_profile_name": "integration-profile-must-not-be-read", - "aws_bedrock_runtime_endpoint": wire.url, "timeout": 5, "num_retries": 0, - "messages": [{"role": "system", "content": "synthetic system"}, {"role": "user", "content": "synthetic bearer request"}], + "model": MODEL, + "api_key": TOKEN if source == "argument" else None, + "aws_region_name": "us-east-1", + "aws_profile_name": "integration-profile-must-not-be-read", + "aws_bedrock_runtime_endpoint": wire.url, + "timeout": 5, + "num_retries": 0, + "messages": [ + {"role": "system", "content": "synthetic system"}, + {"role": "user", "content": "synthetic bearer request"}, + ], "max_tokens": 16, } for asynchronous in (False, True): - result: Final = await litellm.acompletion(**parameters) if asynchronous else await asyncio.to_thread(litellm.completion, **parameters) + result: Final = ( + await litellm.acompletion(**parameters) + if asynchronous + else await asyncio.to_thread(litellm.completion, **parameters) + ) assert result.choices[0].message.content == "bedrock wire control" assert result.choices[0].finish_reason == "stop" assert result.usage.prompt_tokens == 11 and result.usage.completion_tokens == 4 @@ -66,28 +97,57 @@ async def test_bearer_only_sdk_sync_async_requests_do_not_require_aws_credential @pytest.mark.covers("other.provider_wire.bedrock.bearer_db_yaml_survives_reload") -def test_bearer_environment_reference_loads_from_db_and_yaml_and_survives_reload(gateway: Gateway, tmp_path: Path) -> None: +def test_bearer_environment_reference_loads_from_db_and_yaml_and_survives_reload( + gateway: Gateway, tmp_path: Path +) -> None: empty: Final = tmp_path / "empty-aws-config" empty.write_text("") with wire_server(bearer_peer) as wire: parameters: Final = { - "model": MODEL, "api_key": "os.environ/INTEGRATION_BEARER_TOKEN", "aws_region_name": "us-east-1", - "aws_profile_name": "integration-profile-must-not-be-read", "aws_bedrock_runtime_endpoint": wire.url, + "model": MODEL, + "api_key": "os.environ/INTEGRATION_BEARER_TOKEN", + "aws_region_name": "us-east-1", + "aws_profile_name": "integration-profile-must-not-be-read", + "aws_bedrock_runtime_endpoint": wire.url, } alias: Final = f"integration-yaml-{uuid.uuid4().hex}" configuration: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) configuration["model_list"] = [{"model_name": alias, "litellm_params": parameters, "model_info": {"id": alias}}] path: Final = tmp_path / "bedrock.yaml" path.write_text(yaml.safe_dump(configuration)) - overrides: Final = {"INTEGRATION_BEARER_TOKEN": TOKEN, "AWS_CONFIG_FILE": str(empty), "AWS_SHARED_CREDENTIALS_FILE": str(empty), "AWS_EC2_METADATA_DISABLED": "true", "LITELLM_RUST": "false"} - with owned_proxy(gateway, tmp_path, overrides, config=path, remove_environment=tuple(name for name in os.environ if name.startswith("AWS_"))) as candidate, candidate.scenario() as scenario: + overrides: Final = { + "INTEGRATION_BEARER_TOKEN": TOKEN, + "AWS_CONFIG_FILE": str(empty), + "AWS_SHARED_CREDENTIALS_FILE": str(empty), + "AWS_EC2_METADATA_DISABLED": "true", + "LITELLM_RUST": "false", + } + with ( + owned_proxy( + gateway, + tmp_path, + overrides, + config=path, + remove_environment=tuple(name for name in os.environ if name.startswith("AWS_")), + ) as candidate, + candidate.scenario() as scenario, + ): database_model: Final = scenario.model(**parameters) for generation in range(2): for model in (alias, database_model): - response: Final = candidate.request("POST", "/v1/chat/completions", { - "model": model, "messages": [{"role": "system", "content": "synthetic system"}, {"role": "user", "content": "synthetic bearer request"}], - "max_tokens": 16, "cache": {"no-cache": True}, - }) + response: Final = candidate.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [ + {"role": "system", "content": "synthetic system"}, + {"role": "user", "content": "synthetic bearer request"}, + ], + "max_tokens": 16, + "cache": {"no-cache": True}, + }, + ) assert response.status_code == 200, response.text assert response.json()["choices"][0]["message"]["content"] == "bedrock wire control" assert response.json()["usage"]["total_tokens"] == 15 @@ -95,5 +155,61 @@ def test_bearer_environment_reference_loads_from_db_and_yaml_and_survives_reload if generation == 0: entries: Final = candidate.get("/model/info")["data"] target: Final = next(entry for entry in entries if entry["model_name"] == database_model) - response: Final = candidate.request("PATCH", f"/model/{target['model_info']['id']}/update", {"model_info": {"description": "bearer reload"}}) + response: Final = candidate.request( + "PATCH", + f"/model/{target['model_info']['id']}/update", + {"model_info": {"description": "bearer reload"}}, + ) assert response.status_code == 200, response.text + + +INVOKE_MODEL: Final = "bedrock/invoke/anthropic.claude-3-haiku-20240307-v1:0" +INVOKE_RESPONSE: Final = json.dumps( + { + "id": "msg_synthetic", + "type": "message", + "role": "assistant", + "model": "anthropic.claude-3-haiku-20240307-v1:0", + "content": [{"type": "text", "text": "bedrock invoke wire control"}], + "stop_reason": "end_turn", + "stop_sequence": None, + "usage": {"input_tokens": 11, "output_tokens": 4}, + } +).encode() + + +def sigv4_invoke_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/model/anthropic.claude-3-haiku-20240307-v1:0/invoke" + assert request.headers["authorization"].startswith(f"AWS4-HMAC-SHA256 Credential={ACCESS_KEY}/"), dict( + request.headers + ) + assert CLIENT_OAUTH_TOKEN not in request.headers.values(), dict(request.headers) + assert json.loads(request.body)["messages"] == [{"role": "user", "content": "synthetic oauth isolation request"}] + return Reply(body=INVOKE_RESPONSE) + + +@pytest.mark.covers("providers.bedrock_auth.client_anthropic_oauth_token_never_replaces_sigv4_authorization") +def test_client_anthropic_oauth_authorization_header_does_not_replace_bedrock_sigv4_signature(gateway: Gateway) -> None: + with wire_server(sigv4_invoke_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=INVOKE_MODEL, + api_key=None, + aws_access_key_id=ACCESS_KEY, + aws_secret_access_key="synthetic-secret-key-for-testing", + aws_region_name="us-east-1", + aws_bedrock_runtime_endpoint=wire.url, + api_base=wire.url, + ) + response: Final = gateway.request( + "POST", + "/v1/messages", + { + "model": model, + "messages": [{"role": "user", "content": "synthetic oauth isolation request"}], + "max_tokens": 16, + }, + headers={"Authorization": CLIENT_OAUTH_TOKEN, "x-litellm-api-key": f"Bearer {gateway.key}"}, + ) + assert response.status_code == 200, response.text + assert response.json()["content"] == [{"type": "text", "text": "bedrock invoke wire control"}], response.text + assert len(wire.drain()) == 1, response.text diff --git a/tests/integration/providers/test_bedrock_batch_files_wire.py b/tests/integration/providers/test_bedrock_batch_files_wire.py new file mode 100644 index 00000000000..1a834fc2f8c --- /dev/null +++ b/tests/integration/providers/test_bedrock_batch_files_wire.py @@ -0,0 +1,78 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +MODEL: Final = "bedrock/anthropic.claude-3-haiku-20240307-v1:0" +BUCKET: Final = "integration-batch-bucket" +PROMPT: Final = "synthetic completions prompt" +RESPONSES_INPUT: Final = "synthetic responses input" +INPUT_LINES: Final = ( + { + "custom_id": "completions-record", + "method": "POST", + "url": "/v1/completions", + "body": {"model": MODEL, "prompt": PROMPT, "max_tokens": 64}, + }, + { + "custom_id": "responses-record", + "method": "POST", + "url": "/v1/responses", + "body": {"model": MODEL, "input": RESPONSES_INPUT, "max_output_tokens": 16}, + }, +) +EXPECTED_S3_OBJECT: Final = ( + { + "recordId": "completions-record", + "modelInput": { + "messages": [{"role": "user", "content": [{"type": "text", "text": PROMPT}]}], + "max_tokens": 64, + "anthropic_version": "bedrock-2023-05-31", + }, + }, + { + "recordId": "responses-record", + "modelInput": { + "messages": [{"role": "user", "content": [{"type": "text", "text": RESPONSES_INPUT}]}], + "max_tokens": 16, + "anthropic_version": "bedrock-2023-05-31", + }, + }, +) + + +def s3_peer(request: Request) -> Reply: + assert request.method == "PUT" and request.target.startswith(f"/{BUCKET}/"), request.target + assert request.headers["authorization"].startswith("AWS4-HMAC-SHA256 ") + return Reply(body=b"") + + +@pytest.mark.covers( + "other.provider_wire.bedrock.batch_file_completions_and_responses_records_reach_s3_as_user_messages" +) +def test_completions_and_responses_batch_records_upload_as_anthropic_user_messages(gateway: Gateway) -> None: + with wire_server(s3_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, + api_key=None, + api_base=None, + aws_access_key_id="AKIAIOSFODNN7EXAMPLE", + aws_secret_access_key="wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY", + aws_region_name="us-east-1", + s3_bucket_name=BUCKET, + s3_endpoint_url=wire.url, + ) + jsonl: Final = "\n".join(json.dumps(line, separators=(",", ":")) for line in INPUT_LINES) + "\n" + response: Final = gateway.request_multipart( + "/v1/files", + {"purpose": "batch", "model": model}, + {"file": ("in.jsonl", jsonl.encode(), "application/jsonl")}, + ) + assert response.status_code == 200, response.text + assert response.json()["object"] == "file" and response.json()["purpose"] == "batch", response.text + uploads: Final = wire.drain() + assert len(uploads) == 1, f"Expected exactly one S3 PUT, saw {[upload.target for upload in uploads]}" + stored: Final = tuple(json.loads(line) for line in uploads[0].body.decode().splitlines() if line.strip()) + assert stored == EXPECTED_S3_OBJECT diff --git a/tests/integration/providers/test_bedrock_claude_thinking_wire.py b/tests/integration/providers/test_bedrock_claude_thinking_wire.py new file mode 100644 index 00000000000..d3673a55660 --- /dev/null +++ b/tests/integration/providers/test_bedrock_claude_thinking_wire.py @@ -0,0 +1,60 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +MODEL: Final = "bedrock/invoke/us.anthropic.claude-opus-4-8" +TOKEN: Final = "synthetic-bedrock-bearer" +RESPONSE: Final = json.dumps( + { + "id": "msg_adaptive_control", + "type": "message", + "role": "assistant", + "model": "us.anthropic.claude-opus-4-8", + "content": [{"type": "text", "text": "adaptive thinking control"}], + "stop_reason": "end_turn", + "stop_sequence": None, + "usage": {"input_tokens": 12, "output_tokens": 5}, + } +).encode() + + +def adaptive_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/model/us.anthropic.claude-opus-4-8/invoke" + assert request.headers["authorization"] == f"Bearer {TOKEN}" + body: Final = json.loads(request.body) + assert body["messages"] == [{"role": "user", "content": [{"type": "text", "text": "synthetic effort request"}]}] + assert body["thinking"]["type"] == "adaptive", body + assert body["output_config"] == {"effort": "high"}, body + assert "budget_tokens" not in json.dumps(body), body + return Reply(body=RESPONSE) + + +@pytest.mark.covers("other.provider_wire.bedrock.prefixed_opus_4_8_reasoning_effort_sends_adaptive_thinking") +def test_prefixed_opus_4_8_reasoning_effort_reaches_bedrock_as_adaptive_thinking_not_budget_tokens( + gateway: Gateway, +) -> None: + with wire_server(adaptive_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, + api_key=TOKEN, + aws_region_name="us-east-1", + api_base=wire.url, + aws_bedrock_runtime_endpoint=wire.url, + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": "synthetic effort request"}], + "max_tokens": 4096, + "reasoning_effort": "high", + }, + ) + assert response.status_code == 200, response.text + assert response.json()["choices"][0]["message"]["content"] == "adaptive thinking control" + assert response.json()["usage"]["prompt_tokens"] == 12 and response.json()["usage"]["completion_tokens"] == 5 + assert len(wire.drain()) == 1 diff --git a/tests/integration/providers/test_bedrock_converse_config_blocks_wire.py b/tests/integration/providers/test_bedrock_converse_config_blocks_wire.py new file mode 100644 index 00000000000..239236bb29d --- /dev/null +++ b/tests/integration/providers/test_bedrock_converse_config_blocks_wire.py @@ -0,0 +1,46 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from integration.providers.test_bedrock_auth_wire import MODEL, RESPONSE, TOKEN + +GUARDRAIL: Final = {"guardrailIdentifier": "integration-guardrail", "guardrailVersion": "DRAFT", "trace": "enabled"} +PERFORMANCE: Final = {"latency": "optimized"} + + +def converse_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/model/anthropic.claude-3-haiku-20240307-v1%3A0/converse" + body: Final = json.loads(request.body) + assert body["inferenceConfig"] == {"maxTokens": 16, "temperature": 0.2}, body + assert body["guardrailConfig"] == GUARDRAIL, body + assert body["performanceConfig"] == PERFORMANCE, body + return Reply(body=RESPONSE) + + +@pytest.mark.covers("other.provider_wire.bedrock.converse_config_blocks_sent_once_at_top_level") +def test_guardrail_and_performance_config_are_not_duplicated_inside_inference_config(gateway: Gateway) -> None: + with wire_server(converse_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, + api_key=TOKEN, + aws_region_name="us-east-1", + aws_bedrock_runtime_endpoint=wire.url, + guardrailConfig=GUARDRAIL, + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": "synthetic guardrail request"}], + "max_tokens": 16, + "temperature": 0.2, + "performanceConfig": PERFORMANCE, + "cache": {"no-cache": True}, + }, + ) + assert response.status_code == 200, response.text + assert response.json()["choices"][0]["message"]["content"] == "bedrock wire control" + assert len(wire.drain()) == 1, response.text diff --git a/tests/integration/providers/test_bedrock_embedding_wire.py b/tests/integration/providers/test_bedrock_embedding_wire.py new file mode 100644 index 00000000000..40eb0fe2a70 --- /dev/null +++ b/tests/integration/providers/test_bedrock_embedding_wire.py @@ -0,0 +1,58 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +MODEL: Final = "bedrock/cohere.embed-english-v3" +TOKEN: Final = "synthetic-bedrock-bearer" +INPUT: Final = "hello world" +VECTOR: Final = [0.1, 0.2, 0.3] +RESPONSE: Final = json.dumps( + { + "embeddings": {"float": [VECTOR]}, + "id": "synthetic-cohere-embed", + "response_type": "embeddings_by_type", + "texts": [INPUT], + } +).encode() + + +def cohere_english_v3_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/model/cohere.embed-english-v3/invoke" + assert request.headers["authorization"] == f"Bearer {TOKEN}" + assert json.loads(request.body) == { + "texts": [INPUT], + "input_type": "search_document", + "embedding_types": ["float"], + "output_dimension": 512, + } + return Reply(body=RESPONSE) + + +@pytest.mark.covers("other.provider_wire.bedrock.cohere_embed_english_v3_accepts_encoding_format") +def test_cohere_embed_english_v3_accepts_encoding_format_and_dimensions(gateway: Gateway) -> None: + with wire_server(cohere_english_v3_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, + api_key=TOKEN, + api_base=wire.url, + aws_region_name="us-east-1", + ) + for encoding_format in ("float", "base64"): + response: Final = gateway.request( + "POST", + "/v1/embeddings", + { + "model": model, + "input": INPUT, + "encoding_format": encoding_format, + "dimensions": 512, + }, + ) + assert response.status_code == 200, f"encoding_format={encoding_format}: {response.text}" + assert response.json()["data"] == [ + {"object": "embedding", "index": 0, "embedding": VECTOR, "type": "float"}, + ], response.text + assert len(wire.drain()) == 1, f"encoding_format={encoding_format} never reached Bedrock" diff --git a/tests/integration/providers/test_bedrock_gpt5_reasoning_wire.py b/tests/integration/providers/test_bedrock_gpt5_reasoning_wire.py new file mode 100644 index 00000000000..d69c05ad1b1 --- /dev/null +++ b/tests/integration/providers/test_bedrock_gpt5_reasoning_wire.py @@ -0,0 +1,50 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +MODEL: Final = "bedrock/converse/us.openai.gpt-5.6-sol" +TOKEN: Final = "synthetic-bedrock-bearer" +RESPONSE: Final = json.dumps( + { + "output": {"message": {"role": "assistant", "content": [{"text": "gpt-5 reasoning wire control"}]}}, + "stopReason": "end_turn", + "usage": {"inputTokens": 9, "outputTokens": 5, "totalTokens": 14}, + "metrics": {"latencyMs": 1}, + } +).encode() + + +def gpt5_converse_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/model/us.openai.gpt-5.6-sol/converse" + assert request.headers["authorization"] == f"Bearer {TOKEN}" + body: Final = json.loads(request.body) + assert body["messages"] == [{"role": "user", "content": [{"text": "synthetic reasoning request"}]}] + assert body["additionalModelRequestFields"] == {"reasoning": {"effort": "high"}}, body + assert body["inferenceConfig"] == {"maxTokens": 16}, body + return Reply(body=RESPONSE) + + +@pytest.mark.covers("providers.bedrock_converse.gpt5_reasoning_effort_reaches_provider_as_reasoning_effort") +def test_gpt5_reasoning_effort_is_accepted_and_sent_as_converse_reasoning_effort(gateway: Gateway) -> None: + with wire_server(gpt5_converse_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, api_key=TOKEN, aws_region_name="us-east-1", aws_bedrock_runtime_endpoint=wire.url + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": "synthetic reasoning request"}], + "reasoning_effort": "high", + "max_tokens": 16, + "cache": {"no-cache": True}, + }, + ) + assert response.status_code == 200, response.text + assert response.json()["choices"][0]["message"]["content"] == "gpt-5 reasoning wire control", response.text + assert response.json()["usage"]["total_tokens"] == 14, response.text + assert len(wire.drain()) == 1 diff --git a/tests/integration/providers/test_bedrock_invoke_tool_search_wire.py b/tests/integration/providers/test_bedrock_invoke_tool_search_wire.py new file mode 100644 index 00000000000..3806787ed95 --- /dev/null +++ b/tests/integration/providers/test_bedrock_invoke_tool_search_wire.py @@ -0,0 +1,88 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +MODEL_ID: Final = "us.anthropic.claude-sonnet-5" +TOKEN: Final = "synthetic-bedrock-bearer" +TOOL_SEARCH_TOOL: Final = {"type": "tool_search_tool_regex_20251119", "name": "tool_search_tool_regex"} +DEFERRED_TOOL: Final = { + "name": "get_weather", + "description": "Weather lookup", + "input_schema": {"type": "object", "properties": {"city": {"type": "string"}}, "required": ["city"]}, + "defer_loading": True, +} +RESPONSE: Final = json.dumps( + { + "id": "msg_tool_search_control", + "type": "message", + "role": "assistant", + "model": MODEL_ID, + "content": [ + { + "type": "server_tool_use", + "id": "srvtoolu_control", + "name": "tool_search_tool_regex", + "input": {"pattern": "weather"}, + }, + { + "type": "tool_search_tool_result", + "tool_use_id": "srvtoolu_control", + "content": { + "type": "tool_search_tool_search_result", + "tool_references": [{"type": "tool_reference", "tool_name": "get_weather"}], + }, + }, + {"type": "text", "text": "tool search wire control"}, + ], + "stop_reason": "end_turn", + "stop_sequence": None, + "usage": {"input_tokens": 12, "output_tokens": 6}, + } +).encode() + + +def tool_search_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == f"/model/{MODEL_ID}/invoke", request.target + assert request.headers["authorization"] == f"Bearer {TOKEN}" + body: Final = json.loads(request.body) + assert body["anthropic_beta"] == ["tool-search-tool-2025-10-19"], body + assert body["messages"] == [{"role": "user", "content": "find the weather tool"}] + assert body["tools"] == [TOOL_SEARCH_TOOL, DEFERRED_TOOL], body["tools"] + assert body["max_tokens"] == 64 + assert "model" not in body + return Reply(body=RESPONSE) + + +@pytest.mark.covers("providers.bedrock_invoke.tool_search_gen5_claude_sends_bedrock_beta_and_reports_support") +def test_gen5_claude_bedrock_invoke_messages_tool_search_sends_bedrock_beta_field(gateway: Gateway) -> None: + with wire_server(tool_search_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=f"bedrock/invoke/{MODEL_ID}", + api_key=TOKEN, + aws_region_name="us-east-1", + api_base=wire.url, + ) + response: Final = gateway.request( + "POST", + "/v1/messages", + { + "model": model, + "max_tokens": 64, + "messages": [{"role": "user", "content": "find the weather tool"}], + "tools": [TOOL_SEARCH_TOOL, DEFERRED_TOOL], + }, + ) + assert response.status_code == 200, response.text + body: Final = response.json() + assert body["content"][2] == {"type": "text", "text": "tool search wire control"}, response.text + assert body["stop_reason"] == "end_turn" + assert body["usage"]["input_tokens"] == 12 and body["usage"]["output_tokens"] == 6 + assert len(wire.drain()) == 1 + entries: Final = gateway.get("/v1/model/info")["data"] + assert isinstance(entries, list) + info: Final = next(entry for entry in entries if isinstance(entry, dict) and entry["model_name"] == model) + assert isinstance(info["model_info"], dict) + assert info["model_info"]["supports_tool_search"] is True, info["model_info"] diff --git a/tests/integration/providers/test_bedrock_mantle_codex_input_wire.py b/tests/integration/providers/test_bedrock_mantle_codex_input_wire.py new file mode 100644 index 00000000000..bb7961160dc --- /dev/null +++ b/tests/integration/providers/test_bedrock_mantle_codex_input_wire.py @@ -0,0 +1,88 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +MODEL: Final = "bedrock_mantle/openai.gpt-5.6-sol" +TOKEN: Final = "synthetic-mantle-bearer" +CIPHERTEXT: Final = "synthetic-compaction-ciphertext" +CALL_ID: Final = "call_synthetic_shell" +JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) +ACTION: Final[dict[str, JsonValue]] = {"type": "exec", "command": ["ls", "-la"], "timeout_ms": 1000} +RESPONSE: Final = json.dumps( + { + "id": "resp_synthetic_mantle", + "object": "response", + "created_at": 1789788253, + "status": "completed", + "model": "openai.gpt-5.6-sol", + "output": [ + { + "type": "message", + "id": "msg_synthetic_mantle", + "status": "completed", + "role": "assistant", + "content": [{"type": "output_text", "text": "mantle wire control", "annotations": []}], + } + ], + "usage": {"input_tokens": 21, "output_tokens": 4, "total_tokens": 25}, + } +).encode() + + +def user_turn(text: str) -> JsonValue: + return {"type": "message", "role": "user", "content": [{"type": "input_text", "text": text}]} + + +def codex_history(marker: str) -> tuple[JsonValue, ...]: + return ( + user_turn(f"first turn {marker}"), + {"type": "agent_message", "role": "assistant", "content": [{"type": "output_text", "text": "sub-agent reply"}]}, + {"type": "context_compaction", "encrypted_content": CIPHERTEXT}, + {"type": "local_shell_call", "call_id": CALL_ID, "status": "completed", "action": ACTION}, + {"type": "function_call_output", "call_id": CALL_ID, "output": "synthetic shell output"}, + user_turn(f"next turn {marker}"), + ) + + +def mantle_history(marker: str) -> tuple[JsonValue, ...]: + return ( + user_turn(f"first turn {marker}"), + {"type": "message", "role": "assistant", "content": [{"type": "output_text", "text": "sub-agent reply"}]}, + {"type": "compaction", "encrypted_content": CIPHERTEXT}, + {"type": "function_call", "call_id": CALL_ID, "name": "local_shell", "arguments": json.dumps(ACTION)}, + {"type": "function_call_output", "call_id": CALL_ID, "output": "synthetic shell output"}, + user_turn(f"next turn {marker}"), + ) + + +@pytest.mark.covers("other.provider_wire.bedrock_mantle.codex_history_items_reach_mantle_as_supported_types") +def test_codex_agent_message_context_compaction_and_local_shell_call_reach_mantle_as_supported_items( + gateway: Gateway, +) -> None: + marker: Final = uuid.uuid4().hex + expected_input: Final = list(mantle_history(marker)) + + def mantle_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/openai/v1/responses", request.target + assert request.headers["authorization"] == f"Bearer {TOKEN}" + body: Final = JSON_OBJECT.validate_json(request.body) + assert body["model"] == "openai.gpt-5.6-sol", body + assert body["input"] == expected_input, body["input"] + return Reply(body=RESPONSE) + + with wire_server(mantle_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=MODEL, api_key=TOKEN, api_base=wire.url, aws_region_name="us-east-2") + response: Final = gateway.request( + "POST", "/v1/responses", {"model": model, "input": list(codex_history(marker)), "store": False} + ) + assert response.status_code == 200, response.text + assert response.json()["output"][0]["content"][0]["text"] == "mantle wire control", response.text + assert response.json()["usage"]["total_tokens"] == 25, response.text + forwarded: Final = wire.drain() + assert len(forwarded) == 1, forwarded + assert JSON_OBJECT.validate_json(forwarded[0].body)["input"] == expected_input, forwarded[0].body diff --git a/tests/integration/providers/test_bedrock_mantle_responses_wire.py b/tests/integration/providers/test_bedrock_mantle_responses_wire.py new file mode 100644 index 00000000000..9bc6f83f8e4 --- /dev/null +++ b/tests/integration/providers/test_bedrock_mantle_responses_wire.py @@ -0,0 +1,106 @@ +import json +from collections.abc import Callable +from typing import Final +from uuid import uuid4 + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_MODEL: Final = "bedrock_mantle/openai.gpt-5.6-sol" +_TOKEN: Final = "synthetic-mantle-bearer" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) +_SHELL_ACTION: Final[dict[str, JsonValue]] = {"type": "exec", "command": ["ls", "-la"], "timeout_ms": 1000} +_OUTPUT_MESSAGE: Final[dict[str, JsonValue]] = { + "type": "message", + "id": "msg_mantle", + "status": "completed", + "role": "assistant", + "content": [{"type": "output_text", "text": "mantle wire control", "annotations": []}], +} +_RESPONSE: Final = json.dumps( + { + "id": "resp_mantle", + "object": "response", + "status": "completed", + "created_at": 1700000000, + "model": "gpt-5.6-sol", + "output": [_OUTPUT_MESSAGE], + "usage": { + "input_tokens": 11, + "output_tokens": 4, + "total_tokens": 15, + "input_tokens_details": {"cached_tokens": 0}, + "output_tokens_details": {"reasoning_tokens": 0}, + }, + } +).encode() + + +def _codex_history(marker: str) -> list[JsonValue]: + return [ + {"type": "message", "role": "user", "content": f"delegate to a subagent {marker}"}, + { + "type": "agent_message", + "id": "msg_agent", + "content": [{"type": "text", "text": "sub-agent said "}, {"type": "text", "encrypted_content": "hello"}], + }, + {"type": "context_compaction", "id": "cmp_1", "encrypted_content": "compacted-history"}, + { + "type": "local_shell_call", + "id": "lsc_1", + "call_id": "call_shell", + "status": "completed", + "action": _SHELL_ACTION, + }, + {"type": "function_call_output", "call_id": "call_shell", "output": "total 0"}, + ] + + +def _mantle_history(marker: str) -> list[JsonValue]: + return [ + {"type": "message", "role": "user", "content": f"delegate to a subagent {marker}"}, + {"type": "message", "role": "assistant", "content": [{"type": "output_text", "text": "sub-agent said hello"}]}, + {"type": "compaction", "encrypted_content": "compacted-history"}, + { + "type": "function_call", + "call_id": "call_shell", + "name": "local_shell", + "arguments": json.dumps(_SHELL_ACTION), + }, + {"type": "function_call_output", "call_id": "call_shell", "output": "total 0"}, + ] + + +def _mantle_peer(marker: str) -> Callable[[Request], Reply]: + def respond(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/openai/v1/responses", request.target + assert request.headers["authorization"] == f"Bearer {_TOKEN}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["input"] == _mantle_history(marker), json.dumps(body["input"]) + return Reply(body=_RESPONSE) + + return respond + + +@pytest.mark.covers("providers.bedrock_mantle.codex_history_items_reach_the_wire_as_supported_input_items") +def test_codex_agent_message_compaction_and_local_shell_items_are_rewritten_for_mantle(gateway: Gateway) -> None: + marker: Final = uuid4().hex + with wire_server(_mantle_peer(marker)) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=_MODEL, api_base=wire.url, api_key=_TOKEN, aws_region_name="us-east-1") + response: Final = gateway.request( + "POST", "/v1/responses", {"model": model, "input": _codex_history(marker), "stream": False} + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["output"] == [ + { + **_OUTPUT_MESSAGE, + "phase": None, + "content": [ + {"type": "output_text", "text": "mantle wire control", "annotations": [], "logprobs": None} + ], + } + ], response.text + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/openai/v1/responses")] diff --git a/tests/integration/providers/test_bedrock_mantle_wire.py b/tests/integration/providers/test_bedrock_mantle_wire.py new file mode 100644 index 00000000000..48cd0d770aa --- /dev/null +++ b/tests/integration/providers/test_bedrock_mantle_wire.py @@ -0,0 +1,53 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_BACKEND: Final = "openai.gpt-5.6-sol" +_API_KEY: Final = "synthetic-mantle-bearer" +_PROMPT: Final = "synthetic long conversation control" +_PROMPT_TOKENS: Final = 1055489 +_MODEL_MAXIMUM: Final = 1050000 +_RESPONSES_PATH: Final = "/openai/v1/responses" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) +_OVERFLOW_BODY: Final = json.dumps( + { + "error": { + "code": "validation_error", + "message": f"prompt tokens ({_PROMPT_TOKENS}) exceed model maximum ({_MODEL_MAXIMUM}) for {_BACKEND}", + "type": "invalid_request_error", + } + } +).encode() + + +def _overflow_peer(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == _RESPONSES_PATH + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["model"] == _BACKEND + assert _PROMPT in json.dumps(body["input"]), body + return Reply(status=400, body=_OVERFLOW_BODY) + + +@pytest.mark.covers("other.provider_wire.bedrock_mantle.context_overflow_is_reported_as_prompt_too_long") +def test_bedrock_mantle_context_overflow_returns_400_saying_prompt_is_too_long(gateway: Gateway) -> None: + with wire_server(_overflow_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"bedrock_mantle/{_BACKEND}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _PROMPT}]}, + ) + assert response.status_code == 400, response.text + error: Final = _JSON_OBJECT.validate_json(response.content)["error"] + assert isinstance(error, dict), response.text + assert error["code"] == "400", response.text + message: Final = error["message"] + assert isinstance(message, str), response.text + assert f"prompt is too long: {_PROMPT_TOKENS} tokens > {_MODEL_MAXIMUM} maximum" in message, response.text + assert [(request.method, request.target) for request in wire.drain()] == [("POST", _RESPONSES_PATH)] diff --git a/tests/integration/providers/test_bedrock_messages_web_search_replay_wire.py b/tests/integration/providers/test_bedrock_messages_web_search_replay_wire.py new file mode 100644 index 00000000000..2b10d6f420c --- /dev/null +++ b/tests/integration/providers/test_bedrock_messages_web_search_replay_wire.py @@ -0,0 +1,88 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + +BEDROCK_MODEL: Final = "us.anthropic.claude-opus-5-v1:0" +TOKEN: Final = "synthetic-bedrock-bearer" +SNIPPET: Final = "synthetic snippet about the integration harness" +INTERCEPTED_TURN: Final = ( + {"type": "server_tool_use", "id": "srvtoolu_synthetic", "name": "web_search", "input": {"query": "harness docs"}}, + { + "type": "web_search_tool_result", + "tool_use_id": "srvtoolu_synthetic", + "content": [ + { + "type": "web_search_result", + "url": "https://example.test/harness", + "title": "Harness", + "page_age": None, + "encrypted_content": "", + "snippet": SNIPPET, + }, + ], + }, + {"type": "text", "text": "The harness is documented at example.test"}, +) +FLATTENED_TURN: Final = ( + { + "type": "text", + "text": f"Web search results for 'harness docs':\n\nTitle: Harness\nURL: https://example.test/harness\nSnippet: {SNIPPET}", + }, + {"type": "text", "text": "The harness is documented at example.test"}, +) +REPLY: Final = json.dumps( + { + "id": "msg_synthetic_replay", + "type": "message", + "role": "assistant", + "model": BEDROCK_MODEL, + "content": [{"type": "text", "text": "replay accepted"}], + "stop_reason": "end_turn", + "stop_sequence": None, + "usage": {"input_tokens": 30, "output_tokens": 3}, + } +).encode() + + +def bedrock_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == f"/model/{BEDROCK_MODEL}/invoke" + assert request.headers["authorization"] == f"Bearer {TOKEN}" + body: Final = json.loads(request.body) + assert body["messages"] == [ + {"role": "user", "content": "where is the harness documented"}, + {"role": "assistant", "content": list(FLATTENED_TURN)}, + {"role": "user", "content": "and what does it say"}, + ], request.body.decode() + assert "tools" not in body, request.body.decode() + return Reply(body=REPLY) + + +@pytest.mark.covers("providers.bedrock_messages.replayed_intercepted_web_search_turn_is_flattened_to_text") +def test_replayed_intercepted_web_search_turn_reaches_bedrock_as_text_and_answers(gateway: Gateway) -> None: + with wire_server(bedrock_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=f"bedrock/{BEDROCK_MODEL}", + api_key=TOKEN, + api_base=wire.url, + aws_region_name="us-east-1", + ) + response: Final = gateway.request( + "POST", + "/v1/messages", + { + "model": model, + "max_tokens": 64, + "messages": [ + {"role": "user", "content": "where is the harness documented"}, + {"role": "assistant", "content": list(INTERCEPTED_TURN)}, + {"role": "user", "content": "and what does it say"}, + ], + }, + headers={"x-api-key": gateway.key, "anthropic-version": "2023-06-01"}, + ) + assert response.status_code == 200, response.text + assert response.json()["content"] == [{"type": "text", "text": "replay accepted"}], response.text + assert len(wire.drain()) == 1 diff --git a/tests/integration/providers/test_bedrock_passthrough_stream_wire.py b/tests/integration/providers/test_bedrock_passthrough_stream_wire.py new file mode 100644 index 00000000000..bb9bbc65f30 --- /dev/null +++ b/tests/integration/providers/test_bedrock_passthrough_stream_wire.py @@ -0,0 +1,42 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.upstream import _aws_event_frame +from integration._support.wire import Reply, Request, wire_server + +_MODEL_ID: Final = "anthropic.claude-sonnet-5-v1:0" +_EVENT_STREAM: Final = "application/vnd.amazon.eventstream" +_REQUEST_BODY: Final = {"messages": [{"role": "user", "content": [{"text": "synthetic passthrough stream"}]}]} +_EVENTS: Final = ( + ("messageStart", {"role": "assistant"}), + ("contentBlockDelta", {"delta": {"text": "bedrock stream control"}, "contentBlockIndex": 0}), + ("messageStop", {"stopReason": "end_turn"}), + ("metadata", {"usage": {"inputTokens": 11, "outputTokens": 4, "totalTokens": 15}}), +) +_STREAM_BYTES: Final = b"".join(_aws_event_frame(kind, payload, "sc", "u") for kind, payload in _EVENTS) + + +def event_stream_peer(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == f"/model/{_MODEL_ID}/converse-stream" + assert json.loads(request.body)["messages"] == _REQUEST_BODY["messages"] + return Reply(body=_STREAM_BYTES, content_type=_EVENT_STREAM) + + +@pytest.mark.covers("other.provider_wire.bedrock.passthrough_stream_keeps_event_stream_content_type") +def test_bedrock_passthrough_converse_stream_response_carries_event_stream_content_type(gateway: Gateway) -> None: + with wire_server(event_stream_peer) as wire, gateway.scenario() as scenario: + deployment: Final = scenario.model( + model=f"bedrock/{_MODEL_ID}", + api_base=wire.url, + aws_access_key_id="AKIASCRIPTEDPROVIDER", + aws_secret_access_key="scripted-secret", + aws_region_name="us-east-1", + ) + response: Final = gateway.request("POST", f"/bedrock/model/{deployment}/converse-stream", _REQUEST_BODY) + assert response.status_code == 200, response.text + assert len(wire.drain()) == 1, response.text + assert response.headers.get("content-type") == _EVENT_STREAM, dict(response.headers) + assert response.content == _STREAM_BYTES, response.text diff --git a/tests/integration/providers/test_bedrock_rerank_wire.py b/tests/integration/providers/test_bedrock_rerank_wire.py new file mode 100644 index 00000000000..86a3bbbd292 --- /dev/null +++ b/tests/integration/providers/test_bedrock_rerank_wire.py @@ -0,0 +1,92 @@ +import json +import os +from pathlib import Path +from typing import Final + +import pytest +import yaml +from integration._support.client import Gateway +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server + +MODEL: Final = "bedrock/arn:aws:bedrock:us-east-1::foundation-model/cohere.rerank-v3-5:0" +ACCESS_KEY: Final = "AKIAINTEGRATION000002" +FORWARDED_FOR: Final = "203.0.113.5" +RESPONSE: Final = json.dumps( + {"results": [{"index": 1, "relevanceScore": 0.9}, {"index": 0, "relevanceScore": 0.1}]} +).encode() + + +def signed_headers(authorization: str) -> tuple[str, ...]: + return tuple(authorization.split("SignedHeaders=")[1].split(",")[0].split(";")) + + +def rerank_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/rerank" + assert request.headers["authorization"].startswith(f"AWS4-HMAC-SHA256 Credential={ACCESS_KEY}/") + assert signed_headers(request.headers["authorization"]) == ("content-type", "host", "x-amz-date"), request.headers[ + "authorization" + ] + assert request.headers["x-forwarded-for"] == FORWARDED_FOR + body: Final = json.loads(request.body) + assert body["queries"] == [{"textQuery": {"text": "synthetic rerank query"}, "type": "TEXT"}] + assert body["rerankingConfiguration"]["bedrockRerankingConfiguration"]["modelConfiguration"] == { + "modelArn": "arn:aws:bedrock:us-east-1::foundation-model/cohere.rerank-v3-5:0" + } + assert body["rerankingConfiguration"]["bedrockRerankingConfiguration"]["numberOfResults"] == 2 + return Reply(body=RESPONSE) + + +@pytest.mark.covers("providers.bedrock_rerank.forwarded_client_headers_are_sent_unsigned") +def test_forwarded_client_header_on_rerank_is_excluded_from_the_sigv4_signature( + gateway: Gateway, tmp_path: Path +) -> None: + empty: Final = tmp_path / "empty-aws-config" + empty.write_text("") + configuration: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + configuration["general_settings"]["forward_client_headers_to_llm_api"] = True + path: Final = tmp_path / "forwarding.yaml" + path.write_text(yaml.safe_dump(configuration)) + overrides: Final = { + "AWS_CONFIG_FILE": str(empty), + "AWS_SHARED_CREDENTIALS_FILE": str(empty), + "AWS_EC2_METADATA_DISABLED": "true", + "LITELLM_RUST": "false", + } + with wire_server(rerank_peer) as wire: + with ( + owned_proxy( + gateway, + tmp_path, + overrides, + config=path, + remove_environment=tuple(name for name in os.environ if name.startswith("AWS_")), + ) as candidate, + candidate.scenario() as scenario, + ): + model: Final = scenario.model( + model=MODEL, + api_key=None, + api_base=None, + aws_region_name="us-east-1", + aws_bedrock_runtime_endpoint=wire.url, + aws_access_key_id=ACCESS_KEY, + aws_secret_access_key="synthetic-rerank-secret-key-for-testing", + ) + response: Final = candidate.request( + "POST", + "/v1/rerank", + { + "model": model, + "query": "synthetic rerank query", + "documents": ["first synthetic document", "second synthetic document"], + "top_n": 2, + }, + headers={"x-forwarded-for": FORWARDED_FOR}, + ) + assert response.status_code == 200, response.text + assert response.json()["results"] == [ + {"index": 1, "relevance_score": 0.9}, + {"index": 0, "relevance_score": 0.1}, + ], response.text + assert len(wire.drain()) == 1 diff --git a/tests/integration/providers/test_bedrock_thinking_tokens_wire.py b/tests/integration/providers/test_bedrock_thinking_tokens_wire.py new file mode 100644 index 00000000000..074adeb41f6 --- /dev/null +++ b/tests/integration/providers/test_bedrock_thinking_tokens_wire.py @@ -0,0 +1,94 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +MODEL: Final = "bedrock/converse/global.anthropic.claude-opus-4-8" +TOKEN: Final = "synthetic-bedrock-bearer" +PROMPT: Final = "How many prime numbers are less than 30? Think it through, then answer with just the number." +RESPONSES_PROMPT: Final = "How many prime numbers are less than 30? Answer with just the number." +REDACTED_DATA: Final = "RWRhY3RlZC1ieS1CZWRyb2Nr" +INPUT_TOKENS: Final = 31 +OUTPUT_TOKENS: Final = 257 +RESPONSE: Final = json.dumps( + { + "output": { + "message": { + "role": "assistant", + "content": [{"reasoningContent": {"redactedContent": REDACTED_DATA}}, {"text": "10"}], + } + }, + "stopReason": "end_turn", + "usage": { + "inputTokens": INPUT_TOKENS, + "outputTokens": OUTPUT_TOKENS, + "totalTokens": INPUT_TOKENS + OUTPUT_TOKENS, + }, + "metrics": {"latencyMs": 1}, + } +).encode() +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) +_JSON_LIST: Final = TypeAdapter(list[dict[str, JsonValue]]) + + +def redacted_thinking_peer(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/model/global.anthropic.claude-opus-4-8/converse" + assert request.headers["authorization"] == f"Bearer {TOKEN}" + body: Final = json.loads(request.body) + assert body["messages"] in ( + [{"role": "user", "content": [{"text": PROMPT}]}], + [{"role": "user", "content": [{"text": RESPONSES_PROMPT}]}], + ), body + assert body["additionalModelRequestFields"]["thinking"]["type"] == "adaptive", body + return Reply(body=RESPONSE) + + +@pytest.mark.covers("other.provider_wire.bedrock.hidden_thinking_tokens_are_not_reported_as_text") +def test_bedrock_redacted_thinking_is_not_reported_as_zero_reasoning_tokens(gateway: Gateway) -> None: + with wire_server(redacted_thinking_peer) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=MODEL, api_key=TOKEN, aws_region_name="us-east-1", aws_bedrock_runtime_endpoint=wire.url + ) + chat: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": PROMPT}], + "max_tokens": 4000, + "reasoning_effort": "max", + }, + ) + assert chat.status_code == 200, chat.text + chat_body: Final = _JSON_OBJECT.validate_json(chat.content) + message: Final = _JSON_OBJECT.validate_python(_JSON_LIST.validate_python(chat_body["choices"])[0]["message"]) + assert message["content"] == "10", chat.text + assert message["thinking_blocks"] == [{"type": "redacted_thinking", "data": REDACTED_DATA}], chat.text + usage: Final = _JSON_OBJECT.validate_python(chat_body["usage"]) + assert usage["completion_tokens"] == OUTPUT_TOKENS, chat.text + details: Final = _JSON_OBJECT.validate_python(usage["completion_tokens_details"]) + assert details == {}, chat.text + assert len(wire.drain()) == 1 + + responses: Final = gateway.request( + "POST", + "/v1/responses", + {"model": model, "input": RESPONSES_PROMPT, "max_output_tokens": 4000, "reasoning": {"effort": "max"}}, + ) + assert responses.status_code == 200, responses.text + responses_body: Final = _JSON_OBJECT.validate_json(responses.content) + output: Final = _JSON_LIST.validate_python(responses_body["output"]) + reasoning_items: Final = tuple(item for item in output if item["type"] == "reasoning") + assert len(reasoning_items) == 1, responses.text + assert reasoning_items[0]["encrypted_content"] == json.dumps( + [{"type": "redacted_thinking", "data": REDACTED_DATA}], separators=(",", ":") + ), responses.text + responses_usage: Final = _JSON_OBJECT.validate_python(responses_body["usage"]) + assert responses_usage["output_tokens"] == OUTPUT_TOKENS, responses.text + assert _JSON_OBJECT.validate_python(responses_usage["output_tokens_details"])["reasoning_tokens"] == 0, ( + responses.text + ) + assert len(wire.drain()) == 1 diff --git a/tests/integration/providers/test_dashscope_chat_wire.py b/tests/integration/providers/test_dashscope_chat_wire.py new file mode 100644 index 00000000000..a2b3a36d6e3 --- /dev/null +++ b/tests/integration/providers/test_dashscope_chat_wire.py @@ -0,0 +1,62 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_BACKEND: Final = "qwen3.7-plus" +_API_KEY: Final = "synthetic-dashscope-key" +_PROMPT: Final = "What is 3^3?" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +def _completion(identity: str) -> bytes: + return json.dumps( + { + "id": identity, + "object": "chat.completion", + "created": 1, + "model": _BACKEND, + "choices": [{"index": 0, "message": {"role": "assistant", "content": "27"}, "finish_reason": "stop"}], + "usage": {"prompt_tokens": 17, "completion_tokens": 5, "total_tokens": 22}, + } + ).encode() + + +@pytest.mark.covers("other.provider_wire.dashscope.reasoning_effort_reaches_provider") +def test_dashscope_chat_forwards_reasoning_effort_none_to_the_provider(gateway: Gateway) -> None: + identity: Final = f"dashscope-reasoning-{uuid.uuid4().hex}" + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/chat/completions" + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + assert _JSON_OBJECT.validate_json(request.body) == { + "model": _BACKEND, + "messages": [{"role": "user", "content": _PROMPT}], + "reasoning_effort": "none", + } + return Reply(body=_completion(identity)) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"dashscope/{_BACKEND}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _PROMPT}], "reasoning_effort": "none"}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["id"] == identity + assert payload["choices"] == [ + { + "finish_reason": "stop", + "index": 0, + "message": {"role": "assistant", "content": "27", "provider_specific_fields": {"refusal": None}}, + "provider_specific_fields": {}, + } + ] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/chat/completions")] diff --git a/tests/integration/providers/test_databricks_chat_wire.py b/tests/integration/providers/test_databricks_chat_wire.py new file mode 100644 index 00000000000..614382a77f0 --- /dev/null +++ b/tests/integration/providers/test_databricks_chat_wire.py @@ -0,0 +1,129 @@ +import json +import uuid +from collections.abc import Mapping +from typing import Final + +import pytest +from integration._support.client import Gateway, eventually +from integration._support.database import read_rows +from integration._support.wire import Reply, Request, wire_server +from pydantic import BaseModel, ConfigDict, JsonValue, TypeAdapter + +_BACKEND: Final = "databricks-glm-5-2" +_API_KEY: Final = "synthetic-databricks-key" +_PROMPT: Final = "Summarise the cached briefing in one sentence." +_PROVIDER_USAGE: Final[Mapping[str, JsonValue]] = { + "prompt_tokens": 12011, + "completion_tokens": 8, + "total_tokens": 12019, + "cache_read_input_tokens": 12002, + "cache_creation_input_tokens": 0, +} +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +class _PromptTokensDetails(BaseModel): + model_config = ConfigDict(extra="ignore") + cached_tokens: int | None = None + + +class _Usage(BaseModel): + model_config = ConfigDict(extra="ignore") + prompt_tokens: int + completion_tokens: int + total_tokens: int + prompt_tokens_details: _PromptTokensDetails | None = None + + +class _Delta(BaseModel): + model_config = ConfigDict(extra="ignore") + content: str | None = None + + +class _Choice(BaseModel): + model_config = ConfigDict(extra="ignore") + delta: _Delta + + +class _Chunk(BaseModel): + model_config = ConfigDict(extra="ignore") + id: str + choices: tuple[_Choice, ...] + usage: _Usage | None = None + + +def _frame(identity: str, choices: list[Mapping[str, object]], usage: Mapping[str, JsonValue] | None = None) -> bytes: + value: Final = { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": _BACKEND, + "choices": choices, + **({} if usage is None else {"usage": usage}), + } + return b"data: " + json.dumps(value).encode() + b"\n\n" + + +@pytest.mark.covers("other.provider_wire.databricks.stream_usage_and_cache_reads_reach_client_and_spend_log") +def test_databricks_stream_final_usage_chunk_reaches_client_and_spend_log(gateway: Gateway) -> None: + identity: Final = f"databricks-stream-{uuid.uuid4().hex}" + frames: Final = ( + _frame( + identity, [{"index": 0, "delta": {"role": "assistant", "content": "The briefing "}, "finish_reason": None}] + ), + _frame(identity, [{"index": 0, "delta": {"content": "is short."}, "finish_reason": None}]), + _frame(identity, [{"index": 0, "delta": {}, "finish_reason": "stop"}]), + _frame(identity, [], usage=_PROVIDER_USAGE), + b"data: [DONE]\n\n", + ) + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/chat/completions" + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["model"] == _BACKEND + assert body["messages"] == [{"role": "user", "content": _PROMPT}] + assert body["stream"] is True + return Reply(content_type="text/event-stream", chunks=frames) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"databricks/{_BACKEND}", api_base=wire.url, api_key=_API_KEY) + with gateway.client.stream( + "POST", + "/v1/chat/completions", + json={ + "model": model, + "messages": [{"role": "user", "content": _PROMPT}], + "stream": True, + "stream_options": {"include_usage": True}, + }, + headers={"Authorization": f"Bearer {gateway.key}"}, + ) as response: + assert response.status_code == 200, response.read() + lines: Final = tuple(line for line in response.iter_lines() if line.startswith("data: ")) + assert lines[-1] == "data: [DONE]", lines + chunks: Final = tuple(_Chunk.model_validate_json(line.removeprefix("data: ")) for line in lines[:-1]) + assert {chunk.id for chunk in chunks} == {identity} + assert ( + "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) + == "The briefing is short." + ) + usages: Final = tuple(chunk.usage for chunk in chunks if chunk.usage is not None) + assert len(usages) == 1, lines + assert ( + usages[0].prompt_tokens, + usages[0].completion_tokens, + usages[0].total_tokens, + usages[0].prompt_tokens_details.cached_tokens if usages[0].prompt_tokens_details is not None else None, + ) == (12011, 8, 12019, 12002), lines + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/chat/completions")] + rows: Final = eventually( + lambda: read_rows( + 'SELECT prompt_tokens, completion_tokens, total_tokens FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (identity,), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert (rows[0]["prompt_tokens"], rows[0]["completion_tokens"], rows[0]["total_tokens"]) == (12011, 8, 12019) diff --git a/tests/integration/providers/test_databricks_oauth_wire.py b/tests/integration/providers/test_databricks_oauth_wire.py new file mode 100644 index 00000000000..7dbc5f17838 --- /dev/null +++ b/tests/integration/providers/test_databricks_oauth_wire.py @@ -0,0 +1,92 @@ +import base64 +import json +import uuid +from pathlib import Path +from typing import Final +from urllib.parse import parse_qs + +import pytest +from integration._support.client import Gateway +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_MODEL: Final = "databricks/synthetic-vendor.chat-model.v1" +_CLIENT_ID: Final = "synthetic-databricks-client-id" +_CLIENT_SECRET: Final = "synthetic-databricks-client-secret" +_ACCESS_TOKEN: Final = "synthetic-databricks-oauth-token" +_PROMPT: Final = "Which workspace issued this token?" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +def _basic_credentials(client_id: str, client_secret: str) -> str: + return "Basic " + base64.b64encode(f"{client_id}:{client_secret}".encode()).decode() + + +def _completion(identity: str) -> bytes: + return json.dumps( + { + "id": identity, + "object": "chat.completion", + "created": 1, + "model": _MODEL.removeprefix("databricks/"), + "choices": [ + { + "index": 0, + "message": {"role": "assistant", "content": "the workspace origin"}, + "finish_reason": "stop", + } + ], + "usage": {"prompt_tokens": 9, "completion_tokens": 4, "total_tokens": 13}, + } + ).encode() + + +@pytest.mark.covers("other.provider_wire.databricks.oauth_token_url_uses_workspace_origin_for_ai_gateway_api_base") +def test_databricks_ai_gateway_api_base_requests_oauth_token_from_workspace_origin( + gateway: Gateway, tmp_path: Path +) -> None: + identity: Final = f"databricks-oauth-{uuid.uuid4().hex}" + + def respond(request: Request) -> Reply: + if request.target == "/oidc/v1/token": + assert request.method == "POST" + assert request.headers["authorization"] == _basic_credentials(_CLIENT_ID, _CLIENT_SECRET) + assert request.headers["content-type"] == "application/x-www-form-urlencoded" + assert parse_qs(request.body.decode()) == {"grant_type": ["client_credentials"], "scope": ["all-apis"]} + return Reply( + body=json.dumps({"access_token": _ACCESS_TOKEN, "token_type": "Bearer", "expires_in": 3600}).encode() + ) + if request.target == "/ai-gateway/mlflow/v1/chat/completions": + assert request.method == "POST" + assert request.headers["authorization"] == f"Bearer {_ACCESS_TOKEN}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["model"] == _MODEL.removeprefix("databricks/") + assert body["messages"] == [{"role": "user", "content": _PROMPT}] + return Reply(body=_completion(identity)) + return Reply(status=401, body=json.dumps({"error": f"unauthenticated path {request.target}"}).encode()) + + overrides: Final = {"DATABRICKS_CLIENT_ID": _CLIENT_ID, "DATABRICKS_CLIENT_SECRET": _CLIENT_SECRET} + with wire_server(respond) as wire, owned_proxy(gateway, tmp_path, overrides) as candidate: + with candidate.scenario() as scenario: + model: Final = scenario.model(model=_MODEL, api_base=f"{wire.url}/ai-gateway/mlflow/v1", api_key=None) + response: Final = candidate.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _PROMPT}]}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["id"] == identity + assert payload["choices"] == [ + { + "finish_reason": "stop", + "index": 0, + "message": {"content": "the workspace origin", "role": "assistant"}, + } + ] + assert payload["usage"] == {"prompt_tokens": 9, "completion_tokens": 4, "total_tokens": 13} + assert [(request.method, request.target) for request in wire.drain()] == [ + ("POST", "/oidc/v1/token"), + ("POST", "/ai-gateway/mlflow/v1/chat/completions"), + ] diff --git a/tests/integration/providers/test_deepseek_vision_wire.py b/tests/integration/providers/test_deepseek_vision_wire.py new file mode 100644 index 00000000000..25ddaf1aa02 --- /dev/null +++ b/tests/integration/providers/test_deepseek_vision_wire.py @@ -0,0 +1,40 @@ +from typing import Final + +import httpx +import pytest +from pydantic import JsonValue + +from tests.integration._support.client import JSON_OBJECT, Gateway, object_value + +_VISION_MODEL: Final = "deepseek-v4-flash-vision-exp" +_API_KEY: Final = "synthetic-deepseek-key" +_VISION_CONTENT: Final[JsonValue] = [ + {"type": "text", "text": "what is in this image?"}, + {"type": "image_url", "image_url": {"url": "https://example.com/pic.png"}}, +] + + +@pytest.mark.covers("other.provider_wire.deepseek.vision_image_content_list_reaches_provider") +def test_deepseek_vision_forwards_image_url_content_list_instead_of_collapsing_to_text(gateway: Gateway) -> None: + with gateway.scenario() as scenario, httpx.Client(base_url=gateway.upstream_url, trust_env=False) as upstream: + upstream.get("/__observations").raise_for_status() + model: Final = scenario.model( + model=f"deepseek/{_VISION_MODEL}", + api_key=_API_KEY, + model_info={"mode": "chat", "supports_vision": True}, + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _VISION_CONTENT}]}, + ) + assert response.status_code == 200, response.text + observations: Final = JSON_OBJECT.validate_json(upstream.get("/__observations").content)["requests"] + assert isinstance(observations, list) + assert len(observations) == 1, response.text + observed: Final = object_value(observations[0]) + assert observed["path"] == "/v1/chat/completions", response.text + assert observed["authorization"] == f"Bearer {_API_KEY}", response.text + body: Final = object_value(observed["body"]) + assert body["model"] == _VISION_MODEL, response.text + assert body["messages"] == [{"role": "user", "content": _VISION_CONTENT}], response.text diff --git a/tests/integration/providers/test_fal_ai_chat_wire.py b/tests/integration/providers/test_fal_ai_chat_wire.py index 2bb1ac3f168..8cfa51f4389 100644 --- a/tests/integration/providers/test_fal_ai_chat_wire.py +++ b/tests/integration/providers/test_fal_ai_chat_wire.py @@ -2,7 +2,6 @@ import json from pathlib import Path from typing import Final -import httpx import pytest from integration._support.client import Gateway from integration._support.wire import Reply, Request, wire_server @@ -57,7 +56,6 @@ def test_fal_moondream3_chat_sends_prompt_image_and_reasoning(gateway: Gateway) ) with wire_server(respond) as wire, gateway.scenario() as scenario: - wire_url: Final = wire.url model: Final = scenario.model(model=f"fal_ai/{_MODEL}", api_base=wire.url, api_key="synthetic-fal-key") response: Final = gateway.request( "POST", @@ -97,3 +95,32 @@ def test_fal_moondream3_chat_sends_prompt_image_and_reasoning(gateway: Gateway) + 7 * _catalog_cost(f"fal_ai/{_MODEL}", "output_cost_per_token") ) assert [(request.method, request.target) for request in wire.drain()] == [("POST", f"/{_MODEL}")] + + +@pytest.mark.covers("other.provider_wire.fal_ai.chat_non_string_reasoning_effort_rejected_before_wire") +def test_fal_moondream3_chat_rejects_non_string_reasoning_effort_before_the_wire(gateway: Gateway) -> None: + def respond(request: Request) -> Reply: + raise AssertionError(f"provider must not be reached: {request.method} {request.target}") + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"fal_ai/{_MODEL}", api_base=wire.url, api_key="synthetic-fal-key") + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [ + { + "role": "user", + "content": [ + {"type": "text", "text": _PROMPT}, + {"type": "image_url", "image_url": {"url": "https://example.com/pic.png"}}, + ], + } + ], + "reasoning_effort": {"level": "low"}, + }, + ) + assert response.status_code == 400, response.text + assert "reasoning_effort" in response.text + assert wire.drain() == () diff --git a/tests/integration/providers/test_fal_ai_image_wire.py b/tests/integration/providers/test_fal_ai_image_wire.py index 02f24f9e369..c85bcdae8b8 100644 --- a/tests/integration/providers/test_fal_ai_image_wire.py +++ b/tests/integration/providers/test_fal_ai_image_wire.py @@ -4,12 +4,15 @@ from pathlib import Path from typing import Final import httpx -import litellm import pytest -from integration._support.client import Gateway +import yaml +from integration._support.client import Gateway, object_value +from integration._support.process import owned_proxy from integration._support.wire import Reply, Request, wire_server from pydantic import JsonValue, TypeAdapter +import litellm + _GPT_IMAGE_MODEL: Final = "openai/gpt-image-2.5/flare/text-to-image" _FLUX_MODEL: Final = "fal-ai/flux/dev" _EDIT_MODEL: Final = "openai/gpt-image-2.5/flare/edit" @@ -301,6 +304,44 @@ def test_fal_flux_lora_depth_edit_sends_single_image_url_and_charges_flat_row(ga ] cost: Final = _response_cost(response) assert cost == _approx(_catalog_cost("fal_ai/fal-ai/flux-lora-depth")) - assert [(request.method, request.target) for request in wire.drain()] == [ - ("POST", "/fal-ai/flux-lora-depth") - ] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/fal-ai/flux-lora-depth")] + + +@pytest.mark.covers("other.provider_wire.fal_ai.global_api_base_routes_image_generation") +def test_fal_flux_dev_generation_without_deployment_api_base_uses_global_api_base( + gateway: Gateway, tmp_path: Path +) -> None: + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.headers["authorization"] == "Key synthetic-fal-key" + assert request.target == "/fal-ai/flux/dev" + assert _JSON_OBJECT.validate_json(request.body) == {"prompt": _PROMPT, "num_images": 1} + return Reply(body=_image_response(((f"{wire_url}/files/global.png", 1024, 1024),), _PROMPT)) + + with wire_server(respond) as wire: + wire_url: Final = wire.url + configuration: Final = _JSON_OBJECT.validate_python( + yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + ) + configuration["litellm_settings"] = { + **object_value(configuration["litellm_settings"]), + "api_base": wire.url, + } + path: Final = tmp_path / "global-api-base.yaml" + path.write_text(yaml.safe_dump(configuration)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate, candidate.scenario() as scenario: + model: Final = scenario.model(model=f"fal_ai/{_FLUX_MODEL}", api_key="synthetic-fal-key", api_base=None) + response: Final = candidate.request( + "POST", "/v1/images/generations", {"model": model, "prompt": _PROMPT, "n": 1} + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["data"] == [ + { + "url": f"{wire.url}/files/global.png", + "b64_json": None, + "revised_prompt": None, + "provider_specific_fields": {"width": 1024, "height": 1024, "content_type": "image/png"}, + } + ] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/fal-ai/flux/dev")] diff --git a/tests/integration/providers/test_fal_ai_passthrough_wire.py b/tests/integration/providers/test_fal_ai_passthrough_wire.py index f103135124e..b80cc601b3b 100644 --- a/tests/integration/providers/test_fal_ai_passthrough_wire.py +++ b/tests/integration/providers/test_fal_ai_passthrough_wire.py @@ -1,4 +1,5 @@ import json +from pathlib import Path from typing import Final import pytest @@ -84,3 +85,107 @@ def test_fal_queue_submit_charges_and_polls_pass_through_free(gateway: Gateway, ("GET", f"/{_MODEL}/requests/req-1/status"), ("GET", f"/{_MODEL}/requests/req-1"), ] + + +@pytest.mark.covers("other.provider_wire.fal_ai.passthrough_queue_submit_rejects_unpriceable_catalog_key") +def test_fal_queue_submit_to_catalog_key_the_pricer_cannot_price_is_rejected_not_forwarded( + gateway: Gateway, tmp_path: Path +) -> None: + def respond(request: Request) -> Reply: + return Reply(body=json.dumps({"request_id": "req-1", "status": "IN_QUEUE"}).encode()) + + config: Final = tmp_path / "proxy_config.yaml" + config.write_text( + "model_list: []\n" + "general_settings:\n" + " master_key: os.environ/LITELLM_MASTER_KEY\n" + " database_url: os.environ/DATABASE_URL\n" + " store_model_in_db: true\n" + " disable_spend_logs: false\n" + " proxy_batch_write_at: 1\n" + "router_settings:\n" + " disable_cooldowns: true\n" + ) + with wire_server(respond) as wire: + with owned_proxy( + gateway, + tmp_path, + {"FAL_AI_QUEUE_API_BASE": wire.url, "FAL_AI_API_KEY": "synthetic-fal-key"}, + config=config, + ) as candidate: + submit: Final = candidate.request( + "POST", + "/fal_ai/fal-ai/moondream3-preview/query", + {"image_url": "https://example.com/in.png", "prompt": "one word"}, + ) + assert submit.status_code == 400, submit.text + assert "pricing" in submit.text + assert wire.drain() == () + + +@pytest.mark.covers("other.provider_wire.fal_ai.passthrough_queue_submit_prices_string_resolution_like_integer") +def test_fal_queue_submit_prices_string_resolution_like_the_integer(gateway: Gateway, tmp_path: Path) -> None: + def respond(request: Request) -> Reply: + assert request.headers["authorization"] == "Key synthetic-fal-key" + return Reply(body=json.dumps({"request_id": "req-1", "status": "IN_QUEUE"}).encode()) + + numeric_body: Final = {"image_url": "https://example.com/in.png", "resolution": 512} + string_body: Final = {"image_url": "https://example.com/in.png", "resolution": "512"} + config: Final = tmp_path / "proxy_config.yaml" + config.write_text( + "model_list: []\n" + "general_settings:\n" + " master_key: os.environ/LITELLM_MASTER_KEY\n" + " database_url: os.environ/DATABASE_URL\n" + " store_model_in_db: true\n" + " disable_spend_logs: false\n" + " proxy_batch_write_at: 1\n" + "router_settings:\n" + " disable_cooldowns: true\n" + ) + with wire_server(respond) as wire: + with owned_proxy( + gateway, + tmp_path, + {"FAL_AI_QUEUE_API_BASE": wire.url, "FAL_AI_API_KEY": "synthetic-fal-key"}, + config=config, + ) as candidate: + numeric: Final = candidate.request("POST", f"/fal_ai/{_MODEL}", numeric_body) + assert numeric.status_code == 200, numeric.text + assert json.loads(numeric.content) == {"request_id": "req-1", "status": "IN_QUEUE"} + string: Final = candidate.request("POST", f"/fal_ai/{_MODEL}", string_body) + assert string.status_code == 200, string.text + assert json.loads(string.content) == {"request_id": "req-1", "status": "IN_QUEUE"} + numeric_rows: Final = eventually( + lambda: read_rows( + 'SELECT spend FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (numeric.headers["x-litellm-call-id"],), + ), + lambda values: len(values) == 1, + seconds=70, + ) + string_rows: Final = eventually( + lambda: read_rows( + 'SELECT spend FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (string.headers["x-litellm-call-id"],), + ), + lambda values: len(values) == 1, + seconds=70, + ) + numeric_spend_value: Final = numeric_rows[0]["spend"] + string_spend_value: Final = string_rows[0]["spend"] + assert isinstance(numeric_spend_value, (int, float)) + assert isinstance(string_spend_value, (int, float)) + numeric_spend: Final = float(numeric_spend_value) + string_spend: Final = float(string_spend_value) + assert numeric_spend > 0, f"resolution 512 logged {numeric_spend} spend" + assert string_spend > 0, f'resolution "512" logged {string_spend} spend' + assert numeric_spend == string_spend, ( + f'resolution 512 was billed {numeric_spend} but resolution "512" was billed {string_spend}' + ) + forwarded: Final = wire.drain() + assert [(request.method, request.target) for request in forwarded] == [ + ("POST", f"/{_MODEL}"), + ("POST", f"/{_MODEL}"), + ] + assert [json.loads(request.body) for request in forwarded] == [numeric_body, string_body] diff --git a/tests/integration/providers/test_fal_ai_video_wire.py b/tests/integration/providers/test_fal_ai_video_wire.py index 276ea2868a7..90df4520b98 100644 --- a/tests/integration/providers/test_fal_ai_video_wire.py +++ b/tests/integration/providers/test_fal_ai_video_wire.py @@ -1,14 +1,58 @@ +import datetime +import ipaddress import json +import ssl import uuid +from pathlib import Path from typing import Final import pytest -from integration._support.client import Gateway +from cryptography import x509 +from cryptography.hazmat.primitives import hashes, serialization +from cryptography.hazmat.primitives.asymmetric import rsa +from cryptography.x509.oid import NameOID +from integration._support.client import JSON_OBJECT, Gateway, object_value, string_value from integration._support.wire import Reply, Request, wire_server _MODEL: Final = "bytedance/seedance-2.5/text-to-video" _H3_MODEL: Final = "minimax/h3/text-to-video" _MP4: Final = b"\x00\x00\x00\x18ftypmp42" + uuid.uuid4().bytes * 4 +_OVERSIZED_SIDE: Final = "9" * 30 + + +def _h3_queue_reply(request_id: str) -> Reply: + return Reply(body=json.dumps({"status": "IN_QUEUE", "request_id": request_id, "queue_position": 0}).encode()) + + +def _write_self_signed_cert(cert_dir: Path) -> tuple[Path, Path]: + key: Final = rsa.generate_private_key(public_exponent=65537, key_size=2048) + now: Final = datetime.datetime.now(datetime.timezone.utc) + name: Final = x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, "localhost")]) + cert: Final = ( + x509.CertificateBuilder() + .subject_name(name) + .issuer_name(name) + .public_key(key.public_key()) + .serial_number(x509.random_serial_number()) + .not_valid_before(now - datetime.timedelta(days=1)) + .not_valid_after(now + datetime.timedelta(days=7)) + .add_extension( + x509.SubjectAlternativeName([x509.DNSName("localhost"), x509.IPAddress(ipaddress.ip_address("127.0.0.1"))]), + critical=False, + ) + .sign(key, hashes.SHA256()) + ) + cert_file: Final = cert_dir / "cert.pem" + key_file: Final = cert_dir / "key.pem" + cert_file.write_bytes(cert.public_bytes(serialization.Encoding.PEM)) + key_file.write_bytes( + key.private_bytes( + serialization.Encoding.PEM, + serialization.PrivateFormat.TraditionalOpenSSL, + serialization.NoEncryption(), + ) + ) + return cert_file, key_file @pytest.mark.covers("other.provider_wire.fal_ai.video_queue_create_status_and_content_download") @@ -173,7 +217,217 @@ def test_fal_video_failed_result_reports_failed_status_and_fal_error(gateway: Ga video_id: Final = created["id"] status: Final = gateway.get(f"/v1/videos/{video_id}") assert status["status"] == "failed" - assert "input.reference_image_urls: Failed to download the file" in status["error"]["message"] + assert "input.reference_image_urls: Failed to download the file" in string_value( + object_value(status["error"])["message"] + ) content: Final = gateway.request("GET", f"/v1/videos/{video_id}/content") assert content.status_code == 422, content.text assert "Failed to download the file" in content.text + + +@pytest.mark.covers("other.provider_wire.fal_ai.video_result_probe_forwards_extra_headers") +def test_fal_result_probe_carries_the_deployment_extra_headers(gateway: Gateway) -> None: + request_id: Final = "fal-probe-req-" + uuid.uuid4().hex + marker: Final = uuid.uuid4().hex + + def respond(request: Request) -> Reply: + assert request.headers["authorization"] == "Key synthetic-fal-key" + if request.method == "POST": + assert request.target == f"/{_H3_MODEL}" + return Reply( + body=json.dumps({"status": "IN_QUEUE", "request_id": request_id, "queue_position": 0}).encode() + ) + assert request.method == "GET" + if request.target == f"/minimax/h3/requests/{request_id}/status": + return Reply(body=json.dumps({"status": "COMPLETED", "request_id": request_id}).encode()) + assert request.target == f"/minimax/h3/requests/{request_id}" + if request.headers.get("x-integration-routing") != marker: + return Reply(status=403, body=json.dumps({"detail": "routing header missing"}).encode()) + return Reply(body=json.dumps({"video": {"url": f"{wire_url}/files/{request_id}.mp4"}}).encode()) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + wire_url: Final = wire.url + model: Final = scenario.model( + model=f"fal_ai/{_H3_MODEL}", + api_base=wire.url, + api_key="synthetic-fal-key", + extra_headers={"x-integration-routing": marker}, + ) + created: Final = gateway.post( + "/v1/videos", + { + "model": model, + "prompt": "a paper boat drifting across a puddle after rain", + "seconds": 6, + "size": "2k", + }, + ) + assert created["status"] == "queued" + video_id: Final = created["id"] + response: Final = gateway.request("GET", f"/v1/videos/{video_id}") + assert response.status_code == 200, response.text + status: Final = JSON_OBJECT.validate_json(response.content) + assert status["status"] == "completed", status + assert status["error"] is None, status + assert [ + (request.method, request.target, request.headers.get("x-integration-routing")) for request in wire.drain() + ] == [ + ("POST", f"/{_H3_MODEL}", marker), + ("GET", f"/minimax/h3/requests/{request_id}/status", marker), + ("GET", f"/minimax/h3/requests/{request_id}", marker), + ] + + +@pytest.mark.covers("other.provider_wire.fal_ai.video_result_probe_honors_ssl_verify") +def test_fal_result_probe_reuses_the_ssl_verify_false_client(gateway: Gateway, tmp_path: Path) -> None: + request_id: Final = "fal-tls-req-" + uuid.uuid4().hex + cert_file, key_file = _write_self_signed_cert(tmp_path) + context: Final = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + context.load_cert_chain(certfile=cert_file, keyfile=key_file) + + def respond(request: Request) -> Reply: + assert request.headers["authorization"] == "Key synthetic-fal-key" + if request.method == "POST": + assert request.target == f"/{_H3_MODEL}" + return Reply( + body=json.dumps({"status": "IN_QUEUE", "request_id": request_id, "queue_position": 0}).encode() + ) + assert request.method == "GET" + if request.target == f"/minimax/h3/requests/{request_id}/status": + return Reply(body=json.dumps({"status": "COMPLETED", "request_id": request_id}).encode()) + assert request.target == f"/minimax/h3/requests/{request_id}" + return Reply(body=json.dumps({"video": {"url": f"{wire_url}/files/{request_id}.mp4"}}).encode()) + + with wire_server(respond, tls=context) as wire, gateway.scenario() as scenario: + wire_url: Final = wire.url + model: Final = scenario.model( + model=f"fal_ai/{_H3_MODEL}", + api_base=wire.url, + api_key="synthetic-fal-key", + ssl_verify=False, + ) + created: Final = gateway.post( + "/v1/videos", + { + "model": model, + "prompt": "a paper boat drifting across a puddle after rain", + "seconds": 6, + "size": "2k", + }, + ) + assert created["status"] == "queued" + video_id: Final = created["id"] + response: Final = gateway.request("GET", f"/v1/videos/{video_id}") + assert response.status_code == 200, response.text + status: Final = JSON_OBJECT.validate_json(response.content) + assert status["status"] == "completed", status + assert status["error"] is None, status + assert [(request.method, request.target) for request in wire.drain()] == [ + ("POST", f"/{_H3_MODEL}"), + ("GET", f"/minimax/h3/requests/{request_id}/status"), + ("GET", f"/minimax/h3/requests/{request_id}"), + ] + + +@pytest.mark.covers("other.provider_wire.fal_ai.video_result_probe_hangup_stays_completed") +def test_fal_provider_hanging_up_on_the_result_probe_keeps_the_completed_status(gateway: Gateway) -> None: + request_id: Final = "fal-hangup-req-" + uuid.uuid4().hex + + def respond(request: Request) -> Reply: + assert request.headers["authorization"] == "Key synthetic-fal-key" + if request.method == "POST": + assert request.target == f"/{_H3_MODEL}" + return Reply( + body=json.dumps({"status": "IN_QUEUE", "request_id": request_id, "queue_position": 0}).encode() + ) + assert request.method == "GET" + if request.target == f"/minimax/h3/requests/{request_id}/status": + return Reply(body=json.dumps({"status": "COMPLETED", "request_id": request_id}).encode()) + assert request.target == f"/minimax/h3/requests/{request_id}" + return Reply(chunks=(b"{",), abort_after=0) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=f"fal_ai/{_H3_MODEL}", + api_base=wire.url, + api_key="synthetic-fal-key", + ) + created: Final = gateway.post( + "/v1/videos", + { + "model": model, + "prompt": "a paper boat drifting across a puddle after rain", + "seconds": 6, + "size": "2k", + }, + ) + assert created["status"] == "queued" + video_id: Final = created["id"] + response: Final = gateway.request("GET", f"/v1/videos/{video_id}") + assert response.status_code == 200, response.text + status: Final = JSON_OBJECT.validate_json(response.content) + assert status["status"] == "completed", status + assert status["error"] is None, status + assert [(request.method, request.target) for request in wire.drain()] == [ + ("POST", f"/{_H3_MODEL}"), + ("GET", f"/minimax/h3/requests/{request_id}/status"), + ("GET", f"/minimax/h3/requests/{request_id}"), + ] + + +@pytest.mark.covers("other.provider_wire.fal_ai.h3_auto_duration_omits_duration_and_queues") +def test_fal_h3_auto_duration_omits_duration_and_queues(gateway: Gateway) -> None: + request_id: Final = "fal-h3-auto-" + uuid.uuid4().hex + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == f"/{_H3_MODEL}" + assert json.loads(request.body) == { + "prompt": "a cat playing volleyball on a beach", + "resolution": "768P", + "aspect_ratio": "16:9", + } + return _h3_queue_reply(request_id) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"fal_ai/{_H3_MODEL}", api_base=wire.url, api_key="synthetic-fal-key") + response: Final = gateway.request( + "POST", + "/v1/videos", + {"model": model, "prompt": "a cat playing volleyball on a beach", "seconds": "auto", "size": "1280x720"}, + ) + assert response.status_code == 200, response.text + assert response.json()["status"] == "queued" + assert [(request.method, request.target) for request in wire.drain()] == [("POST", f"/{_H3_MODEL}")] + + +@pytest.mark.covers("other.provider_wire.fal_ai.h3_oversized_size_uses_top_resolution_tier") +def test_fal_h3_oversized_size_uses_top_resolution_tier_and_queues(gateway: Gateway) -> None: + request_id: Final = "fal-h3-oversized-" + uuid.uuid4().hex + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == f"/{_H3_MODEL}" + assert json.loads(request.body) == { + "prompt": "a cat playing volleyball on a beach", + "duration": 5, + "resolution": "4K", + "aspect_ratio": "1:1", + } + return _h3_queue_reply(request_id) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"fal_ai/{_H3_MODEL}", api_base=wire.url, api_key="synthetic-fal-key") + response: Final = gateway.request( + "POST", + "/v1/videos", + { + "model": model, + "prompt": "a cat playing volleyball on a beach", + "seconds": "5", + "size": f"{_OVERSIZED_SIDE}x{_OVERSIZED_SIDE}", + }, + ) + assert response.status_code == 200, response.text + assert response.json()["status"] == "queued" + assert [(request.method, request.target) for request in wire.drain()] == [("POST", f"/{_H3_MODEL}")] diff --git a/tests/integration/providers/test_fireworks_ai_router_slug_wire.py b/tests/integration/providers/test_fireworks_ai_router_slug_wire.py new file mode 100644 index 00000000000..4b4ad0b1243 --- /dev/null +++ b/tests/integration/providers/test_fireworks_ai_router_slug_wire.py @@ -0,0 +1,84 @@ +import json +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_ROUTER_SLUG: Final = "routers/glm-latest" +_ROUTER_RESOURCE: Final = "accounts/fireworks/routers/glm-latest" +_API_KEY: Final = "synthetic-fireworks-key" +_PROMPT: Final = "route me through the router" +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +def _provider_body(request: Request, target: str) -> dict[str, JsonValue]: + assert request.method == "POST" + assert request.target == target + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + return _JSON_OBJECT.validate_json(request.body) + + +@pytest.mark.covers("other.provider_wire.fireworks_ai.router_slug_chat_sends_router_resource_name") +def test_fireworks_router_slug_chat_sends_router_resource_not_models_path(gateway: Gateway) -> None: + def respond(request: Request) -> Reply: + body: Final = _provider_body(request, "/chat/completions") + assert body["model"] == _ROUTER_RESOURCE, body + assert body["messages"] == [{"role": "user", "content": _PROMPT}] + return Reply( + body=json.dumps( + { + "id": "fw-router-chat", + "object": "chat.completion", + "created": 1, + "model": _ROUTER_RESOURCE, + "choices": [ + {"index": 0, "message": {"role": "assistant", "content": "routed"}, "finish_reason": "stop"} + ], + "usage": {"prompt_tokens": 5, "completion_tokens": 1, "total_tokens": 6}, + } + ).encode() + ) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"fireworks_ai/{_ROUTER_SLUG}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _PROMPT}]}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["choices"] == [ + {"finish_reason": "stop", "index": 0, "message": {"role": "assistant", "content": "routed"}} + ] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/chat/completions")] + + +@pytest.mark.covers("other.provider_wire.fireworks_ai.router_slug_text_completion_sends_router_resource_name") +def test_fireworks_router_slug_text_completion_sends_router_resource_not_models_path(gateway: Gateway) -> None: + def respond(request: Request) -> Reply: + body: Final = _provider_body(request, "/completions") + assert body["model"] == _ROUTER_RESOURCE, body + assert body["prompt"] == _PROMPT + return Reply( + body=json.dumps( + { + "id": "fw-router-text", + "object": "text_completion", + "created": 1, + "model": _ROUTER_RESOURCE, + "choices": [{"index": 0, "text": "routed", "finish_reason": "stop", "logprobs": None}], + "usage": {"prompt_tokens": 5, "completion_tokens": 1, "total_tokens": 6}, + } + ).encode() + ) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"fireworks_ai/{_ROUTER_SLUG}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request("POST", "/v1/completions", {"model": model, "prompt": _PROMPT}) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["choices"] == [{"index": 0, "text": "routed", "finish_reason": "stop", "logprobs": None}] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/completions")] diff --git a/tests/integration/providers/test_openai_chat_wire.py b/tests/integration/providers/test_openai_chat_wire.py new file mode 100644 index 00000000000..24d7d83e519 --- /dev/null +++ b/tests/integration/providers/test_openai_chat_wire.py @@ -0,0 +1,66 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_BACKEND: Final = "gpt-5.4-mini" +_API_KEY: Final = "synthetic-openai-key" +_PROMPT: Final = "Summarize this conversation in one sentence." +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +def _completion(identity: str, content: str) -> bytes: + return json.dumps( + { + "id": identity, + "object": "chat.completion", + "created": 1, + "model": _BACKEND, + "choices": [{"index": 0, "message": {"role": "assistant", "content": content}, "finish_reason": "stop"}], + "usage": {"prompt_tokens": 19, "completion_tokens": 7, "total_tokens": 26}, + } + ).encode() + + +@pytest.mark.covers("providers.openai_chat_wire.tool_choice_without_tools_is_dropped_before_the_wire") +def test_openai_chat_tool_choice_without_tools_is_not_forwarded(gateway: Gateway) -> None: + identity: Final = f"openai-toolless-{uuid.uuid4().hex}" + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/chat/completions" + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["model"] == _BACKEND + assert body["messages"] == [{"role": "user", "content": _PROMPT}] + assert "tool_choice" not in body, body + assert "tools" not in body, body + return Reply(body=_completion(identity, "One sentence.")) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"openai/{_BACKEND}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _PROMPT}], "tool_choice": "none"}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["id"] == identity + assert payload["choices"] == [ + { + "finish_reason": "stop", + "index": 0, + "message": { + "role": "assistant", + "content": "One sentence.", + "provider_specific_fields": {"refusal": None}, + }, + "provider_specific_fields": {}, + } + ] + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/chat/completions")] diff --git a/tests/integration/providers/test_openai_image_edit_wire.py b/tests/integration/providers/test_openai_image_edit_wire.py new file mode 100644 index 00000000000..501cfaa2a25 --- /dev/null +++ b/tests/integration/providers/test_openai_image_edit_wire.py @@ -0,0 +1,75 @@ +import json +from email.message import Message +from email.parser import BytesParser +from email.policy import HTTP +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import BaseModel + +_PNG_BYTES: Final = ( + b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00\x00\x00" + b"\x1f\x15\xc4\x89\x00\x00\x00\rIDAT\x08\xd7c\xf8\xcf\xc0\xf0\x1f\x00\x05\x00\x01\xff" + b"\x89\x99=\x1d\x00\x00\x00\x00IEND\xaeB`\x82" +) +_PROMPT: Final = "turn the red circle green" +_EDITED_IMAGE_B64: Final = "aW50ZWdyYXRpb24tZWRpdGVkLWltYWdl" + + +class _Image(BaseModel): + b64_json: str + + +class _ImageResponse(BaseModel): + data: tuple[_Image, ...] + + +def _multipart_parts(request: Request) -> tuple[Message, ...]: + envelope: Final = f"content-type: {request.headers['content-type']}\r\n\r\n".encode() + request.body + parsed: Final = BytesParser(policy=HTTP).parsebytes(envelope) + assert parsed.is_multipart(), request.headers["content-type"] + return tuple(parsed.iter_parts()) + + +def _text_fields(parts: tuple[Message, ...]) -> dict[str, str]: + return { + part.get_param("name", header="content-disposition"): part.get_payload(decode=True).decode() + for part in parts + if part.get_filename() is None + } + + +def _file_fields(parts: tuple[Message, ...]) -> dict[str, bytes]: + return { + part.get_param("name", header="content-disposition"): part.get_payload(decode=True) + for part in parts + if part.get_filename() is not None + } + + +@pytest.mark.covers("other.provider_wire.openai.image_edit_forwards_provider_specific_form_fields") +def test_openai_compatible_image_edit_forwards_seed_form_field_to_backend(gateway: Gateway) -> None: + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/v1/images/edits" + assert request.headers["authorization"] == "Bearer synthetic-openai-key" + parts: Final = _multipart_parts(request) + assert _text_fields(parts) == {"model": "gpt-image-1", "prompt": _PROMPT, "seed": "42"} + assert _file_fields(parts) == {"image[]": _PNG_BYTES} + return Reply(body=json.dumps({"created": 1700000000, "data": [{"b64_json": _EDITED_IMAGE_B64}]}).encode()) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model="openai/gpt-image-1", api_base=f"{wire.url}/v1", api_key="synthetic-openai-key" + ) + response: Final = gateway.request_multipart( + "/v1/images/edits", + {"model": model, "prompt": _PROMPT, "seed": "42"}, + {"image": ("red_circle.png", _PNG_BYTES, "image/png")}, + ) + assert response.status_code == 200, response.text + payload: Final = _ImageResponse.model_validate_json(response.content) + assert [image.b64_json for image in payload.data] == [_EDITED_IMAGE_B64], response.text + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/v1/images/edits")] diff --git a/tests/integration/providers/test_responses_bridge_incomplete.py b/tests/integration/providers/test_responses_bridge_incomplete.py new file mode 100644 index 00000000000..3352ca5775e --- /dev/null +++ b/tests/integration/providers/test_responses_bridge_incomplete.py @@ -0,0 +1,64 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server + + +@pytest.mark.covers("other.provider_wire.responses_bridge.max_output_tokens_incomplete_maps_to_length") +def test_chat_over_responses_deployment_returns_length_when_output_tokens_run_out(gateway: Gateway) -> None: + identity: Final = "responses-incomplete-" + uuid.uuid4().hex + + def respond(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/responses", request.target + assert request.headers["authorization"] == "Bearer synthetic-openai-key" + body: Final = json.loads(request.body) + assert body["model"] == "gpt-5.3-codex" + assert body["max_output_tokens"] == 16 + assert body["reasoning"] == {"effort": "high"} + assert body["input"] == [ + { + "type": "message", + "role": "user", + "content": [{"type": "input_text", "text": f"explain the plan in detail {identity}"}], + } + ] + return Reply( + body=json.dumps( + { + "id": f"resp_{identity}", + "object": "response", + "created_at": 1789788253, + "status": "incomplete", + "incomplete_details": {"reason": "max_output_tokens"}, + "model": "gpt-5.3-codex", + "output": [{"type": "reasoning", "id": f"rs_{identity}", "summary": []}], + "usage": {"input_tokens": 12, "output_tokens": 16, "total_tokens": 28}, + } + ).encode() + ) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model="openai/responses/gpt-5.3-codex", api_base=wire.url, api_key="synthetic-openai-key" + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [{"role": "user", "content": f"explain the plan in detail {identity}"}], + "reasoning_effort": "high", + "max_completion_tokens": 16, + }, + ) + assert response.status_code == 200, response.text + body: Final = response.json() + assert len(wire.drain()) == 1 + assert [choice["finish_reason"] for choice in body["choices"]] == ["length"], response.text + assert body["choices"][0]["message"]["content"] == "", response.text + assert body["choices"][0]["message"]["role"] == "assistant", response.text + assert body["usage"]["prompt_tokens"] == 12 and body["usage"]["completion_tokens"] == 16, response.text + assert body["usage"]["total_tokens"] == 28, response.text diff --git a/tests/integration/providers/test_tencent_chat_wire.py b/tests/integration/providers/test_tencent_chat_wire.py new file mode 100644 index 00000000000..84e9eb8ffea --- /dev/null +++ b/tests/integration/providers/test_tencent_chat_wire.py @@ -0,0 +1,86 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_BACKEND: Final = "deepseek-v4-pro" +_API_KEY: Final = "synthetic-tencent-key" +_PROMPT: Final = "What is 17 + 26? Answer with just the number." +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) +_REASONING_REQUESTS: Final[tuple[tuple[str, dict[str, JsonValue], dict[str, JsonValue]], ...]] = ( + ("thinking_enabled", {"thinking": {"type": "enabled"}}, {"type": "enabled"}), + ("reasoning_effort_none", {"reasoning_effort": "none"}, {"type": "disabled"}), +) + + +def _completion(identity: str) -> bytes: + return json.dumps( + { + "id": identity, + "object": "chat.completion", + "created": 1, + "model": _BACKEND, + "choices": [ + { + "index": 0, + "message": {"role": "assistant", "content": "43", "reasoning_content": "17 plus 26 is 43."}, + "finish_reason": "stop", + } + ], + "usage": {"prompt_tokens": 23, "completion_tokens": 41, "total_tokens": 64}, + } + ).encode() + + +@pytest.mark.covers("other.provider_wire.tencent.thinking_reaches_provider_in_request_body") +@pytest.mark.parametrize( + ("reasoning_params", "expected_thinking"), + tuple(case[1:] for case in _REASONING_REQUESTS), + ids=tuple(case[0] for case in _REASONING_REQUESTS), +) +def test_tencent_thinking_is_sent_in_provider_body_instead_of_failing_the_request( + gateway: Gateway, reasoning_params: dict[str, JsonValue], expected_thinking: dict[str, JsonValue] +) -> None: + identity: Final = f"tencent-thinking-{uuid.uuid4().hex}" + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/chat/completions" + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + assert request.headers["content-type"] == "application/json" + assert _JSON_OBJECT.validate_json(request.body) == { + "model": _BACKEND, + "messages": [{"role": "user", "content": _PROMPT}], + "thinking": expected_thinking, + } + return Reply(body=_completion(identity)) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"tencent/{_BACKEND}", api_base=wire.url, api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": _PROMPT}], **reasoning_params}, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + assert payload["id"] == identity + assert payload["choices"] == [ + { + "finish_reason": "stop", + "index": 0, + "message": { + "role": "assistant", + "content": "43", + "reasoning_content": "17 plus 26 is 43.", + "provider_specific_fields": {"refusal": None}, + }, + "provider_specific_fields": {}, + } + ] + assert payload["usage"] == {"prompt_tokens": 23, "completion_tokens": 41, "total_tokens": 64} + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/chat/completions")] diff --git a/tests/integration/providers/test_websearch_interception_wire.py b/tests/integration/providers/test_websearch_interception_wire.py new file mode 100644 index 00000000000..cba4f174233 --- /dev/null +++ b/tests/integration/providers/test_websearch_interception_wire.py @@ -0,0 +1,299 @@ +import json +from pathlib import Path +from typing import Final + +import pytest +import yaml +from integration._support.client import Gateway +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server + +BEDROCK_MODEL: Final = "us.anthropic.claude-haiku-4-5-20251001-v1:0" +INVOKE_TARGET: Final = f"/model/{BEDROCK_MODEL}/invoke" +SEARCH_TARGET: Final = "/tavily/search" +SEARCH_RESULT: Final = { + "title": "Synthetic result", + "url": "https://example.test/result", + "content": "the snippet text", +} + + +def sse_events(text: str) -> tuple[tuple[str, dict[str, object]], ...]: + frames: Final = tuple(frame for frame in text.split("\n\n") if frame.strip()) + return tuple( + ( + next(line.removeprefix("event: ") for line in frame.splitlines() if line.startswith("event: ")), + json.loads(next(line.removeprefix("data: ") for line in frame.splitlines() if line.startswith("data: "))), + ) + for frame in frames + ) + + +@pytest.mark.covers("other.provider_wire.bedrock.websearch_interception_streamed_capped_turn_ends_with_native_results") +def test_streamed_web_search_turn_capped_by_max_agentic_loops_ends_turn_with_snippets_and_ordered_blocks( + gateway: Gateway, tmp_path: Path +) -> None: + def respond(request: Request) -> Reply: + assert request.method == "POST", request.target + body: Final = json.loads(request.body) + if request.target == SEARCH_TARGET: + assert request.headers["authorization"] == "Bearer synthetic-tavily-key" + assert body["query"] == "query-0", body + return Reply(body=json.dumps({"query": "query-0", "results": [SEARCH_RESULT]}).encode()) + assert request.target == INVOKE_TARGET + assert request.headers["authorization"] == "Bearer synthetic-bedrock-token" + assert [tool["name"] for tool in body["tools"]] == ["litellm_web_search"], body["tools"] + assert "stream" not in body, body + depth: Final = sum( + 1 + for message in body["messages"] + if isinstance(message["content"], list) + for block in message["content"] + if block["type"] == "tool_result" + ) + if depth == 1: + assert body["messages"][2]["content"] == [ + { + "type": "tool_result", + "tool_use_id": "toolu_0", + "content": "Title: Synthetic result\nURL: https://example.test/result\nSnippet: the snippet text", + } + ], body["messages"] + return Reply( + body=json.dumps( + { + "id": f"msg_{depth}", + "type": "message", + "role": "assistant", + "model": BEDROCK_MODEL, + "content": [ + {"type": "text", "text": f"turn-{depth}"}, + { + "type": "tool_use", + "id": f"toolu_{depth}", + "name": "litellm_web_search", + "input": {"query": f"query-{depth}"}, + }, + ], + "stop_reason": "tool_use", + "stop_sequence": None, + "usage": {"input_tokens": 10, "output_tokens": 4}, + } + ).encode() + ) + + with wire_server(respond) as wire: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["search_tools"] = [ + { + "search_tool_name": "integration-search", + "litellm_params": { + "search_provider": "tavily", + "api_key": "synthetic-tavily-key", + "api_base": wire.url + "/tavily", + }, + } + ] + config["litellm_settings"].update( + { + "callbacks": ["websearch_interception"], + "websearch_interception_params": { + "enabled_providers": ["bedrock"], + "search_tool_name": "integration-search", + "max_agentic_loops": 1, + }, + } + ) + path: Final = tmp_path / "websearch.yaml" + path.write_text(yaml.safe_dump(config)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate, candidate.scenario() as scenario: + model: Final = scenario.model( + model=f"bedrock/{BEDROCK_MODEL}", + api_key="synthetic-bedrock-token", + api_base=wire.url, + aws_region_name="us-east-1", + aws_bedrock_runtime_endpoint=wire.url, + ) + response: Final = candidate.request( + "POST", + "/v1/messages", + { + "model": model, + "max_tokens": 64, + "stream": True, + "messages": [{"role": "user", "content": "search control"}], + "tools": [{"type": "web_search_20250305", "name": "web_search"}], + }, + ) + assert response.status_code == 200, response.text + events: Final = sse_events(response.text) + assert [name for name, _ in events][:1] == ["message_start"], response.text + assert [name for name, _ in events][-2:] == ["message_delta", "message_stop"], response.text + for position, (name, event) in enumerate(events): + if name == "content_block_stop": + assert event["index"] in { + earlier_event["index"] + for earlier, earlier_event in events[:position] + if earlier == "content_block_start" + }, response.text + started: Final = tuple(event["content_block"] for name, event in events if name == "content_block_start") + search_ids: Final = tuple(block["id"] for block in started if block["type"] == "server_tool_use") + assert search_ids and all(search_id.startswith("srvtoolu_") for search_id in search_ids), response.text + assert started[-1] == {"type": "text", "text": ""}, response.text + assert started[:-1] == tuple( + block + for search_id in search_ids + for block in ( + {"type": "server_tool_use", "id": search_id, "name": "web_search", "input": {"query": "query-0"}}, + { + "type": "web_search_tool_result", + "tool_use_id": search_id, + "content": [ + { + "type": "web_search_result", + "url": "https://example.test/result", + "title": "Synthetic result", + "page_age": None, + "encrypted_content": "", + "snippet": "the snippet text", + } + ], + }, + ) + ), response.text + assert ( + "".join(event["delta"]["text"] for name, event in events if name == "content_block_delta") == "turn-1" + ), response.text + assert [event["delta"]["stop_reason"] for name, event in events if name == "message_delta"] == [ + "end_turn" + ], response.text + assert "litellm_web_search" not in response.text, response.text + assert [request.target for request in wire.drain()] == [INVOKE_TARGET, SEARCH_TARGET, INVOKE_TARGET] + + +import threading +import uuid +from typing import Final +from urllib.parse import parse_qs, urlsplit + +import httpx +import pytest +from integration._support.client import Gateway, eventually + +_QUERY: Final = "integration capped search" +_TEXT_BLOCK: Final = {"type": "text", "text": "searching once more"} +_NOT_INTERCEPTED: Final = "native tool reached the provider" +_SEARCH_RESULT_BLOCK: Final = { + "type": "web_search_result", + "url": "https://owned.invalid/a", + "title": "Owned result", + "page_age": None, + "encrypted_content": "", + "snippet": "owned snippet", +} + + +def _search_tool_use(identity: str) -> dict[str, object]: + return {"type": "tool_use", "id": identity, "name": "litellm_web_search", "input": {"query": _QUERY}} + + +def _anthropic_reply(identity: str, content: list[dict[str, object]], stop_reason: str) -> Reply: + return Reply( + body=json.dumps( + { + "id": identity, + "type": "message", + "role": "assistant", + "model": "claude-sonnet-4-5-20250929", + "content": content, + "stop_reason": stop_reason, + "stop_sequence": None, + "usage": {"input_tokens": 10, "output_tokens": 4}, + } + ).encode() + ) + + +@pytest.mark.covers( + "other.provider_wire.anthropic.websearch_interception_capped_loop_ends_turn_without_internal_tool_use" +) +def test_capped_websearch_interception_loop_ends_turn_instead_of_exposing_internal_tool_use( + gateway: Gateway, tmp_path: Path +) -> None: + identity: Final = "websearch-wire-" + uuid.uuid4().hex + searched: Final = threading.Event() + + def respond(request: Request) -> Reply: + parts: Final = urlsplit(request.target) + if request.method == "GET" and parts.path == "/search": + assert parse_qs(parts.query)["q"] == [_QUERY], request.target + searched.set() + return Reply( + body=json.dumps( + { + "results": [ + {"title": "Owned result", "url": "https://owned.invalid/a", "content": "owned snippet"} + ] + } + ).encode() + ) + assert request.method == "POST" and parts.path == "/v1/messages", request.target + body: Final = json.loads(request.body) + if any(tool.get("type") == "web_search_20250305" for tool in body["tools"]): + return _anthropic_reply(identity, [{"type": "text", "text": _NOT_INTERCEPTED}], "end_turn") + assert [tool["name"] for tool in body["tools"]] == ["litellm_web_search"], body["tools"] + return _anthropic_reply(identity, [_TEXT_BLOCK, _search_tool_use(identity)], "tool_use") + + def send(candidate: Gateway, model: str) -> httpx.Response: + return candidate.request( + "POST", + "/v1/messages", + { + "model": model, + "max_tokens": 64, + "messages": [{"role": "user", "content": identity + " attempt " + uuid.uuid4().hex}], + "tools": [{"type": "web_search_20250305", "name": "web_search", "max_uses": 3}], + }, + ) + + def searched_through_proxy(response: httpx.Response) -> bool: + return searched.is_set() and _NOT_INTERCEPTED not in response.text + + with wire_server(respond) as wire: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["search_tools"] = [ + { + "search_tool_name": "integration-searxng", + "litellm_params": {"search_provider": "searxng", "api_base": wire.url}, + } + ] + config["litellm_settings"].update( + { + "callbacks": ["websearch_interception"], + "websearch_interception_params": { + "enabled": True, + "enabled_providers": ["anthropic"], + "search_tool_name": "integration-searxng", + }, + } + ) + path: Final = tmp_path / "websearch.yaml" + path.write_text(yaml.safe_dump(config)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate, candidate.scenario() as scenario: + model: Final = scenario.model( + model="anthropic/claude-sonnet-4-5-20250929", api_base=wire.url, api_key="synthetic-anthropic-key" + ) + response: Final = eventually(lambda: send(candidate, model), searched_through_proxy, seconds=40) + assert response.status_code == 200, response.text + body: Final = response.json() + assert body["stop_reason"] == "end_turn", response.text + content: Final = body["content"] + assert [block["type"] for block in content] == ["server_tool_use", "web_search_tool_result", "text"], ( + response.text + ) + assert content[0]["name"] == "web_search" and content[0]["input"] == {"query": _QUERY}, response.text + assert content[1]["tool_use_id"] == content[0]["id"], response.text + assert content[1]["content"] == [_SEARCH_RESULT_BLOCK], response.text + assert content[2] == _TEXT_BLOCK, response.text + targets: Final = tuple((request.method, urlsplit(request.target).path) for request in wire.drain()) + assert targets[-3:] == (("POST", "/v1/messages"), ("GET", "/search"), ("POST", "/v1/messages")), targets diff --git a/tests/integration/providers/test_xai_web_search_wire.py b/tests/integration/providers/test_xai_web_search_wire.py new file mode 100644 index 00000000000..1f3a7909047 --- /dev/null +++ b/tests/integration/providers/test_xai_web_search_wire.py @@ -0,0 +1,84 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue, TypeAdapter + +_BACKEND: Final = "grok-4.6-web-search-unmapped" +_API_KEY: Final = "synthetic-xai-key" +_SYSTEM_PROMPT: Final = "Answer in one short sentence and cite the source." +_ALLOWED_DOMAINS: Final = ("weather.example.com", "news.example.org") +_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue]) + + +def _responses_reply(identity: str, text: str) -> bytes: + return json.dumps( + { + "id": identity, + "object": "response", + "created_at": 1, + "status": "completed", + "model": _BACKEND, + "output": [ + { + "type": "message", + "id": f"msg-{identity}", + "status": "completed", + "role": "assistant", + "content": [{"type": "output_text", "text": text, "annotations": []}], + } + ], + "parallel_tool_calls": True, + "tool_choice": "auto", + "tools": [{"type": "web_search"}], + "usage": {"input_tokens": 23, "output_tokens": 41, "total_tokens": 64}, + } + ).encode() + + +@pytest.mark.covers("other.provider_wire.xai.chat_web_search_reaches_responses_with_instructions_and_filters") +def test_xai_chat_web_search_is_sent_to_responses_with_instructions_and_nested_filters(gateway: Gateway) -> None: + identity: Final = f"xai-web-search-{uuid.uuid4().hex}" + user_prompt: Final = f"What is the weather in Paris today? Request {identity}." + + def respond(request: Request) -> Reply: + assert request.method == "POST" + assert request.target == "/v1/responses", request.target + assert request.headers["authorization"] == f"Bearer {_API_KEY}" + body: Final = _JSON_OBJECT.validate_json(request.body) + assert body["model"] == _BACKEND + assert body["instructions"] == _SYSTEM_PROMPT + assert body["input"] == [ + {"type": "message", "role": "user", "content": [{"type": "input_text", "text": user_prompt}]} + ] + assert body["tools"] == [{"type": "web_search", "filters": {"allowed_domains": list(_ALLOWED_DOMAINS)}}] + assert "web_search_options" not in body + return Reply(body=_responses_reply(identity, "Sunny, 21C.")) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(model=f"xai/{_BACKEND}", api_base=f"{wire.url}/v1", api_key=_API_KEY) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + { + "model": model, + "messages": [ + {"role": "system", "content": _SYSTEM_PROMPT}, + {"role": "user", "content": user_prompt}, + ], + "web_search_options": {"filters": {"allowed_domains": list(_ALLOWED_DOMAINS)}}, + }, + ) + assert response.status_code == 200, response.text + payload: Final = _JSON_OBJECT.validate_json(response.content) + choices: Final = payload["choices"] + assert isinstance(choices, list) and len(choices) == 1, response.text + choice: Final = choices[0] + assert isinstance(choice, dict), response.text + message: Final = choice["message"] + assert isinstance(message, dict), response.text + assert (message["role"], message["content"]) == ("assistant", "Sunny, 21C."), response.text + assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/v1/responses")] diff --git a/tests/integration/proxy_config.yaml b/tests/integration/proxy_config.yaml index a3b07f76d2f..a3d29e42120 100644 --- a/tests/integration/proxy_config.yaml +++ b/tests/integration/proxy_config.yaml @@ -5,6 +5,7 @@ general_settings: store_model_in_db: true disable_spend_logs: false proxy_batch_write_at: 1 + proxy_batch_polling_interval: 1 litellm_settings: enable_redis_auth_cache: true cache: true @@ -14,3 +15,11 @@ litellm_settings: port: os.environ/REDIS_PORT router_settings: disable_cooldowns: true +vector_store_registry: + - vector_store_name: integration-config-store + litellm_params: + vector_store_id: vs_integration_config_store + custom_llm_provider: openai + api_base: os.environ/INTEGRATION_UPSTREAM_URL + api_key: integration-provider-key + vector_store_description: declared in tests/integration/proxy_config.yaml diff --git a/tests/integration/routing/test_priority_rate_limit_headers.py b/tests/integration/routing/test_priority_rate_limit_headers.py new file mode 100644 index 00000000000..2d21f3ba8b2 --- /dev/null +++ b/tests/integration/routing/test_priority_rate_limit_headers.py @@ -0,0 +1,88 @@ +import json +import uuid +from pathlib import Path +from typing import Final + +import pytest +import yaml +from integration._support.client import Gateway +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server + +ANTHROPIC_MODEL: Final = "claude-sonnet-4-5-20250929" +MODEL_RPM: Final = 40 +MODEL_TPM: Final = 1000 +PREMIUM_SHARE: Final = 0.5 +UPSTREAM_REPLY: Final = json.dumps( + { + "id": "msg_priority_headers", + "type": "message", + "role": "assistant", + "model": ANTHROPIC_MODEL, + "content": [{"type": "text", "text": "priority header control"}], + "stop_reason": "end_turn", + "stop_sequence": None, + "usage": {"input_tokens": 10, "output_tokens": 4}, + } +).encode() + + +@pytest.mark.covers("other.routing.priority_rate_limits.v1_messages_success_exposes_v3_priority_headers") +def test_non_streaming_v1_messages_success_carries_v3_priority_rate_limit_headers( + gateway: Gateway, tmp_path: Path +) -> None: + probe: Final = "priority header probe " + uuid.uuid4().hex + + def respond(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/v1/messages" + assert request.headers["x-api-key"] == "synthetic-anthropic-key" + assert json.loads(request.body) == { + "model": ANTHROPIC_MODEL, + "messages": [{"role": "user", "content": probe}], + "max_tokens": 16, + "stream": False, + } + return Reply(body=UPSTREAM_REPLY) + + configuration: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + configuration["litellm_settings"] = { + **configuration["litellm_settings"], + "callbacks": ["dynamic_rate_limiter_v3"], + "priority_reservation": {"premium": PREMIUM_SHARE}, + } + path: Final = tmp_path / "priority.yaml" + path.write_text(yaml.safe_dump(configuration)) + with ( + wire_server(respond) as wire, + owned_proxy(gateway, tmp_path, {}, config=path) as candidate, + candidate.scenario() as scenario, + ): + model: Final = scenario.model( + model=f"anthropic/{ANTHROPIC_MODEL}", + api_base=wire.url, + api_key="synthetic-anthropic-key", + rpm=MODEL_RPM, + tpm=MODEL_TPM, + ) + key: Final = scenario.key(metadata={"priority": "premium"}) + response: Final = candidate.request( + "POST", + "/v1/messages", + {"model": model, "max_tokens": 16, "messages": [{"role": "user", "content": probe}]}, + key=key, + ) + assert response.status_code == 200, response.text + assert response.json()["content"] == [{"type": "text", "text": "priority header control"}], response.text + assert len(wire.drain()) == 1 + expected: Final = { + "x-litellm-priority": "premium", + "x-litellm-rate-limiter-version": "v3", + "x-ratelimit-model_saturation_check-limit-requests": str(MODEL_RPM), + "x-ratelimit-model_saturation_check-remaining-requests": str(MODEL_RPM - 1), + "x-ratelimit-priority_model-limit-requests": str(int(MODEL_RPM * PREMIUM_SHARE)), + "x-ratelimit-priority_model-remaining-requests": str(int(MODEL_RPM * PREMIUM_SHARE) - 1), + "x-ratelimit-priority_model-limit-tokens": str(int(MODEL_TPM * PREMIUM_SHARE)), + "x-ratelimit-priority_model-remaining-tokens": str(int(MODEL_TPM * PREMIUM_SHARE) - 1), + } + observed: Final = {name: response.headers.get(name) for name in expected} + assert observed == expected, response.headers diff --git a/tests/integration/routing/test_stale_cost_map_boot.py b/tests/integration/routing/test_stale_cost_map_boot.py new file mode 100644 index 00000000000..d2eeb2bdc6c --- /dev/null +++ b/tests/integration/routing/test_stale_cost_map_boot.py @@ -0,0 +1,86 @@ +import json +import threading +import uuid +from pathlib import Path +from typing import Final + +import httpx +import pytest +from integration._support.client import Gateway, eventually +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server + + +def _proxy_config(directory: Path, model: str, upstream_url: str) -> Path: + config: Final = directory / "stale_cost_map_config.yaml" + config.write_text( + json.dumps( + { + "model_list": [ + { + "model_name": model, + "litellm_params": {"model": model, "api_base": upstream_url + "/v1", "api_key": "sk-upstream"}, + } + ], + "general_settings": { + "master_key": "os.environ/LITELLM_MASTER_KEY", + "database_url": "os.environ/DATABASE_URL", + "store_model_in_db": True, + }, + "router_settings": {"disable_cooldowns": True}, + } + ) + ) + return config + + +@pytest.mark.covers("other.routing.cost_map.config_deployment_dropped_by_stale_boot_map_is_restored_after_reload") +def test_config_deployment_dropped_by_stale_boot_cost_map_is_restored_after_reload( + gateway: Gateway, tmp_path: Path +) -> None: + model: Final = "integration-fresh-" + uuid.uuid4().hex + remote_map: Final = json.dumps( + {model: {"litellm_provider": "openai", "mode": "chat", "input_cost_per_token": 0, "output_cost_per_token": 0}} + ).encode() + fresh_map_published: Final = threading.Event() + + def respond(request: Request) -> Reply: + assert request.target == "/model_prices.json", request + return Reply(body=remote_map) if fresh_map_published.is_set() else Reply(status=503, body=b"{}") + + overrides: Final = {"MODEL_COST_MAP_MIN_MODEL_COUNT": "1", "MODEL_COST_MAP_MAX_SHRINK_RATIO": "0"} + with ( + wire_server(respond) as peer, + httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream, + ): + config: Final = _proxy_config(tmp_path, model, gateway.upstream_url) + with owned_proxy( + gateway, + tmp_path, + {**overrides, "LITELLM_MODEL_COST_MAP_URL": peer.url + "/model_prices.json"}, + config=config, + remove_environment=("LITELLM_LOCAL_MODEL_COST_MAP",), + ) as candidate: + assert model not in tuple(entry["id"] for entry in candidate.get("/v1/models")["data"]) + fresh_map_published.set() + reload: Final = candidate.request("POST", "/reload/model_cost_map") + assert reload.status_code == 200, reload.text + eventually( + lambda: tuple(str(entry["id"]) for entry in candidate.get("/v1/models")["data"]), + lambda served: model in served, + seconds=30, + ) + upstream.get("/__observations").raise_for_status() + response: Final = candidate.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": "stale cost map control"}]}, + ) + assert response.status_code == 200, response.text + assert upstream.get("/__observations").json()["requests"] == [ + { + "path": "/v1/chat/completions", + "authorization": "Bearer sk-upstream", + "body": {"model": model, "messages": [{"role": "user", "content": "stale cost map control"}]}, + } + ] diff --git a/tests/integration/run.py b/tests/integration/run.py index f45164c5ca4..0f9aa75b549 100644 --- a/tests/integration/run.py +++ b/tests/integration/run.py @@ -47,6 +47,7 @@ def main() -> int: "pytest", *selected, "-vv", + "-rs", "--strict-markers", "-p", "no:pytest-retry", @@ -69,7 +70,8 @@ def main() -> int: if result != 0: return result evidence: Final = json.loads((output / "execution.json").read_text()) - if not evidence["complete"] or sorted(evidence["passed"]) != expected or sorted(evidence["collected"]) != expected: + executed: Final = sorted(evidence["passed"] + evidence["skipped"]) + if not evidence["complete"] or executed != expected or sorted(evidence["collected"]) != expected: print("Executed integration nodes differ from the canonical manifest", file=sys.stderr) return 1 return 0 diff --git a/tests/integration/spend/test_batch_completion_accounting.py b/tests/integration/spend/test_batch_completion_accounting.py new file mode 100644 index 00000000000..0cbeda934f6 --- /dev/null +++ b/tests/integration/spend/test_batch_completion_accounting.py @@ -0,0 +1,202 @@ +from __future__ import annotations + +import json +import uuid +from hashlib import sha256 +from typing import Final + +import pytest +from integration._support.client import JSON_OBJECT, Gateway, eventually, string_value +from integration._support.database import read_rows +from integration._support.upstream import delete_scenario, register_scenario +from integration.cost_calculation.cost_tracking_case import JsonResponse, RoutedResponse, TextResponse +from pydantic import JsonValue + +FIRST_LINE: Final = {"prompt_tokens": 10, "completion_tokens": 7, "reasoning_tokens": 4} +SECOND_LINE: Final = {"prompt_tokens": 5, "completion_tokens": 3, "reasoning_tokens": 2} +ERROR_FILE_LINES: Final = 2 + + +def _succeeded_line(index: int, model: str, prompt_tokens: int, completion_tokens: int, reasoning_tokens: int) -> str: + return json.dumps( + { + "id": f"batch_req_{index}", + "custom_id": f"r{index}", + "response": { + "status_code": 200, + "request_id": f"$REQUEST_ID-{index}", + "body": { + "id": f"chatcmpl-$REQUEST_ID-{index}", + "object": "chat.completion", + "model": model, + "choices": [ + {"index": 0, "message": {"role": "assistant", "content": "ok"}, "finish_reason": "stop"} + ], + "usage": { + "prompt_tokens": prompt_tokens, + "completion_tokens": completion_tokens, + "total_tokens": prompt_tokens + completion_tokens, + "completion_tokens_details": {"reasoning_tokens": reasoning_tokens}, + }, + }, + }, + "error": None, + }, + separators=(",", ":"), + ) + + +def _failed_line(index: int) -> str: + return json.dumps( + { + "id": f"batch_req_{index}", + "custom_id": f"r{index}", + "response": { + "status_code": 400, + "request_id": f"$REQUEST_ID-{index}", + "body": {"error": {"message": "rejected line", "type": "invalid_request_error", "code": "400"}}, + }, + "error": {"code": "bad_request", "message": "rejected line"}, + }, + separators=(",", ":"), + ) + + +def _batch_routes(model: str) -> RoutedResponse: + output_lines: Final = ( + _succeeded_line(1, model, **FIRST_LINE), + _succeeded_line(2, model, **SECOND_LINE), + _failed_line(3), + ) + error_lines: Final = tuple(_failed_line(index) for index in range(4, 4 + ERROR_FILE_LINES)) + completed: Final = { + "id": "batch-$REQUEST_ID", + "object": "batch", + "endpoint": "/v1/chat/completions", + "errors": None, + "input_file_id": "file-in-$REQUEST_ID", + "completion_window": "24h", + "status": "completed", + "output_file_id": "file-out-$REQUEST_ID", + "error_file_id": "file-err-$REQUEST_ID", + "created_at": 1, + "in_progress_at": 1, + "completed_at": 1, + "expires_at": 1, + "request_counts": {"total": 5, "completed": 2, "failed": 3}, + "metadata": None, + } + return RoutedResponse( + content_type="application/x-routed", + routes={ + "POST /files": JsonResponse( + content_type="application/json", + body={ + "id": "file-in-$REQUEST_ID", + "object": "file", + "purpose": "batch", + "bytes": 100, + "created_at": 1, + "filename": "in.jsonl", + "status": "processed", + }, + ), + "POST /batches": JsonResponse( + content_type="application/json", + body={**completed, "status": "validating", "output_file_id": None, "error_file_id": None}, + ), + "GET /batches/batch-$REQUEST_ID": JsonResponse(content_type="application/json", body=completed), + "GET /files/file-out-$REQUEST_ID/content": TextResponse( + content_type="application/jsonl", body="\n".join(output_lines) + "\n" + ), + "GET /files/file-err-$REQUEST_ID/content": TextResponse( + content_type="application/jsonl", body="\n".join(error_lines) + "\n" + ), + }, + ) + + +def _input_file(model: str) -> bytes: + return ( + "\n".join( + json.dumps( + { + "custom_id": f"r{index}", + "method": "POST", + "url": "/v1/chat/completions", + "body": {"model": model, "messages": [{"role": "user", "content": "batch accounting"}]}, + }, + separators=(",", ":"), + ) + for index in range(1, 6) + ) + + "\n" + ).encode() + + +def _metadata(value: object) -> dict[str, JsonValue]: + return JSON_OBJECT.validate_json(value) if isinstance(value, str) else JSON_OBJECT.validate_python(value) + + +@pytest.mark.covers("quota_management.spend_tracking.batch_costs.reasoning_tokens_and_error_file_failures_recorded") +def test_completed_batch_spend_row_records_reasoning_tokens_and_error_file_failures(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + key: Final = scenario.key() + scenario_id: Final = f"batch-accounting-{uuid.uuid4().hex[:12]}" + handle: Final = register_scenario(scenario_id, _batch_routes("gpt-4o-mini")) + scenario.cleanups.callback(delete_scenario, handle) + model: Final = scenario.model(api_base=handle.api_base()) + file_response: Final = gateway.request_multipart( + "/v1/files", + {"purpose": "batch", "model": model}, + {"file": ("in.jsonl", _input_file(model), "application/jsonl")}, + key=key, + ) + assert file_response.status_code == 200, file_response.text + batch_response: Final = gateway.request( + "POST", + "/v1/batches", + { + "input_file_id": string_value(JSON_OBJECT.validate_json(file_response.content)["id"]), + "endpoint": "/v1/chat/completions", + "completion_window": "24h", + "model": model, + }, + key=key, + ) + assert batch_response.status_code == 200, batch_response.text + batch_id: Final = string_value(JSON_OBJECT.validate_json(batch_response.content)["id"]) + retrieval: Final = gateway.request("GET", f"/v1/batches/{batch_id}", key=key) + assert retrieval.status_code == 200, retrieval.text + assert retrieval.json()["status"] == "completed", retrieval.text + rows: Final = eventually( + lambda: read_rows( + 'SELECT status, prompt_tokens, completion_tokens, metadata FROM "LiteLLM_SpendLogs" ' + "WHERE api_key=%s AND call_type='aretrieve_batch'", + (sha256(key.encode()).hexdigest(),), + ), + lambda values: len(values) == 1, + seconds=70, + ) + row: Final = rows[0] + metadata: Final = _metadata(row["metadata"]) + prompt_tokens: Final = FIRST_LINE["prompt_tokens"] + SECOND_LINE["prompt_tokens"] + completion_tokens: Final = FIRST_LINE["completion_tokens"] + SECOND_LINE["completion_tokens"] + reasoning_tokens: Final = FIRST_LINE["reasoning_tokens"] + SECOND_LINE["reasoning_tokens"] + assert row["status"] == "success", retrieval.text + assert (row["prompt_tokens"], row["completion_tokens"]) == (prompt_tokens, completion_tokens), retrieval.text + assert (metadata["batch_successful_requests"], metadata["batch_failed_requests"]) == ( + 2, + 1 + ERROR_FILE_LINES, + ), json.dumps(metadata) + usage: Final = JSON_OBJECT.validate_python(metadata["usage_object"]) + details: Final = JSON_OBJECT.validate_python(usage["completion_tokens_details"]) + assert (usage["prompt_tokens"], usage["completion_tokens"], usage["total_tokens"]) == ( + prompt_tokens, + completion_tokens, + prompt_tokens + completion_tokens, + ), json.dumps(metadata) + assert {name: value for name, value in details.items() if value is not None} == { + "reasoning_tokens": reasoning_tokens, + "text_tokens": completion_tokens - reasoning_tokens, + }, json.dumps(metadata) diff --git a/tests/integration/spend/test_batch_observability.py b/tests/integration/spend/test_batch_observability.py new file mode 100644 index 00000000000..ca9c26ff513 --- /dev/null +++ b/tests/integration/spend/test_batch_observability.py @@ -0,0 +1,201 @@ +from __future__ import annotations + +import json +import uuid +from hashlib import sha256 +from typing import Final + +import pytest +from integration._support.client import JSON_OBJECT, Gateway, eventually, object_value, string_value +from integration._support.database import read_rows +from integration._support.upstream import delete_scenario, register_scenario +from integration.cost_calculation.cost_tracking_case import JsonResponse, RoutedResponse, TextResponse +from pydantic import JsonValue + +REASONING_TOKENS: Final = (30, 50) +PROMPT_TOKENS: Final = 10 +COMPLETION_TOKENS: Final = 100 +ERROR_FILE_FAILURES: Final = 2 + + +def _successful_line(index: int, reasoning_tokens: int) -> str: + return json.dumps( + { + "id": f"batch_req_{index}", + "custom_id": f"r{index}", + "response": { + "status_code": 200, + "request_id": f"$REQUEST_ID-{index}", + "body": { + "id": f"chatcmpl-$REQUEST_ID-{index}", + "object": "chat.completion", + "model": "gpt-4o-mini", + "choices": [ + {"index": 0, "message": {"role": "assistant", "content": "ok"}, "finish_reason": "stop"} + ], + "usage": { + "prompt_tokens": PROMPT_TOKENS, + "completion_tokens": COMPLETION_TOKENS, + "total_tokens": PROMPT_TOKENS + COMPLETION_TOKENS, + "completion_tokens_details": {"reasoning_tokens": reasoning_tokens}, + }, + }, + }, + "error": None, + }, + separators=(",", ":"), + ) + + +def _failed_line(index: int) -> str: + return json.dumps( + { + "id": f"batch_req_{index}", + "custom_id": f"r{index}", + "response": {"status_code": 400, "request_id": f"$REQUEST_ID-{index}", "body": {"error": "bad"}}, + "error": {"code": "bad_request", "message": "failed"}, + }, + separators=(",", ":"), + ) + + +def _batch(status: str, *, files_ready: bool) -> dict[str, JsonValue]: + return { + "id": "batch-$REQUEST_ID", + "object": "batch", + "endpoint": "/v1/chat/completions", + "errors": None, + "input_file_id": "file-in-$REQUEST_ID", + "completion_window": "24h", + "status": status, + "output_file_id": "file-out-$REQUEST_ID" if files_ready else None, + "error_file_id": "file-err-$REQUEST_ID" if files_ready else None, + "created_at": 1, + "in_progress_at": 1, + "completed_at": 1 if files_ready else None, + "expires_at": 1, + "request_counts": {"total": 5, "completed": 2, "failed": 3}, + "metadata": None, + } + + +def _provider_routes() -> RoutedResponse: + output_lines: Final = ( + _successful_line(1, REASONING_TOKENS[0]), + _failed_line(2), + _successful_line(3, REASONING_TOKENS[1]), + ) + error_lines: Final = tuple(_failed_line(index) for index in range(4, 4 + ERROR_FILE_FAILURES)) + return RoutedResponse( + content_type="application/x-routed", + routes={ + "POST /files": JsonResponse( + content_type="application/json", + body={ + "id": "file-in-$REQUEST_ID", + "object": "file", + "purpose": "batch", + "bytes": 100, + "created_at": 1, + "filename": "in.jsonl", + "status": "processed", + }, + ), + "POST /batches": JsonResponse( + content_type="application/json", body=_batch("validating", files_ready=False) + ), + "GET /batches/batch-$REQUEST_ID": JsonResponse( + content_type="application/json", body=_batch("completed", files_ready=True) + ), + "GET /files/file-out-$REQUEST_ID/content": TextResponse( + content_type="application/jsonl", body="\n".join(output_lines) + "\n" + ), + "GET /files/file-err-$REQUEST_ID/content": TextResponse( + content_type="application/jsonl", body="\n".join(error_lines) + "\n" + ), + }, + ) + + +def _input_file(model_name: str) -> bytes: + return ( + "\n".join( + json.dumps( + { + "custom_id": f"r{index}", + "method": "POST", + "url": "/v1/chat/completions", + "body": {"model": model_name, "messages": [{"role": "user", "content": "batch observability"}]}, + }, + separators=(",", ":"), + ) + for index in range(1, 6) + ) + + "\n" + ).encode() + + +def _retrieval_rows(key: str) -> tuple[dict[str, JsonValue], ...]: + return tuple( + read_rows( + 'SELECT prompt_tokens, completion_tokens, metadata FROM "LiteLLM_SpendLogs" ' + "WHERE api_key=%s AND call_type='aretrieve_batch'", + (sha256(key.encode()).hexdigest(),), + ) + ) + + +def _metadata(row: dict[str, JsonValue]) -> dict[str, JsonValue]: + value: Final = row["metadata"] + return object_value(JSON_OBJECT.validate_json(value) if isinstance(value, str) else value) + + +@pytest.mark.covers("spend.batches.retrieval_row_aggregates_reasoning_tokens_and_per_request_counts") +def test_batch_retrieval_row_sums_reasoning_tokens_and_counts_output_and_error_file_failures( + gateway: Gateway, +) -> None: + with gateway.scenario() as scenario: + scenario_id: Final = f"batch-observability-{uuid.uuid4().hex[:12]}" + handle: Final = register_scenario(scenario_id, _provider_routes()) + scenario.cleanups.callback(delete_scenario, handle) + model_name: Final = scenario.model(api_base=handle.api_base()) + key: Final = scenario.key(models=[model_name]) + file_response: Final = gateway.request_multipart( + "/v1/files", + {"purpose": "batch", "model": model_name}, + {"file": ("in.jsonl", _input_file(model_name), "application/jsonl")}, + key=key, + ) + assert file_response.status_code == 200, file_response.text + input_file_id: Final = string_value(JSON_OBJECT.validate_json(file_response.content)["id"]) + batch_response: Final = gateway.request( + "POST", + "/v1/batches", + { + "input_file_id": input_file_id, + "endpoint": "/v1/chat/completions", + "completion_window": "24h", + "model": model_name, + }, + key=key, + ) + assert batch_response.status_code == 200, batch_response.text + batch_id: Final = string_value(JSON_OBJECT.validate_json(batch_response.content)["id"]) + retrieval: Final = eventually( + lambda: gateway.request("GET", f"/v1/batches/{batch_id}", key=key), + lambda response: response.status_code == 200 and response.json()["status"] == "completed", + seconds=30, + ) + assert retrieval.status_code == 200, retrieval.text + rows: Final = eventually(lambda: _retrieval_rows(key), lambda values: len(values) == 1, seconds=70) + row: Final = rows[0] + metadata: Final = _metadata(row) + usage: Final = object_value(metadata["usage_object"]) + assert row["prompt_tokens"] == 2 * PROMPT_TOKENS, retrieval.text + assert row["completion_tokens"] == 2 * COMPLETION_TOKENS, retrieval.text + assert object_value(usage["completion_tokens_details"])["reasoning_tokens"] == sum(REASONING_TOKENS), ( + retrieval.text, + usage, + ) + assert metadata["batch_successful_requests"] == 2, (retrieval.text, metadata) + assert metadata["batch_failed_requests"] == 1 + ERROR_FILE_FAILURES, (retrieval.text, metadata) diff --git a/tests/integration/spend/test_batch_poll_starvation.py b/tests/integration/spend/test_batch_poll_starvation.py new file mode 100644 index 00000000000..f68f10e3d8a --- /dev/null +++ b/tests/integration/spend/test_batch_poll_starvation.py @@ -0,0 +1,212 @@ +import json +import os +from hashlib import sha256 +from typing import Final + +import pytest +from integration._support.client import JSON_OBJECT, Gateway, Scenario, eventually, object_value, string_value +from integration._support.database import read_rows +from integration._support.upstream import delete_scenario, register_scenario +from integration.cost_calculation.cost_tracking_case import JsonResponse, RoutedResponse, TextResponse +from pydantic import JsonValue + +from litellm.constants import MAX_OBJECTS_PER_POLL_CYCLE + +INPUT_COST_PER_TOKEN: Final = 0.001 +OUTPUT_COST_PER_TOKEN: Final = 0.002 +PROMPT_TOKENS: Final = 100 +COMPLETION_TOKENS: Final = 50 +BATCH_COST_SHARE: Final = 0.5 + +_INPUT_FILE: Final = JsonResponse( + content_type="application/json", + body={ + "id": "file-in-$REQUEST_ID", + "object": "file", + "purpose": "batch", + "bytes": 100, + "created_at": 1, + "filename": "in.jsonl", + "status": "processed", + }, +) + + +def _batch(status: str, output_file_id: str | None) -> dict[str, JsonValue]: + return { + "id": "batch-$REQUEST_ID", + "object": "batch", + "endpoint": "/v1/chat/completions", + "errors": None, + "input_file_id": "file-in-$REQUEST_ID", + "completion_window": "24h", + "status": status, + "output_file_id": output_file_id, + "error_file_id": None, + "created_at": 1, + "in_progress_at": 1, + "completed_at": 1 if status == "completed" else None, + "expires_at": 1, + "request_counts": {"total": 1, "completed": 1 if status == "completed" else 0, "failed": 0}, + "metadata": None, + } + + +def _accepting_routes() -> dict[str, JsonResponse | TextResponse]: + return { + "POST /files": _INPUT_FILE, + "POST /batches": JsonResponse(content_type="application/json", body=_batch("validating", None)), + } + + +def _gone_at_provider_routes() -> RoutedResponse: + return RoutedResponse( + content_type="application/x-routed", + routes={ + **_accepting_routes(), + "GET /batches/batch-$REQUEST_ID": JsonResponse( + content_type="application/json", + status=404, + body={ + "error": { + "message": "No batch found with id 'batch-$REQUEST_ID'.", + "type": "invalid_request_error", + "param": "id", + "code": "batch_not_found", + } + }, + ), + }, + ) + + +def _completed_routes() -> RoutedResponse: + output_line: Final = { + "id": "batch_req_1", + "custom_id": "r1", + "response": { + "status_code": 200, + "request_id": "$REQUEST_ID-1", + "body": { + "id": "chatcmpl-$REQUEST_ID-1", + "object": "chat.completion", + "model": "gpt-4o-mini", + "choices": [{"index": 0, "message": {"role": "assistant", "content": "ok"}, "finish_reason": "stop"}], + "usage": { + "prompt_tokens": PROMPT_TOKENS, + "completion_tokens": COMPLETION_TOKENS, + "total_tokens": PROMPT_TOKENS + COMPLETION_TOKENS, + }, + }, + }, + "error": None, + } + return RoutedResponse( + content_type="application/x-routed", + routes={ + **_accepting_routes(), + "GET /batches/batch-$REQUEST_ID": JsonResponse( + content_type="application/json", body=_batch("completed", "file-out-$REQUEST_ID") + ), + "GET /files/file-out-$REQUEST_ID/content": TextResponse( + content_type="application/jsonl", body=json.dumps(output_line, separators=(",", ":")) + "\n" + ), + }, + ) + + +def _scripted_deployment(scenario: Scenario, marker: str, routes: RoutedResponse) -> str: + scenario_id: Final = f"poll-{marker}-{sha256(os.urandom(16)).hexdigest()[:12]}" + handle: Final = register_scenario(scenario_id, routes) + scenario.cleanups.callback(delete_scenario, handle) + created: Final = scenario.gateway.post( + "/model/new", + { + "model_name": f"poll-{marker}-{sha256(scenario_id.encode()).hexdigest()[:12]}", + "litellm_params": { + "model": "openai/gpt-4o-mini", + "api_key": "sk-scripted-provider", + "api_base": handle.api_base(), + "input_cost_per_token": INPUT_COST_PER_TOKEN, + "output_cost_per_token": OUTPUT_COST_PER_TOKEN, + }, + }, + ) + scenario.cleanups.callback(scenario.delete_model, string_value(object_value(created["model_info"])["id"])) + return string_value(created["model_name"]) + + +def _submitted_batch_id(gateway: Gateway, key: str, model_name: str) -> str: + request_line: Final = { + "custom_id": "r1", + "method": "POST", + "url": "/v1/chat/completions", + "body": {"model": model_name, "messages": [{"role": "user", "content": "poll starvation"}]}, + } + file_response: Final = gateway.request_multipart( + "/v1/files", + {"purpose": "batch", "target_model_names": model_name}, + {"file": ("in.jsonl", (json.dumps(request_line) + "\n").encode(), "application/jsonl")}, + key=key, + ) + assert file_response.is_success, file_response.text + batch_response: Final = gateway.request( + "POST", + "/v1/batches", + { + "input_file_id": string_value(JSON_OBJECT.validate_json(file_response.content)["id"]), + "endpoint": "/v1/chat/completions", + "completion_window": "24h", + "model": model_name, + }, + key=key, + ) + assert batch_response.is_success, batch_response.text + return string_value(JSON_OBJECT.validate_json(batch_response.content)["id"]) + + +def _managed_rows(batch_ids: tuple[str, ...]) -> list[dict[str, JsonValue]]: + placeholders: Final = ", ".join("%s" for _ in batch_ids) + return read_rows( + f'SELECT batch_processed FROM "LiteLLM_ManagedObjectTable" WHERE unified_object_id IN ({placeholders})', + batch_ids, + ) + + +@pytest.mark.timeout(180) +@pytest.mark.covers("quota_management.spend_tracking.batch_costs.uncostable_rows_retire_so_newer_batches_are_costed") +def test_batches_gone_at_provider_do_not_starve_a_newer_batch_out_of_cost_polling(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + key: Final = scenario.key() + gone_batch_ids: Final = tuple( + _submitted_batch_id( + gateway, key, _scripted_deployment(scenario, f"gone{index}", _gone_at_provider_routes()) + ) + for index in range(MAX_OBJECTS_PER_POLL_CYCLE) + ) + costable_batch_id: Final = _submitted_batch_id( + gateway, key, _scripted_deployment(scenario, "costable", _completed_routes()) + ) + spend_rows: Final = eventually( + lambda: read_rows( + 'SELECT call_type, status, prompt_tokens, completion_tokens, spend FROM "LiteLLM_SpendLogs" ' + "WHERE api_key = %s AND call_type = %s", + (sha256(key.encode()).hexdigest(), "aretrieve_batch"), + ), + lambda rows: len(rows) == 1, + seconds=120, + ) + assert spend_rows == [ + { + "call_type": "aretrieve_batch", + "status": "success", + "prompt_tokens": PROMPT_TOKENS, + "completion_tokens": COMPLETION_TOKENS, + "spend": pytest.approx( + BATCH_COST_SHARE + * (PROMPT_TOKENS * INPUT_COST_PER_TOKEN + COMPLETION_TOKENS * OUTPUT_COST_PER_TOKEN) + ), + } + ] + assert _managed_rows((costable_batch_id,)) == [{"batch_processed": True}] + assert _managed_rows(gone_batch_ids) == [{"batch_processed": True}] * MAX_OBJECTS_PER_POLL_CYCLE diff --git a/tests/integration/spend/test_cache_and_quota.py b/tests/integration/spend/test_cache_and_quota.py index d32297765f6..97ef785aa15 100644 --- a/tests/integration/spend/test_cache_and_quota.py +++ b/tests/integration/spend/test_cache_and_quota.py @@ -1,4 +1,7 @@ +import json +import threading import uuid +from concurrent.futures import ThreadPoolExecutor from contextlib import ExitStack from hashlib import sha256 from typing import Final @@ -7,10 +10,10 @@ import httpx import pytest from hypothesis import strategies as st from hypothesis.stateful import RuleBasedStateMachine, rule, run_state_machine_as_test - from integration._support.client import Gateway, eventually from integration._support.database import read_rows from integration._support.generation import LIFECYCLE_SETTINGS, bounded_http_requests +from integration._support.wire import Reply, Request, wire_server @pytest.mark.covers("quota_management.response_cache.generated_sequences_preserve_content_and_accounting") @@ -211,6 +214,117 @@ def test_key_budget_at_boundary_blocks_provider_then_explicit_reset_restores(gat assert upstream.get("/__observations").json()["requests"] == [] +@pytest.mark.covers("quota_management.budget.key.count_tokens_reserves_nothing_so_completion_within_budget_succeeds") +def test_repeated_count_tokens_on_budgeted_key_does_not_reserve_budget_or_block_later_completion( + gateway: Gateway, +) -> None: + with ( + gateway.scenario() as scenario, + httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream, + ): + model: Final = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002) + key: Final = scenario.key(models=[model], max_budget=0.1) + digest: Final = sha256(key.encode()).hexdigest() + upstream.get("/__observations").raise_for_status() + counts: Final = tuple( + gateway.request( + "POST", + "/v1/messages/count_tokens", + {"model": model, "messages": [{"role": "user", "content": "hello!!!"}]}, + key=key, + headers={"anthropic-version": "2023-06-01"}, + ) + for _ in range(3) + ) + for count in counts: + assert count.status_code == 200, count.text + assert count.json() == counts[0].json(), count.text + input_tokens: Final = counts[0].json()["input_tokens"] + assert isinstance(input_tokens, int) and input_tokens > 0, counts[0].text + assert upstream.get("/__observations").json()["requests"] == [] + completion: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": f"after counting {uuid.uuid4().hex}"}]}, + key=key, + ) + assert completion.status_code == 200, completion.text + assert completion.json()["usage"]["total_tokens"] == 40, completion.text + assert [request["path"] for request in upstream.get("/__observations").json()["requests"]] == [ + "/v1/chat/completions" + ] + spent: Final = eventually( + lambda: read_rows('SELECT spend FROM "LiteLLM_VerificationToken" WHERE token=%s', (digest,)), + lambda values: len(values) == 1 and float(values[0]["spend"]) > 0, + seconds=70, + ) + assert float(spent[0]["spend"]) == pytest.approx(20 * 0.001 + 20 * 0.002) + rows: Final = eventually( + lambda: read_rows('SELECT call_type, spend FROM "LiteLLM_SpendLogs" WHERE api_key=%s', (digest,)), + lambda values: len(values) >= 1, + seconds=70, + ) + assert [(row["call_type"], float(row["spend"])) for row in rows] == [("acompletion", pytest.approx(0.06))] + + +@pytest.mark.covers( + "quota_management.budget.key.in_flight_count_tokens_reserves_nothing_so_completion_reaches_provider" +) +def test_in_flight_count_tokens_does_not_reserve_key_budget_away_from_a_completion(gateway: Gateway) -> None: + counting_reached_provider: Final = threading.Event() + completion_answered: Final = threading.Event() + + def respond(request: Request) -> Reply: + counting_reached_provider.set() + assert completion_answered.wait(timeout=30), "completion never ran while count tokens was in flight" + return Reply(body=b'{"totalTokens": 12, "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 12}]}') + + with ( + wire_server(respond) as wire, + gateway.scenario() as scenario, + httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream, + ThreadPoolExecutor(max_workers=1) as background, + ): + counted: Final = scenario.model( + model="gemini/gemini-3.8-flash", + api_base=wire.url, + api_key="synthetic-gemini-key", + input_cost_per_token=0.001, + output_cost_per_token=0.002, + ) + completed: Final = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002) + key: Final = scenario.key(models=[counted, completed], max_budget=0.06) + contents: Final = [{"role": "user", "parts": [{"text": "hello"}]}] + counting: Final = background.submit( + gateway.request, "POST", f"/v1beta/models/{counted}:countTokens", {"contents": contents}, key=key + ) + assert counting_reached_provider.wait(timeout=30), "count tokens request never reached the provider" + upstream.get("/__observations").raise_for_status() + prompt: Final = f"after count tokens {uuid.uuid4().hex}" + completion: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": completed, "messages": [{"role": "user", "content": prompt}]}, + key=key, + ) + completion_answered.set() + count: Final = counting.result(timeout=30) + assert completion.status_code == 200 and completion.json()["usage"]["total_tokens"] == 40, completion.text + assert [call["body"]["messages"] for call in upstream.get("/__observations").json()["requests"]] == [ + [{"role": "user", "content": prompt}] + ] + assert count.status_code == 200, count.text + assert count.json() == {"totalTokens": 12, "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 12}]}, ( + count.text + ) + provider_calls: Final = wire.drain() + assert [(call.method, call.target) for call in provider_calls] == [ + ("POST", "/v1beta/models/gemini-3.8-flash:countTokens") + ] + assert provider_calls[0].headers["x-goog-api-key"] == "synthetic-gemini-key" + assert json.loads(provider_calls[0].body) == {"contents": contents} + + @pytest.mark.covers("quota_management.response_cache.system_messages_partition_cache_identity") def test_different_system_messages_do_not_share_a_cached_response(gateway: Gateway) -> None: with ( @@ -219,8 +333,7 @@ def test_different_system_messages_do_not_share_a_cached_response(gateway: Gatew ): model: Final = scenario.model() prompt: Final = uuid.uuid4().hex - identities: dict[str, str] = {} - for system, expected_calls in (("first policy", 1), ("second policy", 1), ("first policy", 0)): + def completion_id(system: str, expected_calls: int) -> str: upstream.get("/__observations").raise_for_status() response: Final = gateway.request( "POST", @@ -232,14 +345,12 @@ def test_different_system_messages_do_not_share_a_cached_response(gateway: Gatew ) assert response.status_code == 200 and response.json()["usage"]["total_tokens"] == 40, response.text calls: Final = upstream.get("/__observations").json()["requests"] - assert len(calls) == expected_calls - if system in identities: - assert response.json()["id"] == identities[system] - else: - assert response.json()["id"] not in identities.values() - identities = {**identities, system: response.json()["id"]} - if calls: - assert calls[0]["body"]["messages"] == [ - {"role": "system", "content": system}, - {"role": "user", "content": prompt}, - ] + assert [call["body"]["messages"] for call in calls] == [ + [{"role": "system", "content": system}, {"role": "user", "content": prompt}] + ] * expected_calls, calls + return response.json()["id"] + + first_policy_id: Final = completion_id("first policy", 1) + second_policy_id: Final = completion_id("second policy", 1) + assert first_policy_id != second_policy_id + assert completion_id("first policy", 0) == first_policy_id diff --git a/tests/integration/spend/test_daily_rollup_retry.py b/tests/integration/spend/test_daily_rollup_retry.py new file mode 100644 index 00000000000..cf1b989639a --- /dev/null +++ b/tests/integration/spend/test_daily_rollup_retry.py @@ -0,0 +1,182 @@ +import json +import os +import uuid +from collections.abc import Iterable +from hashlib import sha256 +from typing import Final + +import psycopg +import pytest +from integration._support.client import Gateway, delete_key_if_present, eventually, string_value +from integration._support.database import read_rows +from integration._support.wire import Reply, Request, wire_server +from psycopg import sql + + +def _execute(statements: Iterable[sql.Composable]) -> None: + with psycopg.connect(os.environ["DATABASE_URL"], autocommit=True) as connection: + for statement in statements: + connection.execute(statement) + + +def _install_daily_user_rollup_fault(user_id: str) -> str: + suffix: Final = f"fault-{uuid.uuid4().hex}" + sequence: Final = sql.Identifier(f"{suffix}_attempts") + function: Final = sql.Identifier(suffix) + _execute( + ( + sql.SQL("CREATE SEQUENCE {}").format(sequence), + sql.SQL( + "CREATE FUNCTION {}() RETURNS trigger LANGUAGE plpgsql AS $fault$ " + "BEGIN PERFORM nextval({}); " + "RAISE EXCEPTION 'synthetic daily rollup outage' USING ERRCODE = '55P03'; " + "END $fault$" + ).format(function, sql.Literal(f"{suffix}_attempts")), + sql.SQL( + 'CREATE TRIGGER {} BEFORE INSERT ON "LiteLLM_DailyUserSpend" ' + "FOR EACH ROW WHEN (NEW.user_id = {}) EXECUTE FUNCTION {}()" + ).format(sql.Identifier(suffix), sql.Literal(user_id), function), + ) + ) + return suffix + + +def _lift_daily_user_rollup_fault(suffix: str) -> None: + _execute( + ( + sql.SQL('DROP TRIGGER IF EXISTS {} ON "LiteLLM_DailyUserSpend"').format(sql.Identifier(suffix)), + sql.SQL("DROP FUNCTION IF EXISTS {}()").format(sql.Identifier(suffix)), + sql.SQL("DROP SEQUENCE IF EXISTS {}").format(sql.Identifier(f"{suffix}_attempts")), + ) + ) + + +def _rollup_attempts(suffix: str) -> int: + with psycopg.connect(os.environ["DATABASE_URL"], autocommit=True) as connection: + row: Final = connection.execute( + sql.SQL("SELECT CASE WHEN is_called THEN last_value ELSE 0 END FROM {}").format( + sql.Identifier(f"{suffix}_attempts") + ) + ).fetchone() + assert row is not None + return int(row[0]) + + +@pytest.mark.covers("spend.daily_rollup.failed_user_commit_is_retried_until_report_and_daily_activity_agree") +def test_failed_daily_user_rollup_commit_is_retried_so_spend_report_and_daily_activity_agree( + gateway: Gateway, +) -> None: + def provider(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/v1/chat/completions" + return Reply( + body=json.dumps( + { + "id": "chatcmpl-" + uuid.uuid4().hex, + "object": "chat.completion", + "created": 1, + "model": "gpt-4o-mini", + "choices": [ + { + "index": 0, + "message": {"role": "assistant", "content": "synthetic rollup answer"}, + "finish_reason": "stop", + } + ], + "usage": {"prompt_tokens": 20, "completion_tokens": 20, "total_tokens": 40}, + } + ).encode() + ) + + with wire_server(provider) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + api_base=wire.url + "/v1", input_cost_per_token=0.001, output_cost_per_token=0.002, num_retries=0 + ) + user: Final = scenario.user() + key: Final = string_value(gateway.post("/key/generate", {"user_id": user, "models": [model]})["key"]) + scenario.cleanups.callback(delete_key_if_present, gateway, key) + digest: Final = sha256(key.encode()).hexdigest() + suffix: Final = _install_daily_user_rollup_fault(user) + scenario.cleanups.callback(_lift_daily_user_rollup_fault, suffix) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": "rollup retry control"}]}, + key=key, + ) + assert response.status_code == 200, response.text + assert float(response.headers["x-litellm-response-cost"]) == pytest.approx(20 * 0.001 + 20 * 0.002) + body: Final = response.json() + spend_rows: Final = eventually( + lambda: read_rows( + 'SELECT spend, DATE("startTime")::text AS day, model FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (body["id"],), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert float(spend_rows[0]["spend"]) == pytest.approx(0.06) + day: Final = string_value(spend_rows[0]["day"]) + stored_model: Final = string_value(spend_rows[0]["model"]) + eventually(lambda: _rollup_attempts(suffix), lambda attempts: attempts >= 1, seconds=70) + _lift_daily_user_rollup_fault(suffix) + activity: Final = eventually( + lambda: gateway.request( + "GET", + "/user/daily/activity/aggregated", + params={"start_date": day, "end_date": day, "api_key": digest}, + ), + lambda polled: ( + polled.status_code == 200 + and len(polled.json().get("results", ())) > 0 + and polled.json()["results"][0]["breakdown"]["api_keys"] + .get(digest, {}) + .get("metrics", {}) + .get("spend", 0) + == pytest.approx(0.06) + ), + seconds=90, + ) + assert activity.status_code == 200, activity.text + metrics: Final = activity.json()["results"][0]["breakdown"]["api_keys"][digest]["metrics"] + assert metrics == { + "spend": pytest.approx(0.06), + "flat_cost": pytest.approx(0.0), + "prompt_tokens": 20, + "completion_tokens": 20, + "cache_read_input_tokens": 0, + "cache_creation_input_tokens": 0, + "compression_saved_tokens": 0, + "compression_savings_spend": pytest.approx(0.0), + "prompt_caching_savings_spend": pytest.approx(0.0), + "gateway_injected_caching_savings_spend": pytest.approx(0.0), + "autorouter_savings_spend": pytest.approx(0.0), + "total_tokens": 40, + "successful_requests": 1, + "failed_requests": 0, + "api_requests": 1, + "total_response_time_ms": metrics["total_response_time_ms"], + "timed_requests": metrics["timed_requests"], + } + report: Final = gateway.request( + "GET", + "/global/spend/report", + params={"start_date": day, "end_date": day, "api_key": digest}, + ) + assert report.status_code == 200, report.text + assert report.json() == [ + { + "api_key": digest, + "total_cost": pytest.approx(0.06), + "total_input_tokens": 20, + "total_output_tokens": 20, + "model_details": [ + { + "model": stored_model, + "total_cost": pytest.approx(0.06), + "total_input_tokens": 20, + "total_output_tokens": 20, + } + ], + } + ] + assert metrics["spend"] == pytest.approx(report.json()[0]["total_cost"]) diff --git a/tests/integration/spend/test_disconnected_bedrock_messages_stream_billing.py b/tests/integration/spend/test_disconnected_bedrock_messages_stream_billing.py new file mode 100644 index 00000000000..91f2c1c0760 --- /dev/null +++ b/tests/integration/spend/test_disconnected_bedrock_messages_stream_billing.py @@ -0,0 +1,123 @@ +import base64 +import json +import uuid +from hashlib import sha256 +from typing import Final + +import pytest +from integration._support.client import Gateway, eventually +from integration._support.database import read_rows +from integration._support.upstream import _aws_event_frame +from integration._support.wire import Reply, Request, wire_server +from pydantic import JsonValue + +BEDROCK_MODEL: Final = "anthropic.claude-haiku-4-5-20251001-v1:0" +INPUT_TOKENS: Final = 30 +FULL_OUTPUT_TOKENS: Final = 412 +INPUT_RATE: Final = 0.001 +OUTPUT_RATE: Final = 0.002 + + +def _invoke_chunk(payload: dict[str, JsonValue]) -> bytes: + encoded: Final = base64.b64encode(json.dumps(payload, separators=(",", ":")).encode()).decode() + return _aws_event_frame("chunk", {"bytes": encoded}, "", "") + + +def _message_start(message_id: str) -> bytes: + return _invoke_chunk( + { + "type": "message_start", + "message": { + "id": message_id, + "type": "message", + "role": "assistant", + "model": BEDROCK_MODEL, + "content": [], + "stop_reason": None, + "stop_sequence": None, + "usage": {"input_tokens": INPUT_TOKENS, "output_tokens": 0}, + }, + } + ) + _invoke_chunk({"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}}) + + +def _text_delta(text: str) -> bytes: + return _invoke_chunk({"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": text}}) + + +def _terminal_usage() -> bytes: + return ( + _invoke_chunk({"type": "content_block_stop", "index": 0}) + + _invoke_chunk( + { + "type": "message_delta", + "delta": {"stop_reason": "end_turn"}, + "usage": {"output_tokens": FULL_OUTPUT_TOKENS}, + } + ) + + _invoke_chunk({"type": "message_stop"}) + ) + + +@pytest.mark.covers("spend.anthropic_messages_stream.client_disconnect_bills_terminal_bedrock_usage") +@pytest.mark.timeout(120) +def test_client_disconnect_mid_bedrock_messages_stream_still_bills_terminal_usage(gateway: Gateway) -> None: + message_id: Final = f"msg_{uuid.uuid4().hex}" + + def respond(request: Request) -> Reply: + assert request.target == f"/model/{BEDROCK_MODEL}/invoke-with-response-stream", request.target + assert json.loads(request.body)["messages"] == [{"role": "user", "content": "disconnect control"}], request.body + return Reply( + content_type="application/vnd.amazon.eventstream", + chunks=( + _message_start(message_id) + _text_delta("first"), + _text_delta("second"), + _text_delta("third"), + _terminal_usage(), + ), + pause_between_chunks=0.5, + ) + + with wire_server(respond) as wire, gateway.scenario() as scenario: + model: Final = scenario.model( + model=f"bedrock/invoke/{BEDROCK_MODEL}", + api_base=wire.url, + aws_access_key_id="AKIASCRIPTEDPROVIDER", + aws_secret_access_key="scripted-secret", + aws_region_name="us-east-1", + input_cost_per_token=INPUT_RATE, + output_cost_per_token=OUTPUT_RATE, + ) + key: Final = scenario.key(models=[model]) + with gateway.client.stream( + "POST", + "/v1/messages", + json={ + "model": model, + "messages": [{"role": "user", "content": "disconnect control"}], + "max_tokens": FULL_OUTPUT_TOKENS, + "stream": True, + }, + headers={"Authorization": f"Bearer {key}"}, + ) as response: + assert response.status_code == 200, response.read().decode() + first_event: Final = next(line for line in response.iter_lines() if line.startswith("data:")) + assert json.loads(first_event.removeprefix("data:"))["type"] == "message_start", first_event + + rows: Final = eventually( + lambda: read_rows( + 'SELECT request_id, status, prompt_tokens, completion_tokens, spend FROM "LiteLLM_SpendLogs" ' + "WHERE api_key=%s", + (sha256(key.encode()).hexdigest(),), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert rows[0]["request_id"] == message_id, rows + assert rows[0]["status"] == "success", rows + assert rows[0]["prompt_tokens"] == INPUT_TOKENS, rows + assert rows[0]["completion_tokens"] == FULL_OUTPUT_TOKENS, rows + assert float(str(rows[0]["spend"])) == pytest.approx( + INPUT_TOKENS * INPUT_RATE + FULL_OUTPUT_TOKENS * OUTPUT_RATE + ), rows + assert len(wire.drain()) == 1 diff --git a/tests/integration/spend/test_failed_dispatch_tokens.py b/tests/integration/spend/test_failed_dispatch_tokens.py new file mode 100644 index 00000000000..5778ff9654d --- /dev/null +++ b/tests/integration/spend/test_failed_dispatch_tokens.py @@ -0,0 +1,50 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway, eventually +from integration._support.database import read_rows +from integration._support.wire import Reply, Request, wire_server + + +@pytest.mark.covers("spend.failed_dispatch.failure_row_records_estimated_input_tokens") +def test_provider_500_after_dispatch_records_estimated_prompt_tokens_on_failure_row(gateway: Gateway) -> None: + prompt: Final = "failed dispatch accounting " + uuid.uuid4().hex + system: Final = "You are a terse accounting assistant" + + def provider(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/v1/chat/completions" + body: Final = json.loads(request.body) + assert body["model"] == "gpt-4o-mini" + assert body["messages"] == [{"role": "system", "content": system}, {"role": "user", "content": prompt}] + return Reply( + status=500, + body=b'{"error":{"message":"synthetic provider outage","type":"server_error","code":"500"}}', + ) + + with wire_server(provider) as wire, gateway.scenario() as scenario: + model: Final = scenario.model(api_base=wire.url + "/v1", num_retries=0) + key: Final = scenario.key(models=[model]) + failed: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "system", "content": system}, {"role": "user", "content": prompt}]}, + key=key, + ) + assert failed.status_code == 500 and "synthetic provider outage" in failed.text, failed.text + call_id: Final = failed.headers["x-litellm-call-id"] + assert len(wire.drain()) == 1 + rows: Final = eventually( + lambda: read_rows( + 'SELECT status, spend, prompt_tokens, completion_tokens, total_tokens FROM "LiteLLM_SpendLogs" ' + "WHERE request_id=%s", + (call_id,), + ), + lambda values: len(values) == 1, + seconds=70, + ) + row: Final = rows[0] + assert row["status"] == "failure" and float(row["spend"]) == 0 and row["completion_tokens"] == 0, row + assert row["prompt_tokens"] > 0, f"failure row lost the dispatched input tokens: {row}" + assert row["total_tokens"] == row["prompt_tokens"], row diff --git a/tests/integration/spend/test_model_router_selected_model.py b/tests/integration/spend/test_model_router_selected_model.py new file mode 100644 index 00000000000..a95ee4f9feb --- /dev/null +++ b/tests/integration/spend/test_model_router_selected_model.py @@ -0,0 +1,74 @@ +import json +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway, eventually +from integration._support.database import read_rows +from integration._support.wire import Reply, Request, wire_server + +ROUTER_DEPLOYMENT: Final = "router-deploy" +SELECTED_MODEL: Final = "grok-4-1-fast-reasoning" +SELECTED_MODEL_WITH_PROVIDER: Final = f"azure_ai/{SELECTED_MODEL}" + + +@pytest.mark.covers("spend.model_router.selected_model_is_returned_and_persisted_for_plain_alias") +def test_model_router_alias_without_router_in_name_keeps_selected_model_in_response_and_spend_log( + gateway: Gateway, +) -> None: + prompt: Final = uuid.uuid4().hex + + def provider(request: Request) -> Reply: + assert request.method == "POST" and request.target == "/chat/completions", request.target + assert json.loads(request.body) == { + "model": ROUTER_DEPLOYMENT, + "messages": [{"role": "user", "content": prompt}], + "stream": False, + }, request.body + return Reply( + body=json.dumps( + { + "id": "chatcmpl-" + uuid.uuid4().hex, + "object": "chat.completion", + "created": 1, + "model": SELECTED_MODEL, + "choices": [ + { + "index": 0, + "message": {"role": "assistant", "content": "routed answer"}, + "finish_reason": "stop", + } + ], + "usage": {"prompt_tokens": 20, "completion_tokens": 20, "total_tokens": 40}, + } + ).encode() + ) + + with wire_server(provider) as wire, gateway.scenario() as scenario: + alias: Final = scenario.model( + model=f"azure_ai/model_router/{ROUTER_DEPLOYMENT}", api_base=wire.url, num_retries=0 + ) + response: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": alias, "messages": [{"role": "user", "content": prompt}]}, + ) + assert response.status_code == 200, response.text + body: Final = response.json() + assert body["model"] == SELECTED_MODEL_WITH_PROVIDER, response.text + assert body["choices"][0]["message"]["content"] == "routed answer", response.text + assert len(wire.drain()) == 1 + rows: Final = eventually( + lambda: read_rows( + 'SELECT model, model_group, status FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (body["id"],), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert rows == [{"model": SELECTED_MODEL_WITH_PROVIDER, "model_group": alias, "status": "success"}] + logs: Final = gateway.request("GET", "/spend/logs", params={"request_id": body["id"]}) + assert logs.status_code == 200, logs.text + assert [(row["model"], row["model_group"]) for row in logs.json()] == [(SELECTED_MODEL_WITH_PROVIDER, alias)], ( + logs.text + ) diff --git a/tests/integration/spend/test_org_budget_cli_session_token.py b/tests/integration/spend/test_org_budget_cli_session_token.py new file mode 100644 index 00000000000..f821e337374 --- /dev/null +++ b/tests/integration/spend/test_org_budget_cli_session_token.py @@ -0,0 +1,80 @@ +import os +import uuid +from typing import Final + +import httpx +import pytest +from integration._support.client import Gateway, eventually, string_value +from integration._support.database import read_rows + +from litellm.proxy._types import LiteLLM_UserTable +from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken + + +def _cli_session_token(user_id: str, team_id: str) -> str: + cli_user: Final = LiteLLM_UserTable(user_id=user_id, user_role="internal_user", teams=[team_id], models=[]) + return ExperimentalUIJWTToken.get_cli_jwt_auth_token(user_info=cli_user, team_id=team_id, team_alias="cli-team") + + +@pytest.mark.covers("quota_management.organization_budget.cli_session_token_without_org_id_charges_team_organization") +def test_cli_session_token_without_org_id_charges_and_caps_the_team_organization( + gateway: Gateway, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setenv("LITELLM_SALT_KEY", os.environ.get("LITELLM_SALT_KEY", "sk-integration-salt")) + with ( + gateway.scenario() as scenario, + httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream, + ): + model: Final = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002) + organization: Final = gateway.post( + "/organization/new", {"organization_alias": f"integration-{uuid.uuid4().hex}", "max_budget": 0.06} + ) + org_id: Final = string_value(organization["organization_id"]) + scenario.cleanups.callback( + lambda: gateway.request("DELETE", "/organization/delete", {"organization_ids": [org_id]}) + ) + user_id: Final = scenario.user() + team_id: Final = scenario.team( + organization_id=org_id, models=[model], members_with_roles=[{"role": "user", "user_id": user_id}] + ) + token: Final = _cli_session_token(user_id, team_id) + prompt: Final = f"org budget {uuid.uuid4().hex}" + upstream.get("/__observations").raise_for_status() + first: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": prompt}]}, + key=token, + ) + assert first.status_code == 200 and first.json()["usage"]["total_tokens"] == 40, first.text + reached_upstream: Final = upstream.get("/__observations").json()["requests"] + assert len(reached_upstream) == 1, reached_upstream + assert reached_upstream[0]["body"]["model"] == "gpt-4o-mini", reached_upstream + assert reached_upstream[0]["body"]["messages"] == [{"role": "user", "content": prompt}], reached_upstream + logged: Final = eventually( + lambda: read_rows( + 'SELECT organization_id, team_id, spend FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (first.json()["id"],), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert [(row["organization_id"], row["team_id"], float(row["spend"])) for row in logged] == [ + (org_id, team_id, pytest.approx(0.06)) + ] + charged: Final = eventually( + lambda: read_rows('SELECT spend FROM "LiteLLM_OrganizationTable" WHERE organization_id=%s', (org_id,)), + lambda values: len(values) == 1 and float(values[0]["spend"]) >= 0.06, + seconds=70, + ) + assert float(charged[0]["spend"]) == pytest.approx(0.06) + assert float(gateway.get("/organization/info", {"organization_id": org_id})["spend"]) == pytest.approx(0.06) + denied: Final = gateway.request( + "POST", + "/v1/chat/completions", + {"model": model, "messages": [{"role": "user", "content": f"over org budget {uuid.uuid4().hex}"}]}, + key=token, + ) + assert denied.status_code == 422 and denied.json()["error"]["type"] == "budget_exceeded", denied.text + assert f"Organization={org_id}" in denied.json()["error"]["message"], denied.text + assert upstream.get("/__observations").json()["requests"] == [] diff --git a/tests/integration/spend/test_passthrough_budget_reservation.py b/tests/integration/spend/test_passthrough_budget_reservation.py new file mode 100644 index 00000000000..f072333c616 --- /dev/null +++ b/tests/integration/spend/test_passthrough_budget_reservation.py @@ -0,0 +1,110 @@ +import uuid +from hashlib import sha256 +from pathlib import Path +from typing import Final + +import pytest +import yaml +from integration._support.client import Gateway, eventually, object_value, string_value +from integration._support.database import read_rows +from integration._support.process import owned_proxy +from integration._support.upstream import delete_scenario, register_scenario +from integration.cost_calculation.cost_tracking_case import JsonResponse +from pydantic import JsonValue + +INPUT_COST_PER_TOKEN: Final = 0.000001 +OUTPUT_COST_PER_TOKEN: Final = 0.001 +PROMPT_TOKENS: Final = 10 +CANDIDATE_TOKENS: Final = 5 +COST_PER_CALL: Final = PROMPT_TOKENS * INPUT_COST_PER_TOKEN + CANDIDATE_TOKENS * OUTPUT_COST_PER_TOKEN +MAX_BUDGET: Final = 0.02 +CALLS_WITHIN_BUDGET: Final = 4 + + +def _key_spend(digest: str) -> float: + rows: Final = read_rows('SELECT spend FROM "LiteLLM_VerificationToken" WHERE token=%s', (digest,)) + assert len(rows) == 1, rows + return float(rows[0]["spend"]) + + +def _generate_content_request(model: str) -> dict[str, JsonValue]: + return {"contents": [{"role": "user", "parts": [{"text": f"budget {model}"}]}]} + + +def _generate_content_response(model: str) -> JsonResponse: + return JsonResponse( + content_type="application/json", + body={ + "candidates": [ + { + "content": {"parts": [{"text": f"scripted answer {model}"}], "role": "model"}, + "finishReason": "STOP", + "index": 0, + } + ], + "usageMetadata": { + "promptTokenCount": PROMPT_TOKENS, + "candidatesTokenCount": CANDIDATE_TOKENS, + "totalTokenCount": PROMPT_TOKENS + CANDIDATE_TOKENS, + }, + "modelVersion": model, + }, + ) + + +def _served_call(gateway: Gateway, model: str, key: str, scenario_id: str, call: int) -> None: + digest: Final = sha256(key.encode()).hexdigest() + spend_before: Final = _key_spend(digest) + assert spend_before == pytest.approx((call - 1) * COST_PER_CALL) and spend_before < MAX_BUDGET + response: Final = gateway.request( + "POST", + f"/gemini/v1beta/models/{model}:generateContent", + _generate_content_request(model), + headers={"x-goog-api-key": key, "x-pass-x-scripted-scenario": scenario_id}, + ) + assert response.status_code == 200, f"call {call} with key spend {spend_before}: {response.text}" + assert response.json() == _generate_content_response(model).body, response.text + eventually(lambda: _key_spend(digest), lambda spend: spend >= call * COST_PER_CALL - 1e-9, seconds=70) + + +@pytest.mark.covers("spend.budget_reservation.gemini_passthrough_success_releases_reservation_from_spend_counter") +def test_repeated_gemini_passthrough_calls_stay_served_while_key_spend_is_below_max_budget( + gateway: Gateway, tmp_path: Path +) -> None: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["environment_variables"] = { + "GEMINI_API_BASE": gateway.upstream_url, + "GEMINI_API_KEY": "scripted", + } + path: Final = tmp_path / "gemini-passthrough.yaml" + path.write_text(yaml.safe_dump(config)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate, candidate.scenario() as scenario: + model: Final = f"gemini-passthrough-{uuid.uuid4().hex}" + created: Final = candidate.post( + "/model/new", + { + "model_name": model, + "litellm_params": { + "model": "gemini/gemini-2.5-flash", + "api_key": "scripted", + "api_base": gateway.upstream_url, + "input_cost_per_token": INPUT_COST_PER_TOKEN, + "output_cost_per_token": OUTPUT_COST_PER_TOKEN, + }, + "model_info": {"id": model, "max_output_tokens": 10}, + }, + ) + scenario.cleanups.callback(scenario.delete_model, string_value(object_value(created["model_info"])["id"])) + handle: Final = register_scenario(f"sc-{model}", _generate_content_response(model)) + scenario.cleanups.callback(delete_scenario, handle) + key: Final = scenario.key(models=[model], max_budget=MAX_BUDGET) + for call in range(1, CALLS_WITHIN_BUDGET + 1): + _served_call(candidate, model, key, handle.scenario_id, call) + assert _key_spend(sha256(key.encode()).hexdigest()) == pytest.approx(CALLS_WITHIN_BUDGET * COST_PER_CALL) + denied: Final = candidate.request( + "POST", + f"/gemini/v1beta/models/{model}:generateContent", + _generate_content_request(model), + headers={"x-goog-api-key": key, "x-pass-x-scripted-scenario": handle.scenario_id}, + ) + assert denied.status_code == 422 and denied.json()["error"]["type"] == "budget_exceeded", denied.text diff --git a/tests/integration/spend/test_shutdown_flush.py b/tests/integration/spend/test_shutdown_flush.py new file mode 100644 index 00000000000..d27275f5213 --- /dev/null +++ b/tests/integration/spend/test_shutdown_flush.py @@ -0,0 +1,189 @@ +import json +import os +import signal +import threading +import uuid +from collections.abc import Callable, Iterator +from contextlib import contextmanager +from dataclasses import dataclass +from pathlib import Path +from typing import Final + +import httpx +import psycopg +import pytest +import yaml + +from integration._support.client import Gateway, delete_key_if_present, eventually, string_value +from integration._support.database import read_rows +from integration._support.process import OwnedProxy, owned_proxy_process +from integration._support.wire import Reply, Request, wire_server + +REQUESTS_WHILE_BLOCKED: Final = 6 +CANCEL_LOG_LINE: Final = "in-flight scheduled job(s) for shutdown" +BATCH_DRAINED_LOG_LINE: Final = f"flushed {REQUESTS_WHILE_BLOCKED} daily spend update items from in-memory queue" +MODEL_INSERT_ARRIVED_LOG_LINE: Final = "path=/model/new" + + +def _api_requests(table: str, column: str, identity: str) -> int: + rows: Final = read_rows( + f'SELECT coalesce(sum(api_requests), 0)::int AS total FROM "{table}" WHERE {column}=%s', (identity,) + ) + total: Final = rows[0]["total"] + assert isinstance(total, int) + return total + + +def _waiting_on(table: str) -> int: + rows: Final = read_rows( + "SELECT count(*)::int AS waiting FROM pg_stat_activity WHERE wait_event_type='Lock' AND query LIKE %s", + (f'%"{table}"%',), + ) + waiting: Final = rows[0]["waiting"] + assert isinstance(waiting, int) + return waiting + + +def _provider(request: Request) -> Reply: + if request.method != "POST": + return Reply(status=404, body=b'{"error":"not scripted"}') + assert request.target == "/v1/chat/completions" + return Reply( + body=json.dumps( + { + "id": "chatcmpl-" + uuid.uuid4().hex, + "object": "chat.completion", + "created": 1, + "model": "gpt-4o-mini", + "choices": [{"index": 0, "message": {"role": "assistant", "content": "ok"}, "finish_reason": "stop"}], + "usage": {"prompt_tokens": 3, "completion_tokens": 1, "total_tokens": 4}, + } + ).encode() + ) + + +@dataclass(frozen=True, slots=True) +class _Shutdown: + owner: str + team: str + owned: OwnedProxy + key: str + model: str + + def chat(self) -> None: + body: Final = {"model": self.model, "messages": [{"role": "user", "content": f"spend {uuid.uuid4().hex}"}]} + assert self.owned.gateway.request("POST", "/v1/chat/completions", body, key=self.key).status_code == 200 + + def daily_user_requests(self) -> int: + return _api_requests("LiteLLM_DailyUserSpend", "user_id", self.owner) + + def logged(self, line: str, times: int = 1) -> bool: + return self.owned.log.read_text(errors="replace").count(line) >= times + + def chat_while_spend_update_is_blocked(self, blocker: psycopg.Connection, table: str) -> None: + blocker.execute(f'LOCK TABLE "{table}" IN EXCLUSIVE MODE') + for _ in range(REQUESTS_WHILE_BLOCKED): + self.chat() + eventually(lambda: _waiting_on(table), lambda waiting: waiting == 1, seconds=30) + + def start_blocked_model_insert(self) -> threading.Thread: + body: Final = { + "model_name": f"integration-blocked-{uuid.uuid4().hex}", + "litellm_params": {"model": "openai/gpt-4o-mini", "api_key": "integration-provider-key"}, + "model_info": {}, + } + + def insert() -> None: + try: + self.owned.gateway.request("POST", "/model/new", body) + except httpx.TransportError: + pass + + thread: Final = threading.Thread(target=insert, daemon=True) + thread.start() + return thread + + def terminate_once(self, blocked: Callable[[], bool], release: Callable[[], None]) -> None: + eventually(blocked, lambda state: state, seconds=60) + self.owned.process.send_signal(signal.SIGTERM) + eventually(lambda: self.logged(CANCEL_LOG_LINE), lambda seen: seen, seconds=60) + release() + self.owned.process.wait(timeout=120) + + +def _config_with_pool_limit(tmp_path: Path, pool_limit: int) -> Path: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["general_settings"]["database_connection_pool_limit"] = pool_limit + config["general_settings"]["database_connection_pool_timeout"] = 60 + path: Final = tmp_path / f"pool-{pool_limit}.yaml" + path.write_text(yaml.safe_dump(config)) + return path + + +@contextmanager +def _proxy_with_one_seeded_row(gateway: Gateway, tmp_path: Path, pool_limit: int) -> Iterator[_Shutdown]: + owner: Final = f"integration-owner-{uuid.uuid4().hex}" + with gateway.scenario() as scenario, wire_server(_provider) as wire: + model: Final = scenario.model(api_base=wire.url + "/v1", num_retries=0) + team: Final = scenario.team(models=[model]) + with owned_proxy_process( + gateway, + tmp_path, + { + "LITELLM_LOG": "DEBUG", + "GRACEFUL_SHUTDOWN_TIMEOUT": "1", + "SCHEDULED_JOB_SHUTDOWN_FINISH_TIMEOUT_SECONDS": "1", + "SCHEDULED_JOB_SHUTDOWN_CANCEL_TIMEOUT_SECONDS": "5", + }, + config=_config_with_pool_limit(tmp_path, pool_limit), + ) as owned: + key: Final = string_value( + owned.gateway.post("/key/generate", {"user_id": owner, "team_id": team, "models": [model]})["key"] + ) + scenario.cleanups.callback(delete_key_if_present, gateway, key) + shutdown: Final = _Shutdown(owner, team, owned, key, model) + shutdown.chat() + eventually(shutdown.daily_user_requests, lambda total: total == 1, seconds=60) + yield shutdown + assert _api_requests("LiteLLM_DailyUserSpend", "user_id", owner) == 1 + REQUESTS_WHILE_BLOCKED + assert _api_requests("LiteLLM_DailyTeamSpend", "team_id", team) == 1 + REQUESTS_WHILE_BLOCKED + + +@pytest.mark.covers("quota_management.spend_tracking.shutdown_cancel_keeps_in_flight_daily_batch") +def test_daily_spend_batch_cancelled_while_waiting_for_a_pool_connection_is_written_by_the_final_flush( + gateway: Gateway, tmp_path: Path +) -> None: + with ( + _proxy_with_one_seeded_row(gateway, tmp_path, pool_limit=2) as shutdown, + psycopg.connect(os.environ["DATABASE_URL"]) as models, + psycopg.connect(os.environ["DATABASE_URL"]) as memberships, + ): + models.execute('LOCK TABLE "LiteLLM_ProxyModelTable" IN EXCLUSIVE MODE') + first: Final = shutdown.start_blocked_model_insert() + eventually(lambda: _waiting_on("LiteLLM_ProxyModelTable"), lambda waiting: waiting == 1, seconds=30) + shutdown.chat_while_spend_update_is_blocked(memberships, "LiteLLM_TeamMembership") + second: Final = shutdown.start_blocked_model_insert() + eventually(lambda: shutdown.logged(MODEL_INSERT_ARRIVED_LOG_LINE, times=2), lambda seen: seen, seconds=30) + memberships.rollback() + eventually(lambda: _waiting_on("LiteLLM_ProxyModelTable"), lambda waiting: waiting == 2, seconds=30) + shutdown.terminate_once(lambda: shutdown.logged(BATCH_DRAINED_LOG_LINE), models.rollback) + first.join(timeout=30) + second.join(timeout=30) + + +@pytest.mark.covers("quota_management.spend_tracking.shutdown_cancel_keeps_in_flight_daily_batch") +def test_daily_spend_batch_cancelled_while_waiting_for_a_row_lock_is_written_exactly_once( + gateway: Gateway, tmp_path: Path +) -> None: + with ( + _proxy_with_one_seeded_row(gateway, tmp_path, pool_limit=10) as shutdown, + psycopg.connect(os.environ["DATABASE_URL"]) as holder, + psycopg.connect(os.environ["DATABASE_URL"]) as memberships, + ): + holder.execute('SELECT 1 FROM "LiteLLM_DailyUserSpend" WHERE user_id=%s FOR UPDATE', (shutdown.owner,)) + shutdown.chat_while_spend_update_is_blocked(memberships, "LiteLLM_TeamMembership") + memberships.rollback() + shutdown.terminate_once( + lambda: shutdown.logged(BATCH_DRAINED_LOG_LINE) and _waiting_on("LiteLLM_DailyUserSpend") == 1, + holder.rollback, + ) diff --git a/tests/integration/spend/test_spend_calculate.py b/tests/integration/spend/test_spend_calculate.py new file mode 100644 index 00000000000..aa6103bf4de --- /dev/null +++ b/tests/integration/spend/test_spend_calculate.py @@ -0,0 +1,68 @@ +import uuid +from typing import Final + +import pytest +from integration._support.client import JSON_OBJECT, Gateway, object_value, string_value + + +@pytest.mark.covers("quota_management.spend_tracking.spend_calculate.rejects_unpriced_model") +def test_spend_calculate_rejects_unpriced_model_with_400(gateway: Gateway) -> None: + model: Final = f"openrouter/integration-unpriced-{uuid.uuid4().hex}" + response: Final = gateway.request( + "POST", + "/spend/calculate", + {"model": model, "messages": [{"role": "user", "content": "price this request"}]}, + ) + assert response.status_code == 400, response.text + error: Final = object_value(JSON_OBJECT.validate_json(response.text)["error"]) + assert error["type"] == "invalid_request_error", response.text + assert error["param"] == "model", response.text + assert model in string_value(error["message"]), response.text + + +GEMINI_LIVE_PREVIEW_MODELS: Final = ( + "gemini-live-2.5-flash-preview-native-audio-09-2025", + "gemini/gemini-live-2.5-flash-preview-native-audio-09-2025", +) + + +@pytest.mark.parametrize("model", GEMINI_LIVE_PREVIEW_MODELS) +@pytest.mark.covers("quota_management.spend_tracking.spend_calculate.live_preview_cached_tokens_cost_fresh_rate") +def test_live_preview_entry_charges_cached_tokens_at_the_fresh_rate(gateway: Gateway, model: str) -> None: + def cost_with_cached_tokens(cached_tokens: int) -> float: + response: Final = gateway.request( + "POST", + "/spend/calculate", + { + "completion_response": { + "id": "chatcmpl-live-preview", + "object": "chat.completion", + "created": 1677652288, + "model": model, + "choices": [ + { + "index": 0, + "message": {"role": "assistant", "content": "live preview answer"}, + "finish_reason": "stop", + } + ], + "usage": { + "prompt_tokens": 101_000, + "completion_tokens": 0, + "total_tokens": 101_000, + "prompt_tokens_details": {"cached_tokens": cached_tokens}, + }, + } + }, + ) + assert response.status_code == 200, response.text + cost: Final = object_value(JSON_OBJECT.validate_json(response.text))["cost"] + assert isinstance(cost, int | float) + return float(cost) + + cached_cost: Final = cost_with_cached_tokens(100_000) + fresh_cost: Final = cost_with_cached_tokens(0) + assert fresh_cost > 0, fresh_cost + assert cached_cost == pytest.approx(fresh_cost), ( + f"the entry publishes no cached rate, so 100k cached tokens must bill like fresh ones: {cached_cost} vs {fresh_cost}" + ) diff --git a/tests/integration/spend/test_team_daily_activity_aggregated.py b/tests/integration/spend/test_team_daily_activity_aggregated.py new file mode 100644 index 00000000000..53c2f2efb1d --- /dev/null +++ b/tests/integration/spend/test_team_daily_activity_aggregated.py @@ -0,0 +1,81 @@ +import uuid +from datetime import datetime, timedelta, timezone +from hashlib import sha256 +from typing import Final + +import pytest +from integration._support.client import Gateway, eventually, object_value +from integration._support.database import read_rows + + +@pytest.mark.covers("quota_management.spend_tracking.team_daily_activity_aggregated_reports_whole_range_team_spend") +def test_aggregated_team_activity_reports_the_whole_range_team_spend_in_one_page(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002) + team: Final = scenario.team(models=[model]) + keys: Final = tuple(scenario.key(team_id=team, models=[model]) for _ in range(2)) + digests: Final = tuple(sha256(key.encode()).hexdigest() for key in keys) + for key in keys: + for _ in range(2): + reply: Final = gateway.chat(model, key=key, text=f"team activity {uuid.uuid4().hex}") + assert reply["usage"]["total_tokens"] == 40, reply + logged: Final = eventually( + lambda: read_rows('SELECT spend FROM "LiteLLM_SpendLogs" WHERE team_id=%s', (team,)), + lambda values: len(values) == 4, + seconds=70, + ) + assert sum(float(row["spend"]) for row in logged) == pytest.approx(0.24) + daily: Final = eventually( + lambda: read_rows( + 'SELECT api_key, spend, successful_requests FROM "LiteLLM_DailyTeamSpend" WHERE team_id=%s', (team,) + ), + lambda values: sum(float(row["spend"]) for row in values) >= 0.24 - 1e-9, + seconds=70, + ) + assert sorted(row["api_key"] for row in daily) == sorted(digests), daily + assert all(float(row["spend"]) == pytest.approx(0.12) and row["successful_requests"] == 2 for row in daily) + today: Final = datetime.now(timezone.utc) + response: Final = gateway.request( + "GET", + "/team/daily/activity/aggregated", + params={ + "team_ids": team, + "start_date": (today - timedelta(days=1)).strftime("%Y-%m-%d"), + "end_date": (today + timedelta(days=1)).strftime("%Y-%m-%d"), + "timezone": "0", + }, + ) + assert response.status_code == 200, response.text + body: Final = object_value(response.json()) + metadata: Final = object_value(body["metadata"]) + assert ( + metadata["total_spend"], + metadata["total_prompt_tokens"], + metadata["total_completion_tokens"], + metadata["total_tokens"], + metadata["total_api_requests"], + metadata["total_successful_requests"], + metadata["total_failed_requests"], + metadata["page"], + metadata["total_pages"], + metadata["has_more"], + ) == (pytest.approx(0.24), 80, 80, 160, 4, 4, 0, 1, 1, False), response.text + results: Final = body["results"] + assert isinstance(results, list) and len(results) == 1, response.text + day: Final = object_value(results[0]) + assert object_value(day["metrics"])["spend"] == pytest.approx(0.24), response.text + entities: Final = object_value(object_value(day["breakdown"])["entities"]) + assert set(entities) == {team}, response.text + team_bucket: Final = object_value(entities[team]) + team_metrics: Final = object_value(team_bucket["metrics"]) + assert (team_metrics["spend"], team_metrics["api_requests"], team_metrics["successful_requests"]) == ( + pytest.approx(0.24), + 4, + 4, + ), response.text + per_key: Final = object_value(team_bucket["api_key_breakdown"]) + assert set(per_key) == set(digests), response.text + assert tuple(object_value(object_value(per_key[digest])["metrics"])["spend"] for digest in digests) == ( + pytest.approx(0.12), + pytest.approx(0.12), + ), response.text diff --git a/tests/integration/spend/test_team_member_spend.py b/tests/integration/spend/test_team_member_spend.py new file mode 100644 index 00000000000..89eb2a24bcf --- /dev/null +++ b/tests/integration/spend/test_team_member_spend.py @@ -0,0 +1,54 @@ +import uuid +from typing import Final + +import pytest +from integration._support.client import Gateway, eventually, object_value +from integration._support.database import read_rows + + +@pytest.mark.covers("spend.team_member.member_without_budget_gets_membership_row_and_spend") +def test_member_added_without_any_budget_is_charged_on_its_membership_row(gateway: Gateway) -> None: + with gateway.scenario() as scenario: + model: Final = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002) + team: Final = scenario.team(models=[model]) + user: Final = scenario.user() + added: Final = gateway.request( + "POST", "/team/member_add", {"team_id": team, "member": {"user_id": user, "role": "user"}} + ) + assert added.status_code == 200, added.text + memberships: Final = added.json()["updated_team_memberships"] + assert [ + {"user_id": row["user_id"], "team_id": row["team_id"], "budget_id": row["budget_id"], "spend": row["spend"]} + for row in memberships + ] == [{"user_id": user, "team_id": team, "budget_id": None, "spend": 0}], added.text + assert read_rows( + 'SELECT budget_id, spend, total_spend FROM "LiteLLM_TeamMembership" WHERE team_id=%s AND user_id=%s', + (team, user), + ) == [{"budget_id": None, "spend": 0.0, "total_spend": 0.0}] + key: Final = scenario.key(team_id=team, user_id=user, models=[model]) + assert gateway.chat(model, key=key, text=f"member spend {uuid.uuid4().hex}")["usage"]["total_tokens"] == 40 + charged: Final = eventually( + lambda: read_rows( + 'SELECT spend, total_spend FROM "LiteLLM_TeamMembership" WHERE team_id=%s AND user_id=%s', + (team, user), + ), + lambda values: len(values) == 1 and float(values[0]["spend"]) >= 0.06, + seconds=70, + ) + assert float(charged[0]["spend"]) == pytest.approx(0.06) + assert float(charged[0]["total_spend"]) == pytest.approx(0.06) + team_rows: Final = eventually( + lambda: read_rows('SELECT spend FROM "LiteLLM_TeamTable" WHERE team_id=%s', (team,)), + lambda values: len(values) == 1 and float(values[0]["spend"]) >= 0.06, + seconds=70, + ) + assert float(team_rows[0]["spend"]) == pytest.approx(0.06) + info: Final = gateway.get("/team/info", {"team_id": team}) + listed: Final = info["team_memberships"] + assert isinstance(listed, list) + exposed: Final = [ + (object_value(row)["user_id"], object_value(row)["spend"]) + for row in listed + if object_value(row)["user_id"] == user + ] + assert len(exposed) == 1 and exposed[0][1] == pytest.approx(0.06), info diff --git a/tests/integration/streaming/test_stream_contracts.py b/tests/integration/streaming/test_stream_contracts.py index 0c0fd8bc47c..7466a9454b8 100644 --- a/tests/integration/streaming/test_stream_contracts.py +++ b/tests/integration/streaming/test_stream_contracts.py @@ -2,25 +2,47 @@ import asyncio import json import threading import uuid +from pathlib import Path from typing import Final import pytest -from hypothesis import Phase, example, given, settings, strategies as st -from openai import OpenAI - +import yaml +from hypothesis import Phase, example, given, settings +from hypothesis import strategies as st from integration._support.client import Gateway, eventually from integration._support.database import read_rows +from integration._support.process import owned_proxy from integration._support.wire import Reply, wire_server +from openai import OpenAI def frame(identity: str, delta: dict, *, finish: str | None = None) -> bytes: - value: Final = {"id": identity, "object": "chat.completion.chunk", "created": 1, "model": "gpt-4o-mini", "choices": [{"index": 0, "delta": delta, "finish_reason": finish}]} + value: Final = { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": "gpt-4o-mini", + "choices": [{"index": 0, "delta": delta, "finish_reason": finish}], + } return b"data: " + json.dumps(value, ensure_ascii=False).encode() + b"\n\n" def text_stream(identity: str) -> tuple[bytes, ...]: - usage: Final = {"id": identity, "object": "chat.completion.chunk", "created": 1, "model": "gpt-4o-mini", "choices": [], "usage": {"prompt_tokens": 11, "completion_tokens": 4, "total_tokens": 15}} - return (frame(identity, {"role": "assistant", "content": "Hello "}), frame(identity, {"content": "雪 café"}), frame(identity, {}, finish="stop"), b"data: " + json.dumps(usage).encode() + b"\n\n", b"data: [DONE]\n\n") + usage: Final = { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": "gpt-4o-mini", + "choices": [], + "usage": {"prompt_tokens": 11, "completion_tokens": 4, "total_tokens": 15}, + } + return ( + frame(identity, {"role": "assistant", "content": "Hello "}), + frame(identity, {"content": "雪 café"}), + frame(identity, {}, finish="stop"), + b"data: " + json.dumps(usage).encode() + b"\n\n", + b"data: [DONE]\n\n", + ) @pytest.mark.covers("other.streaming.byte_partitions.preserve_text_identity_and_usage") @@ -37,14 +59,27 @@ def test_generated_tcp_partitions_preserve_unicode_text_identity_and_final_usage boundaries: Final = (0, *sorted(cuts), len(body)) pieces: Final = tuple(body[left:right] for left, right in zip(boundaries, boundaries[1:])) with wire_server(lambda request: Reply(content_type="text/event-stream", chunks=pieces)) as wire: - stream: Final = litellm.completion(model="openai/gpt-4o-mini", api_base=wire.url + "/v1", api_key="synthetic-stream-key", messages=[{"role": "user", "content": "partition control"}], stream=True, stream_options={"include_usage": True}, timeout=5, num_retries=0) + stream: Final = litellm.completion( + model="openai/gpt-4o-mini", + api_base=wire.url + "/v1", + api_key="synthetic-stream-key", + messages=[{"role": "user", "content": "partition control"}], + stream=True, + stream_options={"include_usage": True}, + timeout=5, + num_retries=0, + ) try: chunks: Final = tuple(stream) finally: asyncio.run(stream.aclose()) - assert "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) == "Hello 雪 café" + assert ( + "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) == "Hello 雪 café" + ) assert {chunk.id for chunk in chunks} == {"stream-partition-control"} - assert [choice.finish_reason for chunk in chunks for choice in chunk.choices if choice.finish_reason] == ["stop"] + assert [choice.finish_reason for chunk in chunks for choice in chunk.choices if choice.finish_reason] == [ + "stop" + ] usages: Final = tuple(chunk.usage for chunk in chunks if getattr(chunk, "usage", None) is not None) assert len(usages) == 1 assert usages[0].prompt_tokens == 11 and usages[0].completion_tokens == 4 @@ -59,25 +94,63 @@ def test_fragmented_tool_names_and_arguments_keep_each_call_identity() -> None: identity: Final = "stream-tools-control" deltas: Final = ( - {"role": "assistant", "tool_calls": [{"index": 0, "id": "call-add", "type": "function", "function": {"name": "ad", "arguments": ""}}, {"index": 1, "id": "call-multiply", "type": "function", "function": {"name": "multi", "arguments": ""}}]}, - {"tool_calls": [{"index": 1, "function": {"name": "ply", "arguments": '{"x":3,'}}, {"index": 0, "function": {"arguments": '{"x":1,'}}]}, - {"tool_calls": [{"index": 0, "function": {"name": "d", "arguments": '"y":2}'}}, {"index": 1, "function": {"arguments": '"y":4}'}}]}, + { + "role": "assistant", + "tool_calls": [ + {"index": 0, "id": "call-add", "type": "function", "function": {"name": "ad", "arguments": ""}}, + {"index": 1, "id": "call-multiply", "type": "function", "function": {"name": "multi", "arguments": ""}}, + ], + }, + { + "tool_calls": [ + {"index": 1, "function": {"name": "ply", "arguments": '{"x":3,'}}, + {"index": 0, "function": {"arguments": '{"x":1,'}}, + ] + }, + { + "tool_calls": [ + {"index": 0, "function": {"name": "d", "arguments": '"y":2}'}}, + {"index": 1, "function": {"arguments": '"y":4}'}}, + ] + }, + ) + frames: Final = ( + *tuple(frame(identity, delta) for delta in deltas), + frame(identity, {}, finish="tool_calls"), + b"data: [DONE]\n\n", ) - frames: Final = (*tuple(frame(identity, delta) for delta in deltas), frame(identity, {}, finish="tool_calls"), b"data: [DONE]\n\n") with wire_server(lambda request: Reply(content_type="text/event-stream", chunks=frames)) as wire: - stream: Final = litellm.completion(model="openai/gpt-4o-mini", api_base=wire.url + "/v1", api_key="synthetic-stream-key", messages=[{"role": "user", "content": "tool control"}], stream=True, timeout=5, num_retries=0) + stream: Final = litellm.completion( + model="openai/gpt-4o-mini", + api_base=wire.url + "/v1", + api_key="synthetic-stream-key", + messages=[{"role": "user", "content": "tool control"}], + stream=True, + timeout=5, + num_retries=0, + ) try: chunks: Final = tuple(stream) finally: asyncio.run(stream.aclose()) - events: Final = tuple((choice.index, tool) for chunk in chunks for choice in chunk.choices for tool in (choice.delta.tool_calls or ())) - for index, name, call_id, arguments in ((0, "add", "call-add", {"x": 1, "y": 2}), (1, "multiply", "call-multiply", {"x": 3, "y": 4})): + events: Final = tuple( + (choice.index, tool) + for chunk in chunks + for choice in chunk.choices + for tool in (choice.delta.tool_calls or ()) + ) + for index, name, call_id, arguments in ( + (0, "add", "call-add", {"x": 1, "y": 2}), + (1, "multiply", "call-multiply", {"x": 3, "y": 4}), + ): selected: Final = tuple(tool for choice, tool in events if (choice, tool.index) == (0, index)) assert "".join(tool.id or "" for tool in selected) == call_id assert "".join(tool.function.name or "" for tool in selected) == name assert json.loads("".join(tool.function.arguments or "" for tool in selected)) == arguments assert {tool.index for _, tool in events} == {0, 1} - assert [choice.finish_reason for chunk in chunks for choice in chunk.choices if choice.finish_reason] == ["tool_calls"] + assert [choice.finish_reason for chunk in chunks for choice in chunk.choices if choice.finish_reason] == [ + "tool_calls" + ] assert len(wire.drain()) == 1 @@ -86,13 +159,27 @@ def test_proxy_stream_usage_visibility_keeps_exact_persisted_charge(gateway: Gat with gateway.scenario() as scenario: for include in (None, False, True): identity: Final = "stream-usage-" + uuid.uuid4().hex - with wire_server(lambda request, identity=identity: Reply(content_type="text/event-stream", chunks=text_stream(identity))) as wire: - model: Final = scenario.model(api_base=wire.url + "/v1", input_cost_per_token=0.001, output_cost_per_token=0.002) - with OpenAI(api_key=gateway.key, base_url=str(gateway.client.base_url), timeout=5, max_retries=0) as client: - stream: Final = client.chat.completions.create(model=model, messages=[{"role": "user", "content": identity}], stream=True, **({} if include is None else {"stream_options": {"include_usage": include}})) + with wire_server( + lambda request, identity=identity: Reply(content_type="text/event-stream", chunks=text_stream(identity)) + ) as wire: + model: Final = scenario.model( + api_base=wire.url + "/v1", input_cost_per_token=0.001, output_cost_per_token=0.002 + ) + with OpenAI( + api_key=gateway.key, base_url=str(gateway.client.base_url), timeout=5, max_retries=0 + ) as client: + stream: Final = client.chat.completions.create( + model=model, + messages=[{"role": "user", "content": identity}], + stream=True, + **({} if include is None else {"stream_options": {"include_usage": include}}), + ) with stream: chunks: Final = tuple(stream) - assert "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) == "Hello 雪 café" + assert ( + "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) + == "Hello 雪 café" + ) assert {chunk.id for chunk in chunks} == {identity} usages: Final = tuple(chunk.usage for chunk in chunks if chunk.usage is not None) assert len(usages) == (1 if include else 0) @@ -101,28 +188,369 @@ def test_proxy_stream_usage_visibility_keeps_exact_persisted_charge(gateway: Gat requests: Final = wire.drain() assert len(requests) == 1 assert json.loads(requests[0].body)["stream_options"]["include_usage"] is True - rows: Final = eventually(lambda identity=identity: read_rows('SELECT spend, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs" WHERE request_id=%s', (identity,)), lambda values: len(values) == 1, seconds=70) + rows: Final = eventually( + lambda identity=identity: read_rows( + 'SELECT spend, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (identity,), + ), + lambda values: len(values) == 1, + seconds=70, + ) assert rows[0]["prompt_tokens"] == 11 and rows[0]["completion_tokens"] == 4 assert float(rows[0]["spend"]) == pytest.approx(0.019) +@pytest.mark.covers("other.streaming.messages_bridge.empty_choices_usage_chunk_completes_stream") +def test_messages_stream_completes_through_trailing_empty_choices_usage_chunk(gateway: Gateway) -> None: + identity: Final = "messages-empty-choices-" + uuid.uuid4().hex + metadata: Final = ( + b"data: " + + json.dumps( + { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": "gpt-4o-mini", + "choices": [], + "prompt_filter_results": [{"prompt_index": 0, "content_filter_results": {}}], + }, + ensure_ascii=False, + ).encode() + + b"\n\n" + ) + frames: Final = (metadata, *text_stream(identity)) + with ( + wire_server(lambda request: Reply(content_type="text/event-stream", chunks=frames)) as wire, + gateway.scenario() as scenario, + ): + model: Final = scenario.model(model="azure/gpt-4o-mini", api_base=wire.url + "/v1") + with gateway.client.stream( + "POST", + "/v1/messages", + json={ + "model": model, + "max_tokens": 64, + "stream": True, + "messages": [{"role": "user", "content": identity}], + }, + headers={"Authorization": f"Bearer {gateway.key}"}, + ) as response: + assert response.status_code == 200, response.read().decode() + events: Final = tuple( + json.loads(line.removeprefix("data: ")) for line in response.iter_lines() if line.startswith("data: ") + ) + assert tuple(event["type"] for event in events) == ( + "message_start", + "content_block_start", + "content_block_delta", + "content_block_delta", + "content_block_stop", + "message_delta", + "message_stop", + ), f"observed events: {events!r}" + assert ( + "".join(event["delta"]["text"] for event in events if event["type"] == "content_block_delta") == "Hello 雪 café" + ) + message_delta: Final = next(event for event in events if event["type"] == "message_delta") + assert message_delta["usage"] == {"input_tokens": 11, "output_tokens": 4} + requests: Final = wire.drain() + assert len(requests) == 1 + outbound: Final = json.loads(requests[0].body) + assert outbound["stream"] is True and outbound["stream_options"] == {"include_usage": True}, ( + f"observed outbound body: {outbound!r}" + ) + + +@pytest.mark.covers("other.streaming.responses_bridge.empty_choices_chunks_complete_stream") +def test_responses_stream_completes_through_empty_choices_metadata_and_usage_chunks(gateway: Gateway) -> None: + identity: Final = "responses-empty-choices-" + uuid.uuid4().hex + metadata: Final = ( + b"data: " + + json.dumps( + { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": "gpt-4o-mini", + "choices": [], + "prompt_filter_results": [{"prompt_index": 0, "content_filter_results": {}}], + }, + ensure_ascii=False, + ).encode() + + b"\n\n" + ) + frames: Final = (metadata, *text_stream(identity)) + with ( + wire_server(lambda request: Reply(content_type="text/event-stream", chunks=frames)) as wire, + gateway.scenario() as scenario, + ): + model: Final = scenario.model(model="deepseek/gpt-4o-mini", api_base=wire.url + "/v1") + with gateway.client.stream( + "POST", + "/v1/responses", + json={"model": model, "input": identity, "stream": True}, + headers={"Authorization": f"Bearer {gateway.key}"}, + ) as response: + assert response.status_code == 200, response.read().decode() + events: Final = tuple( + json.loads(line.removeprefix("data: ")) + for line in response.iter_lines() + if line.startswith("data: ") and line != "data: [DONE]" + ) + assert ( + "".join(event["delta"] for event in events if event["type"] == "response.output_text.delta") == "Hello 雪 café" + ), f"observed events: {events!r}" + assert tuple(event["type"] for event in events if event["type"] != "response.output_text.delta") == ( + "response.created", + "response.in_progress", + "response.output_item.added", + "response.content_part.added", + "response.output_text.done", + "response.content_part.done", + "response.output_item.done", + "response.completed", + ), f"observed events: {events!r}" + assert events[-1]["type"] == "response.completed" + assert events[-1]["response"]["usage"] == { + "input_tokens": 11, + "output_tokens": 4, + "output_tokens_details": {"reasoning_tokens": 0, "text_tokens": 4}, + "total_tokens": 15, + } + requests: Final = wire.drain() + assert len(requests) == 1 + outbound: Final = json.loads(requests[0].body) + assert outbound["stream"] is True and outbound["stream_options"] == {"include_usage": True}, ( + f"observed outbound body: {outbound!r}" + ) + + +def provider_cost_object_stream(identity: str, total_cost: float) -> tuple[bytes, ...]: + cost: Final = { + "input_tokens_cost": 0.0001, + "output_tokens_cost": 0.0002, + "request_cost": 0.012, + "total_cost": total_cost, + } + usage: Final = { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": "sonar", + "choices": [], + "usage": {"prompt_tokens": 11, "completion_tokens": 4, "total_tokens": 15, "cost": cost}, + } + return ( + frame(identity, {"role": "assistant", "content": "Hello "}), + frame(identity, {"content": "from search"}), + frame(identity, {}, finish="stop"), + b"data: " + json.dumps(usage).encode() + b"\n\n", + b"data: [DONE]\n\n", + ) + + +def sse_data_lines(text: str) -> tuple[str, ...]: + return tuple(line.removeprefix("data: ") for line in text.splitlines() if line.startswith("data: ")) + + +@pytest.mark.covers("other.streaming.usage.provider_cost_object_completes_stream_and_bills_total_cost") +def test_perplexity_stream_with_cost_breakdown_object_completes_and_bills_total_cost(gateway: Gateway) -> None: + identity: Final = "stream-cost-object-" + uuid.uuid4().hex + total_cost: Final = 0.0123 + with ( + gateway.scenario() as scenario, + wire_server( + lambda request: Reply( + content_type="text/event-stream", chunks=provider_cost_object_stream(identity, total_cost) + ) + ) as wire, + ): + model: Final = scenario.model(model="perplexity/sonar", api_base=wire.url + "/v1") + with gateway.client.stream( + "POST", + "/v1/chat/completions", + json={ + "model": model, + "messages": [{"role": "user", "content": identity}], + "stream": True, + "stream_options": {"include_usage": True}, + }, + headers={"Authorization": f"Bearer {gateway.key}"}, + ) as response: + text: Final = response.read().decode() + assert response.status_code == 200, text + lines: Final = sse_data_lines(text) + assert lines[-1] == "[DONE]", text + events: Final = tuple(json.loads(line) for line in lines[:-1]) + assert [event for event in events if "error" in event] == [], text + assert ( + "".join(choice["delta"].get("content") or "" for event in events for choice in event["choices"]) + == "Hello from search" + ), text + assert [ + choice.get("finish_reason") + for event in events + for choice in event["choices"] + if choice.get("finish_reason") + ] == ["stop"], text + usages: Final = tuple(event["usage"] for event in events if event.get("usage") is not None) + assert len(usages) == 1, text + assert (usages[0]["prompt_tokens"], usages[0]["completion_tokens"], usages[0]["total_tokens"]) == (11, 4, 15), ( + text + ) + requests: Final = wire.drain() + assert len(requests) == 1 + outbound: Final = json.loads(requests[0].body) + assert outbound["model"] == "sonar" and outbound["stream"] is True, outbound + assert outbound["messages"] == [{"role": "user", "content": identity}], outbound + rows: Final = eventually( + lambda: read_rows( + 'SELECT spend, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (identity,), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert (rows[0]["prompt_tokens"], rows[0]["completion_tokens"]) == (11, 4) + assert float(rows[0]["spend"]) == pytest.approx(total_cost) + + +@pytest.mark.covers( + "other.streaming.fallback.empty_leading_chunk_then_disconnect_streams_fallback_with_usage_and_spend" +) +def test_primary_stream_with_empty_first_chunk_then_disconnect_falls_back_and_bills_the_fallback( + gateway: Gateway, + tmp_path: Path, +) -> None: + identity: Final = "stream-empty-fallback-" + uuid.uuid4().hex + empty_first: Final = ( + b"data: " + + json.dumps( + { + "id": identity + "-primary", + "object": "chat.completion.chunk", + "created": 1, + "model": "gpt-4o-mini", + "choices": [], + "usage": {"prompt_tokens": 11, "completion_tokens": 0, "total_tokens": 11}, + } + ).encode() + + b"\n\n" + ) + with ( + wire_server( + lambda request: Reply( + content_type="text/event-stream", + chunks=(empty_first, b":" + b"x" * 4_000_000 + b"\n\n", empty_first), + abort_after=2, + ) + ) as primary, + wire_server( + lambda request: Reply(content_type="text/event-stream", chunks=text_stream(identity)) + ) as fallback, + ): + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["model_list"] = [ + { + "model_name": name, + "litellm_params": { + "model": "openai/gpt-4o-mini", + "api_key": "synthetic-fallback-key", + "api_base": server.url + "/v1", + "input_cost_per_token": 0.001, + "output_cost_per_token": 0.002, + }, + } + for name, server in (("primary", primary), ("fallback", fallback)) + ] + config["router_settings"] = { + "num_retries": 0, + "disable_cooldowns": True, + "fallbacks": [{"primary": ["fallback"]}], + } + path: Final = tmp_path / "fallbacks.yaml" + path.write_text(yaml.safe_dump(config)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate: + body: Final = { + "model": "primary", + "messages": [{"role": "user", "content": identity}], + "stream": True, + "stream_options": {"include_usage": True}, + } + with candidate.client.stream( + "POST", "/v1/chat/completions", json=body, headers={"Authorization": f"Bearer {candidate.key}"} + ) as response: + lines: Final = tuple(line for line in response.iter_lines() if line.startswith("data:")) + assert response.status_code == 200, lines + assert lines[-1] == "data: [DONE]", lines + events: Final = tuple(json.loads(line.removeprefix("data:")) for line in lines[:-1]) + assert all("error" not in event for event in events), lines + assert ( + "".join(choice["delta"].get("content") or "" for event in events for choice in event["choices"]) + == "Hello 雪 café" + ), lines + usages: Final = tuple(event["usage"] for event in events if event.get("usage") is not None) + assert (usages[-1]["prompt_tokens"], usages[-1]["completion_tokens"]) == (11, 4), lines + assert tuple( + json.loads(request.body)["messages"] + for request in primary.drain() + if request.target.endswith("/chat/completions") + ) == (body["messages"],) + assert tuple( + json.loads(request.body)["messages"] + for request in fallback.drain() + if request.target.endswith("/chat/completions") + ) == (body["messages"],) + rows: Final = eventually( + lambda: read_rows( + 'SELECT spend, prompt_tokens, completion_tokens, status FROM "LiteLLM_SpendLogs" WHERE request_id=%s', + (identity,), + ), + lambda values: len(values) == 1, + seconds=70, + ) + assert (rows[0]["prompt_tokens"], rows[0]["completion_tokens"], rows[0]["status"]) == (11, 4, "success"), ( + rows + ) + assert float(rows[0]["spend"]) == pytest.approx(0.019), rows + + @pytest.mark.covers("other.streaming.failure.truncated_transport_raises_and_control_recovers") def test_truncated_http_stream_is_an_error_and_next_stream_succeeds() -> None: import litellm for truncated in (True, False): - with wire_server(lambda request, truncated=truncated: Reply(content_type="text/event-stream", chunks=text_stream("stream-truncated"), abort_after=1 if truncated else None)) as wire: - stream: Final = litellm.completion(model="openai/gpt-4o-mini", api_base=wire.url + "/v1", api_key="synthetic-stream-key", messages=[{"role": "user", "content": "truncation control"}], stream=True, timeout=5, num_retries=0) + with wire_server( + lambda request, truncated=truncated: Reply( + content_type="text/event-stream", + chunks=text_stream("stream-truncated"), + abort_after=1 if truncated else None, + ) + ) as wire: + stream: Final = litellm.completion( + model="openai/gpt-4o-mini", + api_base=wire.url + "/v1", + api_key="synthetic-stream-key", + messages=[{"role": "user", "content": "truncation control"}], + stream=True, + timeout=5, + num_retries=0, + ) try: if truncated: - with pytest.raises(litellm.exceptions.MidStreamFallbackError, match="incomplete chunked read") as failure: + with pytest.raises( + litellm.exceptions.MidStreamFallbackError, match="incomplete chunked read" + ) as failure: tuple(stream) assert isinstance(failure.value.original_exception, litellm.APIConnectionError) assert failure.value.generated_content == "Hello " assert failure.value.is_pre_first_chunk is False else: chunks: Final = tuple(stream) - assert "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) == "Hello 雪 café" + assert ( + "".join(choice.delta.content or "" for chunk in chunks for choice in chunk.choices) + == "Hello 雪 café" + ) assert any(choice.finish_reason == "stop" for chunk in chunks for choice in chunk.choices) finally: asyncio.run(stream.aclose()) @@ -134,9 +562,23 @@ def test_client_cancellation_releases_the_actual_provider_connection() -> None: import litellm gate: Final = threading.Event() - frames: Final = (frame("stream-cancel", {"role": "assistant", "content": "first"}), b":" + b"x" * 4_000_000 + b"\n\n", b"data: [DONE]\n\n") - with wire_server(lambda request: Reply(content_type="text/event-stream", chunks=frames, gate_after_first=gate)) as wire: - stream: Final = litellm.completion(model="openai/gpt-4o-mini", api_base=wire.url + "/v1", api_key="synthetic-stream-key", messages=[{"role": "user", "content": "cancellation control"}], stream=True, timeout=5, num_retries=0) + frames: Final = ( + frame("stream-cancel", {"role": "assistant", "content": "first"}), + b":" + b"x" * 4_000_000 + b"\n\n", + b"data: [DONE]\n\n", + ) + with wire_server( + lambda request: Reply(content_type="text/event-stream", chunks=frames, gate_after_first=gate) + ) as wire: + stream: Final = litellm.completion( + model="openai/gpt-4o-mini", + api_base=wire.url + "/v1", + api_key="synthetic-stream-key", + messages=[{"role": "user", "content": "cancellation control"}], + stream=True, + timeout=5, + num_retries=0, + ) try: first: Final = next(stream) assert first.choices[0].delta.content == "first" diff --git a/tests/integration/streaming/test_stream_parallel_slot_release.py b/tests/integration/streaming/test_stream_parallel_slot_release.py new file mode 100644 index 00000000000..a1dc038208d --- /dev/null +++ b/tests/integration/streaming/test_stream_parallel_slot_release.py @@ -0,0 +1,86 @@ +import json +import uuid +from pathlib import Path +from typing import Final + +import pytest +import yaml +from integration._support.client import Gateway, eventually +from integration._support.process import owned_proxy +from integration._support.wire import Reply, Request, wire_server + + +def frame(identity: str, delta: dict[str, str], *, finish: str | None = None) -> bytes: + event: Final = { + "id": identity, + "object": "chat.completion.chunk", + "created": 1, + "model": "gpt-4o-mini", + "choices": [{"index": 0, "delta": delta, "finish_reason": finish}], + } + return b"data: " + json.dumps(event).encode() + b"\n\n" + + +@pytest.mark.covers("streaming.max_parallel_requests.slot_released_when_stream_logging_callback_fails") +def test_failing_stream_logging_callback_does_not_leak_max_parallel_requests_slot( + gateway: Gateway, tmp_path: Path +) -> None: + identity: Final = "stream-slot-" + uuid.uuid4().hex + prompt: Final = "slot release control " + identity + + def analyzer(request: Request) -> Reply: + assert request.target == "/analyze" + assert json.loads(request.body)["text"] == prompt + return Reply(status=500, body=json.dumps({"error": "synthetic analyzer outage"}).encode()) + + def provider(request: Request) -> Reply: + assert request.target == "/v1/chat/completions" + body: Final = json.loads(request.body) + assert body["messages"] == [{"role": "user", "content": prompt}] + assert body["stream"] is True + return Reply( + content_type="text/event-stream", + chunks=( + frame(identity, {"role": "assistant", "content": "Hello"}), + frame(identity, {"content": " slot"}), + frame(identity, {}, finish="stop"), + b"data: [DONE]\n\n", + ), + ) + + with wire_server(analyzer) as policy, wire_server(provider) as upstream: + config: Final = yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()) + config["guardrails"] = [ + { + "guardrail_name": identity, + "litellm_params": { + "guardrail": "presidio", + "mode": "logging_only", + "default_on": True, + "presidio_filter_scope": "input", + "pii_entities_config": {"EMAIL_ADDRESS": "MASK"}, + "presidio_analyzer_api_base": policy.url + "/", + "presidio_anonymizer_api_base": policy.url + "/", + }, + } + ] + path: Final = tmp_path / "failing_logging_guardrail.yaml" + path.write_text(yaml.safe_dump(config)) + with owned_proxy(gateway, tmp_path, {}, config=path) as candidate, candidate.scenario() as scenario: + model: Final = scenario.model(api_base=upstream.url + "/v1") + key: Final = scenario.key(max_parallel_requests=1) + body: Final = {"model": model, "messages": [{"role": "user", "content": prompt}], "stream": True} + first: Final = candidate.request("POST", "/v1/chat/completions", body, key=key) + assert first.status_code == 200, first.text + assert first.text.endswith("data: [DONE]\n\n"), first.text + assert len(upstream.drain()) == 1 + eventually(lambda: policy.received.qsize(), lambda count: count >= 1) + assert {scan.target for scan in policy.drain()} == {"/analyze"} + second: Final = eventually( + lambda: candidate.request("POST", "/v1/chat/completions", body, key=key), + lambda response: response.status_code == 200, + seconds=20, + return_last_on_timeout=True, + ) + assert second.status_code == 200, second.text + assert second.text.endswith("data: [DONE]\n\n"), second.text diff --git a/tests/integration/streaming/test_ttft_keepalive.py b/tests/integration/streaming/test_ttft_keepalive.py new file mode 100644 index 00000000000..3f8c1bbc112 --- /dev/null +++ b/tests/integration/streaming/test_ttft_keepalive.py @@ -0,0 +1,62 @@ +import json +import threading +import uuid +from collections.abc import Callable, Iterable, Iterator +from typing import Final + +import pytest +from integration._support.client import Gateway +from integration._support.wire import Reply, Request, wire_server +from integration.streaming.test_stream_contracts import text_stream + +KEEPALIVE_SECONDS: Final = 1 + + +def _reply_after_first_ping(identity: str, first_ping_seen: threading.Event) -> Callable[[Request], Reply]: + def respond(_request: Request) -> Reply: + first_ping_seen.wait(timeout=10) + return Reply(content_type="text/event-stream", chunks=text_stream(identity)) + + return respond + + +def _frames_setting(first_ping_seen: threading.Event, lines: Iterable[str]) -> Iterator[str]: + for line in lines: + if line == ": ping": + first_ping_seen.set() + yield line + + +@pytest.mark.covers("streaming.keepalive.sse_pings_fill_silent_time_to_first_token") +def test_stream_emits_sse_ping_comments_before_the_first_data_frame_while_upstream_is_silent( + gateway: Gateway, +) -> None: + identity: Final = "stream-ttft-keepalive-" + uuid.uuid4().hex + first_ping_seen: Final = threading.Event() + with gateway.scenario() as scenario: + with wire_server(_reply_after_first_ping(identity, first_ping_seen)) as wire: + model: Final = scenario.model(api_base=wire.url + "/v1", keepalive_seconds=KEEPALIVE_SECONDS) + with gateway.client.stream( + "POST", + "/v1/chat/completions", + json={"model": model, "messages": [{"role": "user", "content": identity}], "stream": True}, + headers={"Authorization": f"Bearer {gateway.key}"}, + ) as response: + assert response.status_code == 200, response.read().decode() + frames: Final = tuple( + _frames_setting(first_ping_seen, (line for line in response.iter_lines() if line)) + ) + first_data: Final = next(index for index, line in enumerate(frames) if line.startswith("data:")) + assert first_data >= 1, f"No keepalive reached the client before the first data frame: {frames}" + assert frames[:first_data] == (": ping",) * first_data, frames + assert frames[-1] == "data: [DONE]", frames + deltas: Final = tuple(json.loads(line.removeprefix("data: ")) for line in frames[first_data:-1]) + assert ( + "".join(choice["delta"].get("content", "") for chunk in deltas for choice in chunk["choices"]) + == "Hello 雪 café" + ), frames + requests: Final = wire.drain() + assert len(requests) == 1 + outbound: Final = json.loads(requests[0].body) + assert outbound["model"] == "gpt-4o-mini" and outbound["stream"] is True, outbound + assert "keepalive_seconds" not in outbound, outbound diff --git a/tests/litellm_utils_tests/test_utils.py b/tests/litellm_utils_tests/test_utils.py index f7575b969c4..fb20cdf7e0e 100644 --- a/tests/litellm_utils_tests/test_utils.py +++ b/tests/litellm_utils_tests/test_utils.py @@ -263,7 +263,7 @@ def test_trimming_should_not_change_original_messages(): assert messages == messages_copy -@pytest.mark.parametrize("model", ["gpt-4-0125-preview", "claude-sonnet-4-6"]) +@pytest.mark.parametrize("model", ["gpt-5.4-mini", "claude-sonnet-4-6"]) def test_trimming_with_model_cost_max_input_tokens(model): messages = [ {"role": "system", "content": "This is a normal system message"}, diff --git a/tests/llm_translation/conftest.py b/tests/llm_translation/conftest.py index 567040c1d19..a88dcf4ae3e 100644 --- a/tests/llm_translation/conftest.py +++ b/tests/llm_translation/conftest.py @@ -7,6 +7,8 @@ import asyncio import importlib +from collections.abc import Generator +from typing import Final import pytest @@ -20,6 +22,7 @@ from tests._vcr_conftest_common import ( # noqa: E402,F401 emit_cassette_cache_session_banner, emit_vcr_classification_summary, emit_vcr_diagnostic_log, + guard_vcr_patch_points, install_live_call_probe, record_vcr_outcome, register_persister_if_enabled, @@ -37,17 +40,12 @@ def fake_openai_endpoint(): # Per-item respx detection (``apply_vcr_auto_marker_to_items``) handles # the vast majority of respx-vs-vcrpy conflicts automatically. The entries -# below are the persister's and the WebSocket VCR's own unit-test files, which -# exercise ``save_cassette`` / ``load_cassette`` against fakeredis and must not -# themselves run under a live cassette context. +# below are the persister's, the WebSocket VCR's, and the cassette patch-leak +# guard's own unit-test files, which exercise ``save_cassette`` / +# ``load_cassette`` against fakeredis or enter cassettes themselves and must +# not run under a live cassette context. _VCR_AUTO_MARKER_SKIP_FILES = frozenset( - {"test_vcr_redis_persister.py", "test_ws_vcr.py"} -) - -_VCR_INCOMPATIBLE_NODEID_SUFFIXES: tuple[str, ...] = ( - "test_nvidia_nim.py::test_embedding_nvidia_nim", - "test_litellm_proxy_provider.py::test_litellm_gateway_from_sdk_embedding[False]", - "test_litellm_proxy_provider.py::test_litellm_gateway_from_sdk_embedding[True]", + {"test_vcr_redis_persister.py", "test_ws_vcr.py", "test_vcr_leak_guard.py"} ) @@ -77,6 +75,17 @@ def _vcr_outcome_gate(request, vcr): record_vcr_outcome(request, vcr) +@pytest.hookimpl(wrapper=True, trylast=True) +def pytest_runtest_teardown(item: pytest.Item) -> Generator[None, object, object]: + try: + result: Final = yield + except BaseException: + guard_vcr_patch_points(item, teardown_failed=True) + raise + guard_vcr_patch_points(item, teardown_failed=False) + return result + + def pytest_configure(config): _verbose_state.remember_pluginmanager(config) reset_vcr_diag_dir() @@ -172,7 +181,6 @@ def pytest_collection_modifyitems(config, items): apply_vcr_auto_marker_to_items( items, skip_files=_VCR_AUTO_MARKER_SKIP_FILES, - skip_nodeid_suffixes=_VCR_INCOMPATIBLE_NODEID_SUFFIXES, ) custom_logger_tests = [ diff --git a/tests/llm_translation/test_bedrock_dynamic_auth_params_unit_tests.py b/tests/llm_translation/test_bedrock_dynamic_auth_params_unit_tests.py index 2d1d2815026..184a0ae0749 100644 --- a/tests/llm_translation/test_bedrock_dynamic_auth_params_unit_tests.py +++ b/tests/llm_translation/test_bedrock_dynamic_auth_params_unit_tests.py @@ -9,6 +9,7 @@ import litellm from litellm.llms.custom_httpx.http_handler import HTTPHandler from unittest.mock import Mock from litellm.llms.bedrock.base_aws_llm import BaseAWSLLM +from litellm.llms.bedrock.common_utils import BedrockModelInfo @@ -42,7 +43,7 @@ def test_bedrock_completion_with_region_name(): # Pass the client so that the HTTP call will be intercepted. response = litellm.completion( - model="cohere.command-r-v1:0", + model="bedrock/cohere.command-r-v1:0", messages=[{"role": "user", "content": "Hello, world!"}], aws_region_name="us-west-12", client=client, @@ -98,7 +99,7 @@ def test_bedrock_completion_with_dynamic_authentication_params(): # Pass the client so that the HTTP call will be intercepted. response = litellm.completion( - model="cohere.command-r-v1:0", + model="bedrock/cohere.command-r-v1:0", messages=[{"role": "user", "content": "Hello, world!"}], aws_access_key_id="dynamically_generated_access_key_id", aws_secret_access_key="dynamically_generated_secret_access_key", @@ -146,7 +147,7 @@ def test_bedrock_completion_with_dynamic_bedrock_runtime_endpoint(): # Pass the client so that the HTTP call will be intercepted. response = litellm.completion( - model="cohere.command-r-v1:0", + model="bedrock/cohere.command-r-v1:0", messages=[{"role": "user", "content": "Hello, world!"}], aws_bedrock_runtime_endpoint="https://my-fake-endpoint.com", client=client, @@ -179,7 +180,7 @@ class DummyCredentials: "model", [ "bedrock/converse/cohere.command-r-v1:0", - "cohere.command-r-v1:0", + "amazon.nova-2-lite-v1:0", "bedrock/cohere.command-r-v1:0", "bedrock/invoke/cohere.command-r-v1:0", ], @@ -250,7 +251,7 @@ def test_dynamic_aws_params_propagation(model, param_name, param_value, expected "finish_reason": "COMPLETE", } ) - if "converse" in model: + if BedrockModelInfo.get_bedrock_route(model) == "converse": mock_response.text = json.dumps( { "output": { diff --git a/tests/llm_translation/test_fireworks_ai_translation.py b/tests/llm_translation/test_fireworks_ai_translation.py index e20134fc1bf..a7dc913c388 100644 --- a/tests/llm_translation/test_fireworks_ai_translation.py +++ b/tests/llm_translation/test_fireworks_ai_translation.py @@ -9,6 +9,12 @@ from litellm.llms.fireworks_ai.chat.transformation import FireworksAIConfig fireworks = FireworksAIConfig() +VISION_MODEL = next( + key.removeprefix("fireworks_ai/") + for key, info in litellm.model_cost.items() + if key.startswith("fireworks_ai/accounts/fireworks/models/") and info.get("supports_vision") is True +) + def test_map_openai_params_tool_choice(): # Test case 1: tool_choice is "required" @@ -97,7 +103,7 @@ def test_document_inlining_example(disable_add_transform_inline_image_block): with patch.object(client, "post") as mock_post: try: completion( - model="fireworks_ai/accounts/fireworks/models/minimax-m3", + model=f"fireworks_ai/{VISION_MODEL}", messages=[ { "role": "user", @@ -157,7 +163,7 @@ def test_transform_inline_no_longer_added(content, expected_url): result = litellm.FireworksAIConfig()._transform_messages_helper( messages=messages, - model="accounts/fireworks/models/minimax-m3", + model=VISION_MODEL, litellm_params={}, ) result_image_block = result[0]["content"][0] @@ -182,7 +188,7 @@ def test_global_disable_flag_no_longer_adds_transform_inline(is_disabled): ] result = litellm.FireworksAIConfig()._transform_messages_helper( messages=messages, - model="accounts/fireworks/models/minimax-m3", + model=VISION_MODEL, litellm_params={}, ) assert result[0]["content"][0]["image_url"] == url @@ -204,7 +210,7 @@ def test_global_disable_flag_with_transform_messages_helper(monkeypatch): ) as mock_post: try: completion( - model="fireworks_ai/accounts/fireworks/models/minimax-m3", + model=f"fireworks_ai/{VISION_MODEL}", messages=[ { "role": "user", diff --git a/tests/llm_translation/test_gemini_image_usage.py b/tests/llm_translation/test_gemini_image_usage.py index 096f9c4796c..0be8b6c23e1 100644 --- a/tests/llm_translation/test_gemini_image_usage.py +++ b/tests/llm_translation/test_gemini_image_usage.py @@ -238,7 +238,7 @@ def test_gemini_image_generation_accumulates_multiple_image_prompt_token_details os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True" litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" + model = "gemini/gemini-3-pro-image" config = GoogleImageGenConfig() usage_metadata = { diff --git a/tests/llm_translation/test_groq.py b/tests/llm_translation/test_groq.py index c720f818eaf..fbecbeab08b 100644 --- a/tests/llm_translation/test_groq.py +++ b/tests/llm_translation/test_groq.py @@ -32,7 +32,7 @@ class TestGroq(BaseLLMChatTest): @pytest.mark.parametrize( "model", - ["groq/qwen/qwen3-32b", "groq/openai/gpt-oss-20b", "groq/openai/gpt-oss-120b"], + ["groq/qwen/qwen3.8-27b", "groq/openai/gpt-oss-20b", "groq/openai/gpt-oss-120b"], ) def test_reasoning_effort_in_supported_params(self, model): """Test that reasoning_effort is in the list of supported parameters for Groq""" diff --git a/tests/llm_translation/test_litellm_proxy_provider.py b/tests/llm_translation/test_litellm_proxy_provider.py index 8630259877d..a10fc55ecc5 100644 --- a/tests/llm_translation/test_litellm_proxy_provider.py +++ b/tests/llm_translation/test_litellm_proxy_provider.py @@ -2,6 +2,8 @@ import json import re from datetime import datetime from io import BytesIO +from pathlib import Path +from typing import Final from unittest.mock import AsyncMock @@ -12,7 +14,12 @@ import pytest from unittest.mock import MagicMock, patch from litellm.llms.custom_httpx.http_handler import HTTPHandler, AsyncHTTPHandler import pytest_asyncio -from openai import AsyncOpenAI +from openai import AsyncOpenAI, OpenAI +from openai.types import CreateEmbeddingResponse, Embedding +from openai.types.create_embedding_response import Usage + +from tests.capturing_transport import CapturingTransport +from tests._vcr_conftest_common import rewound_new_episodes_cassette @pytest.mark.asyncio @@ -87,62 +94,61 @@ async def test_litellm_gateway_from_sdk_structured_output(): assert "json_schema" in json_schema -@pytest.mark.parametrize("is_async", [False, True]) +_GATEWAY_EMBEDDING_RESPONSE: Final = CreateEmbeddingResponse( + object="list", + data=(Embedding(object="embedding", index=0, embedding=(0.1, 0.2, 0.3)),), + model="my-vllm-model", + usage=Usage(prompt_tokens=2, total_tokens=2), +) + + +async def _gateway_embedding_via_injected_client( + is_async: bool, +) -> tuple[CapturingTransport, litellm.EmbeddingResponse]: + transport: Final = CapturingTransport(_GATEWAY_EMBEDDING_RESPONSE) + response: Final = ( + await litellm.aembedding( + model="litellm_proxy/my-vllm-model", + input="Hello world", + client=AsyncOpenAI(api_key="fake-key", http_client=httpx.AsyncClient(transport=transport)), + api_base="my-custom-api-base", + ) + if is_async + else litellm.embedding( + model="litellm_proxy/my-vllm-model", + input="Hello world", + client=OpenAI(api_key="fake-key", http_client=httpx.Client(transport=transport)), + api_base="my-custom-api-base", + ) + ) + return transport, response + + +@pytest.mark.parametrize("is_async", (False, True)) @pytest.mark.asyncio -async def test_litellm_gateway_from_sdk_embedding(is_async): +async def test_litellm_gateway_from_sdk_embedding(is_async: bool): litellm.set_verbose = True litellm._turn_on_debug() - captured_bodies = [] - - def handler(request: httpx.Request) -> httpx.Response: - captured_bodies.append(json.loads(request.content)) - return httpx.Response( - 200, - json={ - "object": "list", - "data": [{"object": "embedding", "index": 0, "embedding": [0.1, 0.2, 0.3]}], - "model": "my-vllm-model", - "usage": {"prompt_tokens": 2, "total_tokens": 2}, - }, - ) - - if is_async: - from openai import AsyncOpenAI - - openai_client = AsyncOpenAI( - api_key="fake-key", - http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)), - ) - response = await litellm.aembedding( - model="litellm_proxy/my-vllm-model", - input="Hello world", - client=openai_client, - api_base="my-custom-api-base", - ) - else: - from openai import OpenAI - - openai_client = OpenAI( - api_key="fake-key", - http_client=httpx.Client(transport=httpx.MockTransport(handler)), - ) - response = litellm.embedding( - model="litellm_proxy/my-vllm-model", - input="Hello world", - client=openai_client, - api_base="my-custom-api-base", - ) - - request_body = captured_bodies[0] - print("Request body - {}".format(request_body)) + transport, response = await _gateway_embedding_via_injected_client(is_async) + request_body: Final = transport.request_bodies[0] assert "Hello world" == request_body["input"] assert "my-vllm-model" == request_body["model"] assert "encoding_format" not in request_body assert response.data[0]["embedding"] == [0.1, 0.2, 0.3] +@pytest.mark.asyncio +async def test_litellm_gateway_from_sdk_embedding_under_foreign_cassette(tmp_path: Path): + with rewound_new_episodes_cassette(tmp_path): + sync_transport, _ = await _gateway_embedding_via_injected_client(is_async=False) + async_transport, _ = await _gateway_embedding_via_injected_client(is_async=True) + + assert tuple(body["input"] for body in sync_transport.request_bodies) == ("Hello world",) + assert tuple(body["input"] for body in async_transport.request_bodies) == ("Hello world",) + + @pytest.mark.parametrize("is_async", [False, True]) @pytest.mark.asyncio async def test_litellm_gateway_from_sdk_image_generation(is_async): diff --git a/tests/llm_translation/test_nvidia_nim.py b/tests/llm_translation/test_nvidia_nim.py index d5942e674d0..0f16c01fd2f 100644 --- a/tests/llm_translation/test_nvidia_nim.py +++ b/tests/llm_translation/test_nvidia_nim.py @@ -1,17 +1,21 @@ import json from datetime import datetime +from typing import Final from unittest.mock import AsyncMock import httpx import pytest +from openai.types import CreateEmbeddingResponse, Embedding +from openai.types.create_embedding_response import Usage as EmbeddingUsage from unittest.mock import patch, MagicMock import litellm from litellm import Choices, Message, ModelResponse, EmbeddingResponse, Usage from litellm import completion from base_rerank_unit_tests import BaseLLMRerankTest +from tests.capturing_transport import CapturingTransport def test_completion_nvidia_nim(): @@ -63,33 +67,23 @@ def test_embedding_nvidia_nim(): litellm.set_verbose = True from openai import OpenAI - captured_bodies = [] - - def handler(request: httpx.Request) -> httpx.Response: - captured_bodies.append(json.loads(request.content)) - return httpx.Response( - 200, - json={ - "object": "list", - "data": [{"object": "embedding", "index": 0, "embedding": [0.1, 0.2, 0.3]}], - "model": "nvidia/nv-embedqa-e5-v5", - "usage": {"prompt_tokens": 6, "total_tokens": 6}, - }, + transport: Final = CapturingTransport( + CreateEmbeddingResponse( + object="list", + data=(Embedding(object="embedding", index=0, embedding=(0.1, 0.2, 0.3)),), + model="nvidia/nv-embedqa-e5-v5", + usage=EmbeddingUsage(prompt_tokens=6, total_tokens=6), ) - - client = OpenAI( - api_key="fake-api-key", - http_client=httpx.Client(transport=httpx.MockTransport(handler)), ) - response = litellm.embedding( + client: Final = OpenAI(api_key="fake-api-key", http_client=httpx.Client(transport=transport)) + response: Final = litellm.embedding( model="nvidia_nim/nvidia/nv-embedqa-e5-v5", input="What is the meaning of life?", input_type="passage", dimensions=1024, client=client, ) - request_body = captured_bodies[0] - print("request_body: ", request_body) + request_body: Final = transport.request_bodies[0] assert request_body["input"] == "What is the meaning of life?" assert request_body["model"] == "nvidia/nv-embedqa-e5-v5" assert request_body["input_type"] == "passage" diff --git a/tests/llm_translation/test_optional_params.py b/tests/llm_translation/test_optional_params.py index 997f5b3b73f..58446014bdf 100644 --- a/tests/llm_translation/test_optional_params.py +++ b/tests/llm_translation/test_optional_params.py @@ -537,7 +537,7 @@ def test_dynamic_drop_params_e2e(): ) as mock_response: try: response = litellm.completion( - model="command-r", + model="command-r-08-2024", messages=[{"role": "user", "content": "Hey, how's it going?"}], response_format={"key": "value"}, drop_params=True, @@ -556,7 +556,7 @@ def test_dynamic_pass_additional_params(): ) as mock_response: try: response = litellm.completion( - model="command-r", + model="command-r-08-2024", messages=[{"role": "user", "content": "Hey, how's it going?"}], custom_param="test", api_key="my-custom-key", @@ -606,7 +606,7 @@ def test_dynamic_drop_params_parallel_tool_calls(): ) as mock_response: try: response = litellm.completion( - model="command-r", + model="command-r-08-2024", messages=[{"role": "user", "content": "Hey, how's it going?"}], parallel_tool_calls=True, drop_params=True, @@ -663,7 +663,7 @@ def test_dynamic_drop_additional_params_e2e(): ) as mock_response: try: response = litellm.completion( - model="command-r", + model="command-r-08-2024", messages=[{"role": "user", "content": "Hey, how's it going?"}], response_format={"key": "value"}, additional_drop_params=["response_format"], diff --git a/tests/llm_translation/test_vcr_leak_guard.py b/tests/llm_translation/test_vcr_leak_guard.py new file mode 100644 index 00000000000..5372342790b --- /dev/null +++ b/tests/llm_translation/test_vcr_leak_guard.py @@ -0,0 +1,72 @@ +from __future__ import annotations + +import re +from pathlib import Path +from typing import Final + +import httpx +import httpx2 +import pytest + +from tests._vcr_conftest_common import ( + detect_vcr_patch_leak, + guard_vcr_patch_points, + restore_vcr_patch_points, + rewound_new_episodes_cassette, +) + +_ORIGINAL_MOCK_HANDLE_ASYNC_REQUEST: Final = httpx.MockTransport.handle_async_request +_ORIGINAL_HTTPX2_MOCK_HANDLE_ASYNC_REQUEST: Final = httpx2.MockTransport.handle_async_request + + +@pytest.fixture +def leaked_cassette_dir(tmp_path: Path): + context: Final = rewound_new_episodes_cassette(tmp_path) + context.__enter__() + yield tmp_path + context.__exit__(None, None, None) + + +def test_no_leak_when_no_cassette_is_active(): + assert detect_vcr_patch_leak() is None + + +def test_leaked_cassette_is_detected_named_and_restorable(leaked_cassette_dir: Path): + leak: Final = detect_vcr_patch_leak() + + assert leak is not None + assert {"httpx.MockTransport.handle_async_request", "aiohttp.client.ClientSession._request"} <= set( + leak.patch_points + ) + assert leak.cassette_paths == (str(leaked_cassette_dir / "rewound_owner.yaml"),) + + restore_vcr_patch_points() + + assert detect_vcr_patch_leak() is None + assert httpx.MockTransport.handle_async_request is _ORIGINAL_MOCK_HANDLE_ASYNC_REQUEST + + +def test_leak_is_detected_on_every_transport_family_vcrpy_patches(leaked_cassette_dir: Path): + leak: Final = detect_vcr_patch_leak() + + assert leak is not None + assert "httpx2.MockTransport.handle_async_request" in leak.patch_points + assert httpx2.MockTransport.handle_async_request is not _ORIGINAL_HTTPX2_MOCK_HANDLE_ASYNC_REQUEST + + restore_vcr_patch_points() + + assert httpx2.MockTransport.handle_async_request is _ORIGINAL_HTTPX2_MOCK_HANDLE_ASYNC_REQUEST + + +def test_guard_fails_the_leaking_test_and_restores_the_originals(request, leaked_cassette_dir: Path): + with pytest.raises(pytest.fail.Exception, match=re.escape(request.node.nodeid)) as failure: + guard_vcr_patch_points(request.node, teardown_failed=False) + + assert str(leaked_cassette_dir / "rewound_owner.yaml") in str(failure.value) + assert detect_vcr_patch_leak() is None + + +def test_guard_restores_silently_when_the_teardown_already_failed(request, leaked_cassette_dir: Path): + guard_vcr_patch_points(request.node, teardown_failed=True) + + assert detect_vcr_patch_leak() is None diff --git a/tests/llm_translation/test_xai.py b/tests/llm_translation/test_xai.py index 7a121afc3fa..d6d42ed215e 100644 --- a/tests/llm_translation/test_xai.py +++ b/tests/llm_translation/test_xai.py @@ -164,7 +164,7 @@ def test_xai_message_name_filtering(): class TestXAIReasoningEffort(BaseReasoningLLMTests): def get_base_completion_call_args(self): return { - "model": "xai/grok-3-mini-beta", + "model": "xai/grok-4.7", "messages": [{"role": "user", "content": "Hello"}], } diff --git a/tests/local_testing/conftest.py b/tests/local_testing/conftest.py index 228457f4d55..d03f074f557 100644 --- a/tests/local_testing/conftest.py +++ b/tests/local_testing/conftest.py @@ -93,7 +93,6 @@ _VCR_INCOMPATIBLE_FILES = frozenset( # carry no real provider cost. _VCR_INCOMPATIBLE_NODEID_SUFFIXES: tuple[str, ...] = ( "test_router.py::test_router_text_completion_client", - "test_embedding.py::test_encoding_format_omitted_by_default_for_openai_sdk", ) diff --git a/tests/local_testing/test_amazing_vertex_completion.py b/tests/local_testing/test_amazing_vertex_completion.py index 3d66064f5c0..c85ad7fc779 100644 --- a/tests/local_testing/test_amazing_vertex_completion.py +++ b/tests/local_testing/test_amazing_vertex_completion.py @@ -2863,7 +2863,7 @@ def test_gemini_function_call_parameter_in_messages(): mock_client.return_value = mock_response try: completion( - model="vertex_ai/gemini-2.0-flash", + model="vertex_ai/gemini-2.5-flash-preview-09-2025", messages=messages, tools=tools, tool_choice="auto", @@ -3263,7 +3263,7 @@ def test_vertex_anthropic_completion(): client, "post", side_effect=vertex_ai_anthropic_thinking_mock_response ): response = completion( - model="vertex_ai/claude-3-7-sonnet@20250219", + model="vertex_ai/claude-sonnet-4-6@default", messages=[{"role": "user", "content": "Hello, world!"}], vertex_ai_location="us-east5", vertex_ai_project="test-project", @@ -3271,7 +3271,7 @@ def test_vertex_anthropic_completion(): client=client, ) print(response) - assert response.model == "claude-3-7-sonnet@20250219" + assert response.model == "claude-sonnet-4-6@default" assert response._hidden_params["response_cost"] is not None assert response._hidden_params["response_cost"] > 0 @@ -3331,7 +3331,7 @@ def test_gemini_fine_tuned_model_request_consistency(): Assert the same transformation is applied to Fine tuned gemini 2.0 flash and gemini 2.0 flash - Request 1: Fine tuned: vertex_ai/gemini/ft-uuid - - Request 2: vertex_ai/gemini-2.0-flash-001 + - Request 2: vertex_ai/gemini-2.5-flash """ litellm.set_verbose = True load_vertex_ai_credentials() @@ -3403,7 +3403,7 @@ def test_gemini_fine_tuned_model_request_consistency(): with patch.object(client, "post", new=MagicMock()) as mock_post_2: try: response_2 = completion( - model="vertex_ai/gemini-2.0-flash-001", + model="vertex_ai/gemini-2.5-flash", messages=messages, tools=tools, tool_choice="auto", diff --git a/tests/local_testing/test_completion_cost.py b/tests/local_testing/test_completion_cost.py index f40818b9bf1..c24e6c32369 100644 --- a/tests/local_testing/test_completion_cost.py +++ b/tests/local_testing/test_completion_cost.py @@ -5,7 +5,7 @@ import litellm.cost_calculator import asyncio import time -from typing import Optional +from typing import Final, Optional from unittest.mock import MagicMock, patch import pytest @@ -21,6 +21,9 @@ import json import httpx from litellm.types.utils import PromptTokensDetails from litellm.litellm_core_utils.litellm_logging import CustomLogger +from litellm.litellm_core_utils.llm_response_utils.convert_dict_to_response import ( + convert_to_model_response_object, +) class CustomLoggingHandler(CustomLogger): @@ -328,35 +331,39 @@ def test_whisper_azure(): assert round(cost, 5) == round(expected_cost, 5) -def test_dalle_3_azure_cost_tracking(): - litellm.set_verbose = True - # model = "azure/dall-e-3-test" - # response = litellm.image_generation( - # model=model, - # prompt="A cute baby sea otter", - # api_version="2023-12-01-preview", - # api_base=os.getenv("AZURE_SWEDEN_API_BASE"), - # api_key=os.getenv("AZURE_SWEDEN_API_KEY"), - # base_model="dall-e-3", - # ) - # print(f"response: {response}") - response = litellm.ImageResponse( - created=1710265780, - data=[ - { - "b64_json": None, - "revised_prompt": "A close-up image of an adorable baby sea otter. Its fur is thick and fluffy to provide buoyancy and insulation against the cold water. Its eyes are round, curious and full of life. It's lying on its back, floating effortlessly on the calm sea surface under the warm sun. Surrounding the otter are patches of colorful kelp drifting along the gentle waves, giving the scene a touch of vibrancy. The sea otter has its small paws folded on its chest, and it seems to be taking a break from its play.", - "url": "test-azure-blob-url-with-sas-token", - } - ], +def test_gpt_image_2_azure_cost_tracking(): + azure_image_generation_response: Final = { + "created": 1758585600, + "data": [{"b64_json": "iVBORw0KGgo=", "revised_prompt": None, "url": None}], + "output_format": "png", + "quality": "low", + "size": "1024x1024", + "usage": { + "input_tokens": 12, + "input_tokens_details": {"image_tokens": 0, "text_tokens": 12}, + "output_tokens": 196, + "output_tokens_details": {"image_tokens": 196, "text_tokens": 0}, + "total_tokens": 208, + }, + } + response: Final = convert_to_model_response_object( + response_object=azure_image_generation_response, + model_response_object=litellm.ImageResponse(), + response_type="image_generation", + hidden_params={"model": "gpt-image-2", "custom_llm_provider": "azure"}, ) - response.usage = {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0} - response._hidden_params = {"model": "dall-e-3", "model_id": None} - print(f"response hidden params: {response._hidden_params}") - cost = litellm.completion_cost( - completion_response=response, call_type="image_generation" + + cost: Final = litellm.completion_cost( + completion_response=response, + model="azure/my-gpt-image-2-deployment", + custom_llm_provider="azure", + base_model="gpt-image-2", + call_type="image_generation", ) - assert cost > 0 + + pricing: Final = litellm.model_cost["azure/gpt-image-2"] + expected_cost: Final = pricing["input_cost_per_token"] * 12 + pricing["output_cost_per_image_token"] * 196 + assert round(cost, 8) == round(expected_cost, 8) def test_replicate_llama3_cost_tracking(): @@ -445,7 +452,7 @@ def test_groq_response_cost_tracking(is_streaming): response_cost = litellm.response_cost_calculator( response_object=response, - model="groq/llama-3.3-70b-versatile", + model="groq/openai/gpt-oss-120b", custom_llm_provider="groq", call_type=CallTypes.acompletion.value, optional_params={}, @@ -515,7 +522,7 @@ def test_gemini_completion_cost(provider): """ os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True" litellm.model_cost = litellm.get_model_cost_map(url="") - model_name = "gemini-2.0-flash" + model_name = "gemini-3.8-flash" prompt_tokens = 128.0 output_tokens = 228.0 ## GET MODEL FROM LITELLM.MODEL_INFO @@ -543,7 +550,7 @@ def test_vertex_ai_completion_cost(): prompt_tokens = 100 - model_info = litellm.get_model_info(model="gemini-2.0-flash") + model_info = litellm.get_model_info(model="gemini-3.8-flash") print("\nExpected model info:\n{}\n\n".format(model_info)) @@ -551,7 +558,7 @@ def test_vertex_ai_completion_cost(): ## CALCULATED COST calculated_input_cost, calculated_output_cost = cost_per_token( - model="gemini-2.0-flash", + model="gemini-3.8-flash", custom_llm_provider="vertex_ai", prompt_tokens=prompt_tokens, completion_tokens=0, @@ -676,7 +683,7 @@ async def test_completion_cost_hidden_params(sync_mode): def test_vertex_ai_gemini_predict_cost(): - model = "gemini-2.0-flash" + model = "gemini-3.8-flash" messages = [{"role": "user", "content": "Hey, hows it going???"}] predictive_cost = completion_cost(model=model, messages=messages) @@ -757,24 +764,24 @@ def test_completion_cost_tts(model): def test_completion_cost_anthropic(): """ - model_name: claude-3-haiku-20240307 + model_name: claude-haiku-4-5 litellm_params: - model: anthropic/claude-3-haiku-20240307 + model: anthropic/claude-haiku-4-5 max_tokens: 4096 """ router = litellm.Router( model_list=[ { - "model_name": "claude-3-haiku-20240307", + "model_name": "claude-haiku-4-5", "litellm_params": { - "model": "anthropic/claude-3-haiku-20240307", + "model": "anthropic/claude-haiku-4-5", "max_tokens": 4096, }, } ] ) data = { - "model": "claude-3-haiku-20240307", + "model": "claude-haiku-4-5", "prompt_tokens": 21, "completion_tokens": 20, "response_time_ms": 871.7040000000001, @@ -2068,14 +2075,14 @@ def test_completion_cost_params(): """ litellm.set_verbose = True resp1_prompt_cost, resp1_completion_cost = cost_per_token( - model="gemini-2.0-flash", + model="gemini-3.8-flash", prompt_tokens=1000, completion_tokens=1000, custom_llm_provider="vertex_ai_beta", ) resp2_prompt_cost, resp2_completion_cost = cost_per_token( - model="gemini-2.0-flash", prompt_tokens=1000, completion_tokens=1000 + model="gemini-3.8-flash", prompt_tokens=1000, completion_tokens=1000 ) assert resp2_prompt_cost > 0 @@ -2084,7 +2091,7 @@ def test_completion_cost_params(): assert resp1_completion_cost == resp2_completion_cost resp3_prompt_cost, resp3_completion_cost = cost_per_token( - model="vertex_ai/gemini-2.0-flash", prompt_tokens=1000, completion_tokens=1000 + model="vertex_ai/gemini-3.8-flash", prompt_tokens=1000, completion_tokens=1000 ) assert resp3_prompt_cost > 0 @@ -2102,14 +2109,14 @@ def test_completion_cost_params_2(): prompt_tokens = 1000 completion_tokens = 1000 resp1_prompt_cost, resp1_completion_cost = cost_per_token( - model="gemini-2.0-flash", + model="gemini-3.8-flash", prompt_tokens=prompt_tokens, completion_tokens=completion_tokens, ) print(resp1_prompt_cost, resp1_completion_cost) - model_info = litellm.get_model_info("gemini-2.0-flash") + model_info = litellm.get_model_info("gemini-3.8-flash") input_cost_per_token = model_info["input_cost_per_token"] output_cost_per_token = model_info["output_cost_per_token"] @@ -2148,7 +2155,7 @@ def test_completion_cost_params_gemini_3(): ) ], created=1728529259, - model="gemini-2.0-flash", + model="gemini-3.8-flash", object="chat.completion", system_fingerprint=None, usage=usage, @@ -2172,7 +2179,7 @@ def test_completion_cost_params_gemini_3(): pc, cc = cost_per_character( **{ - "model": "gemini-2.0-flash", + "model": "gemini-3.8-flash", "custom_llm_provider": "vertex_ai", "prompt_characters": None, "completion_characters": 3, @@ -2180,9 +2187,9 @@ def test_completion_cost_params_gemini_3(): } ) - model_info = litellm.get_model_info("gemini-2.0-flash") + model_info = litellm.get_model_info("gemini-3.8-flash") - # gemini-2.0-flash has no per-character pricing, so cost_per_character + # gemini-3.8-flash has no per-character pricing, so cost_per_character # falls back to per-token pricing using usage.prompt_tokens / usage.completion_tokens assert round(pc, 10) == round(3771 * model_info["input_cost_per_token"], 10) assert round(cc, 10) == round( @@ -2239,16 +2246,16 @@ async def test_test_completion_cost_gpt4o_audio_output_from_model(stream): ) ], created=1729282652, - model="gpt-4o-audio-preview", + model="gpt-audio-1.5", object="chat.completion", system_fingerprint="fp_4eafc16e9d", usage=usage_object, service_tier=None, ) - cost = completion_cost(completion, model="gpt-4o-audio-preview") + cost = completion_cost(completion, model="gpt-audio-1.5") - model_info = litellm.get_model_info("gpt-4o-audio-preview") + model_info = litellm.get_model_info("gpt-audio-1.5") print(f"model_info: {model_info}") ## input cost @@ -2517,7 +2524,7 @@ def test_cost_calculator_with_base_model(): resp = litellm.completion( model="bedrock/random-model", messages=[{"role": "user", "content": "Hello, how are you?"}], - base_model="bedrock/anthropic.claude-3-sonnet-20240229-v1:0", + base_model="bedrock/anthropic.claude-sonnet-5", mock_response="Hello, how are you?", ) assert resp.model == "random-model" @@ -2551,10 +2558,10 @@ def test_cost_calculator_with_base_model_with_router(base_model_arg): if base_model_arg == "litellm_param": model_item["litellm_params"][ "base_model" - ] = "bedrock/anthropic.claude-3-sonnet-20240229-v1:0" + ] = "bedrock/anthropic.claude-sonnet-5" elif base_model_arg == "model_info": model_item["model_info"] = { - "base_model": "bedrock/anthropic.claude-3-sonnet-20240229-v1:0", + "base_model": "bedrock/anthropic.claude-sonnet-5", } router = Router(model_list=[model_item]) diff --git a/tests/local_testing/test_embedding.py b/tests/local_testing/test_embedding.py index c119334da6f..acbc4f20405 100644 --- a/tests/local_testing/test_embedding.py +++ b/tests/local_testing/test_embedding.py @@ -15,6 +15,9 @@ from unittest.mock import AsyncMock, MagicMock, patch import litellm from litellm import completion, completion_cost, embedding +from openai.types import CreateEmbeddingResponse +from openai.types.create_embedding_response import Usage as EmbeddingUsage +from tests.capturing_transport import CapturingTransport from tests.fake_openai_endpoint import FAKE_OPENAI_API_BASE litellm.set_verbose = False @@ -1268,23 +1271,15 @@ def test_encoding_format_omitted_by_default_for_openai_sdk(monkeypatch): Optional global override: `LITELLM_DEFAULT_EMBEDDING_ENCODING_FORMAT`. """ monkeypatch.delenv("LITELLM_DEFAULT_EMBEDDING_ENCODING_FORMAT", raising=False) - captured_bodies = [] - - def handler(request: httpx.Request) -> httpx.Response: - captured_bodies.append(json.loads(request.content)) - return httpx.Response( - 200, - json={ - "object": "list", - "data": [{"object": "embedding", "index": 0, "embedding": [0.1, 0.2, 0.3]}], - "model": "text-embedding-ada-002", - "usage": {"prompt_tokens": 1, "total_tokens": 1}, - }, + transport = CapturingTransport( + CreateEmbeddingResponse( + object="list", + data=(Embedding(object="embedding", index=0, embedding=(0.1, 0.2, 0.3)),), + model="text-embedding-ada-002", + usage=EmbeddingUsage(prompt_tokens=1, total_tokens=1), ) - - client = openai.OpenAI( - api_key="sk-test", http_client=httpx.Client(transport=httpx.MockTransport(handler)) ) + client = openai.OpenAI(api_key="sk-test", http_client=httpx.Client(transport=transport)) response = embedding( model="text-embedding-ada-002", @@ -1294,7 +1289,7 @@ def test_encoding_format_omitted_by_default_for_openai_sdk(monkeypatch): ) assert response.data[0]["embedding"] == [0.1, 0.2, 0.3] - assert "encoding_format" not in captured_bodies[0], ( + assert "encoding_format" not in transport.request_bodies[0], ( "encoding_format should be omitted from the upstream request when not provided by user" ) diff --git a/tests/local_testing/test_exceptions.py b/tests/local_testing/test_exceptions.py index e6392cda406..813146f8ace 100644 --- a/tests/local_testing/test_exceptions.py +++ b/tests/local_testing/test_exceptions.py @@ -1148,7 +1148,7 @@ def test_openai_gateway_timeout_error(): @pytest.mark.parametrize( "provider, model, call_type", [ - ("anthropic", "claude-3-haiku-20240307", "chat_completion"), + ("anthropic", "claude-haiku-4-5-20251001", "chat_completion"), ], ) @pytest.mark.asyncio diff --git a/tests/local_testing/test_function_call_parsing.py b/tests/local_testing/test_function_call_parsing.py index c98f170a98f..ebb13e0018d 100644 --- a/tests/local_testing/test_function_call_parsing.py +++ b/tests/local_testing/test_function_call_parsing.py @@ -136,7 +136,7 @@ def trade(model_name: str) -> List[Trade]: # type: ignore @pytest.mark.parametrize( - "model", ["claude-haiku-4-5-20251001", "anthropic.claude-3-haiku-20240307-v1:0"] + "model", ["claude-haiku-4-5-20251001", "us.anthropic.claude-haiku-4-5-20251001-v1:0"] ) @pytest.mark.flaky(retries=6, delay=10) def test_function_call_parsing(model): diff --git a/tests/local_testing/test_get_llm_provider.py b/tests/local_testing/test_get_llm_provider.py index ebad0fbafc5..4ac7cecb97a 100644 --- a/tests/local_testing/test_get_llm_provider.py +++ b/tests/local_testing/test_get_llm_provider.py @@ -67,7 +67,17 @@ def test_get_llm_provider_deepseek_custom_api_base(): os.environ.pop("DEEPSEEK_API_BASE") -def test_get_llm_provider_vertex_ai_image_models(): +def test_get_llm_provider_vertex_ai_image_models(monkeypatch): + monkeypatch.setattr(litellm, "vertex_ai_image_models", set()) + monkeypatch.setattr(litellm, "models_by_provider", dict(litellm.models_by_provider)) + litellm.add_known_models( + model_cost_map={ + "vertex_ai/imagegeneration@006": { + "litellm_provider": "vertex_ai-image-models", + "mode": "image_generation", + } + } + ) model, custom_llm_provider, dynamic_api_key, api_base = litellm.get_llm_provider( model="imagegeneration@006", custom_llm_provider=None ) @@ -101,17 +111,17 @@ def test_get_llm_provider_ai21_chat_test2(): def test_get_llm_provider_cohere_chat_test2(): """ - if user prefix with cohere/ but calls command-r-plus then it should be cohere_chat provider + if user prefix with cohere/ but calls command-r-plus-08-2024 then it should be cohere_chat provider """ model, custom_llm_provider, dynamic_api_key, api_base = litellm.get_llm_provider( - model="cohere/command-r-plus", + model="cohere/command-r-plus-08-2024", ) print("model=", model) print("custom_llm_provider=", custom_llm_provider) print("api_base=", api_base) assert custom_llm_provider == "cohere_chat" - assert model == "command-r-plus" + assert model == "command-r-plus-08-2024" def test_get_llm_provider_azure_o1(): diff --git a/tests/local_testing/test_get_model_info.py b/tests/local_testing/test_get_model_info.py index 37f4ece611d..1e46a1bf853 100644 --- a/tests/local_testing/test_get_model_info.py +++ b/tests/local_testing/test_get_model_info.py @@ -16,7 +16,7 @@ def test_get_model_info_simple_model_name(): """ tests if model name given, and model exists in model info - the object is returned """ - model = "claude-3-opus-20240229" + model = "claude-opus-5-5" litellm.get_model_info(model) @@ -24,7 +24,7 @@ def test_get_model_info_custom_llm_with_model_name(): """ Tests if {custom_llm_provider}/{model_name} name given, and model exists in model info, the object is returned """ - model = "anthropic/claude-3-opus-20240229" + model = "anthropic/claude-opus-5-5" litellm.get_model_info(model) diff --git a/tests/local_testing/test_lowest_cost_routing.py b/tests/local_testing/test_lowest_cost_routing.py index 5bf3a3ee98b..631271ca710 100644 --- a/tests/local_testing/test_lowest_cost_routing.py +++ b/tests/local_testing/test_lowest_cost_routing.py @@ -28,7 +28,7 @@ async def test_get_available_deployments(): }, { "model_name": "gpt-3.5-turbo", - "litellm_params": {"model": "groq/llama-3.1-8b-instant"}, + "litellm_params": {"model": "groq/openai/gpt-oss-20b"}, "model_info": {"id": "groq-llama"}, }, ] diff --git a/tests/local_testing/test_openai_moderations_hook.py b/tests/local_testing/test_openai_moderations_hook.py index 530ab714eae..7ce4bc2e4bf 100644 --- a/tests/local_testing/test_openai_moderations_hook.py +++ b/tests/local_testing/test_openai_moderations_hook.py @@ -31,7 +31,7 @@ async def test_openai_moderation_error_raising(monkeypatch): from unittest.mock import AsyncMock, MagicMock from litellm.types.llms.openai import OpenAIModerationResponse - litellm.openai_moderations_model_name = "text-moderation-latest" + litellm.openai_moderations_model_name = "omni-moderation-latest" openai_mod = _ENTERPRISE_OpenAI_Moderation() _api_key = "sk-12345" _api_key = hash_token("sk-12345") @@ -41,9 +41,9 @@ async def test_openai_moderation_error_raising(monkeypatch): llm_router = litellm.Router( model_list=[ { - "model_name": "text-moderation-latest", + "model_name": "omni-moderation-latest", "litellm_params": { - "model": "text-moderation-latest", + "model": "omni-moderation-latest", "api_key": os.environ.get("OPENAI_API_KEY", "fake-key"), }, } diff --git a/tests/local_testing/test_router.py b/tests/local_testing/test_router.py index bd0a9bf8df4..4c62c28530d 100644 --- a/tests/local_testing/test_router.py +++ b/tests/local_testing/test_router.py @@ -1284,15 +1284,18 @@ def test_model_group_info(): router = Router( model_list=[ { - "model_name": "command-r-plus", - "litellm_params": {"model": "cohere.command-r-plus-v1:0"}, + "model_name": "nova-2-lite", + "litellm_params": {"model": "bedrock/amazon.nova-2-lite-v1:0"}, } ] ) - response = router.get_model_group_info(model_group="command-r-plus") + response = router.get_model_group_info(model_group="nova-2-lite") assert response is not None + assert response.model_group == "nova-2-lite" + assert response.providers == ["bedrock"] + assert response.max_input_tokens is not None def test_consistent_model_id(): diff --git a/tests/local_testing/test_router_utils.py b/tests/local_testing/test_router_utils.py index 1b3e361bb1f..635bda55144 100644 --- a/tests/local_testing/test_router_utils.py +++ b/tests/local_testing/test_router_utils.py @@ -188,7 +188,7 @@ def test_router_get_model_info_wildcard_routes(): ] ) model_info = router.get_router_model_info( - deployment=None, received_model_name="gemini/gemini-1.5-flash", id="1" + deployment=None, received_model_name="gemini/gemini-2.5-flash", id="1" ) print(model_info) assert model_info is not None @@ -212,7 +212,7 @@ async def test_router_get_model_group_usage_wildcard_routes(): ) resp = await router.acompletion( - model="gemini/gemini-1.5-flash", + model="gemini/gemini-2.5-flash", messages=[{"role": "user", "content": "Hello, how are you?"}], mock_response="Hello, I'm good.", ) @@ -220,7 +220,7 @@ async def test_router_get_model_group_usage_wildcard_routes(): await asyncio.sleep(2) - tpm, rpm = await router.get_model_group_usage(model_group="gemini/gemini-1.5-flash") + tpm, rpm = await router.get_model_group_usage(model_group="gemini/gemini-2.5-flash") assert tpm is not None, "tpm is None" assert rpm is not None, "rpm is None" @@ -242,7 +242,7 @@ async def test_call_router_callbacks_on_success(): router.cache, "async_increment_cache_pipeline", new=AsyncMock() ) as mock_callback: await router.acompletion( - model="gemini/gemini-1.5-flash", + model="gemini/gemini-2.5-flash", messages=[{"role": "user", "content": "Hello, how are you?"}], mock_response="Hello, I'm good.", ) @@ -255,12 +255,12 @@ async def test_call_router_callbacks_on_success(): for increment in increment_list: if "tpm" in increment["key"]: assert increment["key"].startswith( - "global_router:1:gemini/gemini-1.5-flash:tpm" + "global_router:1:gemini/gemini-2.5-flash:tpm" ) assert increment["increment_value"] == 30 elif "rpm" in increment["key"]: assert increment["key"].startswith( - "global_router:1:gemini/gemini-1.5-flash:rpm" + "global_router:1:gemini/gemini-2.5-flash:rpm" ) assert increment["increment_value"] == 1 @@ -283,7 +283,7 @@ async def test_call_router_callbacks_on_failure(): ) as mock_callback: with pytest.raises(litellm.RateLimitError): await router.acompletion( - model="gemini/gemini-1.5-flash", + model="gemini/gemini-2.5-flash", messages=[{"role": "user", "content": "Hello, how are you?"}], mock_response="litellm.RateLimitError", num_retries=0, @@ -295,7 +295,7 @@ async def test_call_router_callbacks_on_failure(): assert ( mock_callback.call_args_list[0] .kwargs["key"] - .startswith("global_router:1:gemini/gemini-1.5-flash:rpm") + .startswith("global_router:1:gemini/gemini-2.5-flash:rpm") ) @@ -317,7 +317,7 @@ async def test_router_model_group_headers(): for _ in range(2): resp = await router.acompletion( - model="gemini/gemini-1.5-flash", + model="gemini/gemini-2.5-flash", messages=[{"role": "user", "content": "Hello, how are you?"}], mock_response="Hello, I'm good.", ) @@ -325,7 +325,7 @@ async def test_router_model_group_headers(): assert ( resp._hidden_params["additional_headers"]["x-litellm-model-group"] - == "gemini/gemini-1.5-flash" + == "gemini/gemini-2.5-flash" ) assert "x-ratelimit-remaining-requests" in resp._hidden_params["additional_headers"] @@ -349,7 +349,7 @@ async def test_get_remaining_model_group_usage(): ) for _ in range(2): resp = await router.acompletion( - model="gemini/gemini-1.5-flash", + model="gemini/gemini-2.5-flash", messages=[{"role": "user", "content": "Hello, how are you?"}], mock_response="Hello, I'm good.", ) @@ -363,7 +363,7 @@ async def test_get_remaining_model_group_usage(): await asyncio.sleep(1) remaining_usage = await router.get_remaining_model_group_usage( - model_group="gemini/gemini-1.5-flash" + model_group="gemini/gemini-2.5-flash" ) assert remaining_usage is not None assert "x-ratelimit-remaining-requests" in remaining_usage diff --git a/tests/local_testing/test_spend_calculate_endpoint.py b/tests/local_testing/test_spend_calculate_endpoint.py index 3bedab794e2..054dc398039 100644 --- a/tests/local_testing/test_spend_calculate_endpoint.py +++ b/tests/local_testing/test_spend_calculate_endpoint.py @@ -38,7 +38,7 @@ async def test_spend_calc_model_on_router_messages(): { "model_name": "special-llama-model", "litellm_params": { - "model": "groq/llama-3.1-8b-instant", + "model": "groq/openai/gpt-oss-20b", }, } ] @@ -81,7 +81,7 @@ async def test_spend_calc_using_response(): } ], "created": "1677652288", - "model": "groq/llama-3.1-8b-instant", + "model": "groq/openai/gpt-oss-20b", "object": "chat.completion", "system_fingerprint": "fp_873a560973", "usage": { diff --git a/tests/local_testing/whitelisted_bedrock_models.txt b/tests/local_testing/whitelisted_bedrock_models.txt index 7615a540b23..9b66569ff9e 100644 --- a/tests/local_testing/whitelisted_bedrock_models.txt +++ b/tests/local_testing/whitelisted_bedrock_models.txt @@ -139,3 +139,4 @@ bedrock/ap-southeast-2/qwen.qwen3-next-80b-a3b bedrock/eu-west-1/qwen.qwen3-next-80b-a3b bedrock/eu-west-2/qwen.qwen3-next-80b-a3b bedrock/sa-east-1/qwen.qwen3-next-80b-a3b +bedrock/eu-west-2/nvidia.nemotron-super-3-120b diff --git a/tests/logging_callback_tests/langfuse_expected_request_body/completion_with_vertex_call.json b/tests/logging_callback_tests/langfuse_expected_request_body/completion_with_vertex_call.json index b6c11f96953..5998c52659c 100644 --- a/tests/logging_callback_tests/langfuse_expected_request_body/completion_with_vertex_call.json +++ b/tests/logging_callback_tests/langfuse_expected_request_body/completion_with_vertex_call.json @@ -31,14 +31,14 @@ "model_id": null, "cache_key": null, "api_base": null, - "response_cost": 7.5e-06, + "response_cost": 3.5e-05, "additional_headers": {}, "litellm_overhead_time_ms": null, "batch_models": null, - "litellm_model_name": "vertex_ai/gemini-2.0-flash-001", + "litellm_model_name": "vertex_ai/gemini-3-flash-preview", "usage_object": null }, - "litellm_response_cost": 7.5e-06, + "litellm_response_cost": 3.5e-05, "cache_hit": false, "requester_metadata": {} }, @@ -54,13 +54,13 @@ "id": "time-14-15-40-349639_chatcmpl-59a988d0-7ef1-4dc4-bc18-d2e78961817f", "endTime": "2025-05-26T14:15:40.607266-07:00", "completionStartTime": "2025-05-26T14:15:40.607266-07:00", - "model": "gemini-2.0-flash-001", + "model": "gemini-3-flash-preview", "modelParameters": {}, "usage": { "input": 10, "output": 10, "unit": "TOKENS", - "totalCost": 7.5e-06 + "totalCost": 3.5e-05 }, "usageDetails": { "input": 10, diff --git a/tests/logging_callback_tests/test_alerting.py b/tests/logging_callback_tests/test_alerting.py index 3074e973a8e..0a3e1a0e982 100644 --- a/tests/logging_callback_tests/test_alerting.py +++ b/tests/logging_callback_tests/test_alerting.py @@ -582,7 +582,7 @@ async def test_webhook_alerting(alerting_type): None, None, ), - ("gemini-2.0-flash", None, "vertex_ai", "hardy-device-38811", "us-central1"), + ("gemini-3.8-flash", None, "vertex_ai", "hardy-device-38811", "us-central1"), ], ) @pytest.mark.parametrize("error_code", [500, 408, 400]) @@ -688,7 +688,7 @@ async def test_outage_alerting_called( None, None, ), - ("gemini-2.0-flash", None, "vertex_ai", "hardy-device-38811", "us-central1"), + ("gemini-3.8-flash", None, "vertex_ai", "hardy-device-38811", "us-central1"), ], ) @pytest.mark.parametrize("error_code", [500, 408, 400]) @@ -775,7 +775,7 @@ async def test_region_outage_alerting_called( await slack_alerting.region_outage_alerts( exception=error_to_raise, deployment_id=deployment_id # type: ignore ) - if model == "gemini-2.0-flash" and (error_code == 500 or error_code == 408): + if model == "gemini-3.8-flash" and (error_code == 500 or error_code == 408): mock_send_alert.assert_called_once() else: mock_send_alert.assert_not_called() diff --git a/tests/logging_callback_tests/test_langfuse_e2e_test.py b/tests/logging_callback_tests/test_langfuse_e2e_test.py index 5682d3720d8..76ebd2b9a28 100644 --- a/tests/logging_callback_tests/test_langfuse_e2e_test.py +++ b/tests/logging_callback_tests/test_langfuse_e2e_test.py @@ -481,12 +481,12 @@ class TestLangfuseLogging: completion_tokens=10, total_tokens=20, ), - model="vertex/gemini-2.0-flash-001", + model="vertex/gemini-3-flash-preview", object="chat.completion", created=1723081200, ).model_dump() await litellm.acompletion( - model="vertex_ai/gemini-2.0-flash-001", + model="vertex_ai/gemini-3-flash-preview", messages=[{"role": "user", "content": "Hello!"}], mock_response=mock_response, metadata={"trace_id": setup["trace_id"]}, diff --git a/tests/logging_callback_tests/test_langsmith_unit_test.py b/tests/logging_callback_tests/test_langsmith_unit_test.py index 17cd63d8974..341f71f3b4a 100644 --- a/tests/logging_callback_tests/test_langsmith_unit_test.py +++ b/tests/logging_callback_tests/test_langsmith_unit_test.py @@ -356,10 +356,12 @@ async def test_langsmith_key_based_logging(): # tenant_id should not be in headers if not provided assert "x-tenant-id" not in call_args[1]["headers"] + assert call_args[1]["headers"]["Content-Type"] == "application/json" + # Verify the request body contains the expected data - request_body = call_args[1]["json"] + request_body = json.loads(call_args[1]["content"]) assert "post" in request_body - assert len(request_body["post"]) == 1 # Should contain one run + assert len(request_body["post"]) == 1 # EXPECTED BODY expected_body = { @@ -404,7 +406,7 @@ async def test_langsmith_key_based_logging(): } # Print both bodies for debugging - actual_body = call_args[1]["json"] + actual_body = json.loads(call_args[1]["content"]) print("\nExpected body:") print(json.dumps(expected_body, indent=2)) print("\nActual body:") diff --git a/tests/mcp_tests/test_mcp_server.py b/tests/mcp_tests/test_mcp_server.py index 2b92367f186..dfd250338ff 100644 --- a/tests/mcp_tests/test_mcp_server.py +++ b/tests/mcp_tests/test_mcp_server.py @@ -456,9 +456,15 @@ async def test_sse_mcp_handler_mock(): """Test the SSE MCP handler functionality""" from litellm.proxy._types import UserAPIKeyAuth - # Mock the SSE session manager and its methods - mock_sse_session_manager = AsyncMock() - mock_sse_session_manager.handle_request = AsyncMock() + read_stream, write_stream = MagicMock(), MagicMock() + + @asynccontextmanager + async def connect_sse(scope, receive, send): + yield read_stream, write_stream + + mock_sse = MagicMock() + mock_sse.connect_sse.side_effect = connect_sse + run = AsyncMock() # Mock scope, receive, send with proper ASGI scope format mock_scope = { @@ -483,13 +489,14 @@ async def test_sse_mcp_handler_mock(): ) with ( + patch("litellm.proxy._experimental.mcp_server.server.server.run", run), patch( "litellm.proxy._experimental.mcp_server.server._SESSION_MANAGERS_INITIALIZED", True, ), patch( - "litellm.proxy._experimental.mcp_server.server.sse_session_manager", - mock_sse_session_manager, + "litellm.proxy._experimental.mcp_server.server.sse", + mock_sse, ), patch( "litellm.proxy._experimental.mcp_server.server.extract_mcp_auth_context", @@ -504,10 +511,8 @@ async def test_sse_mcp_handler_mock(): # Call the handler await handle_sse_mcp(mock_scope, mock_receive, mock_send) - # Verify SSE session manager handle_request was called - mock_sse_session_manager.handle_request.assert_called_once_with( - mock_scope, mock_receive, mock_send - ) + assert run.await_args.args[:2] == (read_stream, write_stream) + assert mock_sse.connect_sse.call_args.args[0]["path"] == "/mcp/sse" @pytest.mark.asyncio @@ -545,7 +550,10 @@ async def test_sse_mcp_handler_propagates_passthrough_401(): True, ), patch( - "litellm.proxy._experimental.mcp_server.server.sse_session_manager", + "litellm.proxy._experimental.mcp_server.server.sse", + ) as transport, + patch( + "litellm.proxy._experimental.mcp_server.server.server.run", AsyncMock(), ), patch( @@ -569,6 +577,7 @@ async def test_sse_mcp_handler_propagates_passthrough_401(): with pytest.raises(HTTPException) as excinfo: await handle_sse_mcp(mock_scope, mock_receive, mock_send) + transport.connect_sse.assert_not_called() assert excinfo.value.status_code == 401 assert excinfo.value.headers and "WWW-Authenticate" in excinfo.value.headers @@ -2953,7 +2962,7 @@ async def test_call_mcp_tool_uses_manager_permission_lookup(): mcp_info={"server_name": "test_server"}, ) - expected_response = [TextContent(type="text", text="ok")] + expected_response = CallToolResult(content=[TextContent(type="text", text="ok")], isError=False) with ( patch.object( @@ -3029,7 +3038,7 @@ async def test_call_mcp_tool_resolves_unprefixed_tool_name_and_checks_permission mcp_info={"server_name": "test_server"}, ) - expected_response = [TextContent(type="text", text="ok")] + expected_response = CallToolResult(content=[TextContent(type="text", text="ok")], isError=False) with ( patch.object( diff --git a/tests/proxy_migration_tests/test_prisma_toolchain.py b/tests/proxy_migration_tests/test_prisma_toolchain.py index 4e2274cc582..556c680a84a 100644 --- a/tests/proxy_migration_tests/test_prisma_toolchain.py +++ b/tests/proxy_migration_tests/test_prisma_toolchain.py @@ -25,7 +25,6 @@ from collections.abc import Callable from pathlib import Path import pytest - from litellm_proxy_extras.prisma_toolchain import ( DEFAULT_PRISMA_COMMAND_TIMEOUT, DEFAULT_PRISMA_MIGRATE_DEPLOY_TIMEOUT, @@ -36,14 +35,16 @@ from litellm_proxy_extras.prisma_toolchain import ( heal_incomplete_nodeenv_cache, node_binary_path, prisma_bootstrap_timeout, - prisma_command_timeout, prisma_cli_available, + prisma_command_timeout, prisma_migrate_deploy_timeout, resolve_prisma_argv, run_prisma, ) from litellm_proxy_extras.utils import ProxyExtrasDBManager +from tests._process_helpers import process_is_gone + REPO_ROOT = Path(__file__).resolve().parents[2] PROXY_EXTRAS = REPO_ROOT / "litellm-proxy-extras" / "litellm_proxy_extras" @@ -280,17 +281,6 @@ def test_migrate_deploy_stops_at_its_own_timeout( assert elapsed < 30 -def _process_is_gone(pid: int, within_seconds: float) -> bool: - deadline = time.monotonic() + within_seconds - while time.monotonic() < deadline: - try: - os.kill(pid, 0) - except ProcessLookupError: - return True - time.sleep(0.05) - return False - - def test_a_timed_out_migrate_deploy_takes_its_process_tree_with_it( toolchain_env: tuple[Path, Path], monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: @@ -309,7 +299,7 @@ def test_a_timed_out_migrate_deploy_takes_its_process_tree_with_it( grandchild_pid = int(pidfile.read_text()) try: assert len(_deploy_calls(log_path)) == 2 - assert _process_is_gone(grandchild_pid, within_seconds=5) + assert process_is_gone(grandchild_pid, within_seconds=5) finally: try: os.kill(grandchild_pid, signal.SIGKILL) diff --git a/tests/proxy_unit_tests/test_update_daily_tag_spend.py b/tests/proxy_unit_tests/test_update_daily_tag_spend.py index 35e9c6796eb..530c0d16767 100644 --- a/tests/proxy_unit_tests/test_update_daily_tag_spend.py +++ b/tests/proxy_unit_tests/test_update_daily_tag_spend.py @@ -100,6 +100,7 @@ async def test_daily_tag_spend_retries_then_succeeds(): 1, ] ) + prisma_client.db.tx.return_value.__aenter__.return_value.execute_raw = prisma_client.db.execute_raw daily_spend_transactions: Dict[str, DailyTagSpendTransaction] = { "k": { diff --git a/tests/test_litellm/caching/test_caching.py b/tests/test_litellm/caching/test_caching.py index c7ec8abc31e..2e4122530d8 100644 --- a/tests/test_litellm/caching/test_caching.py +++ b/tests/test_litellm/caching/test_caching.py @@ -1,3 +1,4 @@ +import asyncio import logging import re from unittest.mock import MagicMock @@ -6,8 +7,9 @@ import pytest import litellm.caching.redis_cache as redis_cache_module from litellm.caching.caching import Cache +from litellm.caching.caching_handler import _PENDING_CACHE_WRITES from litellm.caching.redis_cache import RedisCache, _RedisTimeoutLogThrottle -from litellm.types.caching import LiteLLMCacheType, SemanticCacheScope +from litellm.types.caching import EMBEDDING_CACHE_FORMAT_VERSION, LiteLLMCacheType, SemanticCacheScope from litellm.types.utils import Embedding, EmbeddingResponse, Usage @@ -278,3 +280,112 @@ def test_exact_cache_key_includes_anthropic_messages_params(anthropic_param): assert baseline != cache.get_cache_key( model="claude-sonnet-4-5", messages=messages, **anthropic_param ) + + +@pytest.mark.asyncio +async def test_embedding_cache_skips_write_when_one_input_yields_many_embeddings(monkeypatch): + """A cross-encoder behind /embeddings returns one score per document for a single + input string; caching data[0] per input would make the second call return 1 score.""" + import litellm + from litellm import CustomLLM + + class ScoreEveryDocument(CustomLLM): + provider_calls: int = 0 + + async def aembedding(self, model, input, model_response, **kwargs) -> EmbeddingResponse: + self.provider_calls += 1 + return EmbeddingResponse( + model=model, + data=[Embedding(embedding=[float(i)], index=i, object="embedding") for i in range(5)], + ) + + scorer = ScoreEveryDocument() + monkeypatch.setattr(litellm, "custom_provider_map", [{"provider": "score-every-doc", "custom_handler": scorer}]) + monkeypatch.setattr(litellm, "provider_list", [*litellm.provider_list, "score-every-doc"]) + monkeypatch.setattr(litellm, "_custom_providers", [*litellm._custom_providers, "score-every-doc"]) + monkeypatch.setattr(litellm, "cache", Cache(type=LiteLLMCacheType.LOCAL)) + + batch = '{"query": "q", "documents": ["a", "b", "c", "d", "e"]}' + first = await litellm.aembedding(model="score-every-doc/m", input=[batch]) + await asyncio.gather(*_PENDING_CACHE_WRITES) + second = await litellm.aembedding(model="score-every-doc/m", input=[batch]) + + assert scorer.provider_calls == 2 + assert [len(first.data), len(second.data)] == [5, 5] + + +@pytest.mark.asyncio +async def test_embedding_cache_refetches_entries_written_without_format_version(monkeypatch): + import litellm + from litellm import CustomLLM + + class EmbedLength(CustomLLM): + provider_calls: int = 0 + + async def aembedding(self, model, input, model_response, **kwargs) -> EmbeddingResponse: + self.provider_calls += 1 + return EmbeddingResponse( + model=model, + data=[ + Embedding(embedding=[float(len(text))], index=idx, object="embedding") + for idx, text in enumerate(input) + ], + ) + + embedder = EmbedLength() + monkeypatch.setattr(litellm, "custom_provider_map", [{"provider": "embed-length", "custom_handler": embedder}]) + monkeypatch.setattr(litellm, "provider_list", [*litellm.provider_list, "embed-length"]) + monkeypatch.setattr(litellm, "_custom_providers", [*litellm._custom_providers, "embed-length"]) + monkeypatch.setattr(litellm, "cache", Cache(type=LiteLLMCacheType.LOCAL)) + + await litellm.aembedding(model="embed-length/m", input=["abcd"]) + await asyncio.gather(*_PENDING_CACHE_WRITES) + store = litellm.cache.cache.cache_dict + stored = [entry["response"] for entry in store.values()] + assert [entry["format_version"] for entry in stored] == [EMBEDDING_CACHE_FORMAT_VERSION], stored + legacy_store = { + key: { + **entry, + "response": { + field: value + for field, value in {**entry["response"], "embedding": [-1.0]}.items() + if field != "format_version" + }, + } + for key, entry in store.items() + } + monkeypatch.setattr(litellm.cache.cache, "cache_dict", legacy_store) + + refetched = await litellm.aembedding(model="embed-length/m", input=["abcd"]) + + assert embedder.provider_calls == 2, "an entry written without format_version must be a cache miss" + assert [item["embedding"] for item in refetched.data] == [[4.0]] + + +@pytest.mark.asyncio +async def test_embedding_cache_serves_base64_string_embeddings_on_repeat(monkeypatch): + import litellm + from litellm import CustomLLM + + class Base64Embedder(CustomLLM): + provider_calls: int = 0 + + async def aembedding(self, model, input, model_response, **kwargs) -> EmbeddingResponse: + self.provider_calls += 1 + return EmbeddingResponse( + model=model, + data=[Embedding(embedding="AACAPwAAAEA=", index=idx, object="embedding") for idx, _ in enumerate(input)], + ) + + embedder = Base64Embedder() + monkeypatch.setattr(litellm, "custom_provider_map", [{"provider": "embed-b64", "custom_handler": embedder}]) + monkeypatch.setattr(litellm, "provider_list", [*litellm.provider_list, "embed-b64"]) + monkeypatch.setattr(litellm, "_custom_providers", [*litellm._custom_providers, "embed-b64"]) + monkeypatch.setattr(litellm, "cache", Cache(type=LiteLLMCacheType.LOCAL)) + + first = await litellm.aembedding(model="embed-b64/m", input=["abcd"]) + await asyncio.gather(*_PENDING_CACHE_WRITES) + second = await litellm.aembedding(model="embed-b64/m", input=["abcd"]) + + assert embedder.provider_calls == 1, "a string embedding written to the cache must be served on repeat" + assert [item["embedding"] for item in second.data] == [item["embedding"] for item in first.data] == ["AACAPwAAAEA="] diff --git a/tests/test_litellm/caching/test_caching_handler.py b/tests/test_litellm/caching/test_caching_handler.py index 39018dca41d..6956a6932d5 100644 --- a/tests/test_litellm/caching/test_caching_handler.py +++ b/tests/test_litellm/caching/test_caching_handler.py @@ -11,7 +11,7 @@ from fastapi.testclient import TestClient from datetime import datetime from unittest.mock import AsyncMock -from litellm.caching.caching_handler import LLMCachingHandler +from litellm.caching.caching_handler import _PENDING_CACHE_WRITES, LLMCachingHandler @pytest.mark.asyncio @@ -780,3 +780,46 @@ async def test_agentic_loop_followup_cache_hit_with_converted_stream_marker_repl assert hit.cached_result.choices[0].message.content == "done" logging_obj.handle_sync_success_callbacks_for_async_calls.assert_called_once() assert logging_obj.handle_sync_success_callbacks_for_async_calls.call_args.kwargs["cache_hit"] is True + + +@pytest.mark.asyncio +async def test_partial_embedding_cache_hit_sends_only_misses_and_keeps_input_order(monkeypatch): + import litellm + from litellm import CustomLLM + from litellm.caching.caching import Cache + from litellm.types.utils import Embedding, EmbeddingResponse + + class RecordingEmbedder(CustomLLM): + provider_inputs: tuple[tuple[str, ...], ...] = () + + async def aembedding(self, model, input, model_response, **kwargs) -> EmbeddingResponse: + self.provider_inputs = (*self.provider_inputs, tuple(input)) + return EmbeddingResponse( + model=model, + data=[ + Embedding(embedding=[float(len(text))], index=idx, object="embedding") + for idx, text in enumerate(input) + ], + ) + + embedder = RecordingEmbedder() + monkeypatch.setattr(litellm, "custom_provider_map", [{"provider": "recording-embedder", "custom_handler": embedder}]) + monkeypatch.setattr(litellm, "provider_list", [*litellm.provider_list, "recording-embedder"]) + monkeypatch.setattr(litellm, "_custom_providers", [*litellm._custom_providers, "recording-embedder"]) + monkeypatch.setattr(litellm, "cache", Cache(type="local")) + + await litellm.aembedding(model="recording-embedder/m", input=["aa", "bbbb"]) + await asyncio.gather(*_PENDING_CACHE_WRITES) + mixed_input = ["c", "aa", "ddd", "bbbb", "eeeee"] + response = await litellm.aembedding(model="recording-embedder/m", input=mixed_input) + await asyncio.gather(*_PENDING_CACHE_WRITES) + + assert embedder.provider_inputs == (("aa", "bbbb"), ("c", "ddd", "eeeee")), embedder.provider_inputs + assert [item["index"] for item in response.data] == [0, 1, 2, 3, 4] + assert [item["embedding"] for item in response.data] == [[float(len(text))] for text in mixed_input] + assert response._hidden_params["cache_hit"] is True, "a partial hit must still be reported as a cache hit" + + repeat = await litellm.aembedding(model="recording-embedder/m", input=mixed_input) + + assert len(embedder.provider_inputs) == 2, embedder.provider_inputs + assert [item["embedding"] for item in repeat.data] == [[float(len(text))] for text in mixed_input] diff --git a/tests/test_litellm/experimental_mcp_client/test_mcp_client.py b/tests/test_litellm/experimental_mcp_client/test_mcp_client.py index 6c20ef135ba..b260d240f29 100644 --- a/tests/test_litellm/experimental_mcp_client/test_mcp_client.py +++ b/tests/test_litellm/experimental_mcp_client/test_mcp_client.py @@ -552,6 +552,50 @@ class TestExecuteSessionOperationSurfacesTransportError: with pytest.raises(asyncio.CancelledError): await client._execute_session_operation(transport_ctx, _op) + @pytest.mark.asyncio + @pytest.mark.parametrize("failure_phase", ("early", "late", "mixed")) + @patch("litellm.experimental_mcp_client.client.ClientSession") + async def test_response_close_preserves_cancellation_and_original_errors(self, session_class, failure_phase): + closed: Final = asyncio.Event() + close_error: Final = httpx2.ReadError("response close failed") + connect_error: Final = httpx2.ConnectError("another request failed before cancellation") + cancelled: Final = asyncio.CancelledError("caller cancelled") + + class FailingCloseStream(httpx2.AsyncByteStream): + async def __aiter__(self) -> AsyncIterator[bytes]: + yield b"pending" + + async def aclose(self) -> None: + closed.set() + raise close_error + + client: Final = MCPClient(server_url="https://example.com/mcp") + async with client._create_httpx_client_factory( + transport=httpx2.MockTransport(lambda _: httpx2.Response(200, stream=FailingCloseStream())) + )() as http_client: + response: Final = await http_client.send(http_client.build_request("POST", client.server_url), stream=True) + + async def initialize(): + if failure_phase == "early": + await response.aclose() + raise cancelled + + async def close_transport(*args): + if failure_phase == "early": + return + try: + await response.aclose() + except httpx2.ReadError as error: + failures: Final = [error, connect_error] if failure_phase == "mixed" else [error] + raise _FakeExceptionGroup("transport", [_FakeExceptionGroup("reader", failures)]) + + self._make_session(session_class, initialize) + expected: Final = close_error if failure_phase == "early" else connect_error if failure_phase == "mixed" else cancelled + with pytest.raises(type(expected)) as caught: + await client._execute_session_operation(self._make_transport(close_transport), AsyncMock(), http_client) + assert caught.value is expected + assert closed.is_set() + @pytest.mark.asyncio @patch("litellm.experimental_mcp_client.client.ClientSession") async def test_cleanup_error_after_success_is_swallowed(self, mock_session_cls): @@ -568,6 +612,94 @@ class TestExecuteSessionOperationSurfacesTransportError: assert result == "done" + @pytest.mark.asyncio + @patch("litellm.experimental_mcp_client.client.ClientSession") + async def test_session_entry_failure_still_closes_transport(self, session_class): + failure: Final = RuntimeError("session dispatcher did not start") + session_class.return_value.__aenter__ = AsyncMock(side_effect=failure) + closed: Final = asyncio.Event() + + async def close_transport(*args): + await anyio.lowlevel.checkpoint() + closed.set() + + transport: Final = self._make_transport(close_transport) + client: Final = MCPClient(server_url="https://example.com/mcp") + with pytest.raises(RuntimeError) as caught: + await client._execute_session_operation(transport, AsyncMock()) + assert caught.value is failure + assert closed.is_set() + + @pytest.mark.asyncio + @pytest.mark.parametrize("original_error", (False, True)) + @patch("litellm.experimental_mcp_client.client.ClientSession") + async def test_session_exit_cancellation_preserves_original_failure(self, session_class, original_error): + self._make_session(session_class, AsyncMock(return_value=None)) + cancelled: Final = asyncio.CancelledError("cancelled while closing session") + session_class.return_value.__aexit__ = AsyncMock(side_effect=cancelled) + original: Final = RuntimeError("operation failed") + transport: Final = self._make_transport(None) + client: Final = MCPClient(server_url="https://example.com/mcp") + + async def operation(session): + if original_error: + raise original + return "done" + + with pytest.raises(RuntimeError if original_error else asyncio.CancelledError) as caught: + await client._execute_session_operation(transport, operation) + assert caught.value is (original if original_error else cancelled) + transport.__aexit__.assert_awaited_once() + + @pytest.mark.asyncio + @pytest.mark.parametrize("signal_type", (SystemExit, KeyboardInterrupt)) + @pytest.mark.parametrize("phase", ("session", "transport")) + @patch("litellm.experimental_mcp_client.client.ClientSession") + async def test_cleanup_preserves_process_exit(self, session_class, phase, signal_type): + self._make_session(session_class, AsyncMock(return_value=None)) + signal: Final = signal_type("process stopping") + if phase == "session": + session_class.return_value.__aexit__ = AsyncMock(side_effect=signal) + transport: Final = self._make_transport(signal if phase == "transport" else None) + client: Final = MCPClient(server_url="https://example.com/mcp") + with pytest.raises(signal_type) as caught: + await client._execute_session_operation(transport, AsyncMock(return_value="done")) + assert caught.value is signal + transport.__aexit__.assert_awaited_once() + + @pytest.mark.asyncio + @patch("litellm.experimental_mcp_client.client.ClientSession") + async def test_session_and_termination_share_one_cleanup_deadline(self, session_class): + self._make_session(session_class, AsyncMock(return_value=None)) + deleting: Final = asyncio.Event() + + async def close_session(*args): + await anyio.sleep(1) + + async def respond(request: httpx2.Request) -> httpx2.Response: + deleting.set() + await anyio.sleep_forever() + raise AssertionError("termination unexpectedly resumed") + + client: Final = MCPClient(server_url="https://example.com/mcp") + http_client: Final = client._create_httpx_client_factory(transport=httpx2.MockTransport(respond))() + session_class.return_value.__aexit__ = AsyncMock(side_effect=close_session) + + async def close_transport(*args): + await http_client.delete(client.server_url) + + before: Final = anyio.current_time() + try: + with pytest.raises(asyncio.CancelledError): + await client._execute_session_operation( + self._make_transport(close_transport), AsyncMock(return_value="completed"), http_client=http_client + ) + assert deleting.is_set() + assert 4.8 <= anyio.current_time() - before < 5.8 + finally: + await http_client.aclose() + + class TestMCPClientResolvedAuth: """A pre-resolved httpx2.Auth is attached to the upstream client's auth= slot.""" @@ -736,7 +868,7 @@ async def test_run_with_session_quiet_on_error_demotes_warning_to_debug(): async def _op(_session): raise boom - async def _fake_exec(_transport_ctx, _operation): + async def _fake_exec(_transport_ctx, _operation, http_client=None): raise boom with patch.object(client, "_create_transport_context", return_value=(object(), None)): @@ -1486,7 +1618,9 @@ async def test_http_response_handler_preserves_success_and_http_errors(status_co client: Final = MCPClient(server_url="https://example.com/mcp", timeout=30) async with client._create_httpx_client_factory(transport=httpx2.MockTransport(respond))() as http_client: operation: Final = client._execute_session_operation( - streamable_http_client(client.server_url, http_client=http_client), lambda session: session.list_tools() + streamable_http_client(client.server_url, http_client=http_client), + lambda session: session.list_tools(), + http_client=http_client, ) if status_code == 200: result: Final = await asyncio.wait_for(operation, timeout=3) @@ -1816,13 +1950,14 @@ async def test_interrupted_http_response_preserves_the_transport_failure() -> No def respond(request: httpx2.Request) -> httpx2.Response: return httpx2.Response(200, headers={"Content-Type": "application/json"}, stream=_InterruptedHTTPBody()) - async with httpx2.AsyncClient(transport=httpx2.MockTransport(respond)) as http_client: - client: Final = MCPClient(server_url="https://example.com/mcp", timeout=30) + client: Final = MCPClient(server_url="https://example.com/mcp", timeout=30) + async with client._create_httpx_client_factory(transport=httpx2.MockTransport(respond))() as http_client: with pytest.raises(httpx2.RemoteProtocolError, match="secret-incomplete-response"): await asyncio.wait_for( client._execute_session_operation( streamable_http_client(client.server_url, http_client=http_client), lambda session: session.list_tools(), + http_client=http_client, ), timeout=3, ) @@ -1906,7 +2041,7 @@ async def test_optional_discovery_capabilities_and_errors( "jsonrpc": "2.0", "id": payload.id, "result": { - "protocolVersion": payload.params["protocolVersion"], + "protocolVersion": (payload.params or {})["protocolVersion"], "capabilities": {} if outcome == "absent" else {advertised if outcome == "other_capability" else capability: {}}, @@ -1985,7 +2120,7 @@ async def test_optional_discovery_uses_each_sessions_capabilities(supports_first return httpx2.Response(202) result: Final = ( { - "protocolVersion": payload.params["protocolVersion"], + "protocolVersion": (payload.params or {})["protocolVersion"], "capabilities": next(capabilities), "serverInfo": {"name": "changing", "version": "1"}, } @@ -2030,7 +2165,7 @@ async def test_optional_discovery_preserves_cancellation(method: str) -> None: "jsonrpc": "2.0", "id": payload.id, "result": { - "protocolVersion": payload.params["protocolVersion"], + "protocolVersion": (payload.params or {})["protocolVersion"], "capabilities": {"resources": {}, "prompts": {}}, "serverInfo": {"name": "pending", "version": "1"}, }, @@ -2112,7 +2247,7 @@ async def test_optional_discovery_collects_all_pages(method: str, session_id: st "jsonrpc": "2.0", "id": payload.id, "result": { - "protocolVersion": payload.params["protocolVersion"], + "protocolVersion": (payload.params or {})["protocolVersion"], "capabilities": {"prompts": {}, "resources": {}}, "serverInfo": {"name": "paged", "version": "1"}, }, @@ -2200,7 +2335,7 @@ async def test_optional_discovery_rejects_incomplete_walks( "jsonrpc": "2.0", "id": payload.id, "result": { - "protocolVersion": payload.params["protocolVersion"], + "protocolVersion": (payload.params or {})["protocolVersion"], "capabilities": {"prompts": {}, "resources": {}}, "serverInfo": {"name": "interrupted", "version": "1"}, }, @@ -2281,7 +2416,7 @@ async def test_optional_discovery_allows_exhaustion_at_page_cap(method: str, mon return httpx2.Response(202) if payload.method == "initialize": result: Final = { - "protocolVersion": payload.params["protocolVersion"], + "protocolVersion": (payload.params or {})["protocolVersion"], "capabilities": {"prompts": {}, "resources": {}}, "serverInfo": {"name": "empty-pages", "version": "1"}, } @@ -2455,3 +2590,309 @@ def test_public_mcp_import_preserves_incompatible_sdk_error() -> None: assert not isinstance(caught.value, ModuleNotFoundError) assert caught.value.__cause__ is None assert "litellm[mcp]" not in str(caught.value) + + +@pytest.mark.asyncio +@pytest.mark.parametrize("grouped", (False, True)) +@pytest.mark.parametrize("raise_on_error", (False, True)) +@pytest.mark.parametrize("termination", ("ok", "failure", "hang")) +async def test_outer_deadline_delivers_session_termination(termination: str, grouped: bool, raise_on_error: bool) -> None: + deleted: Final = asyncio.Event() + started: Final = asyncio.Event() + + async def respond(request: httpx2.Request) -> httpx2.Response: + await anyio.lowlevel.checkpoint() + if request.method == "DELETE": + first_termination: Final = not deleted.is_set() + deleted.set() + if termination == "hang" and first_termination: + await anyio.sleep_forever() + return httpx2.Response(500 if termination == "failure" else 200) + if request.method == "GET": + return httpx2.Response(405) + payload: Final = _JSONRPC_MESSAGE_ADAPTER.validate_json(request.content) + if not isinstance(payload, JSONRPCRequest): + return httpx2.Response(202) + if payload.method == "initialize": + return httpx2.Response( + 200, + headers={"mcp-session-id": "cancel-owned-session"}, + json={ + "jsonrpc": "2.0", + "id": payload.id, + "result": { + "protocolVersion": "2025-11-25", + "capabilities": {"tools": {}}, + "serverInfo": {"name": "cancellation-peer", "version": "1"}, + }, + }, + ) + if payload.method == "tools/list": + return httpx2.Response(200, json={"jsonrpc": "2.0", "id": payload.id, "result": {"tools": []}}) + started.set() + await anyio.sleep_forever() + raise AssertionError("cancelled request resumed") + + client: Final = _MockTransportClient(respond, server_url="https://example.com/mcp", timeout=30) + + async def invoke(): + with anyio.fail_after(0.2): + pending: Final = client.call_tool(CallToolRequestParams(name="slow", arguments={}), raise_on_error=raise_on_error) + if grouped: + await asyncio.gather(pending) + else: + await pending + + before: Final = anyio.current_time() + with pytest.raises(TimeoutError): + await invoke() + assert started.is_set() + assert deleted.is_set(), "Cancellation must deliver DELETE before returning to the caller" + + assert anyio.current_time() - before < 6.5 + assert await client.list_tools(raise_on_error=True) == [] + + +@pytest.mark.asyncio +@pytest.mark.parametrize("original_error", (False, True)) +async def test_task_cancellation_during_cleanup_preserves_failure(original_error: bool) -> None: + deleting: Final = asyncio.Event() + drained: Final = asyncio.Event() + original: Final = RuntimeError("operation failed before teardown") + + async def respond(request: httpx2.Request) -> httpx2.Response: + if request.method == "DELETE": + deleting.set() + try: + await anyio.sleep_forever() + finally: + drained.set() + if request.method == "GET": + return httpx2.Response(405) + payload: Final = _JSONRPC_MESSAGE_ADAPTER.validate_json(request.content) + if not isinstance(payload, JSONRPCRequest): + return httpx2.Response(202) + return httpx2.Response( + 200, + headers={"mcp-session-id": "cleanup-session"}, + json={ + "jsonrpc": "2.0", + "id": payload.id, + "result": { + "protocolVersion": (payload.params or {})["protocolVersion"], + "capabilities": {}, + "serverInfo": {"name": "cleanup-peer", "version": "1"}, + }, + }, + ) + + async def operation(session: mcp_client_module.ClientSession) -> str: + if original_error: + raise original + return "completed" + + client: Final = _MockTransportClient(respond, server_url="https://example.com/mcp", timeout=30) + task: Final = asyncio.create_task(client.run_with_session(operation)) + await asyncio.wait_for(deleting.wait(), 2) + for _ in range(3): + task.cancel() + await asyncio.sleep(0) + with pytest.raises(RuntimeError if original_error else asyncio.CancelledError) as caught: + await task + assert drained.is_set(), "Caller must wait for termination cleanup to finish" + if original_error: + assert caught.value is original + else: + assert task.cancelled() + + +@pytest.mark.asyncio +@pytest.mark.parametrize("original_error", (False, True)) +@pytest.mark.parametrize("cancel_mode", ("task", "scope")) +async def test_http_close_cancellation_cannot_turn_into_success(original_error: bool, cancel_mode: str) -> None: + closing: Final = asyncio.Event() + drained: Final = asyncio.Event() + original: Final = RuntimeError("failed before HTTP close") + + class ClosingHTTPClient(httpx2.AsyncClient): + async def aclose(self) -> None: + closing.set() + try: + await anyio.sleep_forever() + finally: + drained.set() + + class ClosingMCPClient(MCPClient): + def _create_transport_context(self): + http_client: Final = ClosingHTTPClient(transport=httpx2.MockTransport(lambda _: httpx2.Response(200))) + return streamable_http_client(self.server_url, http_client=http_client), http_client + + async def _execute_session_operation(self, transport_ctx, operation, http_client=None): + if original_error: + raise original + return "completed" + + client: Final = ClosingMCPClient(server_url="https://example.com/mcp") + + async def invoke() -> str: + with anyio.fail_after(0.05 if cancel_mode == "scope" else None): + return await client.run_with_session(AsyncMock()) + + task: Final = asyncio.create_task(invoke()) + await asyncio.wait_for(closing.wait(), 2) + if cancel_mode == "task": + task.cancel() + cancellation_type: Final = asyncio.CancelledError if cancel_mode == "task" else TimeoutError + with pytest.raises(RuntimeError if original_error else cancellation_type) as caught: + await task + assert drained.is_set(), "Caller must wait for HTTP closure to finish" + if original_error: + assert caught.value is original + elif cancel_mode == "task": + assert task.cancelled() + + +@pytest.mark.asyncio +@pytest.mark.parametrize("cancel_mode", ("scope", "task", "wait_for", "read_timeout")) +@pytest.mark.parametrize("concurrency", (1, 5)) +@pytest.mark.parametrize("termination", ("ok", "hang", "hang_body")) +@pytest.mark.parametrize("raise_on_error", (False, True)) +async def test_cancellation_delivers_termination_over_tcp( + cancel_mode: str, concurrency: int, termination: str, raise_on_error: bool +) -> None: + started: Final = asyncio.Event() + terminations: Final[list[bytes]] = [] + starts: Final[list[bytes]] = [] + stop: Final = asyncio.Event() + connections: Final[list[asyncio.Task[None]]] = [] + + async def handle_connection(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None: + connection: Final = asyncio.current_task() + assert connection is not None + connections.append(connection) + try: + request_line: Final = await reader.readline() + if not request_line: + return + method: Final = request_line.split()[0] + headers: Final = await reader.readuntil(b"\r\n\r\n") + length: Final = next( + ( + int(line.split(b":", 1)[1]) + for line in headers.splitlines() + if line.lower().startswith(b"content-length:") + ), + 0, + ) + try: + body: Final = await reader.readexactly(length) + except asyncio.IncompleteReadError: + return + if method == b"DELETE": + terminations.append(body) + if termination != "ok": + await stop.wait() + return + writer.write(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\nConnection: close\r\n\r\n") + elif method == b"GET": + writer.write(b"HTTP/1.1 405 Method Not Allowed\r\nContent-Length: 0\r\nConnection: close\r\n\r\n") + else: + payload: Final = json.loads(body) + if payload["method"] == "tools/call": + if termination == "hang_body": + writer.write( + b"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n" + b"Content-Length: 200\r\nConnection: close\r\n\r\n" + ) + await writer.drain() + starts.append(body) + if len(starts) == concurrency: + started.set() + await stop.wait() + return + if payload["method"] == "initialize": + response: Final = json.dumps( + { + "jsonrpc": "2.0", + "id": payload["id"], + "result": { + "protocolVersion": "2025-06-18", + "capabilities": {"tools": {}}, + "serverInfo": {"name": "tcp-peer", "version": "1"}, + }, + } + ).encode() + writer.write( + b"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nMcp-Session-Id: tcp-session\r\n" + + f"Content-Length: {len(response)}\r\nConnection: close\r\n\r\n".encode() + + response + ) + else: + writer.write(b"HTTP/1.1 202 Accepted\r\nContent-Length: 0\r\nConnection: close\r\n\r\n") + await writer.drain() + finally: + writer.close() + await writer.wait_closed() + + listener: Final = await asyncio.start_server(handle_connection, "127.0.0.1", 0) + port: Final = listener.sockets[0].getsockname()[1] + client: Final = MCPClient( + server_url=f"http://127.0.0.1:{port}/mcp", timeout=2 if cancel_mode == "read_timeout" else 0.5 if termination != "ok" else 30 + ) + + async def calls(): + results: Final = await asyncio.gather( + *( + client.call_tool(CallToolRequestParams(name="slow", arguments={}), raise_on_error=raise_on_error) + for _ in range(concurrency) + ), + return_exceptions=cancel_mode == "read_timeout", + ) + if cancel_mode == "read_timeout": + if raise_on_error: + assert all(isinstance(result, TimeoutError) for result in results) + else: + assert all(isinstance(result, CallToolResult) and result.is_error for result in results) + return results + + async def invoke(): + if cancel_mode == "scope": + with anyio.fail_after(0.2): + return await calls() + return await calls() + + try: + task: Final = asyncio.create_task(invoke()) + await asyncio.wait_for(started.wait(), 3) + if cancel_mode == "task": + task.cancel() + expected_error: Final = ( + TimeoutError + if cancel_mode == "read_timeout" + else asyncio.CancelledError + if cancel_mode == "task" + else TimeoutError + ) + if cancel_mode == "read_timeout": + done, _ = await asyncio.wait((task,), timeout=8) + assert task in done, "Read timeout and bounded cleanup must complete without external cancellation" + await task + elif cancel_mode == "wait_for": + with pytest.raises(expected_error): + await asyncio.wait_for(task, 0.2) + else: + with pytest.raises(expected_error): + await task + assert len(starts) == concurrency + assert len(terminations) == concurrency, "Each cancelled call must send DELETE over a fresh TCP connection" + finally: + stop.set() + if not task.done(): + task.cancel() + await asyncio.wait((task,), timeout=8) + listener.close() + for connection in connections: + connection.cancel() + closed: Final = await asyncio.wait_for(asyncio.gather(*connections, return_exceptions=True), 2) + assert all(result is None or isinstance(result, asyncio.CancelledError) for result in closed), closed + await asyncio.wait_for(listener.wait_closed(), 2) diff --git a/tests/test_litellm/integrations/conftest.py b/tests/test_litellm/integrations/conftest.py new file mode 100644 index 00000000000..adc8e36e0af --- /dev/null +++ b/tests/test_litellm/integrations/conftest.py @@ -0,0 +1,96 @@ +import functools +import http.server +import ipaddress +import queue +import ssl +import threading +from collections.abc import Iterator +from dataclasses import dataclass +from datetime import datetime, timedelta, timezone +from pathlib import Path +from typing import Final + +import pytest + + +@dataclass(frozen=True, slots=True) +class TlsSink: + url: str + certificate_path: str + received: "queue.Queue[str]" + + +class _RecordingOtelHandler(http.server.BaseHTTPRequestHandler): + def __init__(self, *args: object, received: "queue.Queue[str]", **kwargs: object) -> None: + self._received: Final = received + super().__init__(*args, **kwargs) + + def do_POST(self) -> None: + length: Final = int(self.headers.get("Content-Length") or 0) + if length: + self.rfile.read(length) + self._received.put(self.path) + self.send_response(200) + self.send_header("Content-Type", "application/x-protobuf") + self.send_header("Content-Length", "0") + self.end_headers() + + def log_message(self, format: str, *args: object) -> None: + pass + + +def write_self_signed_cert(directory: Path, stem: str) -> tuple[Path, Path]: + from cryptography import x509 + from cryptography.hazmat.primitives import hashes, serialization + from cryptography.hazmat.primitives.asymmetric import rsa + from cryptography.x509.oid import NameOID + + key: Final = rsa.generate_private_key(public_exponent=65537, key_size=2048) + name: Final = x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, "localhost")]) + certificate: Final = ( + x509.CertificateBuilder() + .subject_name(name) + .issuer_name(name) + .public_key(key.public_key()) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(timezone.utc) - timedelta(minutes=1)) + .not_valid_after(datetime.now(timezone.utc) + timedelta(hours=1)) + .add_extension( + x509.SubjectAlternativeName([x509.DNSName("localhost"), x509.IPAddress(ipaddress.ip_address("127.0.0.1"))]), + critical=False, + ) + .sign(key, hashes.SHA256()) + ) + certificate_path: Final = directory / f"{stem}.crt" + certificate_path.write_bytes(certificate.public_bytes(serialization.Encoding.PEM)) + key_path: Final = directory / f"{stem}.key" + key_path.write_bytes( + key.private_bytes( + serialization.Encoding.PEM, + serialization.PrivateFormat.TraditionalOpenSSL, + serialization.NoEncryption(), + ) + ) + return certificate_path, key_path + + +@pytest.fixture +def tls_sink(tmp_path: Path) -> Iterator[TlsSink]: + certificate_path, key_path = write_self_signed_cert(tmp_path, "sink") + received: queue.Queue[str] = queue.Queue() + context: Final = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + context.load_cert_chain(str(certificate_path), str(key_path)) + server: Final = http.server.ThreadingHTTPServer( + ("127.0.0.1", 0), functools.partial(_RecordingOtelHandler, received=received) + ) + server.socket = context.wrap_socket(server.socket, server_side=True) + thread: Final = threading.Thread(target=server.serve_forever, daemon=True) + thread.start() + yield TlsSink( + url=f"https://127.0.0.1:{server.server_port}", + certificate_path=str(certificate_path), + received=received, + ) + server.shutdown() + server.server_close() + thread.join(timeout=5) diff --git a/tests/test_litellm/integrations/otel/test_otel_v2_components.py b/tests/test_litellm/integrations/otel/test_otel_v2_components.py index 0c95049ce05..07705e17d9a 100644 --- a/tests/test_litellm/integrations/otel/test_otel_v2_components.py +++ b/tests/test_litellm/integrations/otel/test_otel_v2_components.py @@ -2,14 +2,17 @@ baggage helpers, metrics, the typed coercion helpers, mapper branches, span-name builders, and the registry validator's failure paths. Needs the OTel SDK.""" +import contextlib import json import threading +import time from collections.abc import Iterator from contextvars import Context as ContextVarContext from dataclasses import replace from http.server import BaseHTTPRequestHandler, HTTPServer, ThreadingHTTPServer import pytest +import requests pytest.importorskip("opentelemetry") @@ -18,6 +21,9 @@ from opentelemetry.proto.collector.trace.v1.trace_service_pb2 import ( # noqa: ) from opentelemetry import baggage # noqa: E402 from opentelemetry.context import attach, detach # noqa: E402 +from opentelemetry._logs.severity import SeverityNumber # noqa: E402 +from opentelemetry.sdk._logs import LogData, LogRecord # noqa: E402 +from opentelemetry.sdk._logs.export import LogExportResult # noqa: E402 from opentelemetry.sdk.metrics import MeterProvider # noqa: E402 from opentelemetry.sdk.metrics.export import InMemoryMetricReader # noqa: E402 from opentelemetry.sdk.trace import TracerProvider # noqa: E402 @@ -29,11 +35,14 @@ from opentelemetry.sdk.trace.export import ( # noqa: E402 from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( # noqa: E402 InMemorySpanExporter, ) -from opentelemetry.trace import SpanKind, get_current_span # noqa: E402 +from opentelemetry.sdk.util.instrumentation import InstrumentationScope # noqa: E402 +from opentelemetry.trace import SpanKind, TraceFlags, get_current_span # noqa: E402 from opentelemetry.trace.propagation.tracecontext import ( # noqa: E402 TraceContextTextMapPropagator, ) +import litellm # noqa: E402 +from conftest import TlsSink # noqa: E402 from litellm.integrations.otel.plumbing import context as ctx_mod # noqa: E402 from litellm.integrations.otel.plumbing import providers # noqa: E402 from litellm.integrations.otel.model.config import OpenTelemetryV2Config # noqa: E402 @@ -1281,6 +1290,50 @@ def test_operation_exception_log_event_always_carries_required_pair(): assert ExceptionEvent.STACKTRACE not in attributes +def test_operation_exception_log_event_records_without_the_events_api(): + """Recording must not import the Events API modules (removed upstream in 1.44.0); + the SDK record path still exports.""" + import importlib + import sys + from unittest.mock import patch + + from opentelemetry._logs.severity import SeverityNumber + from opentelemetry.sdk._logs.export import InMemoryLogExporter + from opentelemetry.trace import INVALID_SPAN_CONTEXT + + from litellm.integrations.otel.model.semconv import ExceptionEvent, GenAIEvent + + plumbing = ("litellm.integrations.otel.plumbing.events", "litellm.integrations.otel.plumbing.providers") + without_events_api = { + **{name: module for name, module in sys.modules.items() if name not in plumbing}, + "opentelemetry._events": None, + "opentelemetry.sdk._events": None, + } + with patch.dict(sys.modules, without_events_api, clear=True): + events_mod = importlib.import_module(plumbing[0]) + providers_mod = importlib.import_module(plumbing[1]) + + log_exporter = InMemoryLogExporter() + cfg = OpenTelemetryV2Config(exporter="in_memory", enable_events=True) + logger_provider = providers_mod.build_logger_provider(cfg, log_exporter=log_exporter) + recorder = events_mod.GenAIEventRecorder(providers_mod.get_event_logger(logger_provider)) + recorder.record_operation_exception( + span_context=INVALID_SPAN_CONTEXT, + error_type="RateLimitError", + message="rate limited", + stack_trace=None, + timestamp_ns=None, + ) + + (log,) = log_exporter.get_finished_logs() + record = log.log_record + assert record.attributes[GenAIEvent.NAME_KEY] == GenAIEvent.OPERATION_EXCEPTION + assert record.attributes[ExceptionEvent.TYPE] == "RateLimitError" + assert record.attributes[ExceptionEvent.MESSAGE] == "rate limited" + assert record.severity_number == SeverityNumber.WARN + assert record.timestamp is not None + + def test_operation_exception_log_event_not_emitted_on_success(): engine, span_exporter, log_exporter = _engine_with_event_recorder() engine.emit(SpanRole.LLM_CALL, _llm_call_data(None)) @@ -1414,3 +1467,178 @@ def test_genai_mapper_guardrail_cost_in_spend_attr(): billed = dict(entry) del billed["guardrail_cost_in_spend"] assert LiteLLM.GUARDRAIL_COST_IN_SPEND not in GenAIMapper().map(GuardrailSpanData.from_logging_entry(billed)) + + +def _sampled_span_context(): + from opentelemetry.trace import SpanContext, TraceFlags, TraceState + + return SpanContext( + trace_id=0x0AF7651916CD43DD8448EB211C80319C, + span_id=0x00F067AA0BA902B7, + is_remote=False, + trace_flags=TraceFlags(TraceFlags.SAMPLED), + trace_state=TraceState(), + ) + + +def test_operation_exception_log_event_exports_through_console_exporter(): + """The emitted record serializes through a real SDK exporter: the console + exporter only handles SDK-shaped records (``to_json`` plus a resource), so + an API-shaped record crashed the export under the repo's pinned OTel.""" + import io + import json as json_mod + + from opentelemetry.sdk._logs import LoggerProvider + from opentelemetry.sdk._logs.export import ConsoleLogExporter, SimpleLogRecordProcessor + from opentelemetry.sdk.resources import Resource + + from litellm.integrations.otel.model.semconv import ExceptionEvent, GenAIEvent + from litellm.integrations.otel.plumbing.events import GenAIEventRecorder + + out = io.StringIO() + logger_provider = LoggerProvider(resource=Resource.create({"service.name": "otel-event-test"})) + logger_provider.add_log_record_processor(SimpleLogRecordProcessor(ConsoleLogExporter(out=out))) + recorder = GenAIEventRecorder(providers.get_event_logger(logger_provider), logger_provider.resource) + recorder.record_operation_exception( + span_context=_sampled_span_context(), + error_type="RateLimitError", + message="rate limited", + stack_trace=None, + timestamp_ns=None, + ) + + exported = json_mod.loads(out.getvalue()) + assert exported["attributes"][GenAIEvent.NAME_KEY] == GenAIEvent.OPERATION_EXCEPTION + assert exported["attributes"][ExceptionEvent.TYPE] == "RateLimitError" + assert exported["attributes"][ExceptionEvent.MESSAGE] == "rate limited" + assert exported["body"] == "rate limited" + assert exported["resource"]["attributes"]["service.name"] == "otel-event-test" + + +def test_operation_exception_log_event_encodes_for_otlp(): + """The OTLP log encoder reads ``log_record.resource`` and rejects a None + body on the pinned OTel line, so the event must encode into a real + ExportLogsServiceRequest, not only land in an in-memory exporter.""" + from opentelemetry.exporter.otlp.proto.common._log_encoder import encode_logs + from opentelemetry.sdk._logs.export import InMemoryLogExporter + + from litellm.integrations.otel.model.semconv import GenAIEvent + from litellm.integrations.otel.plumbing.events import GenAIEventRecorder + + log_exporter = InMemoryLogExporter() + cfg = OpenTelemetryV2Config(exporter="in_memory", enable_events=True) + logger_provider = providers.build_logger_provider(cfg, log_exporter=log_exporter) + recorder = GenAIEventRecorder(providers.get_event_logger(logger_provider), logger_provider.resource) + recorder.record_operation_exception( + span_context=_sampled_span_context(), + error_type="RateLimitError", + message="rate limited", + stack_trace=None, + timestamp_ns=None, + ) + + request = encode_logs(log_exporter.get_finished_logs()) + (resource_logs,) = request.resource_logs + (scope_logs,) = resource_logs.scope_logs + (encoded,) = scope_logs.log_records + encoded_attrs = {a.key: a.value.string_value for a in encoded.attributes} + assert encoded_attrs[GenAIEvent.NAME_KEY] == GenAIEvent.OPERATION_EXCEPTION + assert encoded.body.string_value == "rate limited" + resource_attrs = {a.key: a.value.string_value for a in resource_logs.resource.attributes} + assert resource_attrs["service.name"] == logger_provider.resource.attributes["service.name"] + + + + +def _isolate_v2_otlp_tls_env(monkeypatch: pytest.MonkeyPatch) -> None: + for key in ( + "SSL_VERIFY", + "SSL_CERT_FILE", + "OTEL_EXPORTER_OTLP_CERTIFICATE", + "OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE", + "OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE", + "OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE", + ): + monkeypatch.delenv(key, raising=False) + monkeypatch.setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "2") + monkeypatch.setattr(litellm, "ssl_verify", True) + + +def test_v2_otlp_http_span_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_v2_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + cfg = OpenTelemetryV2Config(exporter="otlp_http", endpoint=tls_sink.url) + _export_one_span(cfg) + assert tls_sink.received.get(timeout=5) == "/v1/traces" + + +def test_v2_http_json_span_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_v2_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + cfg = OpenTelemetryV2Config(exporter="http/json", endpoint=tls_sink.url) + _export_one_span(cfg) + assert tls_sink.received.get(timeout=5) == "/v1/traces" + + +def test_v2_otlp_http_metric_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_v2_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + cfg = OpenTelemetryV2Config(exporter="otlp_http", endpoint=tls_sink.url) + reader = providers.build_metric_reader(cfg) + provider = MeterProvider(metric_readers=[reader]) + try: + provider.get_meter("v2-tls-test").create_counter("tls_export_test").add(1) + assert provider.force_flush(), "metric flush failed" + assert tls_sink.received.get(timeout=5) == "/v1/metrics" + finally: + provider.shutdown() + + +def test_v2_otlp_http_log_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_v2_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + cfg = OpenTelemetryV2Config(exporter="otlp_http", endpoint=tls_sink.url) + exporter = providers.build_log_exporter(cfg) + try: + record = LogRecord( + timestamp=int(time.time() * 1e9), + observed_timestamp=int(time.time() * 1e9), + trace_id=0, + span_id=0, + trace_flags=TraceFlags(0), + severity_number=SeverityNumber.INFO, + body="v2-tls-test", + ) + log_data = LogData(log_record=record, instrumentation_scope=InstrumentationScope("v2-tls-test")) + result = exporter.export([log_data]) + assert result is LogExportResult.SUCCESS, f"log export failed: {result}" + assert tls_sink.received.get(timeout=5) == "/v1/logs" + finally: + exporter.shutdown() + + +def test_v2_otlp_http_export_skips_verification_when_ssl_verify_false( + monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink +) -> None: + _isolate_v2_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_VERIFY", "false") + cfg = OpenTelemetryV2Config(exporter="otlp_http", endpoint=tls_sink.url) + _export_one_span(cfg) + assert tls_sink.received.get(timeout=5) == "/v1/traces" + + +def test_v2_otlp_http_export_rejects_untrusted_collector_by_default( + monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink +) -> None: + + + _isolate_v2_otlp_tls_env(monkeypatch) + cfg = OpenTelemetryV2Config(exporter="otlp_http", endpoint=tls_sink.url) + provider = providers.build_tracer_provider(cfg) + provider.get_tracer("probe").start_span("probe").end() + try: + with contextlib.suppress(requests.exceptions.SSLError): + provider.force_flush() + assert tls_sink.received.empty(), "sink received a request it should never have trusted" + finally: + provider.shutdown() diff --git a/tests/test_litellm/integrations/otel/test_otel_v2_sources_of_truth.py b/tests/test_litellm/integrations/otel/test_otel_v2_sources_of_truth.py index b9ec625fdfc..95df3709ab8 100644 --- a/tests/test_litellm/integrations/otel/test_otel_v2_sources_of_truth.py +++ b/tests/test_litellm/integrations/otel/test_otel_v2_sources_of_truth.py @@ -934,11 +934,32 @@ def test_text_completion_choices_become_assistant_messages_in_choice_order() -> capture_content=True, ) - assert data.choices_out == (_assistant_choice(" first", "length"), _assistant_choice(" second", "stop")) + assert data.choices_out == ( + {"index": 0, "logprobs": None, **_assistant_choice(" first", "length")}, + {"index": 1, "logprobs": None, **_assistant_choice(" second", "stop")}, + ) assert data.finish_reasons == ("length", "stop") assert data.response_id == "cmpl-1" +def test_text_completion_choices_keep_provider_fields_beside_the_synthesized_message() -> None: + choice: Final = { + "index": 2, + "text": "Hello there", + "finish_reason": "stop", + "logprobs": {"tokens": ["Hello"], "token_logprobs": [-0.1]}, + "content_filter_results": {"hate": {"filtered": False}}, + "provider_specific": {"cached": True}, + } + data: Final = LLMCallSpanData.from_standard_logging_payload( + _route_payload("atext_completion", "gpt-3.5-turbo-instruct", {"choices": [choice]}), capture_content=True + ) + + assert data.choices_out == ( + {k: v for k, v in choice.items() if k != "text"} | _assistant_choice("Hello there", "stop"), + ) + + def test_text_completion_choices_follow_the_content_capture_gate_but_finish_reasons_do_not() -> None: data: Final = LLMCallSpanData.from_standard_logging_payload( _route_payload( diff --git a/tests/test_litellm/integrations/test_anthropic_cache_control_hook.py b/tests/test_litellm/integrations/test_anthropic_cache_control_hook.py index 7bf4533979a..f787d370f04 100644 --- a/tests/test_litellm/integrations/test_anthropic_cache_control_hook.py +++ b/tests/test_litellm/integrations/test_anthropic_cache_control_hook.py @@ -1664,7 +1664,7 @@ class TestEnableAnthropicPromptCaching: points = self._points(model="us.anthropic.claude-sonnet-4-5-20250929-v1:0", provider="bedrock") assert [p["index"] for p in points] == [None, -1] - @pytest.mark.parametrize("model, provider", [("gpt-4o", "openai"), ("gemini-2.0-flash", "gemini")]) + @pytest.mark.parametrize("model, provider", [("gpt-4o", "openai")]) def test_non_anthropic_providers_never_injected(self, monkeypatch, model, provider): """These report supports_prompt_caching=True but never consume cache_control markers.""" from litellm.utils import supports_prompt_caching diff --git a/tests/test_litellm/integrations/test_langsmith_init.py b/tests/test_litellm/integrations/test_langsmith_init.py index f56d2310e73..9c0650baee6 100644 --- a/tests/test_litellm/integrations/test_langsmith_init.py +++ b/tests/test_litellm/integrations/test_langsmith_init.py @@ -1,13 +1,17 @@ import asyncio +import json import os +from datetime import datetime, timezone +from decimal import Decimal from typing import Final from unittest.mock import AsyncMock, MagicMock, patch +import httpx import pytest - import litellm from litellm.integrations.langsmith import LangsmithLogger +from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler from litellm.types.integrations.langsmith import LangsmithQueueObject @@ -219,6 +223,121 @@ class TestLangsmithLoggerInit: assert len(logger.log_queue) == 1 +class TestLangsmithBatchSerialization: + async def _logger(self, transport_handler, tenant_id=None): + logger = LangsmithLogger( + langsmith_api_key="test-key", + langsmith_project="test-project", + langsmith_base_url="https://api.smith.langchain.com", + langsmith_tenant_id=tenant_id, + ) + if logger._flush_task is not None: + logger._flush_task.cancel() + handler = AsyncHTTPHandler() + await handler.client.aclose() + handler.client = httpx.AsyncClient( + transport=httpx.MockTransport(transport_handler) + ) + logger.async_httpx_client = handler + return logger + + @staticmethod + def _capturing_transport(captured): + async def handle(request: httpx.Request) -> httpx.Response: + captured.append(request) + return httpx.Response(200, request=request, json={"ok": True}) + + return handle + + def _queue(self, logger, extra): + return [ + LangsmithQueueObject( + data={"id": "run-1", "name": "LLMRun", "extra": extra}, + credentials=logger.default_credentials, + ) + ] + + @pytest.mark.asyncio + async def test_datetime_and_decimal_metadata_reach_langsmith_as_strings(self): + captured: list[httpx.Request] = [] # mutable-ok: transport capture buffer + logger = await self._logger(self._capturing_transport(captured)) + logger.log_queue = self._queue( + logger, + { + "created_at": datetime(2026, 1, 2, 3, 4, 5, tzinfo=timezone.utc), + "spend": Decimal("0.0042"), + }, + ) + + await logger.async_send_batch() + + assert len(captured) == 1, "batch was dropped instead of being sent" + body = json.loads(captured[0].content) + assert body["post"][0]["extra"] == { + "created_at": "2026-01-02 03:04:05+00:00", + "spend": "0.0042", + } + await logger.async_httpx_client.client.aclose() + + @pytest.mark.asyncio + async def test_nan_metadata_is_dropped_instead_of_shipping_invalid_json(self): + captured: list[httpx.Request] = [] # mutable-ok: transport capture buffer + logger = await self._logger(self._capturing_transport(captured)) + logger.log_queue = self._queue(logger, {"score": float("nan")}) + + await logger.async_send_batch() + + assert captured == [], ( + "nan metadata must abort the batch: a bare NaN token is invalid JSON and LangSmith rejects it" + ) + await logger.async_httpx_client.client.aclose() + + @pytest.mark.asyncio + async def test_batch_declares_json_content_type(self): + captured: list[httpx.Request] = [] # mutable-ok: transport capture buffer + logger = await self._logger(self._capturing_transport(captured)) + logger.log_queue = self._queue(logger, {"model": "gpt-4.1-mini"}) + + await logger.async_send_batch() + + assert captured[0].headers["content-type"] == "application/json", ( + "a content= body carries no implicit content type; LangSmith refuses it without this header" + ) + assert captured[0].url.path.endswith("/api/v1/runs/batch") + assert captured[0].headers["x-api-key"] == "test-key" + assert "x-tenant-id" not in captured[0].headers + await logger.async_httpx_client.client.aclose() + + @pytest.mark.asyncio + async def test_tenant_id_is_forwarded_on_the_batch_request(self): + captured: list[httpx.Request] = [] # mutable-ok: transport capture buffer + logger = await self._logger( + self._capturing_transport(captured), tenant_id="tenant-1" + ) + logger.log_queue = self._queue(logger, {"model": "gpt-4.1-mini"}) + + await logger.async_send_batch() + + assert captured[0].headers["x-tenant-id"] == "tenant-1" + await logger.async_httpx_client.client.aclose() + + @pytest.mark.asyncio + async def test_langsmith_error_response_does_not_propagate(self): + captured: list[httpx.Request] = [] # mutable-ok: transport capture buffer + + async def reject(request: httpx.Request) -> httpx.Response: + captured.append(request) + return httpx.Response(422, request=request, text="bad run") + + logger = await self._logger(reject) + logger.log_queue = self._queue(logger, {"model": "gpt-4.1-mini"}) + + await logger.async_send_batch() + + assert len(captured) == 1, "the batch never left the process" + await logger.async_httpx_client.client.aclose() + + class TestLangsmithPrepareLogData: """Regression test for #24001: _prepare_log_data must inject usage_metadata into outputs so LangSmith's Cost column is populated.""" @@ -544,12 +663,10 @@ async def test_events_appended_during_flush_are_not_dropped(): credentials=logger.default_credentials, data={"id": "late"} ) - async def fake_post( - url: str, json: dict[str, list[dict[str, str]]], headers: dict[str, str] - ) -> MagicMock: + async def fake_post(url: str, content: str, headers: dict[str, str]) -> MagicMock: if not sent_batches: logger.log_queue.append(late_event) - sent_batches.append(json["post"]) + sent_batches.append(json.loads(content)["post"]) response = MagicMock() response.status_code = 200 response.raise_for_status = MagicMock() diff --git a/tests/test_litellm/integrations/test_opentelemetry.py b/tests/test_litellm/integrations/test_opentelemetry.py index bea9a38e9dd..974961f2eb5 100644 --- a/tests/test_litellm/integrations/test_opentelemetry.py +++ b/tests/test_litellm/integrations/test_opentelemetry.py @@ -1,5 +1,6 @@ import asyncio import concurrent.futures +import contextlib import gc import json import os @@ -9,21 +10,30 @@ import time import unittest import weakref from datetime import datetime, timedelta, timezone +from pathlib import Path from types import MappingProxyType -from parameterized import parameterized +from typing import Final from unittest.mock import MagicMock, patch +import pytest + # Adds the grandparent directory to sys.path to allow importing project modules from opentelemetry import trace -from opentelemetry.sdk._logs import LogData +from opentelemetry._logs.severity import SeverityNumber +from opentelemetry.sdk._logs import LogData, LogRecord from opentelemetry.sdk._logs import LoggerProvider as OTLoggerProvider -from opentelemetry.sdk._logs.export import InMemoryLogExporter, SimpleLogRecordProcessor +from opentelemetry.sdk._logs.export import InMemoryLogExporter, LogExportResult, SimpleLogRecordProcessor from opentelemetry.sdk.metrics import MeterProvider from opentelemetry.sdk.metrics.export import InMemoryMetricReader, MetricsData -from opentelemetry.sdk.trace import TracerProvider -from opentelemetry.sdk.trace.export import SimpleSpanProcessor +from opentelemetry.sdk.trace import ReadableSpan, TracerProvider +from opentelemetry.sdk.trace.export import SimpleSpanProcessor, SpanExportResult +from opentelemetry.sdk.util.instrumentation import InstrumentationScope from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter +from parameterized import parameterized +import requests + +from conftest import TlsSink, write_self_signed_cert import litellm from litellm.integrations import opentelemetry as otel_module from litellm.integrations.opentelemetry import ( @@ -2081,6 +2091,138 @@ class TestOpenTelemetryEndpointNormalization(unittest.TestCase): self.assertEqual(traces, "http://collector:4318/v1/traces") +def _isolate_otlp_tls_env(monkeypatch: pytest.MonkeyPatch) -> None: + for key in ( + "SSL_VERIFY", + "SSL_CERT_FILE", + "OTEL_EXPORTER_OTLP_CERTIFICATE", + "OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE", + "OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE", + "OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE", + ): + monkeypatch.delenv(key, raising=False) + monkeypatch.setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "2") + monkeypatch.setattr(litellm, "ssl_verify", True) + + +def _ended_span() -> tuple[TracerProvider, ReadableSpan]: + provider: Final = TracerProvider() + span = provider.get_tracer(__name__).start_span("tls-export-test") + span.end() + return provider, span + + +def _assert_export_rejected(processor, span: ReadableSpan, sink: TlsSink) -> None: + with contextlib.suppress(requests.exceptions.SSLError): + result: Final = processor.span_exporter.export([span]) + assert result is SpanExportResult.FAILURE, f"rejected export must report failure, got {result}" + assert sink.received.empty(), "sink received a request it should never have trusted" + + +def _otlp_http_otel(endpoint: str) -> OpenTelemetry: + return OpenTelemetry(config=OpenTelemetryConfig(exporter="otlp_http", endpoint=endpoint)) + + +def test_otlp_http_span_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + otel: Final = _otlp_http_otel(tls_sink.url) + processor: Final = otel._get_span_processor() + provider, span = _ended_span() + try: + result: Final = processor.span_exporter.export([span]) + assert result is SpanExportResult.SUCCESS, f"span export failed: {result}" + assert tls_sink.received.get(timeout=5) == "/v1/traces" + finally: + processor.shutdown() + provider.shutdown() + + +def test_otlp_http_metric_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + otel: Final = _otlp_http_otel(tls_sink.url) + reader: Final = otel._get_metric_reader() + provider: Final = MeterProvider(metric_readers=[reader]) + try: + provider.get_meter(__name__).create_counter("tls_export_test").add(1) + assert provider.force_flush(), "metric flush failed" + assert tls_sink.received.get(timeout=5) == "/v1/metrics" + finally: + provider.shutdown() + + +def test_otlp_http_log_export_trusts_ssl_cert_file(monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink) -> None: + _isolate_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + otel: Final = _otlp_http_otel(tls_sink.url) + exporter: Final = otel._get_log_exporter() + try: + record: Final = LogRecord( + timestamp=int(time.time() * 1e9), + observed_timestamp=int(time.time() * 1e9), + trace_id=0, + span_id=0, + trace_flags=trace.TraceFlags(0), + severity_number=SeverityNumber.INFO, + body="tls-export-test", + ) + log_data: Final = LogData(log_record=record, instrumentation_scope=InstrumentationScope("tls-export-test")) + result: Final = exporter.export([log_data]) + assert result is LogExportResult.SUCCESS, f"log export failed: {result}" + assert tls_sink.received.get(timeout=5) == "/v1/logs" + finally: + exporter.shutdown() + + +def test_otlp_http_export_skips_verification_when_ssl_verify_false( + monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink +) -> None: + _isolate_otlp_tls_env(monkeypatch) + monkeypatch.setenv("SSL_VERIFY", "false") + otel: Final = _otlp_http_otel(tls_sink.url) + processor: Final = otel._get_span_processor() + provider, span = _ended_span() + try: + result: Final = processor.span_exporter.export([span]) + assert result is SpanExportResult.SUCCESS, f"span export failed: {result}" + assert tls_sink.received.get(timeout=5) == "/v1/traces" + finally: + processor.shutdown() + provider.shutdown() + + +def test_otlp_http_export_rejects_untrusted_collector_by_default( + monkeypatch: pytest.MonkeyPatch, tls_sink: TlsSink +) -> None: + _isolate_otlp_tls_env(monkeypatch) + otel: Final = _otlp_http_otel(tls_sink.url) + processor: Final = otel._get_span_processor() + provider, span = _ended_span() + try: + _assert_export_rejected(processor, span, tls_sink) + finally: + processor.shutdown() + provider.shutdown() + + +def test_otel_certificate_env_takes_precedence_over_ssl_cert_file( + monkeypatch: pytest.MonkeyPatch, tmp_path: Path, tls_sink: TlsSink +) -> None: + _isolate_otlp_tls_env(monkeypatch) + unrelated_certificate, _ = write_self_signed_cert(tmp_path, "unrelated") + monkeypatch.setenv("SSL_CERT_FILE", tls_sink.certificate_path) + monkeypatch.setenv("OTEL_EXPORTER_OTLP_CERTIFICATE", str(unrelated_certificate)) + otel: Final = _otlp_http_otel(tls_sink.url) + processor: Final = otel._get_span_processor() + provider, span = _ended_span() + try: + _assert_export_rejected(processor, span, tls_sink) + finally: + processor.shutdown() + provider.shutdown() + + class TestOpenTelemetryProtocolSelection(unittest.TestCase): """Test suite for verifying correct exporter selection based on protocol""" diff --git a/tests/test_litellm/integrations/test_prometheus_deployment_state_proxy_rejects.py b/tests/test_litellm/integrations/test_prometheus_deployment_state_proxy_rejects.py new file mode 100644 index 00000000000..fedfc2b0848 --- /dev/null +++ b/tests/test_litellm/integrations/test_prometheus_deployment_state_proxy_rejects.py @@ -0,0 +1,101 @@ +""" +LIT-7701 attributes a pre_call_hook rejection's failure log to the model +group's single deployment (``model_id`` and ``custom_llm_provider``) and flags +it with ``PROXY_REJECTED_BEFORE_ROUTING_KEY``. The deployment health metrics +must keep treating such rejects as "no deployment picked": a key rate limit or +guardrail block never reached the deployment, so it must not flip +``litellm_deployment_state`` to partial outage or count as a deployment failure +response. A failure raised after the router picked a deployment (a post-call +guardrail block, a provider error) carries no flag and keeps its deployment labels. +""" + +import pytest +from fastapi import HTTPException +from prometheus_client import REGISTRY + +from litellm.constants import PROXY_REJECTED_BEFORE_ROUTING_KEY +from litellm.exceptions import GuardrailRaisedException +from litellm.integrations.prometheus import PrometheusLogger +from litellm.proxy._types import ProxyException +from litellm.proxy.common_utils.proxy_rate_limit_error import ProxyRateLimitError + + +@pytest.fixture(autouse=True) +def cleanup_prometheus_registry(): + for collector in list(REGISTRY._collector_to_names.keys()): + try: + REGISTRY.unregister(collector) + except Exception: + pass + + yield + + for collector in list(REGISTRY._collector_to_names.keys()): + try: + REGISTRY.unregister(collector) + except Exception: + pass + + +def _attributed_failure_kwargs(exception: Exception, rejected_before_routing: bool) -> dict: + return { + "model": "openai/gpt-4.1", + "litellm_params": { + "custom_llm_provider": "openai", + "metadata": {"model_info": {"id": "dep-1"}, "model_group": "internal-model"}, + **({PROXY_REJECTED_BEFORE_ROUTING_KEY: True} if rejected_before_routing else {}), + }, + "standard_logging_object": { + "model_id": "dep-1", + "model_group": "internal-model", + "api_base": "https://api.openai.com", + "metadata": {}, + }, + "exception": exception, + } + + +def _model_id_values(metric) -> set[str]: + index = metric._labelnames.index("model_id") + return {sample_key[index] for sample_key in metric._metrics} + + +class _ProviderError(Exception): + status_code = 500 + + +@pytest.mark.parametrize( + "rejection", + [ + HTTPException(status_code=403, detail="guardrail blocked"), + ProxyException(message="budget exceeded", type="budget_exceeded", param=None, code=400), + ProxyRateLimitError(detail={"error": "key rpm limit"}), + GuardrailRaisedException(guardrail_name="pii", message="blocked", status_code=403), + ], + ids=["http_exception", "proxy_exception", "proxy_rate_limit", "guardrail_raised"], +) +def test_attributed_proxy_reject_leaves_deployment_healthy(rejection: Exception): + logger = PrometheusLogger() + + logger.set_llm_deployment_failure_metrics(_attributed_failure_kwargs(rejection, rejected_before_routing=True)) + + assert logger.litellm_deployment_state._metrics == {} + assert _model_id_values(logger.litellm_deployment_failure_responses) == {""} + assert _model_id_values(logger.litellm_deployment_total_requests) == {""} + + +@pytest.mark.parametrize( + "failure", + [ + _ProviderError("upstream 500"), + GuardrailRaisedException(guardrail_name="pii", message="response blocked", status_code=400), + ], + ids=["provider_error", "post_call_guardrail"], +) +def test_failure_after_routing_still_marks_deployment_partial_outage(failure: Exception): + logger = PrometheusLogger() + + logger.set_llm_deployment_failure_metrics(_attributed_failure_kwargs(failure, rejected_before_routing=False)) + + assert _model_id_values(logger.litellm_deployment_state) == {"dep-1"} + assert _model_id_values(logger.litellm_deployment_failure_responses) == {"dep-1"} diff --git a/tests/test_litellm/integrations/test_prometheus_requested_model_cardinality.py b/tests/test_litellm/integrations/test_prometheus_requested_model_cardinality.py index 519a13751f1..f86f4460b28 100644 --- a/tests/test_litellm/integrations/test_prometheus_requested_model_cardinality.py +++ b/tests/test_litellm/integrations/test_prometheus_requested_model_cardinality.py @@ -116,6 +116,22 @@ async def test_unknown_models_collapse_to_one_series_on_proxy_request_metrics(ro assert _total_value(metric) == 25 +@pytest.mark.asyncio +@pytest.mark.parametrize("model", [["gpt-4o-mini"], {"name": "gpt-4o-mini"}, 123]) +async def test_non_string_models_collapse_to_other_on_proxy_request_metrics(router, model: object): + logger = PrometheusLogger() + + with patch("litellm.proxy.proxy_server.llm_router", router, create=True): # test-quality-ok: production reads proxy_server.llm_router lazily, no injection seam + await logger.async_post_call_failure_hook( + request_data={"model": model, "metadata": {}, "proxy_server_request": {}}, + original_exception=_ClientSideError("'model' must be a string."), + user_api_key_dict=UserAPIKeyAuth(api_key="hashed-key-1"), + ) + + assert _requested_model_values(logger.litellm_proxy_failed_requests_metric) == {UNRECOGNIZED_REQUESTED_MODEL_LABEL} + assert _total_value(logger.litellm_proxy_failed_requests_metric) == 1 + + @pytest.mark.asyncio async def test_known_alias_and_wildcard_models_keep_their_own_labels(router): logger = PrometheusLogger() diff --git a/tests/test_litellm/integrations/test_s3_v2.py b/tests/test_litellm/integrations/test_s3_v2.py index 52fbbe40b0e..a9d13038180 100644 --- a/tests/test_litellm/integrations/test_s3_v2.py +++ b/tests/test_litellm/integrations/test_s3_v2.py @@ -1273,9 +1273,7 @@ async def test_combined_prefix_reflects_in_s3_object_key(): assert "myteam/apikey/" in key, f"Expected both prefixes in key: {key}" -def test_s3_object_key_sanitizes_slashes_in_file_name(): - """Response ids containing slashes (e.g. bedrock batch job ARNs) must not - create nested S3 folders; only path/prefix/date slashes are separators.""" +def test_s3_object_key_sanitizes_slashes_and_colons_in_file_name(): from litellm.integrations.s3 import get_s3_object_key start_time = datetime(2026, 2, 11, 0, 35, 18, 391582) @@ -1290,10 +1288,32 @@ def test_s3_object_key_sanitizes_slashes_in_file_name(): assert key == ( "LiteLLMAPPLogs/myteam/2026-02-11/" - "time-00-35-18-391582_arn:aws:bedrock:us-east-1:123456789012:model-invocation-job_gl18r6skk9yy.json" + "time-00-35-18-391582_arn_aws_bedrock_us-east-1_123456789012_model-invocation-job_gl18r6skk9yy.json" ) +@pytest.mark.parametrize( + "response_id", + [ + "s3://example-batch-bucket/litellm-bedrock-files/input.jsonl", + "gs://example-batch-bucket/litellm-vertex-files/input.jsonl", + ], +) +def test_s3_object_key_has_no_colon_for_cloud_uri_file_ids(response_id: str): + from litellm.integrations.s3 import get_s3_object_key + + key = get_s3_object_key( + s3_path="", + prefix="", + start_time=datetime(2026, 9, 7, 4, 51, 6, 685889), + s3_file_name=f"time-04-51-06-685889_{response_id}", + ) + + filename = key.rsplit("/", 1)[-1] + assert ":" not in filename + assert filename.endswith("_input.jsonl.json") + + def test_create_s3_batch_logging_element_flat_key_for_arn_response_id(): """End-to-end through the s3_v2 element builder: an ARN response id must yield a flat file directly under the date segment.""" diff --git a/tests/test_litellm/integrations/websearch_interception/test_websearch_interception_handler.py b/tests/test_litellm/integrations/websearch_interception/test_websearch_interception_handler.py index f39f41a6d12..d6450d0f1de 100644 --- a/tests/test_litellm/integrations/websearch_interception/test_websearch_interception_handler.py +++ b/tests/test_litellm/integrations/websearch_interception/test_websearch_interception_handler.py @@ -287,6 +287,162 @@ async def test_execute_search_attributes_spend_to_the_calling_key(monkeypatch): ) +def _perplexity_router() -> MagicMock: + router = MagicMock() + router.search_tools = [ + { + "search_tool_name": "perplexity-sonar-pro", + "litellm_params": {"search_provider": "perplexity", "api_key": "fake-key"}, + } + ] + return router + + +@pytest.mark.asyncio +@pytest.mark.parametrize( + "parent_kwargs", + [ + pytest.param( + { + "litellm_call_id": "parent-call-1", + "litellm_trace_id": "trace-abc", + "litellm_session_id": "session-abc", + "metadata": { + "user_api_key_auth": UserAPIKeyAuth(api_key="hashed-sk-1234"), + "session_id": "session-abc", + }, + }, + id="chat-completions-call-kwargs", + ), + pytest.param( + { + "litellm_call_id": "parent-call-1", + "litellm_metadata": { + "user_api_key_auth": UserAPIKeyAuth(api_key="hashed-sk-1234"), + "session_id": "session-abc", + "trace_id": "trace-abc", + }, + }, + id="anthropic-messages-litellm-metadata", + ), + pytest.param( + { + "litellm_params": { + "litellm_call_id": "parent-call-1", + "litellm_trace_id": "trace-abc", + "metadata": {"user_api_key_auth": UserAPIKeyAuth(api_key="hashed-sk-1234")}, + "litellm_metadata": {"session_id": "session-abc"}, + } + }, + id="logging-payload-with-both-metadata-keys", + ), + ], +) +async def test_execute_search_inherits_parent_request_session_and_trace( + monkeypatch: pytest.MonkeyPatch, parent_kwargs: dict[str, object] +): + """The intercepted asearch is billed as its own call but must land in the parent request's + session and trace, otherwise every search shows up as a separate one-call session in SpendLogs.""" + import litellm + from litellm.proxy import proxy_server + from litellm.proxy.spend_tracking.spend_tracking_utils import _get_session_id_for_spend_log + + logger = WebSearchInterceptionLogger(enabled_providers=["bedrock"], search_tool_name="perplexity-sonar-pro") + mock_asearch = AsyncMock(return_value=SearchResponse(object="search", results=[])) + monkeypatch.setattr(proxy_server, "llm_router", _perplexity_router()) + monkeypatch.setattr(litellm, "asearch", mock_asearch) + + await logger._execute_search("what is litellm", kwargs=parent_kwargs) + + forwarded = mock_asearch.await_args.kwargs + assert forwarded["litellm_session_id"] == "session-abc" + assert forwarded["litellm_trace_id"] == "trace-abc" + assert forwarded["litellm_metadata"]["session_id"] == "session-abc" + assert forwarded["litellm_metadata"]["trace_id"] == "trace-abc" + assert forwarded["litellm_metadata"]["parent_request_id"] == "parent-call-1" + assert forwarded["litellm_metadata"]["user_api_key"] == "hashed-sk-1234" + assert forwarded["litellm_metadata"]["model_group"] == "perplexity-sonar-pro" + assert "litellm_call_id" not in forwarded + assert ( + _get_session_id_for_spend_log( + kwargs={"litellm_trace_id": forwarded["litellm_trace_id"]}, + metadata=forwarded["litellm_metadata"], + standard_logging_payload=None, + omit_when_missing=True, + ) + == "session-abc" + ) + + +@pytest.mark.asyncio +async def test_execute_search_forwards_parent_otel_span_from_key_auth(monkeypatch: pytest.MonkeyPatch): + import litellm + from litellm.proxy import proxy_server + + logger = WebSearchInterceptionLogger(enabled_providers=["bedrock"], search_tool_name="perplexity-sonar-pro") + mock_asearch = AsyncMock(return_value=SearchResponse(object="search", results=[])) + monkeypatch.setattr(proxy_server, "llm_router", _perplexity_router()) + monkeypatch.setattr(litellm, "asearch", mock_asearch) + parent_span = object() + + await logger._execute_search( + "what is litellm", + kwargs={"metadata": {"user_api_key_auth": UserAPIKeyAuth(api_key="sk", parent_otel_span=parent_span)}}, + ) + + assert mock_asearch.await_args.kwargs["litellm_metadata"]["litellm_parent_otel_span"] is parent_span + + +@pytest.mark.asyncio +async def test_execute_search_without_parent_session_does_not_invent_one(monkeypatch: pytest.MonkeyPatch): + """A parent request with no session/trace must not stamp empty correlation keys on the search.""" + import litellm + from litellm.proxy import proxy_server + + logger = WebSearchInterceptionLogger(enabled_providers=["bedrock"], search_tool_name="perplexity-sonar-pro") + mock_asearch = AsyncMock(return_value=SearchResponse(object="search", results=[])) + monkeypatch.setattr(proxy_server, "llm_router", _perplexity_router()) + monkeypatch.setattr(litellm, "asearch", mock_asearch) + + await logger._execute_search( + "what is litellm", + kwargs={"litellm_params": {"metadata": {"user_api_key_auth": UserAPIKeyAuth(api_key="sk"), "prompt": "x"}}}, + ) + + forwarded = mock_asearch.await_args.kwargs + assert "litellm_session_id" not in forwarded + assert "litellm_trace_id" not in forwarded + assert not {"session_id", "trace_id", "parent_request_id", "prompt"} & forwarded["litellm_metadata"].keys() + + +@pytest.mark.asyncio +async def test_concurrent_searches_keep_their_own_parent_session(monkeypatch: pytest.MonkeyPatch): + import asyncio + + import litellm + from litellm.proxy import proxy_server + + logger = WebSearchInterceptionLogger(enabled_providers=["bedrock"], search_tool_name="perplexity-sonar-pro") + mock_asearch = AsyncMock(return_value=SearchResponse(object="search", results=[])) + monkeypatch.setattr(proxy_server, "llm_router", _perplexity_router()) + monkeypatch.setattr(litellm, "asearch", mock_asearch) + + await asyncio.gather( + *( + logger._execute_search( + f"query {i}", + kwargs={"metadata": {"user_api_key_auth": UserAPIKeyAuth(api_key="sk"), "session_id": f"session-{i}"}}, + ) + for i in range(5) + ) + ) + + seen = { + call.kwargs["query"]: call.kwargs["litellm_metadata"]["session_id"] for call in mock_asearch.await_args_list + } + assert seen == {f"query {i}": f"session-{i}" for i in range(5)} + + @pytest.mark.asyncio async def test_execute_search_without_proxy_auth_context_stays_sdk_only(monkeypatch): """SDK callers have no key to attribute the search to, so no proxy metadata is invented.""" diff --git a/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py b/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py index 4b25c87d70f..76ccdec25d0 100644 --- a/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py +++ b/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py @@ -1,6 +1,7 @@ +import json from collections.abc import Mapping from datetime import datetime, timezone -from typing import cast +from typing import Final, cast import pytest @@ -298,42 +299,6 @@ def test_reasoning_tokens_gemini(_local_model_cost_map): ) -def test_reasoning_tokens_gemini_3_1_flash_lite(_local_model_cost_map): - """Test cost calculation for gemini-3.1-flash-lite-preview with reasoning tokens""" - model = "gemini-3.1-flash-lite-preview" - custom_llm_provider = "gemini" - - usage = Usage( - completion_tokens=1000, - prompt_tokens=500, - total_tokens=1500, - completion_tokens_details=CompletionTokensDetailsWrapper( - accepted_prediction_tokens=None, - audio_tokens=None, - reasoning_tokens=400, - rejected_prediction_tokens=None, - text_tokens=600, - ), - prompt_tokens_details=PromptTokensDetailsWrapper( - audio_tokens=None, cached_tokens=None, text_tokens=500, image_tokens=None - ), - ) - model_cost_map = litellm.model_cost[model] - prompt_cost, completion_cost = generic_cost_per_token( - model=model, - usage=usage, - custom_llm_provider=custom_llm_provider, - ) - - assert round(prompt_cost, 10) == round( - model_cost_map["input_cost_per_token"] * usage.prompt_tokens, - 10, - ) - assert round(completion_cost, 10) == round( - (model_cost_map["output_cost_per_token"] * usage.completion_tokens_details.text_tokens) - + (model_cost_map["output_cost_per_reasoning_token"] * usage.completion_tokens_details.reasoning_tokens), - 10, - ) def test_image_tokens_with_custom_pricing(): @@ -2220,65 +2185,8 @@ def test_vertex_image_generation_cost_falls_back_to_flat_image_pricing(_local_mo assert round(cost, 10) == round(expected_cost, 10) -def test_gemini_image_generation_cost_prefers_token_usage_metadata(_local_model_cost_map): - """ - When usage metadata exists on image responses, Gemini image generation cost - should be calculated from token pricing, not flat output_cost_per_image. - """ - - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - - input_text_tokens = 20 - input_image_tokens = 1120 - output_image_tokens = 1120 - prompt_tokens = input_text_tokens + input_image_tokens - - image_response = ImageResponse( - data=[ImageObject(b64_json="img1"), ImageObject(b64_json="img2")], - usage=ImageUsage( - input_tokens=prompt_tokens, - input_tokens_details=ImageUsageInputTokensDetails( - text_tokens=input_text_tokens, - image_tokens=input_image_tokens, - ), - output_tokens=output_image_tokens, - total_tokens=prompt_tokens + output_image_tokens, - ), - ) - - cost = gemini_image_generation_cost_calculator( - model=model, - image_response=image_response, - ) - - expected_prompt_cost = prompt_tokens * model_info["input_cost_per_token"] - expected_completion_cost = output_image_tokens * model_info["output_cost_per_image_token"] - expected_total_cost = expected_prompt_cost + expected_completion_cost - - assert round(cost, 10) == round(expected_total_cost, 10) - # Ensure this is not falling back to flat per-image pricing. - assert cost != len(image_response.data) * model_info["output_cost_per_image"] -def test_gemini_image_generation_cost_falls_back_to_flat_image_pricing(_local_model_cost_map): - """ - Without usage metadata, Gemini image generation cost should fall back to - output_cost_per_image * number_of_images. - """ - - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - - image_response = ImageResponse(data=[ImageObject(b64_json="img1"), ImageObject(b64_json="img2")]) - - cost = gemini_image_generation_cost_calculator( - model=model, - image_response=image_response, - ) - - expected_cost = len(image_response.data) * model_info["output_cost_per_image"] - assert round(cost, 10) == round(expected_cost, 10) def test_query_count_is_free_without_a_per_query_price(_local_model_cost_map): @@ -2459,23 +2367,6 @@ def test_vertex_global_or_absent_location_no_uplift(vertex_location, _local_mode assert base == located -@pytest.mark.parametrize("model", ["claude-opus-4-1", "gemini-2.0-flash-001"]) -def test_vertex_location_no_uplift_for_uniformly_priced_model(model, _local_model_cost_map): - """Models Google prices uniformly across endpoints (Gemini 2.x, Claude Opus 4.1 - and older) carry no multiplier and must not move with the location.""" - from litellm.types.utils import Usage - - usage = Usage(prompt_tokens=1000, completion_tokens=500, total_tokens=1500) - - base = generic_cost_per_token(model=model, usage=usage, custom_llm_provider="vertex_ai") - regional = generic_cost_per_token( - model=model, - usage=usage, - custom_llm_provider="vertex_ai", - vertex_location="us-east5", - ) - - assert base == regional, f"{model} should not have a regional-endpoint uplift" def test_vertex_uplift_invalid_multiplier_defaults_to_one(): @@ -3637,6 +3528,97 @@ def test_get_token_base_cost_resolves_missing_cache_write_rates_like_the_tiered_ assert creation_1h == pytest.approx(expected_creation_1h) +def _image_response(num_images: int = 1, usage: ImageUsage | None = None) -> ImageResponse: + return ImageResponse( + data=[ImageObject(url="https://example.com/img.png") for _ in range(num_images)], + usage=usage, + ) + + +_GPT_IMAGE_2_HIGH_1024: Final = {"quality": "high", "image_size": {"width": 1024, "height": 1024}} + + +@pytest.mark.parametrize( + ("model", "optional_params", "model_info", "num_images", "expected_cost"), + [ + ("fal-ai/unlisted-image-model", None, {"output_cost_per_image": 0.08}, 1, 0.08), + ("fal-ai/unlisted-image-model", None, {"output_cost_per_image": 0.08}, 2, 0.16), + ("fal-ai/unlisted-image-model", None, {"output_cost_per_image": "0.08"}, 1, 0.08), + ("openai/gpt-image-2", _GPT_IMAGE_2_HIGH_1024, {"output_cost_per_image": 0.5}, 1, 0.5), + ("openai/gpt-image-2", _GPT_IMAGE_2_HIGH_1024, {"mode": "image_generation"}, 1, 0.211), + ("openai/gpt-image-2", _GPT_IMAGE_2_HIGH_1024, {"output_cost_per_image": "0.08 USD"}, 1, 0.211), + ], +) +def test_route_image_generation_cost_honors_deployment_model_info( + _local_model_cost_map: None, + model: str, + optional_params: dict[str, object] | None, + model_info: ModelInfo, + num_images: int, + expected_cost: float, +) -> None: + cost = CostCalculatorUtils.route_image_generation_cost_calculator( + model=model, + completion_response=_image_response(num_images), + custom_llm_provider="fal_ai", + optional_params=optional_params, + call_type="image_generation", + model_info=model_info, + ) + + assert cost == pytest.approx(expected_cost) + + +def test_route_image_generation_cost_openai_honors_deployment_input_cost_per_image( + _local_model_cost_map: None, +) -> None: + cost = CostCalculatorUtils.route_image_generation_cost_calculator( + model="dall-e-3", + completion_response=_image_response(), + custom_llm_provider="openai", + quality="standard", + size="1024-x-1024", + call_type="image_generation", + model_info={"input_cost_per_image": 0.07}, + ) + + assert cost == pytest.approx(0.07) + + + + +@pytest.mark.parametrize( + ("custom_llm_provider", "model"), + [ + ("gemini", "gemini/unlisted-image-model"), + ("vertex_ai", "vertex_ai/unlisted-image-model"), + ("azure_ai", "unlisted-image-model"), + ("openai", "gpt-image-unlisted"), + ], +) +def test_route_image_generation_cost_bills_deployment_image_price_when_unlisted_model_reports_tokens( + _local_model_cost_map: None, + custom_llm_provider: str, + model: str, +) -> None: + usage = ImageUsage( + input_tokens=10, + input_tokens_details=ImageUsageInputTokensDetails(image_tokens=0, text_tokens=10), + output_tokens=1290, + total_tokens=1300, + ) + + cost = CostCalculatorUtils.route_image_generation_cost_calculator( + model=model, + completion_response=_image_response(num_images=2, usage=usage), + custom_llm_provider=custom_llm_provider, + call_type="image_generation", + model_info={"output_cost_per_image": 0.05}, + ) + + assert cost == pytest.approx(0.10) + + def _batch_rates_model_info(**rates: object) -> ModelInfo: return cast(ModelInfo, dict(rates)) diff --git a/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py b/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py index 7bae2eaa338..41a2d19b8ab 100644 --- a/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py +++ b/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py @@ -109,26 +109,6 @@ def test_get_cost_for_built_in_tools_file_search(): assert cost == 0.00 -def test_get_cost_for_anthropic_web_search(): - """ - Test that Anthropic web search cost is tracked when usage.server_tool_use.web_search_requests - is set. Use claude-3-7-sonnet-20250219 (has search_context_cost_per_query) and - custom_llm_provider=anthropic so get_cost_for_anthropic_web_search is invoked. - """ - from litellm.types.utils import ServerToolUse, Usage - - model = "claude-3-7-sonnet-20250219" - usage = Usage(server_tool_use=ServerToolUse(web_search_requests=1)) - cost = StandardBuiltInToolCostTracking.get_cost_for_built_in_tools( - model=model, - usage=usage, - response_object=None, - standard_built_in_tools_params=None, - custom_llm_provider="anthropic", - ) - assert cost > 0.0 - - def test_get_cost_for_anthropic_web_search_with_server_tool_use_dict(): """ Anthropic-compatible passthrough responses can construct Usage from a raw @@ -145,88 +125,6 @@ def test_get_cost_for_anthropic_web_search_with_server_tool_use_dict(): ) -def test_anthropic_web_search_cost_from_raw_response_dict_when_usage_drops_server_tool_use(): - """ - Regression: on the Anthropic /v1/messages sync cost path the response is the raw - Anthropic dict while the reconstructed OpenAI-shape Usage drops server_tool_use. - The web-search fee must still be charged by reading the count off the raw dict, - and the passed-in Usage must not be mutated. - """ - from litellm.types.utils import Usage - - model = "claude-3-7-sonnet-20250219" - web_search_requests = 3 - raw_response = { - "id": "msg_1", - "type": "message", - "role": "assistant", - "model": model, - "content": [{"type": "text", "text": "hi"}], - "stop_reason": "end_turn", - "stop_sequence": None, - "usage": { - "input_tokens": 100, - "output_tokens": 50, - "server_tool_use": {"web_search_requests": web_search_requests}, - }, - } - usage = Usage(prompt_tokens=100, completion_tokens=50, total_tokens=150) - assert getattr(usage, "server_tool_use", None) is None - - cost = StandardBuiltInToolCostTracking.get_cost_for_built_in_tools( - model=model, - usage=usage, - response_object=raw_response, - custom_llm_provider="anthropic", - standard_built_in_tools_params=None, - ) - - per_query_cost = litellm.get_model_info(model)["search_context_cost_per_query"][ - "search_context_size_medium" - ] - assert cost == per_query_cost * web_search_requests - assert cost > 0.0 - assert getattr(usage, "server_tool_use", None) is None - - -def test_anthropic_web_search_cost_from_raw_response_dict_when_usage_is_none(): - """ - Regression: when a caller hands the cost tracker a raw Anthropic dict without a - parallel Usage object, the web-search fee must still be priced per request from - usage.server_tool_use.web_search_requests on the dict instead of falling back to - the flat search_context_size_medium tier. - """ - model = "claude-3-7-sonnet-20250219" - web_search_requests = 4 - raw_response = { - "id": "msg_1", - "type": "message", - "role": "assistant", - "model": model, - "content": [{"type": "text", "text": "hi"}], - "stop_reason": "end_turn", - "stop_sequence": None, - "usage": { - "input_tokens": 100, - "output_tokens": 50, - "server_tool_use": {"web_search_requests": web_search_requests}, - }, - } - - cost = StandardBuiltInToolCostTracking.get_cost_for_built_in_tools( - model=model, - usage=None, - response_object=raw_response, - custom_llm_provider="anthropic", - standard_built_in_tools_params=None, - ) - - per_query_cost = litellm.get_model_info(model)["search_context_cost_per_query"][ - "search_context_size_medium" - ] - assert cost == per_query_cost * web_search_requests - - def test_anthropic_web_search_zero_requests_from_raw_response_charges_zero(): """ Regression: a raw Anthropic dict reporting zero web search requests must price @@ -287,27 +185,6 @@ def test_anthropic_response_usage_block_preserves_server_tool_use(): assert dumped_usage["server_tool_use"] == {"web_search_requests": 2} -@pytest.mark.parametrize( - "model", ["gemini/gemini-2.0-flash-001", "gemini-2.0-flash-001"] -) -def test_get_cost_for_gemini_web_search(model): - """ - Test that the cost for a web search is 0.00 when no response object is provided - """ - from litellm.types.utils import PromptTokensDetailsWrapper, Usage - - usage = Usage( - prompt_tokens_details=PromptTokensDetailsWrapper(web_search_requests=1) - ) - cost = StandardBuiltInToolCostTracking.get_cost_for_built_in_tools( - model=model, - usage=usage, - response_object=None, - standard_built_in_tools_params=None, - ) - assert cost > 0.0 - - def test_completion_cost_includes_web_search_without_standard_built_in_tools_params(): """ Test that completion_cost includes web search cost even when diff --git a/tests/test_litellm/litellm_core_utils/llm_response_utils/test_get_api_base.py b/tests/test_litellm/litellm_core_utils/llm_response_utils/test_get_api_base.py new file mode 100644 index 00000000000..63977c30270 --- /dev/null +++ b/tests/test_litellm/litellm_core_utils/llm_response_utils/test_get_api_base.py @@ -0,0 +1,93 @@ +import json + +import pytest + +import litellm +from litellm.litellm_core_utils.llm_response_utils import get_api_base as get_api_base_module +from litellm.llms.chatgpt.common_utils import CHATGPT_API_BASE +from litellm.llms.github_copilot.common_utils import DEFAULT_GITHUB_COPILOT_API_BASE + + +@pytest.fixture +def isolated_token_dirs(tmp_path, monkeypatch): + monkeypatch.setenv("GITHUB_COPILOT_TOKEN_DIR", str(tmp_path / "github_copilot")) + monkeypatch.setenv("CHATGPT_TOKEN_DIR", str(tmp_path / "chatgpt")) + monkeypatch.delenv("GITHUB_COPILOT_API_BASE", raising=False) + monkeypatch.delenv("CHATGPT_API_BASE", raising=False) + monkeypatch.delenv("OPENAI_CHATGPT_API_BASE", raising=False) + return tmp_path + + +@pytest.fixture +def resolution_lookups(monkeypatch): + lookups: list = [] + + def _record(*args, **kwargs): + lookups.append((args, kwargs)) + raise RuntimeError("provider resolution must not run for an authenticating provider") + + monkeypatch.setattr(get_api_base_module, "get_llm_provider", _record) + return lookups + + +class TestDeclaredAuthenticatingProvider: + """get_llm_provider runs the OAuth device flow for github_copilot and chatgpt, and get_api_base + runs on every response's hidden params and on every mapped exception, so it must answer from + the declaration without resolving. The recorder appends before raising, and get_api_base + swallows resolver errors, so an empty list proves the lookup never ran.""" + + @pytest.mark.parametrize( + "model, custom_llm_provider, expected", + [ + ("github_copilot/gpt-4o", None, DEFAULT_GITHUB_COPILOT_API_BASE), + ("gpt-4o", "github_copilot", DEFAULT_GITHUB_COPILOT_API_BASE), + ("chatgpt/gpt-5", None, CHATGPT_API_BASE), + ("gpt-5", "chatgpt", CHATGPT_API_BASE), + ], + ) + def test_answers_without_resolving( + self, model, custom_llm_provider, expected, isolated_token_dirs, resolution_lookups + ): + api_base = litellm.get_api_base(model=model, optional_params={"custom_llm_provider": custom_llm_provider}) + + assert resolution_lookups == [] + assert api_base == expected + + def test_copilot_keeps_the_enterprise_endpoint_from_disk(self, isolated_token_dirs, resolution_lookups): + token_dir = isolated_token_dirs / "github_copilot" + token_dir.mkdir() + (token_dir / "api-key.json").write_text( + json.dumps({"endpoints": {"api": "https://api.enterprise.githubcopilot.com"}}) + ) + + api_base = litellm.get_api_base(model="github_copilot/gpt-4o", optional_params={}) + + assert resolution_lookups == [] + assert api_base == "https://api.enterprise.githubcopilot.com" + + def test_explicit_api_base_still_wins(self, isolated_token_dirs, resolution_lookups): + api_base = litellm.get_api_base( + model="github_copilot/gpt-4o", optional_params={"api_base": "https://copilot.example/v1"} + ) + + assert resolution_lookups == [] + assert api_base == "https://copilot.example/v1" + + def test_other_providers_still_resolve(self, isolated_token_dirs, resolution_lookups): + litellm.get_api_base(model="openai/gpt-4o", optional_params={}) + + assert len(resolution_lookups) == 1 + + +@pytest.mark.parametrize( + "model, expected", + [ + ("gemini/gemini-2.5-pro", "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-pro:generateContent"), + ("openai/gpt-4o", "https://api.openai.com"), + ], +) +def test_providers_with_a_fixed_base_still_get_it(model, expected, monkeypatch): + for env in ("GEMINI_API_BASE", "OPENAI_API_BASE", "OPENAI_BASE_URL"): + monkeypatch.delenv(env, raising=False) + + assert litellm.get_api_base(model=model, optional_params={}) == expected diff --git a/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py b/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py index 62cf5680266..79c50bf2369 100644 --- a/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py +++ b/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py @@ -4,7 +4,6 @@ import json import os import sys from typing import Final -from unittest.mock import MagicMock, patch import pytest @@ -356,6 +355,20 @@ def test_get_file_ids_from_messages_file_field_not_dict(): assert get_file_ids_from_messages(messages) == [] +def test_get_file_ids_from_messages_skips_bare_string_content_items(): + messages = [ + { + "role": "user", + "content": [ + "what type of file is this?", + {"type": "file", "file": {"file_id": "file-abc"}}, + ], + } + ] + + assert get_file_ids_from_messages(messages) == ["file-abc"] + + def test_update_messages_with_model_file_ids_skips_non_openai_file_blocks(): """`update_messages_with_model_file_ids` is also called on user content before provider dispatch. It must tolerate non-OpenAI file blocks the same diff --git a/tests/test_litellm/litellm_core_utils/test_bug_report.py b/tests/test_litellm/litellm_core_utils/test_bug_report.py index f47361dda2e..62d7090b960 100644 --- a/tests/test_litellm/litellm_core_utils/test_bug_report.py +++ b/tests/test_litellm/litellm_core_utils/test_bug_report.py @@ -21,6 +21,7 @@ from litellm.litellm_core_utils.bug_report import ( bug_report_issue_url, bug_report_notice, build_bug_report, + build_environment_report, should_report_bug, strip_bug_report_notice, ) @@ -202,3 +203,28 @@ def test_oversized_config_is_trimmed_from_the_end_before_any_frame(): assert all(frame in description for frame in report.litellm_frames) assert "general_settings.flag_0000 = true" in description assert "general_settings.flag_0399 = true" not in description + + +def test_issue_url_carries_exactly_the_environment_report_fields(): + report = build_bug_report( + RuntimeError("boom"), + surface="proxy", + config_lines=("litellm_settings.drop_params = true",), + ) + environment = report.environment + query = parse_qs(urlparse(bug_report_issue_url(report)).query) + description = query["description"][0] + + assert environment == build_environment_report( + surface="proxy", config_lines=("litellm_settings.drop_params = true",) + ) + assert query["version"] == [environment.litellm_version] + assert f"Surface: {environment.surface}\n" in description + assert f"LiteLLM: {environment.litellm_version}\n" in description + assert f"Python: {environment.python_version}\n" in description + assert "\nlitellm_settings.drop_params = true\n" in description + assert query.get("deployment") == (None if environment.deployment is None else [environment.deployment]) + + +def test_sdk_environment_reports_the_pip_deployment(): + assert build_environment_report(surface="sdk").deployment == "pip / Python SDK" diff --git a/tests/test_litellm/litellm_core_utils/test_core_helpers.py b/tests/test_litellm/litellm_core_utils/test_core_helpers.py index bca61a0e76f..6eeea271127 100644 --- a/tests/test_litellm/litellm_core_utils/test_core_helpers.py +++ b/tests/test_litellm/litellm_core_utils/test_core_helpers.py @@ -322,6 +322,28 @@ class TestRedactNestedMatchAndRegexKeys: assert redact_nested_match_and_regex_keys(None) is None assert redact_nested_match_and_regex_keys("plain") == "plain" + def test_redacts_custom_keys_without_changing_default_keys(self): + payload = { + "keyword": "secret-keyword", + "snippet": "secret-snippet", + "match": "secret-match", + "regex": "secret-regex", + "nested": [{"keyword": "nested-keyword", "match": "nested-match"}], + } + + custom_keys = redact_nested_match_and_regex_keys(payload, keys=("keyword", "snippet")) + default_keys = redact_nested_match_and_regex_keys(payload) + + assert custom_keys["keyword"] == "[REDACTED]" + assert custom_keys["snippet"] == "[REDACTED]" + assert custom_keys["nested"][0]["keyword"] == "[REDACTED]" + assert custom_keys["match"] == "secret-match" + assert custom_keys["regex"] == "secret-regex" + assert default_keys["match"] == "[REDACTED]" + assert default_keys["regex"] == "[REDACTED]" + assert default_keys["keyword"] == "secret-keyword" + assert default_keys["snippet"] == "secret-snippet" + @pytest.mark.parametrize( "value, expected", diff --git a/tests/test_litellm/litellm_core_utils/test_error_normalization.py b/tests/test_litellm/litellm_core_utils/test_error_normalization.py new file mode 100644 index 00000000000..9d5469ddb4c --- /dev/null +++ b/tests/test_litellm/litellm_core_utils/test_error_normalization.py @@ -0,0 +1,231 @@ +import httpx +import pytest + +import litellm +from litellm.exceptions import MidStreamFallbackError +from litellm.litellm_core_utils.error_normalization import normalize_error +from litellm.litellm_core_utils.litellm_logging import StandardLoggingPayloadSetup +from litellm.proxy._types import ProxyErrorTypes, ProxyException +from litellm.types.router import RouterErrors + +_RESPONSE = httpx.Response(status_code=500, request=httpx.Request("POST", "https://example.invalid")) + + +def _proxy_exc(message: str, error_type: str, code: int) -> ProxyException: + return ProxyException(message=message, type=error_type, param=None, code=code) + + +@pytest.mark.parametrize( + ("messages", "expected"), + [ + ( + ( + _proxy_exc("Rate limit exceeded for team X. Reset at 10:01", "rate_limit_error", 429), + _proxy_exc("Rate limit exceeded for team Y. Reset at 10:02", "rate_limit_error", 429), + ), + "429_RATE_LIMIT_EXCEEDED", + ), + ( + ( + litellm.BudgetExceededError(current_cost=3501.85, max_budget=3500), + _proxy_exc( + "User=abc, Current cost=1000.03, Max budget=1000", ProxyErrorTypes.budget_exceeded.value, 400 + ), + litellm.RateLimitError( + "budget", + llm_provider="openai", + model="gpt", + rate_limit_type=litellm.exceptions.RateLimitType.BUDGET, + ), + ), + "429_BUDGET_EXCEEDED", + ), + ( + ( + _proxy_exc("Token Expired", ProxyErrorTypes.expired_key.value, 401), + _proxy_exc("Malformed API Key", ProxyErrorTypes.auth_error.value, 401), + litellm.AuthenticationError("Signature verification failed", llm_provider="azure", model="gpt"), + ), + "401_AUTHENTICATION_FAILED", + ), + ( + ( + _proxy_exc("No team has access to gpt-5.5-mini", ProxyErrorTypes.team_model_access_denied.value, 401), + _proxy_exc("key not allowed to access claude", ProxyErrorTypes.key_model_access_denied.value, 401), + ValueError( + "Not allowed to access model due to tags configuration. Passed model=gpt-5.5 and tags=['team-a']" + ), + ), + "403_MODEL_ACCESS_DENIED", + ), + ( + ( + _proxy_exc("Missing required parameter: messages", ProxyErrorTypes.bad_request_error.value, 400), + litellm.BadRequestError("Missing required parameter: input", llm_provider="openai", model="gpt"), + ), + "400_MISSING_REQUIRED_PARAMETER", + ), + ( + ( + litellm.ContextWindowExceededError( + "1002823 tokens > 1000000 maximum", model="g", llm_provider="vertex" + ), + litellm.BadRequestError("Input is too long for requested model", llm_provider="anthropic", model="c"), + ), + "400_CONTEXT_WINDOW_EXCEEDED", + ), + ( + ( + litellm.NotFoundError("Response id xxx not found", llm_provider="openai", model="gpt"), + _proxy_exc("No vector store found with id abc", ProxyErrorTypes.not_found_error.value, 404), + ), + "404_RESOURCE_NOT_FOUND", + ), + ( + ( + litellm.APIConnectionError("Connection error", llm_provider="openai", model="gpt"), + litellm.InternalServerError("TransferEncodingError", llm_provider="openai", model="gpt"), + litellm.APIError(500, "Response payload is not completed", llm_provider="openai", model="gpt"), + httpx.RemoteProtocolError( + "peer closed connection without sending complete message body (incomplete chunked read)" + ), + ), + "500_PROVIDER_CONNECTION_ERROR", + ), + ( + ( + litellm.ServiceUnavailableError("server_is_overloaded", llm_provider="anthropic", model="c"), + litellm.InternalServerError( + "Bedrock is unable to process your request", llm_provider="bedrock", model="c" + ), + litellm.APIError(529, "Overloaded", llm_provider="anthropic", model="c"), + ), + "503_PROVIDER_OVERLOADED", + ), + ( + ( + litellm.InternalServerError( + "The server had an error while processing your request", llm_provider="openai", model="gpt" + ), + litellm.APIError(500, "server_error", llm_provider="openai", model="gpt"), + ), + "500_PROVIDER_INTERNAL_ERROR", + ), + ( + ( + _proxy_exc("No fallback model group found for gpt-5.6", "internal_server_error", 500), + _proxy_exc("No fallback model group found for claude-46-sonnet", "internal_server_error", 500), + ), + "500_ROUTER_NO_FALLBACK", + ), + ( + ( + _proxy_exc("Error doing the fallback: RateLimitError", "internal_server_error", 500), + MidStreamFallbackError( + "stream died", model="gpt", llm_provider="openai", original_exception=ValueError("boom") + ), + ), + "500_ROUTER_FALLBACK_FAILURE", + ), + ( + ( + TypeError("cannot pickle '_thread.RLock' object"), + RuntimeError("dictionary changed size during iteration"), + TypeError("'NoneType' object is not iterable"), + ), + "500_INTERNAL_STATE_ERROR", + ), + ( + ( + litellm.Timeout("Timeout on reading data from socket", model="gpt", llm_provider="openai"), + litellm.APIError(504, "Request timed out", llm_provider="openai", model="gpt"), + ), + "408_UPSTREAM_TIMEOUT", + ), + ( + ( + _proxy_exc("500: Upstream passthrough request failed", "internal_server_error", 500), + _proxy_exc("503: Upstream passthrough request failed", "internal_server_error", 503), + ), + "500_UPSTREAM_PASSTHROUGH", + ), + ( + ( + _proxy_exc("OCR is not supported for provider openai", "internal_server_error", 500), + NotImplementedError("rerank"), + ), + "500_UNSUPPORTED_OPERATION", + ), + ], +) +def test_variants_of_one_failure_share_a_normalized_error(messages: tuple[Exception, ...], expected: str) -> None: + normalized = {StandardLoggingPayloadSetup.get_error_information(exc)["normalized_error"] for exc in messages} + assert normalized == {expected} + + +def test_router_no_healthy_deployment_wording_clusters_as_no_healthy_deployments() -> None: + for message in (RouterErrors.no_healthy_deployments.value, "No healthy deployments found."): + exc = litellm.BadRequestError(message, llm_provider="openai", model="gpt-4o") + assert normalize_error(exc, "400", message) == "429_NO_HEALTHY_DEPLOYMENTS", message + + +def test_provider_budget_routing_wording_clusters_as_budget_exceeded() -> None: + message = RouterErrors.no_deployments_with_provider_budget_routing.value + exc = litellm.BadRequestError(message, llm_provider="openai", model="gpt-4o") + assert normalize_error(exc, "400", message) == "429_BUDGET_EXCEEDED" + + +def test_router_fallback_wording_does_not_hide_the_wrapped_exception_class() -> None: + provider_message = "litellm.AuthenticationError: OpenAIException - Incorrect API key provided" + exc = litellm.AuthenticationError( + provider_message + "\nNo fallback model group found for lookup_groups=['x']", + llm_provider="openai", + model="gpt", + ) + assert normalize_error(exc, "401", str(exc)) == "401_AUTHENTICATION_FAILED" + wrapped = litellm.AuthenticationError( + "Error doing the fallback: " + provider_message, llm_provider="openai", model="gpt" + ) + assert normalize_error(wrapped, "401", str(wrapped)) == "401_AUTHENTICATION_FAILED" + + +def test_parameter_length_error_is_not_a_context_window_error() -> None: + exc = litellm.BadRequestError("string too long: 'user' max 64 chars", llm_provider="openai", model="gpt") + assert StandardLoggingPayloadSetup.get_error_information(exc)["normalized_error"] == "400_INVALID_REQUEST" + + +def test_no_exception_has_no_normalized_error() -> None: + assert StandardLoggingPayloadSetup.get_error_information(None)["normalized_error"] is None + + +def test_unknown_exception_falls_back_to_status_then_unclassified() -> None: + assert normalize_error(Exception("x"), "429", "x") == "429_RATE_LIMIT_EXCEEDED" + assert normalize_error(Exception("x"), "", "x") == "UNCLASSIFIED" + + +def test_budget_exceeded_error_with_custom_wording_is_still_a_budget_error() -> None: + exc = litellm.BudgetExceededError(current_cost=2.0, max_budget=1.0, message="Spending cap reached for key") + assert StandardLoggingPayloadSetup.get_error_information(exc)["normalized_error"] == "429_BUDGET_EXCEEDED" + + +def test_every_model_access_denied_proxy_type_shares_one_cluster() -> None: + access_denied_types = tuple(t for t in ProxyErrorTypes if t.value.endswith("_model_access_denied")) + assert len(access_denied_types) >= 6, access_denied_types + codes = {normalize_error(_proxy_exc("denied", t.value, 403), "403", "denied") for t in access_denied_types} + assert codes == {"403_MODEL_ACCESS_DENIED"}, codes + + +def test_non_string_type_attribute_falls_through_to_status() -> None: + class _OddType(Exception): + type = {"kind": "odd"} + + assert normalize_error(_OddType("odd"), "500", "odd") == "500_PROVIDER_INTERNAL_ERROR" + + +def test_normalized_error_never_embeds_dynamic_parts() -> None: + exc = _proxy_exc( + "No team has access to anthropic.claude-sonnet-4-5", ProxyErrorTypes.team_model_access_denied.value, 401 + ) + info = StandardLoggingPayloadSetup.get_error_information(exc) + assert info["error_message"] == "No team has access to anthropic.claude-sonnet-4-5" + assert "claude" not in (info["normalized_error"] or "") diff --git a/tests/test_litellm/litellm_core_utils/test_fallback_generalizations.py b/tests/test_litellm/litellm_core_utils/test_fallback_generalizations.py index 7928768b3bd..f70b52a7026 100644 --- a/tests/test_litellm/litellm_core_utils/test_fallback_generalizations.py +++ b/tests/test_litellm/litellm_core_utils/test_fallback_generalizations.py @@ -979,10 +979,6 @@ def test_shipped_tool_search_rule_fills_mapped_claude_entries_without_flag(shipp assert "supports_tool_search" not in litellm.model_cost[key] assert litellm.get_model_info(model, custom_llm_provider=provider)["supports_tool_search"] is True - assert "supports_tool_search" not in litellm.model_cost["claude-opus-4-1"] - opus_4_1_info = litellm.get_model_info("claude-opus-4-1", custom_llm_provider="anthropic") - assert opus_4_1_info.get("supports_tool_search") is None - assert "supports_tool_search" not in litellm.model_cost["azure_ai/claude-opus-5"] azure_opus_5_info = litellm.get_model_info("claude-opus-5", custom_llm_provider="azure_ai") assert azure_opus_5_info.get("supports_tool_search") is None diff --git a/tests/test_litellm/litellm_core_utils/test_get_litellm_params.py b/tests/test_litellm/litellm_core_utils/test_get_litellm_params.py index 4c963d14ada..7fb45e1b092 100644 --- a/tests/test_litellm/litellm_core_utils/test_get_litellm_params.py +++ b/tests/test_litellm/litellm_core_utils/test_get_litellm_params.py @@ -4,6 +4,8 @@ Tests for get_litellm_params and related helpers. Ensures backward compatibility after sparse kwargs extraction optimization. """ +from typing import Final + import pytest from litellm.litellm_core_utils.get_litellm_params import ( @@ -12,6 +14,10 @@ from litellm.litellm_core_utils.get_litellm_params import ( get_litellm_params, ) +NAMED_PRICE_PARAMS: Final = frozenset( + {"input_cost_per_token", "output_cost_per_token", "input_cost_per_second", "output_cost_per_second"} +) + class TestGetBaseModelFromLitellmCallMetadata: def test_none_metadata_returns_none(self): @@ -40,10 +46,27 @@ class TestGetLitellmParamsKwargsExtraction: """Verify that optional kwargs are correctly extracted via sparse extraction.""" def test_no_kwargs_omits_optional_keys(self): - """When no kwargs passed, optional keys should not be in result.""" + """When no kwargs passed, optional keys are absent; the named price params are present as None.""" result = get_litellm_params(api_key="test-key") - for key in _OPTIONAL_KWARGS_KEYS: + for key in _OPTIONAL_KWARGS_KEYS - NAMED_PRICE_PARAMS: assert key not in result + for key in NAMED_PRICE_PARAMS: + assert result[key] is None + + def test_custom_pricing_kwargs_are_extracted(self) -> None: + from litellm.litellm_core_utils.litellm_logging import use_custom_pricing_for_model + from litellm.types.router import CustomPricingLiteLLMParams + + assert set(CustomPricingLiteLLMParams.model_fields) <= _OPTIONAL_KWARGS_KEYS + + result = get_litellm_params(output_cost_per_image=0.08, input_cost_per_audio_token=1e-6) + assert result["output_cost_per_image"] == 0.08 + assert result["input_cost_per_audio_token"] == 1e-6 + assert use_custom_pricing_for_model(result) is True + + result_without_prices = get_litellm_params() + assert "output_cost_per_image" not in result_without_prices + assert use_custom_pricing_for_model(result_without_prices) is False def test_present_kwargs_are_extracted(self): result = get_litellm_params( diff --git a/tests/test_litellm/litellm_core_utils/test_get_llm_provider_logic.py b/tests/test_litellm/litellm_core_utils/test_get_llm_provider_logic.py index 1ecef9ffff7..ed8438bb1de 100644 --- a/tests/test_litellm/litellm_core_utils/test_get_llm_provider_logic.py +++ b/tests/test_litellm/litellm_core_utils/test_get_llm_provider_logic.py @@ -1,5 +1,6 @@ from typing import Final +import httpx import pytest import litellm @@ -8,6 +9,7 @@ from litellm.litellm_core_utils.get_llm_provider_logic import ( get_llm_provider, is_registered_custom_provider, ) +from litellm.llms.custom_httpx.http_handler import HTTPHandler CUSTOM_PROVIDER: Final = "test-onprem-llm" @@ -53,3 +55,26 @@ def test_get_llm_provider_still_rejects_unregistered_prefix(registered_custom_pr ) def test_is_registered_custom_provider(registered_custom_provider: str, candidate: str | None, expected: bool) -> None: assert is_registered_custom_provider(candidate) is expected + + +def test_get_llm_provider_leaves_fal_ai_api_base_unset_for_global_fallback() -> None: + _, provider, _, api_base = get_llm_provider(model="fal_ai/fal-ai/flux/schnell") + assert provider == "fal_ai" + assert api_base is None + + _, _, _, explicit = get_llm_provider(model="fal_ai/fal-ai/flux/schnell", api_base="http://edge.local/fal") + assert explicit == "http://edge.local/fal" + + +def test_image_generation_fal_ai_egresses_to_global_api_base(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(litellm, "api_base", "http://gateway.local/fal") + monkeypatch.setenv("FAL_AI_API_KEY", "test") + seen: Final[list[httpx.URL]] = [] + + def handler(request: httpx.Request) -> httpx.Response: + seen.append(request.url) + return httpx.Response(200, json={"images": [{"url": "https://fal.media/a.png"}]}) + + client: Final = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(handler))) + litellm.image_generation(model="fal_ai/fal-ai/flux/schnell", prompt="a red kite", client=client) + assert str(seen[0]).startswith("http://gateway.local/fal") diff --git a/tests/test_litellm/litellm_core_utils/test_get_model_cost_map.py b/tests/test_litellm/litellm_core_utils/test_get_model_cost_map.py index 262dabb7c1b..00977d9c3ee 100644 --- a/tests/test_litellm/litellm_core_utils/test_get_model_cost_map.py +++ b/tests/test_litellm/litellm_core_utils/test_get_model_cost_map.py @@ -218,7 +218,6 @@ def test_shipped_backup_marks_claude_4_6_plus_adaptive_not_4_0(): assert backup[adaptive]["supports_adaptive_thinking"] is True, adaptive for non_adaptive in [ - "claude-opus-4-20250514", "us.anthropic.claude-opus-4-20250514-v1:0", "claude-opus-4-5", ]: diff --git a/tests/test_litellm/litellm_core_utils/test_image_handling.py b/tests/test_litellm/litellm_core_utils/test_image_handling.py index 8fa4bd6c14d..21e97e97357 100644 --- a/tests/test_litellm/litellm_core_utils/test_image_handling.py +++ b/tests/test_litellm/litellm_core_utils/test_image_handling.py @@ -427,7 +427,7 @@ async def test_async_inline_remote_media_cancels_the_other_fetches_when_one_fail _SSRF_VERDICTS = ( SSRFError( "URL targets a blocked address (10.0.0.8). If this is a legitimate internal service, " - "add the host to `user_url_allowed_hosts` in general_settings." + "add the host to `user_url_allowed_hosts` in litellm_settings." ), SSRFError("DNS resolution failed for 'internal.example': [Errno 8] nodename nor servname provided, or not known"), SSRFError("No addresses found for 'internal.example'"), diff --git a/tests/test_litellm/litellm_core_utils/test_litellm_logging.py b/tests/test_litellm/litellm_core_utils/test_litellm_logging.py index b0fc725b50a..5bdc0e9f8b8 100644 --- a/tests/test_litellm/litellm_core_utils/test_litellm_logging.py +++ b/tests/test_litellm/litellm_core_utils/test_litellm_logging.py @@ -5,16 +5,15 @@ import json import logging import os import sys +import time from collections.abc import Callable, Iterator, Mapping from types import MappingProxyType from typing import Final, Literal from unittest.mock import AsyncMock, MagicMock, patch -import pytest - -import time - import httpx +import pytest +from mcp.types import AudioContent, CallToolResult, ImageContent, TextContent from openai._legacy_response import HttpxBinaryResponseContent import litellm @@ -51,6 +50,272 @@ def logging_obj(): ) +@pytest.mark.asyncio +async def test_async_post_mcp_tool_call_hook_preserves_and_returns_content(logging_obj): + from litellm.types.mcp import MCPPostCallResponseObject + + class RedactingLogger(CustomLogger): + async def async_post_mcp_tool_call_hook( + self, + kwargs: dict[str, object], + response_obj: MCPPostCallResponseObject, + start_time: datetime.datetime, + end_time: datetime.datetime, + ) -> MCPPostCallResponseObject: + assert isinstance(response_obj.mcp_tool_call_response, list) + assert isinstance(response_obj.mcp_tool_call_response[0], TextContent) + response_obj.mcp_tool_call_response = [TextContent(type="text", text="[REDACTED]")] + return response_obj + + logging_obj.dynamic_success_callbacks = [RedactingLogger()] + result = CallToolResult(content=[TextContent(type="text", text="SECRET-1234")], isError=False) + + hooked_content = await logging_obj.async_post_mcp_tool_call_hook( + kwargs=logging_obj.model_call_details, + response_obj=result, + start_time=datetime.datetime.now(), + end_time=datetime.datetime.now(), + ) + + assert hooked_content.content == [TextContent(type="text", text="[REDACTED]")] + + +@pytest.mark.asyncio +async def test_async_post_mcp_tool_call_hook_chains_every_callback(logging_obj): + from litellm.types.mcp import MCPPostCallResponseObject + + class ReplacingLogger(CustomLogger): + def __init__(self, old: str, new: str) -> None: + super().__init__() + self.old: Final = old + self.new: Final = new + self.seen: list[str] = [] # mutable-ok: test records what each callback observed + + async def async_post_mcp_tool_call_hook( + self, + kwargs: dict[str, object], + response_obj: MCPPostCallResponseObject, + start_time: datetime.datetime, + end_time: datetime.datetime, + ) -> MCPPostCallResponseObject: + first = response_obj.mcp_tool_call_response[0] + assert isinstance(first, TextContent) + self.seen.append(first.text) + return MCPPostCallResponseObject( + mcp_tool_call_response=[TextContent(type="text", text=first.text.replace(self.old, self.new))], + hidden_params=response_obj.hidden_params, + ) + + first_logger: Final = ReplacingLogger("SECRET", "[S]") + second_logger: Final = ReplacingLogger("1234", "[N]") + logging_obj.dynamic_success_callbacks = [first_logger, second_logger] + result = CallToolResult(content=[TextContent(type="text", text="SECRET-1234")], isError=False) + + hooked_content = await logging_obj.async_post_mcp_tool_call_hook( + kwargs=logging_obj.model_call_details, + response_obj=result, + start_time=datetime.datetime.now(), + end_time=datetime.datetime.now(), + ) + + assert first_logger.seen == ["SECRET-1234"] + assert second_logger.seen == ["[S]-1234"] + assert hooked_content.content == [TextContent(type="text", text="[S]-[N]")] + + +@pytest.mark.asyncio +@pytest.mark.parametrize("mode", ["replace", "inplace", "empty", "inplace_none", "replace_none"]) +@pytest.mark.parametrize("structured", [False, True]) +async def test_mcp_content_rewrite_never_returns_stale_structured_data(logging_obj, mode, structured): + from litellm.types.llms.base import HiddenParams + from litellm.types.mcp import MCPPostCallResponseObject + + class Redactor(CustomLogger): + async def async_post_mcp_tool_call_hook(self, kwargs, response_obj, start_time, end_time): + block = response_obj.mcp_tool_call_response[0] + assert isinstance(block, TextContent) + if mode in ("inplace", "inplace_none"): + block.text = "[REDACTED]" + return None if mode == "inplace_none" else response_obj + if mode == "replace_none": + response_obj.mcp_tool_call_response = [TextContent(type="text", text="[REDACTED]")] + return None + return MCPPostCallResponseObject( + mcp_tool_call_response=[] if mode == "empty" else [TextContent(type="text", text="[REDACTED]")], + hidden_params=HiddenParams(response_cost=0.25), + ) + + logging_obj.dynamic_success_callbacks = [Redactor()] + result = CallToolResult( + content=[TextContent(type="text", text="SECRET-1234")], + structured_content={"nested": {"secret": "SECRET-1234"}} if structured else None, + meta={"request": "trace-1"}, + ) + logging_obj.model_call_details["original_response"] = result + returned = await logging_obj.async_post_mcp_tool_call_hook( + kwargs=logging_obj.model_call_details, + response_obj=result, + start_time=datetime.datetime.now(), + end_time=datetime.datetime.now(), + ) + assert "SECRET-1234" not in result.model_dump_json(by_alias=True) + assert returned is result + assert result.content == ([] if mode == "empty" else [TextContent(type="text", text="[REDACTED]")]) + assert result.structured_content is None + assert result.is_error is structured + assert result.meta == {"request": "trace-1"} + assert logging_obj.model_call_details["original_response"] is result + + +@pytest.mark.asyncio +@pytest.mark.parametrize("mode", ["none", "cost", "direct", "block", "exception"]) +async def test_mcp_callbacks_preserve_effective_result_and_cost(logging_obj, mode): + from litellm.types.llms.base import HiddenParams + from litellm.types.mcp import MCPPostCallResponseObject + + class Callback(CustomLogger): + async def async_post_mcp_tool_call_hook(self, kwargs, response_obj, start_time, end_time): + if mode == "exception": + response_obj.mcp_tool_call_response[0].text = "discarded" + raise ValueError("non-blocking callback") + if mode in ("direct", "block"): + original = kwargs["original_response"] + original.content = [TextContent(type="text", text="safe")] + original.structured_content = {"result": "safe"} + original.is_error = mode == "block" + if mode == "none" or mode == "direct": + return None + return MCPPostCallResponseObject( + mcp_tool_call_response=response_obj.mcp_tool_call_response, + hidden_params=HiddenParams(response_cost=0.25), + ) + + logging_obj.dynamic_success_callbacks = [Callback()] + result = CallToolResult( + content=[TextContent(type="text", text="original")], structured_content={"result": "original"} + ) + logging_obj.model_call_details["original_response"] = result + returned = await logging_obj.async_post_mcp_tool_call_hook( + kwargs=logging_obj.model_call_details, + response_obj=result, + start_time=datetime.datetime.now(), + end_time=datetime.datetime.now(), + ) + expected = "safe" if mode in ("direct", "block") else "original" + assert result.content == [TextContent(type="text", text=expected)] + assert result.structured_content == {"result": expected} + assert result.is_error is (mode == "block") + assert returned is result + assert logging_obj.model_call_details.get("response_cost") == (0.25 if mode in ("cost", "block") else None) + + +@pytest.mark.asyncio +async def test_mcp_callback_cancellation_propagates_without_mutating_result(logging_obj): + class CancelledCallback(CustomLogger): + async def async_post_mcp_tool_call_hook(self, kwargs, response_obj, start_time, end_time): + response_obj.mcp_tool_call_response[0].text = "partial" + raise asyncio.CancelledError + + logging_obj.dynamic_success_callbacks = [CancelledCallback()] + result = CallToolResult(content=[TextContent(type="text", text="original")]) + with pytest.raises(asyncio.CancelledError): + await logging_obj.async_post_mcp_tool_call_hook( + kwargs={}, + response_obj=result, + start_time=datetime.datetime.now(), + end_time=datetime.datetime.now(), + ) + assert result.content == [TextContent(type="text", text="original")] + + +@pytest.mark.asyncio +@pytest.mark.parametrize("callbacks", [[], ["prometheus"]]) +@pytest.mark.parametrize("is_error", [False, True]) +async def test_mcp_without_custom_callbacks_preserves_mixed_content(logging_obj, callbacks, is_error): + logging_obj.dynamic_success_callbacks = callbacks + result = CallToolResult( + content=[ + TextContent(type="text", text="ok"), + ImageContent(type="image", data="aW1n", mime_type="image/png"), + AudioContent(type="audio", data="c291bmQ=", mime_type="audio/wav"), + ], + structured_content={"result": "ok"}, + is_error=is_error, + ) + before = result.model_dump() + returned = await logging_obj.async_post_mcp_tool_call_hook( + kwargs={}, + response_obj=result, + start_time=datetime.datetime.now(), + end_time=datetime.datetime.now(), + ) + assert returned is result + assert returned.model_dump() == before + + +@pytest.mark.asyncio +@pytest.mark.parametrize("replace_structured", [False, True]) +@pytest.mark.parametrize("same_content", [False, True]) +async def test_mcp_native_structured_replacement_must_match_returned_content( + logging_obj, replace_structured, same_content +): + from litellm.types.mcp import MCPPostCallResponseObject + + class NativeReplacement(CustomLogger): + async def async_post_mcp_tool_call_hook(self, kwargs, response_obj, start_time, end_time): + original = kwargs["original_response"] + original.content[0].text = "native-safe" + if replace_structured: + original.structured_content["result"] = "native-safe" + return MCPPostCallResponseObject( + mcp_tool_call_response=[TextContent(type="text", text="native-safe" if same_content else "final-safe")], + hidden_params=response_obj.hidden_params, + ) + + result = CallToolResult( + content=[TextContent(type="text", text="SECRET-1234")], + structured_content={"result": "SECRET-1234"}, + ) + logging_obj.dynamic_success_callbacks = [NativeReplacement()] + returned = await logging_obj.async_post_mcp_tool_call_hook( + kwargs={"original_response": result}, response_obj=result, + start_time=datetime.datetime.now(), end_time=datetime.datetime.now(), + ) + assert returned is result + assert result.content == [TextContent(type="text", text="native-safe" if same_content else "final-safe")] + assert result.structured_content == ({"result": "native-safe"} if replace_structured and same_content else None) + assert result.is_error is not (replace_structured and same_content) + assert "SECRET-1234" not in result.model_dump_json() + + + +@pytest.mark.asyncio +@pytest.mark.parametrize("mode", ["none", "wrapper", "exception"]) +@pytest.mark.parametrize("structured", [False, True]) +async def test_mcp_direct_content_edit_invalidates_stale_structured_data(logging_obj, mode, structured): + class DirectRedactor(CustomLogger): + async def async_post_mcp_tool_call_hook(self, kwargs, response_obj, start_time, end_time): + kwargs["original_response"].content[0].text = "[REDACTED]" + if mode == "exception": + raise ValueError("non-blocking callback after direct edit") + return response_obj if mode == "wrapper" else None + + result = CallToolResult( + content=[TextContent(type="text", text="SECRET-1234")], + structured_content={"result": "SECRET-1234"} if structured else None, + ) + logging_obj.dynamic_success_callbacks = [DirectRedactor()] + returned = await logging_obj.async_post_mcp_tool_call_hook( + kwargs={"original_response": result}, response_obj=result, + start_time=datetime.datetime.now(), end_time=datetime.datetime.now(), + ) + assert returned is result + assert result.content == [TextContent(type="text", text="[REDACTED]")] + assert result.structured_content is None + assert result.is_error is structured + assert "SECRET-1234" not in result.model_dump_json() + + def test_get_combined_callback_list_preserves_insertion_order(logging_obj): assert logging_obj.get_combined_callback_list( dynamic_success_callbacks=["prometheus", "langfuse", "datadog", "otel", "s3"], @@ -8124,21 +8389,6 @@ def test_get_assembled_streaming_response_bills_a_provider_reported_usage_cost() assert logging_obj._response_cost_calculator(result=assembled) == 0.0042 -def test_get_assembled_streaming_response_without_usage_cost_leaves_pricing_to_the_price_map(): - logging_obj = _responses_stream_logging_obj() - now = datetime.datetime.now() - - assembled = logging_obj._get_assembled_streaming_response( - result=_completed_responses_event(ResponseAPIUsage(input_tokens=12, output_tokens=2, total_tokens=14)), - start_time=now, - end_time=now, - is_async=True, - streaming_chunks=[], - ) - - assert "additional_headers" not in assembled._hidden_params - price_map_cost = logging_obj._response_cost_calculator(result=assembled) - assert price_map_cost is not None and 0 < price_map_cost != 0.0042 def test_response_cost_calculator_prices_terminal_responses_event_from_its_response(): diff --git a/tests/test_litellm/litellm_core_utils/test_provider_affinity.py b/tests/test_litellm/litellm_core_utils/test_provider_affinity.py new file mode 100644 index 00000000000..edf4f5169b5 --- /dev/null +++ b/tests/test_litellm/litellm_core_utils/test_provider_affinity.py @@ -0,0 +1,107 @@ +import pytest + +from litellm.constants import SESSION_ID_GENERATED_METADATA_KEY +from litellm.litellm_core_utils.provider_affinity import ( + add_provider_affinity_header, + get_stable_session_id, +) + + +@pytest.mark.parametrize( + ("litellm_params", "expected"), + [ + ({"litellm_session_id": "litellm-session"}, "litellm-session"), + ({"session_id": "direct-session"}, "direct-session"), + ({"metadata": {"session_id": "metadata-session"}}, "metadata-session"), + ({"litellm_metadata": {"session_id": "litellm-metadata-session"}}, "litellm-metadata-session"), + ], +) +def test_get_stable_session_id_uses_explicit_session_sources(litellm_params: dict, expected: str): + assert get_stable_session_id(litellm_params) == expected + + +def test_get_stable_session_id_does_not_use_trace_id(): + assert get_stable_session_id({"litellm_trace_id": "per-request-trace"}) is None + + +@pytest.mark.parametrize("metadata_key", ["metadata", "litellm_metadata"]) +def test_get_stable_session_id_ignores_proxy_generated_session(metadata_key: str): + assert ( + get_stable_session_id( + { + "litellm_session_id": "generated-session", + metadata_key: { + "session_id": "generated-session", + SESSION_ID_GENERATED_METADATA_KEY: True, + }, + } + ) + is None + ) + + +def test_get_stable_session_id_prefers_explicit_session_over_proxy_generated_session(): + assert ( + get_stable_session_id( + { + "session_id": "explicit-session", + "litellm_session_id": "generated-session", + "metadata": { + "session_id": "generated-session", + SESSION_ID_GENERATED_METADATA_KEY: True, + }, + } + ) + == "explicit-session" + ) + + +def test_add_provider_affinity_header_maps_session_id(): + headers = add_provider_affinity_header( + headers={"Content-Type": "application/json"}, + litellm_params={ + "litellm_session_id": "session-123", + "provider_affinity_header": "X-Conversation-Id", + }, + ) + + assert headers == { + "Content-Type": "application/json", + "X-Conversation-Id": "session-123", + } + + +def test_add_provider_affinity_header_preserves_explicit_header_case_insensitively(): + headers = add_provider_affinity_header( + headers={"x-conversation-id": "explicit-session"}, + litellm_params={ + "litellm_session_id": "session-123", + "provider_affinity_header": "X-Conversation-Id", + }, + ) + + assert headers == {"x-conversation-id": "explicit-session"} + + +@pytest.mark.parametrize("session_id", ["session\r", "session\n", "session\0"]) +def test_add_provider_affinity_header_rejects_control_characters(session_id: str): + with pytest.raises(ValueError, match="session_id cannot contain HTTP header control characters"): + add_provider_affinity_header( + headers={}, + litellm_params={ + "litellm_session_id": session_id, + "provider_affinity_header": "X-Conversation-Id", + }, + ) + + +def test_add_provider_affinity_header_does_nothing_without_config_or_session(): + assert add_provider_affinity_header({}, {"litellm_session_id": "session-123"}) == {} + assert ( + add_provider_affinity_header( + {}, + {"provider_affinity_header": "X-Conversation-Id"}, + ) + == {} + ) + diff --git a/tests/test_litellm/litellm_core_utils/test_realtime_errors.py b/tests/test_litellm/litellm_core_utils/test_realtime_errors.py index 1d2cf905f4e..999c660c286 100644 --- a/tests/test_litellm/litellm_core_utils/test_realtime_errors.py +++ b/tests/test_litellm/litellm_core_utils/test_realtime_errors.py @@ -1,13 +1,17 @@ import json +from typing import cast import pytest from litellm.litellm_core_utils.realtime_errors import ( WEBSOCKET_CLOSE_REASON_MAX_BYTES, client_close_code, + close_after_upstream_handshake_refusal, realtime_error_event, + upstream_handshake_close_code, websocket_close_reason, ) +from litellm.types.realtime import RealtimeErrorEvent def test_realtime_error_event_shape(): @@ -52,3 +56,52 @@ def test_websocket_close_reason_truncates_multibyte_message_by_bytes(): ) def test_client_close_code_only_forwards_codes_a_server_may_send(upstream_code, expected): assert client_close_code(upstream_code) == expected + + +@pytest.mark.parametrize( + ("status_code", "expected"), + [(401, 1008), (403, 1008), (429, 1013), (500, 1011)], +) +def test_upstream_handshake_close_code_maps_http_status_to_close_code(status_code: int, expected: int): + assert upstream_handshake_close_code(status_code) == expected + + +class _RecordingWebSocket: + def __init__(self) -> None: + self.sent: list[str] = [] + self.closed: tuple[int, str | None] | None = None + + async def send_text(self, data: str) -> None: + self.sent.append(data) + + async def close(self, code: int = 1000, reason: str | None = None) -> None: + self.closed = (code, reason) + + +@pytest.mark.asyncio +async def test_close_after_upstream_handshake_refusal_sends_error_event_then_policy_close(): + websocket = _RecordingWebSocket() + + await close_after_upstream_handshake_refusal(websocket, 401) + + assert len(websocket.sent) == 1 + event = cast(RealtimeErrorEvent, json.loads(websocket.sent[0])) + assert event["type"] == "error" + assert event["error"]["type"] == "server_error" + assert "401" in event["error"]["message"] + assert websocket.closed is not None + assert websocket.closed[0] == 1008 + assert websocket.closed[1] + + +@pytest.mark.asyncio +async def test_close_after_upstream_handshake_refusal_still_closes_when_send_fails(): + class _DeadWebSocket(_RecordingWebSocket): + async def send_text(self, data: str) -> None: + raise RuntimeError("socket gone") + + websocket = _DeadWebSocket() + + await close_after_upstream_handshake_refusal(websocket, 500) + + assert websocket.closed == (1011, "Upstream realtime handshake rejected with HTTP 500") diff --git a/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_server_tool_use.py b/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_server_tool_use.py index 75508917a1e..e8a7ef74bfa 100644 --- a/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_server_tool_use.py +++ b/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_server_tool_use.py @@ -99,29 +99,3 @@ def test_stream_chunk_builder_coerces_server_tool_use_to_pydantic(): assert server_tool_use.web_search_requests == 3 -def test_completion_cost_does_not_raise_on_streaming_web_search_response(): - """ - Regression: completion_cost(...) must not raise AttributeError when the - response was reconstructed by stream_chunk_builder from a streaming - Anthropic web_search call. - """ - chunks = [ - _make_text_chunk("hello"), - _make_finish_chunk_with_usage_dict_server_tool_use(), - ] - - rebuilt = stream_chunk_builder(chunks) - assert rebuilt is not None - - # The exact dollar amount depends on the model-pricing table; what matters - # for this regression is that it does NOT raise AttributeError on - # `dict has no attribute 'web_search_requests'`. - try: - cost = completion_cost(completion_response=rebuilt) - except AttributeError as e: # pragma: no cover - regression guard - pytest.fail( - "completion_cost raised AttributeError after stream_chunk_builder " - f"(issue #26153 regression): {e}" - ) - - assert isinstance(cost, (int, float)) diff --git a/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py b/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py index 5d75c6699cf..af763da2d87 100644 --- a/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py +++ b/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py @@ -1,5 +1,6 @@ from collections.abc import Mapping, Sequence from typing import Final +from unittest.mock import MagicMock import pytest @@ -7,6 +8,7 @@ import pytest from litellm import ChatCompletionUsageBlock, stream_chunk_builder from litellm.types.utils import GenericStreamingChunk from litellm.litellm_core_utils.streaming_chunk_builder_utils import ChunkProcessor +from litellm.llms.anthropic.chat.handler import ModelResponseIterator from litellm.types.utils import ( ChatCompletionDeltaToolCall, ChatCompletionMessageToolCall, @@ -1650,6 +1652,71 @@ def test_calculate_usage_falls_back_to_prompt_counter_when_mock_stream_has_no_ad assert usage.prompt_tokens == 77 +@pytest.mark.parametrize( + ("message_delta_usage", "expected_cache_creation", "expected_cache_read"), + [ + ( + { + "input_tokens": 2, + "cache_creation_input_tokens": 0, + "cache_read_input_tokens": 58352, + "output_tokens": 408, + }, + 0, + 58352, + ), + ({"output_tokens": 408}, 58352, 0), + ({"input_tokens": 2, "output_tokens": 408}, 58352, 0), + ], + ids=["delta_restates_cache_counts", "delta_reports_output_only", "delta_reports_input_and_output_only"], +) +def test_anthropic_stream_usage_takes_cache_counts_from_last_event_that_reports_them( + message_delta_usage: Mapping[str, int], expected_cache_creation: int, expected_cache_read: int +) -> None: + iterator: Final = ModelResponseIterator(streaming_response=MagicMock(), sync_stream=True, json_mode=False) + events: Final = ( + { + "type": "message_start", + "message": { + "id": "msg_1", + "type": "message", + "role": "assistant", + "model": "claude-sonnet-4-5", + "content": [], + "stop_reason": None, + "usage": { + "input_tokens": 2, + "cache_creation_input_tokens": 58352, + "cache_read_input_tokens": 0, + "output_tokens": 1, + }, + }, + }, + {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}}, + {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "hi"}}, + {"type": "content_block_stop", "index": 0}, + {"type": "message_delta", "delta": {"stop_reason": "end_turn"}, "usage": dict(message_delta_usage)}, + {"type": "message_stop"}, + ) + + response: Final = stream_chunk_builder( + chunks=[iterator.chunk_parser(event) for event in events], + messages=[{"role": "user", "content": "hi"}], + ) + + assert response.usage.cache_creation_input_tokens == expected_cache_creation + assert response.usage.cache_read_input_tokens == expected_cache_read + assert response.usage.prompt_tokens == 58354 + assert response.usage.prompt_tokens_details.cache_creation_tokens == expected_cache_creation + assert response.usage.prompt_tokens_details.cached_tokens == expected_cache_read + assert ( + response.usage.prompt_tokens + - response.usage.cache_read_input_tokens + - response.usage.cache_creation_input_tokens + == 2 + ) + + _ZERO_USAGE_TEXT_CHUNKS: Final = ( _openai_chunk(choices=[{"index": 0, "delta": {"role": "assistant", "content": "Hi"}, "finish_reason": None}]), _openai_chunk(choices=[{"index": 0, "delta": {"content": " there"}, "finish_reason": None}]), diff --git a/tests/test_litellm/litellm_core_utils/test_token_counter.py b/tests/test_litellm/litellm_core_utils/test_token_counter.py index 5ce6a4b1ce9..eccf44a1bda 100644 --- a/tests/test_litellm/litellm_core_utils/test_token_counter.py +++ b/tests/test_litellm/litellm_core_utils/test_token_counter.py @@ -633,9 +633,6 @@ def test_openai_token_with_image_and_text(): "model, base_model, input_tokens, user_max_tokens, expected_value", [ ("random-model", "random-model", 1024, 1024, 1024), - ("command", "command", 1000000, None, None), # model max = 4096 - ("command", "command", 4000, 256, 96), # model max = 4096 - ("command", "command", 4000, 10, 10), # model max = 4096 ("gpt-3.5-turbo", "gpt-3.5-turbo", 4000, 5000, 4096), # model max output = 4096 ], ) diff --git a/tests/test_litellm/llms/anthropic/test_anthropic_common_utils.py b/tests/test_litellm/llms/anthropic/test_anthropic_common_utils.py index 945033c5cac..1a21b6d4394 100644 --- a/tests/test_litellm/llms/anthropic/test_anthropic_common_utils.py +++ b/tests/test_litellm/llms/anthropic/test_anthropic_common_utils.py @@ -14,6 +14,7 @@ import json import os import sys from types import SimpleNamespace +from typing import Final from unittest.mock import patch import pytest @@ -2275,3 +2276,72 @@ def test_create_anthropic_model_list_response_lists_ids_as_told(): assert (gpt["id"], gpt["display_name"], gpt["max_input_tokens"]) == ("claude-router-gpt-4o[1m]", "GPT 4o", 1000000) assert (haiku["id"], haiku["display_name"]) == ("claude-haiku-4-5", "claude-haiku-4-5") assert (response["first_id"], response["last_id"]) == ("claude-router-gpt-4o[1m]", "claude-haiku-4-5") + + +class TestMalformedContentListItems: + @pytest.mark.parametrize( + "content", + [ + pytest.param(["what type of file is this?"], id="string_containing_type"), + pytest.param(["how do I set cache_control?"], id="string_containing_cache_control"), + pytest.param([None], id="none_item"), + pytest.param([5], id="int_item"), + pytest.param([["nested"]], id="list_item"), + ], + ) + def test_beta_headers_resolve_for_non_dict_content_items(self, content: list[object]) -> None: + from litellm.llms.anthropic.common_utils import AnthropicModelInfo + + config: Final = AnthropicModelInfo() + messages: Final = [{"role": "user", "content": content}] + + headers: Final = config.validate_environment( + headers={}, + model="claude-sonnet-4-5", + messages=messages, + optional_params={}, + litellm_params={}, + api_key=FAKE_REGULAR_KEY, + ) + + assert headers["x-api-key"] == FAKE_REGULAR_KEY + assert config.is_cache_control_set(messages) is False + assert config.is_pdf_used(messages) is False + + def test_real_content_parts_still_set_their_beta_headers(self) -> None: + from litellm.llms.anthropic.common_utils import AnthropicModelInfo + + config: Final = AnthropicModelInfo() + + assert config.is_pdf_used([{"role": "user", "content": [{"type": "image", "source": {}}]}]) is True + assert config.is_pdf_used([{"role": "user", "content": [{"type": "text", "text": "hi"}]}]) is False + assert ( + config.is_cache_control_set( + [ + { + "role": "user", + "content": [{"type": "text", "text": "hi", "cache_control": {"type": "ephemeral"}}], + } + ] + ) + is True + ) + + def test_mixed_list_keeps_detecting_the_valid_part(self) -> None: + from litellm.llms.anthropic.common_utils import AnthropicModelInfo + + config: Final = AnthropicModelInfo() + messages: Final = [{"role": "user", "content": ["what type of file is this?", {"type": "image", "source": {}}]}] + + assert config.is_pdf_used(messages) is True + + def test_litellm_completion_rejects_bare_string_content_item_as_bad_request(self) -> None: + import litellm + + with pytest.raises(litellm.BadRequestError): + litellm.completion( + model="anthropic/claude-haiku-4-5-20251001", + messages=[{"role": "user", "content": ["what type of file is this?"]}], + api_key=FAKE_REGULAR_KEY, + max_tokens=5, + ) diff --git a/tests/test_litellm/llms/azure/realtime/__init__.py b/tests/test_litellm/llms/azure/realtime/__init__.py new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/test_litellm/llms/azure/realtime/__init__.py @@ -0,0 +1 @@ + diff --git a/tests/test_litellm/llms/azure/realtime/test_handler.py b/tests/test_litellm/llms/azure/realtime/test_handler.py new file mode 100644 index 00000000000..e9d24b459d8 --- /dev/null +++ b/tests/test_litellm/llms/azure/realtime/test_handler.py @@ -0,0 +1,86 @@ +import json +from typing import cast +from unittest.mock import MagicMock, patch + +import pytest + + +class _RecordingClientWebSocket: + scope: dict[str, list[tuple[bytes, bytes]]] = {"headers": []} + + def __init__(self) -> None: + self.sent: list[str] = [] + self.closed: list[tuple[int, str | None]] = [] + + async def send_text(self, data: str) -> None: + self.sent.append(data) + + async def close(self, code: int = 1000, reason: str | None = None) -> None: + self.closed.append((code, reason)) + + +@pytest.mark.asyncio +async def test_async_realtime_upstream_handshake_refusal_sends_error_event_then_policy_close(): + from websockets.datastructures import Headers + from websockets.exceptions import InvalidStatus + from websockets.http11 import Response + + from litellm.llms.azure.realtime.handler import AzureOpenAIRealtime + from litellm.types.realtime import RealtimeErrorEvent + + handler = AzureOpenAIRealtime() + model = "gpt-realtime" + + dummy_websocket = _RecordingClientWebSocket() + dummy_logging_obj = MagicMock() + + refused = InvalidStatus(Response(401, "Unauthorized", Headers())) + + with patch("websockets.connect", side_effect=refused): + await handler.async_realtime( # pyright: ignore[reportUnknownMemberType] # handler's websocket param is a Protocol here but the mock connect type is incomplete + model=model, + websocket=dummy_websocket, + logging_obj=dummy_logging_obj, + api_base="https://example.openai.azure.com", + api_key="bad-key", + api_version="2025-08-28", + query_params={"model": model}, + ) + + assert len(dummy_websocket.sent) == 1 + event = cast(RealtimeErrorEvent, json.loads(dummy_websocket.sent[0])) + assert event["type"] == "error" + assert event["error"]["type"] == "server_error" + assert "401" in event["error"]["message"] + assert dummy_websocket.closed and dummy_websocket.closed[0][0] == 1008 + + +@pytest.mark.asyncio +async def test_async_realtime_unexpected_error_sends_error_event_then_internal_close(): + from litellm.llms.azure.realtime.handler import AzureOpenAIRealtime + from litellm.types.realtime import RealtimeErrorEvent + + handler = AzureOpenAIRealtime() + model = "gpt-realtime" + + dummy_websocket = _RecordingClientWebSocket() + dummy_logging_obj = MagicMock() + + with patch("websockets.connect", side_effect=OSError("connection reset")): + await handler.async_realtime( # pyright: ignore[reportUnknownMemberType] # same as above + model=model, + websocket=dummy_websocket, + logging_obj=dummy_logging_obj, + api_base="https://example.openai.azure.com", + api_key="bad-key", + api_version="2025-08-28", + query_params={"model": model}, + ) + + assert len(dummy_websocket.sent) == 1 + event = cast(RealtimeErrorEvent, json.loads(dummy_websocket.sent[0])) + assert event["type"] == "error" + assert event["error"]["type"] == "server_error" + assert event["error"]["message"] == "Internal server error" + assert "connection reset" not in dummy_websocket.sent[0] + assert dummy_websocket.closed and dummy_websocket.closed[0] == (1011, "Internal server error") diff --git a/tests/test_litellm/llms/azure_ai/image_generation/test_azure_ai_flux2_image_generation.py b/tests/test_litellm/llms/azure_ai/image_generation/test_azure_ai_flux2_image_generation.py index 512e98b4151..fdd21c87732 100644 --- a/tests/test_litellm/llms/azure_ai/image_generation/test_azure_ai_flux2_image_generation.py +++ b/tests/test_litellm/llms/azure_ai/image_generation/test_azure_ai_flux2_image_generation.py @@ -205,6 +205,36 @@ def test_flux2_flex_cost_accepts_lowercase_model_spelling(): assert cost == pytest.approx(5e-08 * 1536 * 1024 * 2) +def test_flux2_flex_cost_prefers_deployment_input_cost_per_pixel() -> None: + response: Final = ImageResponse(data=[ImageObject(b64_json="aW1n"), ImageObject(b64_json="aW1n")]) + + cost: Final = CostCalculatorUtils.route_image_generation_cost_calculator( + model="FLUX.2-flex", + completion_response=response, + custom_llm_provider="azure_ai", + size="2048x1024", + call_type="image_generation", + model_info={"input_cost_per_pixel": 2e-07}, + ) + + assert cost == pytest.approx(2e-07 * 2048 * 1024 * 2) + + +def test_unlisted_azure_ai_model_bills_deployment_input_cost_per_pixel() -> None: + response: Final = ImageResponse(data=[ImageObject(b64_json="aW1n"), ImageObject(b64_json="aW1n")]) + + cost: Final = CostCalculatorUtils.route_image_generation_cost_calculator( + model="unlisted-flux-deployment", + completion_response=response, + custom_llm_provider="azure_ai", + size="1024x1024", + call_type="image_generation", + model_info={"input_cost_per_pixel": 1e-07}, + ) + + assert cost == pytest.approx(1e-07 * 1024 * 1024 * 2) + + def test_flux2_response_preserves_mapped_dimensions(): config = AzureFoundryFluxImageGenerationConfig() params = config.map_openai_params( diff --git a/tests/test_litellm/llms/bedrock/batches/test_transformation.py b/tests/test_litellm/llms/bedrock/batches/test_transformation.py index eb08c19cbdf..347c459a369 100644 --- a/tests/test_litellm/llms/bedrock/batches/test_transformation.py +++ b/tests/test_litellm/llms/bedrock/batches/test_transformation.py @@ -19,9 +19,8 @@ from unittest.mock import MagicMock, patch import httpx import pytest - from litellm.llms.bedrock.batches.transformation import BedrockBatchesConfig -from litellm.types.utils import LiteLLMBatch, LlmProviders +from litellm.types.utils import LlmProviders # AWS JobStatus -> OpenAI BatchJobStatus, exactly as encoded in transformation.py # (both transform_create_batch_response and transform_retrieve_batch_response). @@ -270,6 +269,44 @@ def test_create_request_keeps_kms_key_alongside_s3_bucket_owner(config, monkeypa } +def test_create_request_omits_kms_key_when_env_var_is_blank(config, monkeypatch): + monkeypatch.setenv("AWS_S3_ENCRYPTION_KEY_ID", "") + monkeypatch.delenv("AWS_S3_BUCKET_OWNER", raising=False) + + bedrock_request = _signed_batch_request(config, {}, {}) + + assert bedrock_request["outputDataConfig"] == { + "s3OutputDataConfig": {"s3Uri": "s3://in-bucket/litellm-batch-outputs/litellm-batch-1/"} + } + + +def test_create_request_omits_s3_bucket_owner_when_env_var_is_blank(config, monkeypatch): + monkeypatch.setenv("AWS_S3_BUCKET_OWNER", "") + monkeypatch.delenv("AWS_S3_ENCRYPTION_KEY_ID", raising=False) + + bedrock_request = _signed_batch_request(config, {}, {}) + + assert bedrock_request["inputDataConfig"] == {"s3InputDataConfig": {"s3Uri": "s3://in-bucket/in.jsonl"}} + assert bedrock_request["outputDataConfig"] == { + "s3OutputDataConfig": {"s3Uri": "s3://in-bucket/litellm-batch-outputs/litellm-batch-1/"} + } + + +def test_create_request_emits_real_values_alongside_blank_sibling_env_var(config, monkeypatch): + monkeypatch.setenv("AWS_S3_ENCRYPTION_KEY_ID", "kms-key-123") + monkeypatch.setenv("AWS_S3_BUCKET_OWNER", "") + + bedrock_request = _signed_batch_request(config, {}, {}) + + assert bedrock_request["inputDataConfig"] == {"s3InputDataConfig": {"s3Uri": "s3://in-bucket/in.jsonl"}} + assert bedrock_request["outputDataConfig"] == { + "s3OutputDataConfig": { + "s3Uri": "s3://in-bucket/litellm-batch-outputs/litellm-batch-1/", + "s3EncryptionKeyId": "kms-key-123", + } + } + + def test_create_request_missing_input_file_id_raises(config): with pytest.raises(ValueError, match="input_file_id is required"): config.transform_create_batch_request( diff --git a/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py b/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py index db5da28c024..ad77f9d4d1b 100644 --- a/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py +++ b/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py @@ -1,12 +1,11 @@ import json import os +from typing import Final +from unittest.mock import MagicMock, patch import httpx import pytest -from typing import Final -from unittest.mock import MagicMock, patch - import litellm from litellm import ModelResponse from litellm.llms.bedrock.chat.converse_transformation import AmazonConverseConfig @@ -802,13 +801,13 @@ def test_output_config_format_translated_to_native_output_config_converse(): } result = config._transform_request( - model="bedrock/converse/us.anthropic.claude-opus-4-7", + model="bedrock/converse/us.anthropic.claude-sonnet-4-6", messages=[{"role": "user", "content": "hi"}], optional_params={ "maxTokens": 256, "thinking": {"type": "adaptive"}, "output_config": { - "effort": "xhigh", + "effort": "max", "format": {"type": "json_schema", "schema": schema}, }, }, @@ -817,7 +816,7 @@ def test_output_config_format_translated_to_native_output_config_converse(): ) additional = result.get("additionalModelRequestFields", {}) - assert additional.get("output_config") == {"effort": "xhigh"} + assert additional.get("output_config") == {"effort": "max"} assert "format" not in additional["output_config"] assert result["outputConfig"]["textFormat"]["type"] == "json_schema" parsed_schema = json.loads( @@ -4292,6 +4291,84 @@ def test_translate_response_format_native_output_config(monkeypatch): monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", old_env) +BEDROCK_OPUS_4_7_AND_4_8_MODELS: Final = ( + "anthropic.claude-opus-4-7", + "global.anthropic.claude-opus-4-7", + "us.anthropic.claude-opus-4-7", + "eu.anthropic.claude-opus-4-7", + "au.anthropic.claude-opus-4-7", + "jp.anthropic.claude-opus-4-7", + "anthropic.claude-opus-4-8", + "global.anthropic.claude-opus-4-8", + "us.anthropic.claude-opus-4-8", + "eu.anthropic.claude-opus-4-8", + "au.anthropic.claude-opus-4-8", + "jp.anthropic.claude-opus-4-8", + "us-gov.anthropic.claude-opus-4-8", + "us-gov-west-1/anthropic.claude-opus-4-8", + "us-gov-east-1/anthropic.claude-opus-4-8", +) + +CAPITAL_RESPONSE_FORMAT: Final = { + "type": "json_schema", + "json_schema": { + "name": "capital", + "schema": { + "type": "object", + "properties": {"city": {"type": "string"}, "country": {"type": "string"}}, + "required": ["city", "country"], + "additionalProperties": False, + }, + }, +} + + +def _converse_request_for_json_schema(model: str, stream: bool) -> tuple[dict, dict]: + config = AmazonConverseConfig() + optional_params = config.map_openai_params( + non_default_params={"response_format": CAPITAL_RESPONSE_FORMAT, "stream": stream}, + optional_params={}, + model=model, + drop_params=False, + ) + request = config._transform_request( + model=model, + messages=[{"role": "user", "content": "Name the capital of France."}], + optional_params=optional_params, + litellm_params={}, + headers={}, + ) + return optional_params, request + + +@pytest.mark.parametrize("model", BEDROCK_OPUS_4_7_AND_4_8_MODELS) +@pytest.mark.parametrize("stream", [False, True]) +def test_opus_4_7_and_4_8_json_schema_sent_as_forced_tool_not_output_config(monkeypatch, model, stream): + """Regression for issue #27846: Bedrock rejects outputConfig on Opus 4.7 and 4.8 + (``output_config.format: Extra inputs are not permitted``), so json_schema has to + go out as the forced json_tool_call tool, streamed through fake_stream.""" + monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") + monkeypatch.setattr(litellm, "model_cost", litellm.get_model_cost_map(url="")) + + optional_params, request = _converse_request_for_json_schema(model=model, stream=stream) + + assert "outputConfig" not in request + assert [tool["toolSpec"]["name"] for tool in request["toolConfig"]["tools"]] == ["json_tool_call"] + assert request["toolConfig"]["toolChoice"] == {"tool": {"name": "json_tool_call"}} + assert optional_params.get("fake_stream", False) is stream + + +def test_sonnet_4_6_json_schema_still_uses_native_output_config(monkeypatch): + monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") + monkeypatch.setattr(litellm, "model_cost", litellm.get_model_cost_map(url="")) + + optional_params, request = _converse_request_for_json_schema(model="us.anthropic.claude-sonnet-4-6", stream=True) + + assert request["outputConfig"]["textFormat"]["structure"]["jsonSchema"]["name"] == "capital" + assert "toolConfig" not in request + assert "fake_stream" not in optional_params + + def test_translate_response_format_fallback_tool_call(): """For unsupported models, should fall back to tool-call approach.""" config = AmazonConverseConfig() @@ -5417,9 +5494,14 @@ def test_cache_control_injection_tool_config_honors_ttl_for_regional_model_lacki old_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP") old_cost = litellm.model_cost monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") + cost_map = dict(litellm.get_model_cost_map(url="")) + cost_map["jp.anthropic.claude-opus-4-7"] = { + k: v + for k, v in cost_map["jp.anthropic.claude-opus-4-7"].items() + if k != "cache_creation_input_token_cost_above_1hr" + } + litellm.model_cost = cost_map try: - assert "cache_creation_input_token_cost_above_1hr" not in litellm.model_cost["jp.anthropic.claude-opus-4-7"] assert "cache_creation_input_token_cost_above_1hr" in litellm.model_cost["anthropic.claude-opus-4-7"] config = AmazonConverseConfig() messages = [ @@ -5580,43 +5662,6 @@ def test_tool_config_cachepoint_not_placed_or_credited_for_model_without_prompt_ assert "litellm_gateway_injected_cache" not in bucket -def test_translate_response_format_json_schema_still_injects_tool(): - """ - response_format with an explicit json_schema should still use the - synthetic tool call approach (for models that don't support native - structured outputs). - """ - config = AmazonConverseConfig() - - response_format = { - "type": "json_schema", - "json_schema": { - "name": "FactResult", - "schema": { - "type": "object", - "properties": { - "facts": { - "type": "array", - "items": {"type": "string"}, - }, - }, - "required": ["facts"], - }, - }, - } - - optional_params: dict = {} - result = config._translate_response_format_param( - value=response_format, - model="anthropic.claude-3-haiku-20240307-v1:0", - optional_params=optional_params, - non_default_params={"response_format": response_format}, - is_thinking_enabled=False, - ) - - assert result["json_mode"] is True - assert "tools" in result - assert "tool_choice" in result def test_transform_response_finish_reason_stop_when_json_mode_filters_all_tools(): @@ -7537,3 +7582,92 @@ def test_eager_input_streaming_non_boolean_is_a_bad_request(): "us.anthropic.claude-sonnet-4-5-20250929-v1:0", [_eager_openai_tool(eager_input_streaming="true")], ) + + +@pytest.mark.parametrize("model", ("anthropic.claude-opus-4-7", "us.anthropic.claude-opus-4-7")) +def test_converse_accepts_anthropic_default_temperature(model: str) -> None: + result: Final = litellm.utils.get_optional_params( + model=model, + custom_llm_provider="bedrock", + temperature=1, + drop_params=False, + ) + + assert result["temperature"] == 1 + + +def test_get_supported_openai_params_drops_sampling_params_for_gpt5_models(): + config = AmazonConverseConfig() + for model in [ + "bedrock/converse/global.openai.gpt-5.6-luna", + "global.openai.gpt-5.6-luna", + "global.openai.gpt-5.6-sol", + "us.openai.gpt-5.6-terra", + "eu.openai.gpt-5.6-luna", + "openai.gpt-5.6-luna", + "bedrock/openai.gpt-5.6-luna", + ]: + supported = config.get_supported_openai_params(model=model) + assert "temperature" not in supported + assert "top_p" not in supported + + supported_oss = config.get_supported_openai_params(model="openai.gpt-oss-120b-1:0") + assert "temperature" in supported_oss + assert "top_p" in supported_oss + + +def test_map_openai_params_drops_temperature_and_top_p_when_drop_params_true(): + config = AmazonConverseConfig() + for model in [ + "bedrock/converse/global.openai.gpt-5.6-luna", + "openai.gpt-5.6-luna", + "eu.openai.gpt-5.6-luna", + ]: + result = config.map_openai_params( + non_default_params={"temperature": 1.0, "top_p": 0.9, "max_tokens": 50}, + optional_params={}, + model=model, + drop_params=True, + ) + assert "temperature" not in result + assert "topP" not in result + assert result.get("maxTokens") == 50 + + +def test_map_openai_params_raises_unsupported_params_when_drop_params_false(monkeypatch): + monkeypatch.setattr(litellm, "drop_params", False) + config = AmazonConverseConfig() + for model in [ + "bedrock/converse/global.openai.gpt-5.6-luna", + "openai.gpt-5.6-luna", + ]: + with pytest.raises(litellm.utils.UnsupportedParamsError) as exc_info: + config.map_openai_params( + non_default_params={"temperature": 1.0}, + optional_params={}, + model=model, + drop_params=False, + ) + assert "does not support temperature=1.0" in str(exc_info.value) + + +def test_map_openai_params_retains_sampling_params_for_supported_models(): + config = AmazonConverseConfig() + result = config.map_openai_params( + non_default_params={"temperature": 0.7, "top_p": 0.8}, + optional_params={}, + model="openai.gpt-oss-120b-1:0", + drop_params=False, + ) + assert result.get("temperature") == 0.7 + assert result.get("topP") == 0.8 + + +def test_supports_sampling_params_prefixed_and_anthropic_fallback(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setitem( + litellm.model_cost, + "global.custom-test-reasoning-model", + {"supports_sampling_params": False}, + ) + assert AmazonConverseConfig._supports_sampling_params("custom-test-reasoning-model") is False + assert AmazonConverseConfig._supports_sampling_params("anthropic.claude-custom-unregistered") is True diff --git a/tests/test_litellm/llms/bedrock/chat/test_invoke_handler.py b/tests/test_litellm/llms/bedrock/chat/test_invoke_handler.py index c3f8c2ba903..466e9b4fda8 100644 --- a/tests/test_litellm/llms/bedrock/chat/test_invoke_handler.py +++ b/tests/test_litellm/llms/bedrock/chat/test_invoke_handler.py @@ -1,4 +1,10 @@ +import base64 +import binascii import datetime +import json +import struct +from collections.abc import AsyncIterator, Mapping, Sequence +from typing import Final from unittest.mock import AsyncMock, MagicMock import httpx @@ -13,6 +19,7 @@ from litellm.llms.bedrock.chat.invoke_handler import ( make_sync_call, ) from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler +from litellm.types.utils import ModelResponseStream def test_transform_thinking_blocks_with_redacted_content(): @@ -704,3 +711,91 @@ async def test_async_invoke_streaming_non_200_forwards_bedrock_response_headers( ) assert exc_info.value.response.headers["x-amzn-requestid"] == "req-non200-async" + + +def _bedrock_event_stream_frame(chunk: Mapping[str, object]) -> bytes: + def header(name: str, value: str) -> bytes: + return bytes([len(name)]) + name.encode() + bytes([7]) + struct.pack(">H", len(value)) + value.encode() + + headers: Final = header(":event-type", "chunk") + header(":content-type", "application/json") + header( + ":message-type", "event" + ) + payload: Final = json.dumps({"bytes": base64.b64encode(json.dumps(chunk).encode()).decode()}).encode() + prelude: Final = struct.pack(">II", 12 + len(headers) + len(payload) + 4, len(headers)) + body: Final = prelude + struct.pack(">I", binascii.crc32(prelude)) + headers + payload + return body + struct.pack(">I", binascii.crc32(body)) + + +def _openai_stream_chunk(delta: Mapping[str, str], finish_reason: str | None = None) -> Mapping[str, object]: + return { + "id": "chatcmpl-1", + "object": "chat.completion.chunk", + "created": 1, + "model": "moonshot.kimi-k2-thinking", + "choices": [{"index": 0, "delta": delta, "finish_reason": finish_reason}], + } + + +_MOONSHOT_RAW_STREAM: Final = b"".join( + _bedrock_event_stream_frame(chunk) + for chunk in ( + _openai_stream_chunk({"role": "assistant", "reasoning_content": "thinking"}), + _openai_stream_chunk({"content": '{"city": '}), + _openai_stream_chunk({"content": '"San Francisco"}'}), + _openai_stream_chunk({}, "stop"), + ) +) + + +def _assert_moonshot_stream_content(chunks: Sequence[ModelResponseStream]) -> None: + assert "".join(chunk.choices[0].delta.content or "" for chunk in chunks) == '{"city": "San Francisco"}' + assert "".join(getattr(chunk.choices[0].delta, "reasoning_content", None) or "" for chunk in chunks) == "thinking" + assert [chunk.choices[0].finish_reason for chunk in chunks if chunk.choices[0].finish_reason] == ["stop"] + + +@pytest.fixture +def _aws_test_credentials(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setenv("AWS_ACCESS_KEY_ID", "AKIATEST") + monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "test-secret") + monkeypatch.setenv("AWS_REGION_NAME", "us-east-1") + + +@pytest.mark.parametrize("response_format", [None, {"type": "json_object"}]) +def test_moonshot_invoke_stream_yields_openai_shaped_chunks( + _aws_test_credentials: None, response_format: Mapping[str, str] | None +) -> None: + raw_stream: Final = _MOONSHOT_RAW_STREAM + response: Final = MagicMock(status_code=200, headers={}) + response.iter_bytes = lambda chunk_size=None: iter([raw_stream]) + client: Final = HTTPHandler() + client.post = MagicMock(return_value=response) + + stream: Final = litellm.completion( + model="bedrock/invoke/moonshot.kimi-k2-thinking", + messages=[{"role": "user", "content": "weather as json"}], + stream=True, + client=client, + **({"response_format": response_format} if response_format else {}), + ) + _assert_moonshot_stream_content(list(stream)) + + +@pytest.mark.asyncio +async def test_moonshot_invoke_async_stream_yields_openai_shaped_chunks(_aws_test_credentials: None) -> None: + async def _aiter_bytes(chunk_size: int | None = None) -> AsyncIterator[bytes]: + yield _MOONSHOT_RAW_STREAM + + response: Final = MagicMock(status_code=200, headers={}) + response.aiter_bytes = _aiter_bytes + client: Final = AsyncHTTPHandler() + client.post = AsyncMock(return_value=response) + + stream: Final = await litellm.acompletion( + model="bedrock/invoke/moonshot.kimi-k2-thinking", + messages=[{"role": "user", "content": "weather as json"}], + stream=True, + response_format={"type": "json_object"}, + client=client, + ) + + _assert_moonshot_stream_content([chunk async for chunk in stream]) diff --git a/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py b/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py index ea8b722b849..f4d51d975bb 100644 --- a/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py +++ b/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py @@ -1,12 +1,17 @@ import asyncio +import base64 import copy import json import os +import struct +import zlib from datetime import datetime from types import SimpleNamespace +from collections.abc import AsyncIterator, Mapping, Sequence from typing import Final from unittest.mock import Mock +import httpx import pytest # Ensure the project root is on the import path so `litellm` can be imported when @@ -3395,3 +3400,97 @@ def test_bedrock_invoke_eager_input_streaming_beta_not_duplicated_with_client_he ) assert result["anthropic_beta"] == [FINE_GRAINED_TOOL_STREAMING_BETA] + + +def _bedrock_event_frame(payload: Mapping[str, object]) -> bytes: + def _header(name: str, value: str) -> bytes: + return ( + bytes([len(name)]) + + name.encode() + + bytes([7]) + + struct.pack(">H", len(value)) + + value.encode() + ) + + headers: Final = ( + _header(":message-type", "event") + + _header(":event-type", "chunk") + + _header(":content-type", "application/json") + ) + body: Final = json.dumps( + {"bytes": base64.b64encode(json.dumps(payload).encode()).decode()} + ).encode() + prelude: Final = struct.pack(">II", 12 + len(headers) + len(body) + 4, len(headers)) + prelude_crc: Final = struct.pack(">I", zlib.crc32(prelude)) + message_crc: Final = struct.pack(">I", zlib.crc32(prelude + prelude_crc + headers + body)) + return prelude + prelude_crc + headers + body + message_crc + + +class _GatedAsyncByteStream(httpx.AsyncByteStream): + def __init__(self, chunks: Sequence[bytes], gate: asyncio.Event) -> None: + self._chunks = chunks + self._gate = gate + + async def __aiter__(self) -> AsyncIterator[bytes]: + yield self._chunks[0] + await self._gate.wait() + for chunk in self._chunks[1:]: + yield chunk + + async def aclose(self) -> None: + return None + + +@pytest.mark.asyncio +async def test_get_async_streaming_response_iterator_yields_small_frame_before_upstream_pauses(): + gate: Final = asyncio.Event() + response: Final = httpx.Response( + 200, + stream=_GatedAsyncByteStream( + chunks=( + _bedrock_event_frame( + { + "type": "message_start", + "message": { + "id": "msg_test", + "type": "message", + "role": "assistant", + "content": [], + "model": "us.anthropic.claude-sonnet-4-6", + "usage": {"input_tokens": 3, "output_tokens": 1}, + }, + } + ), + _bedrock_event_frame( + { + "type": "message_stop", + "usage": {"input_tokens": 3, "output_tokens": 9}, + } + ), + ), + gate=gate, + ), + ) + + iterator: Final = AmazonAnthropicClaudeMessagesConfig().get_async_streaming_response_iterator( + model="us.anthropic.claude-sonnet-4-6", + httpx_response=response, + request_body={"model": "us.anthropic.claude-sonnet-4-6"}, + litellm_logging_obj=LiteLLMLoggingObj( + model="bedrock/us.anthropic.claude-sonnet-4-6", + messages=[{"role": "user", "content": "Hello"}], + stream=True, + call_type="chat", + start_time=datetime.now(), + litellm_call_id="test_small_frame_before_upstream_pauses", + function_id="test_small_frame_before_upstream_pauses", + ), + ) + + first: Final = await asyncio.wait_for(anext(iterator), timeout=10) + assert first.startswith(b"event: message_start\n"), first + + gate.set() + remaining: Final = tuple([chunk async for chunk in iterator]) + assert any(chunk.startswith(b"event: message_stop\n") for chunk in remaining), remaining + await iterator.aclose() diff --git a/tests/test_litellm/llms/custom_httpx/test_http_handler.py b/tests/test_litellm/llms/custom_httpx/test_http_handler.py index 33272a1a9e4..8358d15d30e 100644 --- a/tests/test_litellm/llms/custom_httpx/test_http_handler.py +++ b/tests/test_litellm/llms/custom_httpx/test_http_handler.py @@ -6,6 +6,8 @@ import pathlib import ssl import threading import weakref +from collections.abc import Callable, Mapping +from typing import Final from unittest.mock import MagicMock, patch import certifi @@ -23,6 +25,7 @@ from litellm.llms.custom_httpx.http_handler import ( _get_httpx_client, get_ssl_configuration, ) +from litellm.types.llms.custom_http import VerifyTypes @pytest.mark.asyncio @@ -1396,6 +1399,47 @@ async def test_finalizer_on_live_loop_disposes_foreign_loop_session_without_sche assert session.closed +class _RetryClientHandler(AsyncHTTPHandler): + def __init__(self, first: httpx.AsyncClient, retry: httpx.AsyncClient) -> None: + self._retry_client: Final = retry + super().__init__() + self.client = first + + def create_client( + self, + timeout: float | httpx.Timeout | None = None, + event_hooks: Mapping[str, list[Callable[..., object]]] | None = None, + ssl_verify: VerifyTypes | None = None, + shared_session: ClientSession | None = None, + ) -> httpx.AsyncClient: + return self._retry_client + + +@pytest.mark.asyncio +@pytest.mark.parametrize("method", ["post", "put", "patch", "delete"]) +async def test_connection_error_retry_forwards_content(method: str): + captured: list[bytes] = [] # mutable-ok: async closure capture buffer + + async def raise_connection_error(request: httpx.Request) -> httpx.Response: + raise httpx.RemoteProtocolError("connection dropped", request=request) + + async def capture_and_succeed(request: httpx.Request) -> httpx.Response: + captured.append(request.content) + return httpx.Response(200, request=request) + + first: Final = httpx.AsyncClient(transport=httpx.MockTransport(raise_connection_error)) + retry: Final = httpx.AsyncClient(transport=httpx.MockTransport(capture_and_succeed)) + async with first, retry: + handler: Final = _RetryClientHandler(first=first, retry=retry) + + body = b'{"post": ["run1"]}' + await getattr(handler, method)("https://api.example.com/runs/batch", content=body) + + assert captured == [body], "the retried request must carry the same content= body" + await handler.close() + + + @pytest.fixture def forward_proxy_server(): """Plain HTTP forward proxy that records the absolute URIs it is asked to fetch.""" diff --git a/tests/test_litellm/llms/databricks/test_databricks_cost_calculator.py b/tests/test_litellm/llms/databricks/test_databricks_cost_calculator.py index afac7b0bc1a..de0e547c0cd 100644 --- a/tests/test_litellm/llms/databricks/test_databricks_cost_calculator.py +++ b/tests/test_litellm/llms/databricks/test_databricks_cost_calculator.py @@ -153,14 +153,6 @@ def test_uncached_request_bills_every_prompt_token_at_the_input_rate(local_model assert completion_cost == pytest.approx(200 * info["output_cost_per_token"]) -def test_legacy_endpoint_names_still_resolve(local_model_cost_map: None) -> None: - info: Final = _model_info("databricks/databricks-mixtral-8x7b-instruct") - usage: Final = Usage(prompt_tokens=100, completion_tokens=100, total_tokens=200) - - prompt_cost, completion_cost = cost_per_token(model="databricks/mixtral-8x7b-instruct-v0.1", usage=usage) - - assert prompt_cost == pytest.approx(100 * info["input_cost_per_token"]) - assert completion_cost == pytest.approx(100 * info["output_cost_per_token"]) @pytest.mark.parametrize("model", NEW_MODELS) diff --git a/tests/test_litellm/llms/fal_ai/chat/test_fal_ai_chat_transformation.py b/tests/test_litellm/llms/fal_ai/chat/test_fal_ai_chat_transformation.py index 41e8fc0c8c5..b7a79f03f8d 100644 --- a/tests/test_litellm/llms/fal_ai/chat/test_fal_ai_chat_transformation.py +++ b/tests/test_litellm/llms/fal_ai/chat/test_fal_ai_chat_transformation.py @@ -249,6 +249,23 @@ def test_map_openai_params_drops_unknown_reasoning_effort_when_dropping(): assert "reasoning" not in mapped +@pytest.mark.parametrize("effort", [{"level": "low"}, ["low"], 1]) +def test_map_openai_params_rejects_non_string_reasoning_effort(effort: object) -> None: + with pytest.raises(FalAIError) as exc_info: + FalAIChatConfig().map_openai_params( + non_default_params={"reasoning_effort": effort}, optional_params={}, model=MODEL, drop_params=False + ) + assert exc_info.value.status_code == 400 + + +@pytest.mark.parametrize("effort", [{"level": "low"}, ["low"], 1]) +def test_map_openai_params_drops_non_string_reasoning_effort_when_dropping(effort: object) -> None: + mapped = FalAIChatConfig().map_openai_params( + non_default_params={"reasoning_effort": effort}, optional_params={}, model=MODEL, drop_params=True + ) + assert "reasoning" not in mapped + + def test_map_openai_params_maps_sampling_params(): mapped = FalAIChatConfig().map_openai_params( non_default_params={"temperature": 0.5, "top_p": 0.7, "max_tokens": 10}, diff --git a/tests/test_litellm/llms/fal_ai/test_cost_calculator.py b/tests/test_litellm/llms/fal_ai/test_cost_calculator.py index 56dcba04b5c..3c6e6aea090 100644 --- a/tests/test_litellm/llms/fal_ai/test_cost_calculator.py +++ b/tests/test_litellm/llms/fal_ai/test_cost_calculator.py @@ -7,6 +7,7 @@ from litellm.litellm_core_utils.llm_cost_calc.utils import CostCalculatorUtils from litellm.llms.fal_ai.cost_calculator import cost_calculator, fal_ai_passthrough_cost from litellm.types.utils import ImageObject, ImageResponse + @pytest.fixture(autouse=True) def _use_local_model_cost_map(monkeypatch): monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") @@ -203,3 +204,41 @@ def test_passthrough_trellis_2_without_resolution_falls_back_to_default_rate(): def test_passthrough_unknown_model_returns_none(): assert fal_ai_passthrough_cost("fal-ai/no-such-model", {"resolution": 512}) is None + + +def test_passthrough_string_resolution_is_priced_like_the_integer(monkeypatch: pytest.MonkeyPatch): + monkeypatch.setitem( + litellm.model_cost, + "fal_ai/fal-ai/keyed-model", + { + "litellm_provider": "fal_ai", + "mode": "image_generation", + "output_cost_per_image": 0.3, + "output_cost_per_image_512": 0.25, + "output_cost_per_image_1536": 0.35, + }, + ) + assert fal_ai_passthrough_cost("fal-ai/keyed-model", {"resolution": "512"}) == 0.25 + assert fal_ai_passthrough_cost("fal-ai/keyed-model", {"resolution": 512}) == 0.25 + assert fal_ai_passthrough_cost("fal-ai/keyed-model", {"resolution": "1536"}) == 0.35 + assert fal_ai_passthrough_cost("fal-ai/keyed-model", {"resolution": True}) == 0.3 + assert fal_ai_passthrough_cost("fal-ai/keyed-model", {"resolution": 512.0}) == 0.3 + + +def test_passthrough_cost_is_none_only_when_no_price_applies_to_the_request(monkeypatch: pytest.MonkeyPatch): + monkeypatch.setitem( + litellm.model_cost, + "fal_ai/fal-ai/priceless-model", + {"litellm_provider": "fal_ai", "mode": "image_generation"}, + ) + monkeypatch.setitem( + litellm.model_cost, + "fal_ai/fal-ai/keyed-only-model", + {"litellm_provider": "fal_ai", "mode": "image_generation", "output_cost_per_image_512": 0.02}, + ) + assert fal_ai_passthrough_cost("fal-ai/priceless-model", {}) is None + assert fal_ai_passthrough_cost("fal-ai/priceless-model", {"resolution": 512}) is None + assert fal_ai_passthrough_cost("fal-ai/no-such-model", {}) is None + assert fal_ai_passthrough_cost("fal-ai/keyed-only-model", {}) is None + assert fal_ai_passthrough_cost("fal-ai/keyed-only-model", {"resolution": 1024}) is None + assert fal_ai_passthrough_cost("fal-ai/keyed-only-model", {"resolution": "512"}) == 0.02 diff --git a/tests/test_litellm/llms/fal_ai/videos/test_fal_ai_video_transformation.py b/tests/test_litellm/llms/fal_ai/videos/test_fal_ai_video_transformation.py index 86ecbf6701b..d4ad22ca5a0 100644 --- a/tests/test_litellm/llms/fal_ai/videos/test_fal_ai_video_transformation.py +++ b/tests/test_litellm/llms/fal_ai/videos/test_fal_ai_video_transformation.py @@ -1,3 +1,4 @@ +import sys from typing import Final from unittest.mock import AsyncMock, Mock @@ -86,6 +87,17 @@ class TestFalAIVideoTransformation: assert mapped["reference_image_urls"] == [url] assert "image_url" not in mapped + def test_map_openai_params_h3_omits_auto_duration(self): + assert self.config.map_openai_params({"seconds": "auto"}, H3_TEXT_MODEL, False) == {} + assert self.config.map_openai_params({"seconds": "auto"}, MODEL, False) == {"duration": "auto"} + + def test_map_openai_params_h3_size_beyond_tiers_uses_top_resolution(self): + side = str(sys.maxsize + 1) + assert self.config.map_openai_params({"size": f"{side}x{side}"}, H3_TEXT_MODEL, False) == { + "resolution": "4K", + "aspect_ratio": "1:1", + } + def test_transform_video_create_request(self): body, files, url = self.config.transform_video_create_request( model=MODEL, @@ -377,6 +389,117 @@ class TestFalAIVideoTransformation: assert "input.reference_image_urls: Failed to download the file" in video.error["message"] client.get.assert_awaited_once_with(url=result_url, headers=auth_headers) + def test_status_completed_result_probe_reuses_status_client_and_extra_headers(self): + status_url = "https://queue.fal.run/minimax/h3/requests/abc/status" + status_headers: Final = { + "Authorization": "Key synthetic-fal-key", + "Content-Type": "application/json", + "X-Routing": "canary-7", + } + response: Final = httpx.Response( + 200, + json={"request_id": "abc", "status": "COMPLETED"}, + request=httpx.Request("GET", status_url, headers=status_headers), + ) + result_url: Final = status_url.removesuffix("/status") + status_client: Final = Mock() + status_client.get.return_value = httpx.Response( + 403, text="missing X-Routing", request=httpx.Request("GET", result_url) + ) + factory_client: Final = Mock() + config = FalAIVideoConfig(sync_client_factory=lambda: factory_client) + + video = config.transform_video_status_retrieve_response( + raw_response=response, + logging_obj=self.logging_obj, + custom_llm_provider="fal_ai", + client=status_client, + ) + + assert video.status == "failed" + assert video.error == {"code": "fal_error", "message": "missing X-Routing"} + factory_client.get.assert_not_called() + status_client.get.assert_called_once() + assert status_client.get.call_args.kwargs["url"] == result_url + assert status_client.get.call_args.kwargs["headers"].items() >= status_headers.items() + + def test_status_completed_result_probe_transport_error_keeps_completed(self): + status_url = "https://queue.fal.run/minimax/h3/requests/abc/status" + response: Final = httpx.Response( + 200, + json={"request_id": "abc", "status": "COMPLETED"}, + request=httpx.Request("GET", status_url), + ) + client: Final = Mock() + client.get.side_effect = httpx.ReadError("connection reset by fal.ai") + + video = FalAIVideoConfig().transform_video_status_retrieve_response( + raw_response=response, + logging_obj=self.logging_obj, + custom_llm_provider="fal_ai", + client=client, + ) + + assert video.status == "completed" + assert video.error is None + + @pytest.mark.asyncio + async def test_async_status_completed_result_probe_reuses_status_client_and_extra_headers(self): + status_url = "https://queue.fal.run/minimax/h3/requests/abc/status" + status_headers: Final = { + "Authorization": "Key synthetic-fal-key", + "Content-Type": "application/json", + "X-Routing": "canary-7", + } + response: Final = httpx.Response( + 200, + json={"request_id": "abc", "status": "COMPLETED"}, + request=httpx.Request("GET", status_url, headers=status_headers), + ) + result_url: Final = status_url.removesuffix("/status") + status_client: Final = Mock() + status_client.get = AsyncMock( + return_value=httpx.Response(403, text="missing X-Routing", request=httpx.Request("GET", result_url)) + ) + factory_client: Final = Mock() + factory_client.get = AsyncMock() + config = FalAIVideoConfig(async_client_factory=lambda: factory_client) + + video = await config.async_transform_video_status_retrieve_response( + raw_response=response, + logging_obj=self.logging_obj, + custom_llm_provider="fal_ai", + client=status_client, + ) + + assert video.status == "failed" + assert video.error == {"code": "fal_error", "message": "missing X-Routing"} + factory_client.get.assert_not_awaited() + status_client.get.assert_awaited_once() + assert status_client.get.await_args.kwargs["url"] == result_url + assert status_client.get.await_args.kwargs["headers"].items() >= status_headers.items() + + @pytest.mark.asyncio + async def test_async_status_completed_result_probe_transport_error_keeps_completed(self): + status_url = "https://queue.fal.run/minimax/h3/requests/abc/status" + response: Final = httpx.Response( + 200, + json={"request_id": "abc", "status": "COMPLETED"}, + request=httpx.Request("GET", status_url), + ) + client: Final = Mock() + client.get = AsyncMock(side_effect=httpx.ConnectError("tls handshake failed")) + + video = await FalAIVideoConfig().async_transform_video_status_retrieve_response( + raw_response=response, + logging_obj=self.logging_obj, + custom_llm_provider="fal_ai", + client=client, + ) + + assert video.status == "completed" + assert video.error is None + def test_status_in_progress_does_not_fetch_result(self): status_url = "https://queue.fal.run/minimax/h3/requests/abc/status" response = httpx.Response( @@ -552,17 +675,23 @@ class TestFalAIVideoTransformation: row = litellm.model_cost[f"fal_ai/{H3_TEXT_MODEL}"] model_info = litellm.get_model_info(model=H3_TEXT_MODEL, custom_llm_provider="fal_ai") - assert video_generation_cost( - model=H3_TEXT_MODEL, - duration_seconds=5, - custom_llm_provider="fal_ai", - model_info=model_info, - video_resolution="2K", - ) == 5 * row["output_cost_per_second_2k"] - assert video_generation_cost( - model=H3_TEXT_MODEL, - duration_seconds=5, - custom_llm_provider="fal_ai", - model_info=model_info, - video_resolution="768p", - ) == 5 * row["output_cost_per_second_768p"] + assert ( + video_generation_cost( + model=H3_TEXT_MODEL, + duration_seconds=5, + custom_llm_provider="fal_ai", + model_info=model_info, + video_resolution="2K", + ) + == 5 * row["output_cost_per_second_2k"] + ) + assert ( + video_generation_cost( + model=H3_TEXT_MODEL, + duration_seconds=5, + custom_llm_provider="fal_ai", + model_info=model_info, + video_resolution="768p", + ) + == 5 * row["output_cost_per_second_768p"] + ) diff --git a/tests/test_litellm/llms/gemini/test_cost_calculator.py b/tests/test_litellm/llms/gemini/test_cost_calculator.py index 5eed11dff03..b2633c6091b 100644 --- a/tests/test_litellm/llms/gemini/test_cost_calculator.py +++ b/tests/test_litellm/llms/gemini/test_cost_calculator.py @@ -200,172 +200,12 @@ def test_maps_no_usage_details(): assert cost_per_google_maps_grounding_request(usage=usage, model_info=model_info) == 0.0 -def test_gemini_image_edit_cost_prefers_token_usage_metadata(monkeypatch): - monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - - input_text_tokens = 20 - input_image_tokens = 1120 - output_image_tokens = 1120 - prompt_tokens = input_text_tokens + input_image_tokens - image_response = ImageResponse( - data=[ImageObject(b64_json="img1"), ImageObject(b64_json="img2")], - usage=ImageUsage( - input_tokens=prompt_tokens, - input_tokens_details=ImageUsageInputTokensDetails( - text_tokens=input_text_tokens, - image_tokens=input_image_tokens, - ), - output_tokens=output_image_tokens, - total_tokens=prompt_tokens + output_image_tokens, - ), - ) - - cost = gemini_image_edit_cost_calculator( - model=model, - image_response=image_response, - ) - - expected_cost = ( - prompt_tokens * model_info["input_cost_per_token"] - + output_image_tokens * model_info["output_cost_per_image_token"] - ) - flat_image_cost = ( - len(image_response.data or []) * model_info["output_cost_per_image"] - ) - assert round(cost, 10) == round(expected_cost, 10) - assert cost != flat_image_cost -def test_gemini_image_edit_cost_uses_output_token_details(monkeypatch): - monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - - input_text_tokens = 20 - output_text_tokens = 213 - output_image_tokens = 1120 - output_tokens = output_text_tokens + output_image_tokens - image_response = ImageResponse( - data=[ImageObject(b64_json="img1")], - usage=ImageUsage( - input_tokens=input_text_tokens, - input_tokens_details=ImageUsageInputTokensDetails( - text_tokens=input_text_tokens, - image_tokens=0, - ), - output_tokens=output_tokens, - total_tokens=input_text_tokens + output_tokens, - prompt_tokens=input_text_tokens, - completion_tokens=output_tokens, - prompt_tokens_details={ - "text_tokens": input_text_tokens, - "image_tokens": 0, - }, - completion_tokens_details={ - "text_tokens": output_text_tokens, - "image_tokens": output_image_tokens, - }, - output_tokens_details={ - "text_tokens": output_text_tokens, - "image_tokens": output_image_tokens, - }, - ), - ) - - cost = gemini_image_edit_cost_calculator( - model=model, - image_response=image_response, - ) - - expected_cost = ( - input_text_tokens * model_info["input_cost_per_token"] - + output_text_tokens * model_info["output_cost_per_token"] - + output_image_tokens * model_info["output_cost_per_image_token"] - ) - all_output_as_image_cost = ( - input_text_tokens * model_info["input_cost_per_token"] - + (output_text_tokens + output_image_tokens) - * model_info["output_cost_per_image_token"] - ) - assert round(cost, 10) == round(expected_cost, 10) - assert cost != all_output_as_image_cost -def test_gemini_image_generation_cost_uses_output_token_details(monkeypatch): - monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - - input_text_tokens = 20 - output_text_tokens = 213 - output_image_tokens = 1120 - output_tokens = output_text_tokens + output_image_tokens - image_response = ImageResponse( - data=[ImageObject(b64_json="img1")], - usage=ImageUsage( - input_tokens=input_text_tokens, - input_tokens_details=ImageUsageInputTokensDetails( - text_tokens=input_text_tokens, - image_tokens=0, - ), - output_tokens=output_tokens, - total_tokens=input_text_tokens + output_tokens, - prompt_tokens=input_text_tokens, - completion_tokens=output_tokens, - prompt_tokens_details={ - "text_tokens": input_text_tokens, - "image_tokens": 0, - }, - completion_tokens_details={ - "text_tokens": output_text_tokens, - "image_tokens": output_image_tokens, - }, - output_tokens_details={ - "text_tokens": output_text_tokens, - "image_tokens": output_image_tokens, - }, - ), - ) - - cost = gemini_image_generation_cost_calculator( - model=model, - image_response=image_response, - ) - - expected_cost = ( - input_text_tokens * model_info["input_cost_per_token"] - + output_text_tokens * model_info["output_cost_per_token"] - + output_image_tokens * model_info["output_cost_per_image_token"] - ) - all_output_as_image_cost = ( - input_text_tokens * model_info["input_cost_per_token"] - + (output_text_tokens + output_image_tokens) - * model_info["output_cost_per_image_token"] - ) - assert round(cost, 10) == round(expected_cost, 10) - assert cost != all_output_as_image_cost -def test_gemini_image_edit_cost_falls_back_to_flat_image_pricing(monkeypatch): - monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - image_response = ImageResponse( - data=[ImageObject(b64_json="img1"), ImageObject(b64_json="img2")] - ) - - cost = gemini_image_edit_cost_calculator( - model=model, - image_response=image_response, - ) - - assert cost == len(image_response.data or []) * model_info["output_cost_per_image"] def _image_response_with_web_search(web_search_requests): @@ -383,43 +223,8 @@ def _image_response_with_web_search(web_search_requests): return ImageResponse(data=[ImageObject(b64_json="img1")], usage=usage) -def test_gemini_image_generation_cost_adds_web_search_grounding(monkeypatch): - monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" - model_info = litellm.get_model_info(model=model, custom_llm_provider="gemini") - - grounded = gemini_image_generation_cost_calculator( - model=model, - image_response=_image_response_with_web_search(2), - ) - ungrounded = gemini_image_generation_cost_calculator( - model=model, - image_response=_image_response_with_web_search(None), - ) - - expected_web_search_cost = cost_per_web_search_request( - usage=_make_usage(2), model_info=model_info - ) - assert expected_web_search_cost > 0 - assert round(grounded - ungrounded, 10) == round(expected_web_search_cost, 10) -def test_gemini_image_generation_cost_no_web_search_when_absent(monkeypatch): - monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") - litellm.model_cost = litellm.get_model_cost_map(url="") - model = "gemini/gemini-3-pro-image-preview" - - cost_zero = gemini_image_generation_cost_calculator( - model=model, - image_response=_image_response_with_web_search(0), - ) - cost_none = gemini_image_generation_cost_calculator( - model=model, - image_response=_image_response_with_web_search(None), - ) - - assert cost_zero == cost_none @pytest.mark.parametrize( diff --git a/tests/test_litellm/llms/github_copilot/test_github_copilot_transformation.py b/tests/test_litellm/llms/github_copilot/test_github_copilot_transformation.py index f1f1978b06f..b1d7e49fbac 100644 --- a/tests/test_litellm/llms/github_copilot/test_github_copilot_transformation.py +++ b/tests/test_litellm/llms/github_copilot/test_github_copilot_transformation.py @@ -371,62 +371,8 @@ def test_x_initiator_header_system_only_messages(): assert headers["X-Initiator"] == "user" -def test_get_supported_openai_params_claude_model(): - """Test that Claude models with extended thinking support have thinking and reasoning parameters.""" - config = GithubCopilotConfig() - - # Test Claude 4 model supports thinking and reasoning_effort parameters - supported_params = config.get_supported_openai_params("claude-sonnet-4-20250514") - assert "thinking" in supported_params - assert "reasoning_effort" in supported_params - - # Test Claude 3-7 model supports thinking and reasoning_effort parameters - supported_params_claude37 = config.get_supported_openai_params( - "claude-3-7-sonnet-20250219" - ) - assert "thinking" in supported_params_claude37 - assert "reasoning_effort" in supported_params_claude37 - - # Test Claude 3.5 model does NOT support thinking parameters (no extended thinking) - supported_params_claude35 = config.get_supported_openai_params("claude-3.5-sonnet") - assert "thinking" not in supported_params_claude35 - assert "reasoning_effort" not in supported_params_claude35 - - # Test non-Claude model doesn't include thinking parameters but may include reasoning_effort - supported_params_gpt = config.get_supported_openai_params("gpt-4o") - assert "thinking" not in supported_params_gpt - # gpt-4o should NOT have reasoning_effort (not a reasoning model) - assert "reasoning_effort" not in supported_params_gpt - - # Test O-series reasoning models include reasoning_effort but not thinking - supported_params_o3 = config.get_supported_openai_params("o3-mini") - assert "thinking" not in supported_params_o3 - # o3-mini should have reasoning_effort (it's an O-series reasoning model) - assert "reasoning_effort" in supported_params_o3 -def test_get_supported_openai_params_case_insensitive(): - """Test that Claude model detection is case-insensitive for models with extended thinking.""" - config = GithubCopilotConfig() - - # Test uppercase Claude 4 model with full model name - supported_params_upper = config.get_supported_openai_params( - "CLAUDE-SONNET-4-20250514" - ) - assert "thinking" in supported_params_upper - assert "reasoning_effort" in supported_params_upper - - # Test mixed case Claude 3-7 model (has extended thinking) with full model name - supported_params_mixed = config.get_supported_openai_params( - "Claude-3-7-Sonnet-20250219" - ) - assert "thinking" in supported_params_mixed - assert "reasoning_effort" in supported_params_mixed - - # Test that Claude 3.5 models don't have thinking support (case insensitive) - supported_params_35 = config.get_supported_openai_params("CLAUDE-3.5-SONNET") - assert "thinking" not in supported_params_35 - assert "reasoning_effort" not in supported_params_35 def test_copilot_vision_request_header_with_image(): diff --git a/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py b/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py index b2071155f3f..28e86e40944 100644 --- a/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py +++ b/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py @@ -1,4 +1,7 @@ +import base64 +import io import json +import sys from litellm._uuid import uuid from unittest.mock import MagicMock, patch @@ -544,3 +547,74 @@ async def test_ollama_async_completion_inlines_remote_images_off_the_event_loop( assert response.choices[0].message.content == "Green" assert async_only_image_fetch.fetched == [image_url] assert captured["body"]["images"] == [async_only_image_fetch.base64_png] + + +def _image_base64(image_format: str) -> str: + from PIL import Image + + buffer = io.BytesIO() + Image.new("RGB", (4, 4), "green").save(buffer, image_format) + return base64.b64encode(buffer.getvalue()).decode("utf-8") + + +def _transform_image_request(image_base64: str, mime_subtype: str) -> dict: + return OllamaConfig().transform_request( + model="llava", + messages=[ + { + "role": "user", + "content": [ + {"type": "text", "text": "What colour is this?"}, + { + "type": "image_url", + "image_url": {"url": f"data:image/{mime_subtype};base64,{image_base64}"}, + }, + ], + } + ], + optional_params={}, + litellm_params={}, + headers={}, + ) + + +@pytest.mark.parametrize("image_format", ["PNG", "JPEG"]) +def test_transform_request_sends_png_and_jpeg_images_without_pillow( + image_format: str, monkeypatch: pytest.MonkeyPatch +) -> None: + image_base64 = _image_base64(image_format) + monkeypatch.setitem(sys.modules, "PIL", None) + + data = _transform_image_request(image_base64, image_format.lower()) + + assert data["images"] == [image_base64] + + +def test_transform_request_without_pillow_says_how_to_convert_other_image_formats( + monkeypatch: pytest.MonkeyPatch, +) -> None: + gif_base64 = _image_base64("GIF") + monkeypatch.setitem(sys.modules, "PIL", None) + + with pytest.raises(Exception, match="pip install Pillow"): + _transform_image_request(gif_base64, "gif") + + +def test_transform_request_reencodes_other_image_formats_as_jpeg() -> None: + from PIL import Image + + data = _transform_image_request(_image_base64("GIF"), "gif") + + (encoded,) = data["images"] + assert Image.open(io.BytesIO(base64.b64decode(encoded))).format == "JPEG" + + +@pytest.mark.parametrize( + "payload", + [base64.b64encode(b"not an image").decode("utf-8"), "abc"], + ids=["decodable_but_not_an_image", "invalid_base64"], +) +def test_transform_request_leaves_unreadable_images_untouched(payload: str) -> None: + data = _transform_image_request(payload, "png") + + assert data["images"] == [payload] diff --git a/tests/test_litellm/llms/openai/realtime/test_openai_realtime_handler.py b/tests/test_litellm/llms/openai/realtime/test_openai_realtime_handler.py index 4221954d787..f7a88b5ba63 100644 --- a/tests/test_litellm/llms/openai/realtime/test_openai_realtime_handler.py +++ b/tests/test_litellm/llms/openai/realtime/test_openai_realtime_handler.py @@ -416,3 +416,52 @@ async def test_async_realtime_ws_url_has_no_ssl(): # Verify ssl is None for ws:// URLs (the fix for issue #19222) assert called_kwargs["ssl"] is None + + +@pytest.mark.asyncio +async def test_async_realtime_upstream_handshake_refusal_sends_error_event_then_policy_close(): + from typing import cast + + from websockets.datastructures import Headers + from websockets.exceptions import InvalidStatus + from websockets.http11 import Response + + from litellm.llms.openai.realtime.handler import OpenAIRealtime + from litellm.types.realtime import RealtimeErrorEvent + + handler = OpenAIRealtime() + model = "gpt-realtime" + + sent: list[str] = [] + closed: list[tuple[int, str | None]] = [] + + class RecordingClientWebSocket: + scope: dict[str, list[tuple[bytes, bytes]]] = {"headers": []} + + async def send_text(self, data: str) -> None: + sent.append(data) + + async def close(self, code: int = 1000, reason: str | None = None) -> None: + closed.append((code, reason)) + + dummy_websocket = RecordingClientWebSocket() + dummy_logging_obj = MagicMock() + + refused = InvalidStatus(Response(401, "Unauthorized", Headers())) + + with patch("websockets.connect", side_effect=refused): + await handler.async_realtime( # pyright: ignore[reportUnknownMemberType] # handler's websocket param is Any + model=model, + websocket=dummy_websocket, + logging_obj=dummy_logging_obj, + api_base="https://api.openai.com/", + api_key="bad-key", + query_params={"model": model}, + ) + + assert len(sent) == 1 + event = cast(RealtimeErrorEvent, json.loads(sent[0])) + assert event["type"] == "error" + assert event["error"]["type"] == "server_error" + assert "401" in event["error"]["message"] + assert closed and closed[0][0] == 1008 diff --git a/tests/test_litellm/llms/openai/test_gpt5_transformation.py b/tests/test_litellm/llms/openai/test_gpt5_transformation.py index 0adc7fa8d5f..41f5816600f 100644 --- a/tests/test_litellm/llms/openai/test_gpt5_transformation.py +++ b/tests/test_litellm/llms/openai/test_gpt5_transformation.py @@ -38,10 +38,6 @@ def test_gpt5_supports_reasoning_effort(config: OpenAIConfig): assert "reasoning_effort" in config.get_supported_openai_params(model="gpt-5-mini") -def test_gpt5_chat_does_not_support_reasoning_effort(config: OpenAIConfig): - assert "reasoning_effort" not in config.get_supported_openai_params( - model="gpt-5-chat-latest" - ) def test_gpt5_chat_supports_temperature(config: OpenAIConfig): @@ -174,10 +170,6 @@ def test_gpt5_codex_unsupported_params_drop(config: OpenAIConfig): assert param not in config.get_supported_openai_params(model="gpt-5-codex") -def test_gpt5_codex_supports_tool_choice(gpt5_config: OpenAIGPT5Config): - """Test that GPT-5-Codex supports tool_choice parameter.""" - supported_params = gpt5_config.get_supported_openai_params(model="gpt-5-codex") - assert "tool_choice" in supported_params def test_gpt5_codex_supports_function_calling(config: OpenAIConfig): @@ -246,14 +238,6 @@ def test_gpt5_1_reasoning_effort_none(config: OpenAIConfig): assert params["reasoning_effort"] == effort -def test_gpt5_1_codex_max_allows_reasoning_effort_xhigh(config: OpenAIConfig): - params = config.map_openai_params( - non_default_params={"reasoning_effort": "xhigh"}, - optional_params={}, - model="gpt-5.1-codex-max", - drop_params=False, - ) - assert params["reasoning_effort"] == "xhigh" def test_gpt5_rejects_reasoning_effort_xhigh_for_other_models(config: OpenAIConfig): diff --git a/tests/test_litellm/llms/openai_like/test_provider_affinity_forwarding.py b/tests/test_litellm/llms/openai_like/test_provider_affinity_forwarding.py new file mode 100644 index 00000000000..43101234e63 --- /dev/null +++ b/tests/test_litellm/llms/openai_like/test_provider_affinity_forwarding.py @@ -0,0 +1,389 @@ +import json +from unittest.mock import MagicMock + +import httpx +import pytest + +import litellm +from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler +from litellm.llms.openai_like import dynamic_config +from litellm.llms.openai_like.json_loader import JSONProviderRegistry, SimpleProviderConfig + + +def _provider(*, responses: bool = False) -> SimpleProviderConfig: + endpoints = ["/v1/chat/completions"] + if responses: + endpoints.append("/v1/responses") + return SimpleProviderConfig( + "db_only_provider", + { + "base_url": "https://db-only.example/v1", + "api_key_env": "DYNAMIC_PROVIDER_API_KEY", + "supported_endpoints": endpoints, + }, + ) + + +def _chat_response_payload(content: str = "dynamic response") -> dict[str, object]: + return { + "id": "chatcmpl-dynamic-provider", + "object": "chat.completion", + "created": 1234567890, + "model": "test-model", + "choices": [ + { + "index": 0, + "message": {"role": "assistant", "content": content}, + "finish_reason": "stop", + } + ], + "usage": {"prompt_tokens": 2, "completion_tokens": 2, "total_tokens": 4}, + } + + +def _responses_payload() -> dict[str, object]: + return { + "id": "resp_dynamic_provider", + "object": "response", + "created_at": 1234567890, + "status": "completed", + "model": "test-model", + "output": [], + "parallel_tool_calls": True, + "usage": {"input_tokens": 2, "output_tokens": 2, "total_tokens": 4}, + "error": None, + } + + +@pytest.fixture(autouse=True) +def _isolate_registry_state(): + original_providers = dict(JSONProviderRegistry._providers) + dynamic_config._responses_config_cache.clear() + yield + JSONProviderRegistry._providers = original_providers + dynamic_config._responses_config_cache.clear() + + +def test_dynamic_provider_receives_affinity_header_for_chat(): + from openai import OpenAI + + JSONProviderRegistry._providers = {"db_only_provider": _provider()} + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_chat_response_payload()) + + client = OpenAI( + api_key="test-key", + base_url="https://db-only.example/v1", + http_client=httpx.Client(transport=httpx.MockTransport(respond)), + ) + try: + litellm.completion( + model="db_only_provider/test-model", + messages=[{"role": "user", "content": "hello"}], + api_key="test-key", + client=client, + extra_headers={"X-Customer-Header": "customer-value"}, + litellm_session_id="session-sync", + provider_affinity_header="X-Conversation-Id", + ) + finally: + client.close() + + assert requests[0].headers["x-conversation-id"] == "session-sync" + assert requests[0].headers["x-customer-header"] == "customer-value" + + +def test_dynamic_provider_does_not_use_trace_id_for_chat_affinity(): + from openai import OpenAI + + JSONProviderRegistry._providers = {"db_only_provider": _provider()} + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_chat_response_payload()) + + client = OpenAI( + api_key="test-key", + base_url="https://db-only.example/v1", + http_client=httpx.Client(transport=httpx.MockTransport(respond)), + ) + try: + litellm.completion( + model="db_only_provider/test-model", + messages=[{"role": "user", "content": "hello"}], + api_key="test-key", + client=client, + metadata={"trace_id": "per-request-trace"}, + provider_affinity_header="X-Conversation-Id", + ) + finally: + client.close() + + assert "x-conversation-id" not in requests[0].headers + + +@pytest.mark.asyncio +async def test_dynamic_provider_receives_affinity_header_for_async_chat(): + from openai import AsyncOpenAI + + JSONProviderRegistry._providers = {"db_only_provider": _provider()} + requests: list[httpx.Request] = [] + + async def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_chat_response_payload("async response")) + + client = AsyncOpenAI( + api_key="test-key", + base_url="https://db-only.example/v1", + http_client=httpx.AsyncClient(transport=httpx.MockTransport(respond)), + ) + try: + response = await litellm.acompletion( + model="db_only_provider/test-model", + messages=[{"role": "user", "content": "hello"}], + api_key="test-key", + client=client, + litellm_session_id="session-async", + provider_affinity_header="X-Conversation-Id", + ) + finally: + await client.close() + + assert response.choices[0].message.content == "async response" + assert requests[0].headers["x-conversation-id"] == "session-async" + + +def test_dynamic_provider_receives_affinity_header_for_streaming_chat(): + from openai import OpenAI + + JSONProviderRegistry._providers = {"db_only_provider": _provider()} + chunks = [ + { + "id": "chatcmpl-dynamic-stream", + "object": "chat.completion.chunk", + "created": 1234567890, + "model": "test-model", + "choices": [ + { + "index": 0, + "delta": {"role": "assistant", "content": "streamed"}, + "finish_reason": None, + } + ], + }, + { + "id": "chatcmpl-dynamic-stream", + "object": "chat.completion.chunk", + "created": 1234567890, + "model": "test-model", + "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}], + }, + ] + stream_body = "".join(f"data: {json.dumps(chunk)}\n\n" for chunk in chunks) + "data: [DONE]\n\n" + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, content=stream_body, headers={"content-type": "text/event-stream"}) + + client = OpenAI( + api_key="test-key", + base_url="https://db-only.example/v1", + http_client=httpx.Client(transport=httpx.MockTransport(respond)), + ) + try: + response_chunks = list( + litellm.completion( + model="db_only_provider/test-model", + messages=[{"role": "user", "content": "hello"}], + api_key="test-key", + client=client, + stream=True, + litellm_session_id="session-stream", + provider_affinity_header="X-Conversation-Id", + ) + ) + finally: + client.close() + + assert any(chunk.choices[0].delta.content == "streamed" for chunk in response_chunks) + assert requests[0].headers["x-conversation-id"] == "session-stream" + + +def test_dynamic_provider_receives_affinity_header_for_responses(): + JSONProviderRegistry._providers = {"db_only_provider": _provider(responses=True)} + logging_obj = MagicMock() + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_responses_payload()) + + http_client = httpx.Client(transport=httpx.MockTransport(respond)) + try: + litellm.responses( + model="db_only_provider/test-model", + input="hello", + api_key="test-key", + litellm_session_id="session-responses", + provider_affinity_header="X-Conversation-Id", + litellm_logging_obj=logging_obj, + client=HTTPHandler(client=http_client), + ) + finally: + http_client.close() + + assert requests[0].headers["X-Conversation-Id"] == "session-responses" + assert ( + logging_obj.update_from_kwargs.call_args.kwargs["litellm_params"]["provider_affinity_header"] + == "X-Conversation-Id" + ) + + +def test_dynamic_provider_uses_metadata_session_id_for_responses(): + JSONProviderRegistry._providers = {"db_only_provider": _provider(responses=True)} + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_responses_payload()) + + http_client = httpx.Client(transport=httpx.MockTransport(respond)) + try: + litellm.responses( + model="db_only_provider/test-model", + input="hello", + api_key="test-key", + metadata={"session_id": "session-from-metadata"}, + provider_affinity_header="X-Conversation-Id", + litellm_logging_obj=MagicMock(), + client=HTTPHandler(client=http_client), + ) + finally: + http_client.close() + + assert requests[0].headers["X-Conversation-Id"] == "session-from-metadata" + + +@pytest.mark.asyncio +@pytest.mark.parametrize("stream", [False, True], ids=["non-streaming", "streaming"]) +async def test_dynamic_provider_receives_affinity_header_for_async_responses(stream: bool): + JSONProviderRegistry._providers = {"db_only_provider": _provider(responses=True)} + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_responses_payload()) + + client = AsyncHTTPHandler() + await client.close() + client.client = httpx.AsyncClient(transport=httpx.MockTransport(respond)) + try: + response = await litellm.aresponses( + model="db_only_provider/test-model", + input="hello", + api_key="test-key", + stream=stream, + litellm_session_id="session-async-responses", + provider_affinity_header="X-Conversation-Id", + client=client, + ) + finally: + await client.client.aclose() + + assert requests[0].headers["X-Conversation-Id"] == "session-async-responses" + if stream: + assert hasattr(response, "__aiter__") + else: + assert getattr(response, "model", None) == "test-model" + + +def test_control_characters_in_session_id_are_a_bad_request_for_chat(): + from openai import OpenAI + + JSONProviderRegistry._providers = {"db_only_provider": _provider()} + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_chat_response_payload()) + + client = OpenAI( + api_key="test-key", + base_url="https://db-only.example/v1", + http_client=httpx.Client(transport=httpx.MockTransport(respond)), + ) + try: + with pytest.raises(litellm.BadRequestError, match="HTTP header control characters"): + litellm.completion( + model="db_only_provider/test-model", + messages=[{"role": "user", "content": "hello"}], + api_key="test-key", + client=client, + litellm_session_id="session\nsplit", + provider_affinity_header="X-Conversation-Id", + ) + finally: + client.close() + + assert requests == [] + + +def test_control_characters_in_session_id_are_a_bad_request_for_responses(): + JSONProviderRegistry._providers = {"db_only_provider": _provider(responses=True)} + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_responses_payload()) + + http_client = httpx.Client(transport=httpx.MockTransport(respond)) + try: + with pytest.raises(litellm.BadRequestError, match="HTTP header control characters"): + litellm.responses( + model="db_only_provider/test-model", + input="hello", + api_key="test-key", + litellm_session_id="session\nsplit", + provider_affinity_header="X-Conversation-Id", + litellm_logging_obj=MagicMock(), + client=HTTPHandler(client=http_client), + ) + finally: + http_client.close() + + assert requests == [] + + +def test_builtin_provider_receives_affinity_header(): + from openai import OpenAI + + requests: list[httpx.Request] = [] + + def respond(request: httpx.Request) -> httpx.Response: + requests.append(request) + return httpx.Response(200, json=_chat_response_payload()) + + client = OpenAI( + api_key="test-key", + base_url="https://api.openai.com/v1", + http_client=httpx.Client(transport=httpx.MockTransport(respond)), + ) + try: + litellm.completion( + model="openai/test-model", + messages=[{"role": "user", "content": "hello"}], + api_key="test-key", + client=client, + litellm_session_id="session-builtin", + provider_affinity_header="X-Conversation-Id", + ) + finally: + client.close() + + assert requests[0].headers["X-Conversation-Id"] == "session-builtin" diff --git a/tests/test_litellm/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py b/tests/test_litellm/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py index a796e2ac607..88ba7fc37d9 100644 --- a/tests/test_litellm/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py +++ b/tests/test_litellm/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py @@ -2461,6 +2461,12 @@ def test_is_gemini_3_or_newer(): assert VertexGeminiConfig._is_gemini_3_or_newer("gemini-pro") == False assert VertexGeminiConfig._is_gemini_3_or_newer("gemini-flash") == False + assert VertexGeminiConfig._is_gemini_3_or_newer("4965075652664360960") == False + assert VertexGeminiConfig._is_gemini_3_or_newer("gemini/4965075652664360960") == False + assert VertexGeminiConfig._is_gemini_3_or_newer("gemini/ft-uuid") == False + assert VertexGeminiConfig._is_gemini_3_or_newer("gemma-3-27b-it") == False + assert VertexGeminiConfig._is_gemini_3_or_newer("gemini/gemma-3-27b-it") == False + # Edge cases assert VertexGeminiConfig._is_gemini_3_or_newer("") == False @@ -2504,6 +2510,26 @@ def test_gemini_3_reasoning_effort_maps_to_thinking_level(model: str): assert "thinkingBudget" not in mapped["thinkingConfig"] +@pytest.mark.parametrize( + "model", + ["4965075652664360960", "gemini/4965075652664360960", "gemini/ft-uuid", "gemma-3-27b-it"], +) +def test_fine_tuned_endpoint_and_gemma_get_no_gemini_3_default_temperature(model: str): + from litellm.llms.vertex_ai.gemini.vertex_and_google_ai_studio_gemini import ( + VertexGeminiConfig, + ) + + mapped = VertexGeminiConfig().map_openai_params( + non_default_params={"max_tokens": 10}, + optional_params={}, + model=model, + drop_params=False, + ) + + assert mapped["max_output_tokens"] == 10 + assert "temperature" not in mapped + + def _tool_call_messages(tool_call_id: str): @@ -5948,8 +5974,8 @@ def test_calculate_web_search_requests_counts_unique_queries(): @pytest.mark.parametrize("custom_llm_provider", ["gemini", "vertex_ai"]) @pytest.mark.parametrize( "model", - ["gemini-2.5-flash", "gemini-3-pro-preview"], - ids=["thinking_budget_mapper", "thinking_level_mapper"], + ["gemini-2.5-flash"], + ids=["thinking_budget_mapper"], ) @pytest.mark.parametrize("reasoning_effort", ["banana", "xhigh"]) def test_invalid_reasoning_effort_is_a_400_not_a_500(custom_llm_provider, model, reasoning_effort): diff --git a/tests/test_litellm/llms/vertex_ai/test_vertex_passthrough_logging_handler.py b/tests/test_litellm/llms/vertex_ai/test_vertex_passthrough_logging_handler.py index 58e7529309a..4199e57d2f9 100644 --- a/tests/test_litellm/llms/vertex_ai/test_vertex_passthrough_logging_handler.py +++ b/tests/test_litellm/llms/vertex_ai/test_vertex_passthrough_logging_handler.py @@ -238,31 +238,3 @@ def test_audio_predict_response_supports_bytes_base64_encoded( assert logging_obj.model_call_details["response_cost"] == pytest.approx(0.06) -def test_image_predict_response_is_not_billed_as_audio( - local_model_cost_map: None, -) -> None: - logging_obj = MagicMock() - logging_obj.model_call_details = {} - response = httpx.Response( - status_code=200, - json={"predictions": [{"bytesBase64Encoded": "frame", "mimeType": "image/png"}]}, - ) - - result = VertexPassthroughLoggingHandler.vertex_passthrough_handler( - httpx_response=response, - logging_obj=logging_obj, - url_route=( - "/v1/projects/test/locations/us-central1/publishers/google/models/imagen-4.0-generate-001:predict" - ), - result=response.text, - start_time=datetime.now(), - end_time=datetime.now(), - cache_hit=False, - request_body={"instances": [{"prompt": "a red cube"}]}, - ) - - assert isinstance(result["result"], litellm.ImageResponse) - assert logging_obj.call_type == PassthroughCallTypes.passthrough_image_generation.value - assert result["kwargs"]["response_cost"] == pytest.approx( - litellm.model_cost["vertex_ai/imagen-4.0-generate-001"]["output_cost_per_image"] - ) diff --git a/tests/test_litellm/llms/wandb/test_wandb_chat_transformation.py b/tests/test_litellm/llms/wandb/test_wandb_chat_transformation.py index a25ed585ecc..5c168d84766 100644 --- a/tests/test_litellm/llms/wandb/test_wandb_chat_transformation.py +++ b/tests/test_litellm/llms/wandb/test_wandb_chat_transformation.py @@ -37,10 +37,6 @@ WANDB_REASONING_MODELS: Final = ( "Qwen/Qwen3.5-35B-A3B", "zai-org/GLM-5.2", "moonshotai/Kimi-K2.5", - "MiniMaxAI/MiniMax-M2.5", - "zai-org/GLM-4.5", - "Qwen/Qwen3-235B-A22B-Thinking-2507", - "deepseek-ai/DeepSeek-R1-0528", ) diff --git a/tests/test_litellm/llms/xai/test_xai_cost_calculator.py b/tests/test_litellm/llms/xai/test_xai_cost_calculator.py index cf3bc73a225..6065f1053e7 100644 --- a/tests/test_litellm/llms/xai/test_xai_cost_calculator.py +++ b/tests/test_litellm/llms/xai/test_xai_cost_calculator.py @@ -152,83 +152,10 @@ class TestXAICostCalculator: setattr(reported, "server_side_tool_usage_details", {"web_search_calls": 3}) assert get_cost_for_web_search_request("xai", reported, {}) == 0.0 - def test_no_reported_cost_falls_back_to_token_math(self): - """Absent the provider figure, nothing changes for existing callers.""" - usage = Usage(prompt_tokens=100, completion_tokens=200, total_tokens=300) - prompt_cost, completion_cost = cost_per_token(model="grok-4-latest", usage=usage) - assert prompt_cost > 0.0 - assert completion_cost > 0.0 - def test_malformed_reported_cost_falls_back_to_token_math(self): - """A junk value must not fail the request, fall back to calculating.""" - usage = Usage(prompt_tokens=100, completion_tokens=200, total_tokens=300) - setattr(usage, "cost", "not-a-number") - prompt_cost, completion_cost = cost_per_token(model="grok-4-latest", usage=usage) - - assert prompt_cost > 0.0 - assert completion_cost > 0.0 - - def test_boolean_reported_cost_falls_back_to_token_math(self): - """True is an int in python and would otherwise be billed as $1.""" - usage = Usage(prompt_tokens=100, completion_tokens=200, total_tokens=300) - setattr(usage, "cost", True) - - prompt_cost, completion_cost = cost_per_token(model="grok-4-latest", usage=usage) - - assert prompt_cost > 0.0 - assert completion_cost > 0.0 - assert completion_cost != 1.0 - - def test_negative_reported_cost_is_rejected(self): - """A negative amount must never reach spend tracking. - - A caller who can set api_base controls the response body, so trusting a - negative figure would let them subtract from their own recorded spend and - slip past a budget. Fall back to token pricing instead, and keep charging - the web search surcharge, since no trustworthy total was reported. - """ - usage = Usage( - prompt_tokens=100, - completion_tokens=200, - total_tokens=300, - cost=-0.0037756, - ) - setattr(usage, "server_side_tool_usage_details", {"web_search_calls": 3}) - - prompt_cost, completion_cost = cost_per_token(model="grok-4-latest", usage=usage) - - assert prompt_cost > 0.0 - assert completion_cost > 0.0 - assert cost_per_web_search_request(usage=usage, model_info={}) > 0.0 - - def test_non_finite_reported_cost_is_rejected(self): - """NaN compares false against every budget threshold. - - Usage stores a provider supplied cost without validating it, so a caller who - controls the response body could report NaN and leave spend >= max_budget - false for the life of the key rather than mispricing one request. The - infinities are refused alongside it. Fall back to token pricing and keep - charging the web search surcharge, since no trustworthy total was reported. - """ - for reported_cost in (float("nan"), float("inf"), float("-inf")): - usage = Usage( - prompt_tokens=100, - completion_tokens=200, - total_tokens=300, - cost=reported_cost, - ) - setattr(usage, "server_side_tool_usage_details", {"web_search_calls": 3}) - - prompt_cost, completion_cost = cost_per_token(model="grok-4-latest", usage=usage) - - assert math.isfinite(prompt_cost), reported_cost - assert math.isfinite(completion_cost), reported_cost - assert prompt_cost > 0.0, reported_cost - assert completion_cost > 0.0, reported_cost - assert cost_per_web_search_request(usage=usage, model_info={}) > 0.0, reported_cost def test_zero_reported_cost_is_honoured(self): """A reported zero is a real answer, not a missing value.""" diff --git a/tests/test_litellm/llms/xai/test_xai_redirected_slug_pricing.py b/tests/test_litellm/llms/xai/test_xai_redirected_slug_pricing.py deleted file mode 100644 index 83e8925f70b..00000000000 --- a/tests/test_litellm/llms/xai/test_xai_redirected_slug_pricing.py +++ /dev/null @@ -1,102 +0,0 @@ -""" -xAI retired eight slugs on 2026-05-15 but kept them resolvable: chat slugs redirect to -grok-4.3 and bill at grok-4.3's rates, while the grok-code-fast slugs are aliases of -grok-build-0.1 and bill at its rates, so the registry must price them that way or spend -tracking is wrong. The grok-3-beta, grok-3-fast, grok-3-mini, and grok-4-1-fast slugs -are absent from /v1/language-models and resolve to grok-4.3 the same way (the chat -response names grok-4.3 as the served model), so they carry grok-4.3's rates too. -https://docs.x.ai/developers/migration/may-15-retirement -https://docs.x.ai/developers/models/grok-build-0.1 -""" - -from __future__ import annotations - -import json -from pathlib import Path - -import pytest - -REPO_ROOT = Path(__file__).parents[4] -PRICES_PATH = REPO_ROOT / "model_prices_and_context_window.json" -BACKUP_PRICES_PATH = REPO_ROOT / "litellm" / "model_prices_and_context_window_backup.json" -MAP_PATHS = (PRICES_PATH, BACKUP_PRICES_PATH) - -REDIRECT_TARGET = "xai/grok-4.3" -GROK_3_MINI_SLUGS = ( - "xai/grok-3-mini", - "xai/grok-3-mini-beta", - "xai/grok-3-mini-fast", - "xai/grok-3-mini-fast-beta", - "xai/grok-3-mini-fast-latest", - "xai/grok-3-mini-latest", -) -REDIRECTED_SLUGS = ( - "xai/grok-3", - "xai/grok-3-beta", - "xai/grok-3-fast-beta", - "xai/grok-3-fast-latest", - "xai/grok-3-latest", - *GROK_3_MINI_SLUGS, - "xai/grok-4", - "xai/grok-4-0709", - "xai/grok-4-1-fast", - "xai/grok-4-1-fast-non-reasoning", - "xai/grok-4-1-fast-non-reasoning-latest", - "xai/grok-4-1-fast-reasoning", - "xai/grok-4-1-fast-reasoning-latest", - "xai/grok-4-fast-non-reasoning", - "xai/grok-4-fast-reasoning", - "xai/grok-4-latest", -) -CODE_REDIRECT_TARGET = "xai/grok-build-0.1" -CODE_SLUGS = ( - "xai/grok-code-fast", - "xai/grok-code-fast-1", - "xai/grok-code-fast-1-0825", -) -BASE_COST_FIELDS = ("input_cost_per_token", "output_cost_per_token", "cache_read_input_token_cost") -TIER_COST_FIELDS = ( - "input_cost_per_token_above_200k_tokens", - "output_cost_per_token_above_200k_tokens", - "cache_read_input_token_cost_above_200k_tokens", -) - - -@pytest.fixture(scope="module", params=[p.name for p in MAP_PATHS]) -def cost_map(request: pytest.FixtureRequest) -> dict: - path = next(p for p in MAP_PATHS if p.name == request.param) - return json.loads(path.read_text(encoding="utf-8")) - - -@pytest.mark.parametrize("slug", REDIRECTED_SLUGS) -def test_redirected_slug_bills_at_the_target_rate(cost_map: dict, slug: str): - target = cost_map[REDIRECT_TARGET] - entry = cost_map[slug] - for field in BASE_COST_FIELDS: - assert entry[field] == target[field], field - - -@pytest.mark.parametrize("slug", CODE_SLUGS) -def test_code_slug_bills_at_grok_build_rate(cost_map: dict, slug: str): - """grok-code-fast* are aliases of grok-build-0.1, not grok-4.3 redirects.""" - target = cost_map[CODE_REDIRECT_TARGET] - entry = cost_map[slug] - for field in (*BASE_COST_FIELDS, *TIER_COST_FIELDS): - assert entry[field] == target[field], field - - -@pytest.mark.parametrize("slug", REDIRECTED_SLUGS) -def test_redirected_slug_carries_the_target_tier_rates(cost_map: dict, slug: str): - """The request executes as grok-4.3, so it is tiered at grok-4.3's 200k boundary.""" - target = cost_map[REDIRECT_TARGET] - entry = cost_map[slug] - for field in TIER_COST_FIELDS: - assert entry[field] == target[field], field - assert {k for k in entry if "_above_" in k} == {k for k in target if "_above_" in k} - - -def test_both_cost_maps_agree_on_the_redirected_slugs(): - prices = json.loads(PRICES_PATH.read_text(encoding="utf-8")) - backup = json.loads(BACKUP_PRICES_PATH.read_text(encoding="utf-8")) - for slug in (*REDIRECTED_SLUGS, *CODE_SLUGS, REDIRECT_TARGET, CODE_REDIRECT_TARGET): - assert prices[slug] == backup[slug], slug diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py b/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py index 35e7055bbc0..05ed53df8e8 100644 --- a/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py +++ b/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py @@ -3057,6 +3057,11 @@ class TestMCPDelegateAuthToUpstream: ) cases = [ + ("/mcp/sse", []), + ("/mcp/sse/", []), + ("/mcp/sse/messages", []), + ("/mcp/sse/messages/", []), + ("/sse/mcp", ["sse"]), # Single server, single segment. ("/mcp/foo", ["foo"]), # Server name with one embedded slash (two segments). @@ -6524,6 +6529,53 @@ class TestMCPDcrBridgeDelegateAdmission: assert exc_info.value.status_code == 503 + async def test_reload_admitted_key_returns_admin_for_master_key_hash(self): + """An envelope sealed under the master key has no DB row to reload; the reload resolves it + to the PROXY_ADMIN auth context (api_key is the alias, never the hash) rather than failing. + A hash that is NOT the master key's still reaches the prisma gate and fails the same as + before (500 with no database connection).""" + from litellm.constants import LITELLM_PROXY_MASTER_KEY_ALIAS + from litellm.proxy._types import LitellmUserRoles, hash_token + + with ( + patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY), + patch("litellm.proxy.proxy_server.prisma_client", None), + ): + admitted = await MCPRequestHandler._reload_admitted_key(hash_token(self._MASTER_KEY)) + assert admitted.user_role == LitellmUserRoles.PROXY_ADMIN + assert admitted.api_key == LITELLM_PROXY_MASTER_KEY_ALIAS + with pytest.raises(HTTPException) as exc_info: + await MCPRequestHandler._reload_admitted_key("not-the-master-hash") + assert exc_info.value.status_code == 500 + + @pytest.mark.parametrize( + "flag_enabled, scope, expected", + [(True, "scoped", []), (False, "scoped", ["public"]), (True, "unscoped", ["public"])], + ) + async def test_master_envelope_respects_allow_all_scope(self, flag_enabled, scope, expected): + from litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp import MCPServerAccess + from litellm.proxy._experimental.mcp_server.mcp_server_manager import MCPServerManager + from litellm.proxy._types import hash_token + + manager = MCPServerManager() + with patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY): + admitted = await MCPRequestHandler._reload_admitted_key(hash_token(self._MASTER_KEY)) + with ( + patch.object(manager, "get_allow_all_keys_server_ids", return_value=["public"]), + patch.object(manager, "_get_active_submitted_mcp_server_ids_for_user", new=AsyncMock(return_value=[])), + patch.object( + MCPRequestHandler, + "_get_allowed_mcp_servers_for_user", + new=AsyncMock(return_value=["granted"] if scope == "scoped" else []), + ), + ): + servers = await manager.get_allowed_mcp_servers( + admitted, + access=MCPServerAccess(server_ids=(), scope=scope), + general_settings={"mcp_allow_all_keys_respects_mcp_scope": flag_enabled}, + ) + assert servers == expected + async def test_envelope_for_key_barred_from_mcp_routes_is_rejected_403(self): """A key whose allowed_routes exclude MCP must not reach tools via an envelope: the arm runs RouteChecks.should_call_route before admitting, exactly as the standard pipeline does between @@ -6954,10 +7006,12 @@ class TestMCPDcrBridgeDelegateAdmission: assert exc_info.value.status_code == 403 assert not exc_info.value.headers - async def test_explicit_litellm_key_wins_over_envelope_arm(self): - """An explicit x-litellm-api-key is always a LiteLLM credential and its arm precedes the - envelope arm: user_api_key_auth validates the key and NO inner token is injected, even - though the Authorization header carries a valid envelope.""" + async def test_explicit_litellm_key_matching_envelope_admits_under_explicit_key(self): + """The dual-credential arm: an explicit x-litellm-api-key paired with an envelope sealing the + SAME key hash admits under the explicit key's auth context AND injects the sealed upstream + token for egress. When the envelope seals a different principal the request is a 403 instead + (covered by the mismatch tests), and the explicit key never silently drops the envelope the + way the pre-fix ordering did.""" envelope = self._mint_bridge_envelope() scope = { "type": "http", @@ -6970,7 +7024,7 @@ class TestMCPDcrBridgeDelegateAdmission: } async def mock_user_api_key_auth(api_key, request): - return UserAPIKeyAuth(api_key=api_key, user_id="litellm-key-user") + return UserAPIKeyAuth(api_key=self._KEY_HASH, user_id="litellm-key-user") with ( patch( @@ -6992,9 +7046,10 @@ class TestMCPDcrBridgeDelegateAdmission: mock_auth.assert_called_once() assert mock_auth.call_args.kwargs["api_key"] == "Bearer sk-explicit-litellm-key" - # The explicit-key arm admitted; the envelope arm never ran, so no inner token is injected. assert auth_result.user_id == "litellm-key-user" - assert mcp_server_auth_headers == {} + assert mcp_server_auth_headers == { + "bridge_delegate_server": {"Authorization": "Bearer inner-upstream-access-token"} + } async def test_non_bridge_oauth_delegate_server_does_not_take_envelope_arm(self): """An oauth_delegate server that is NOT a DCR bridge (``dcr_bridge`` unset) must not take the @@ -7134,6 +7189,199 @@ class TestMCPDcrBridgeDelegateAdmission: assert exc_info.value.status_code == 500 +@pytest.mark.asyncio +class TestMCPDcrBridgeDualCredential: + """Dual-credential arm: ``x-litellm-api-key`` alongside an ``llm_env_`` bearer on a + DCR-bridge ``oauth_delegate`` route (issue #38208). + + Real MCP clients send their litellm key on every request, so the envelope minted at + ``/{server}/token`` arrives paired with the key rather than alone. The explicit credential + is the admission context and the envelope supplies the upstream token, but only when both + name the same principal; a mismatch is a 403, an invalid envelope is the scope's + ``invalid_token`` challenge, and the envelope itself never reaches egress. + """ + + _DELEGATE = TestMCPDcrBridgeDelegateAdmission + _MASTER_KEY = TestMCPDcrBridgeDelegateAdmission._MASTER_KEY + _KEY_HASH = TestMCPDcrBridgeDelegateAdmission._KEY_HASH + + @staticmethod + def _dual_scope(envelope: str, explicit_key: str): + return { + "type": "http", + "method": "POST", + "path": "/mcp/bridge_delegate_server", + "headers": [ + (b"authorization", f"Bearer {envelope}".encode("latin-1")), + (b"x-litellm-api-key", explicit_key.encode("latin-1")), + ], + } + + @pytest.mark.parametrize("dual_credential", [False, True]) + async def test_admission_rejects_server_without_routable_name(self, dual_credential): + envelope = self._DELEGATE._mint_bridge_envelope() + server = self._DELEGATE._bridge_delegate_server(server_name=None) + admission = ( + MCPRequestHandler._admit_dcr_bridge_dual_credential( + server=server, + requested_name="bridge_delegate_server", + authorization_value=f"Bearer {envelope}", + litellm_api_key="sk-explicit-key", + mcp_server_auth_headers=None, + request=self._DELEGATE._mcp_request(), + route="/mcp/bridge_delegate_server", + ) + if dual_credential + else MCPRequestHandler._admit_dcr_bridge_delegate( + server=server, + requested_name="bridge_delegate_server", + authorization_value=f"Bearer {envelope}", + mcp_server_auth_headers=None, + request=self._DELEGATE._mcp_request(), + route="/mcp/bridge_delegate_server", + ) + ) + with ( + patch( + "litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp.user_api_key_auth", + new=AsyncMock(return_value=self._DELEGATE._reloaded_key()), + ), + patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY), + self._DELEGATE._patch_key_reload() as reload_key, + pytest.raises(HTTPException) as exc_info, + ): + await admission + + assert exc_info.value.status_code == 500 + assert exc_info.value.detail == "Server misconfigured: MCP server has no routable name" + reload_key.assert_not_awaited() + + @pytest.mark.parametrize("mapped_jwt", [False, True]) + async def test_dual_credential_matching_key_admits_under_explicit_key_and_forwards_upstream_token(self, mapped_jwt): + """The reported bug: before the fix this request validated the key and dropped the + envelope, so egress forwarded no upstream credential and the upstream 401 yielded + ``tools: []``. Now the explicit key's auth context wins admission AND the sealed + upstream token is injected per-server, while the envelope bearer is scrubbed from + every egress header context.""" + envelope = self._DELEGATE._mint_bridge_envelope(key_hash=self._KEY_HASH) + explicit_auth = self._DELEGATE._reloaded_key( + api_key=None if mapped_jwt else self._KEY_HASH, + token=self._KEY_HASH, + user_id=None if mapped_jwt else "explicit-key-user", + ) + presented_token = "aaa.bbb.ccc" if mapped_jwt else "sk-explicit-key" + with ( + patch( + "litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp.user_api_key_auth", + new_callable=AsyncMock, + return_value=explicit_auth, + ) as mock_auth, + patch("litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager") as mock_mgr, + patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY), + self._DELEGATE._patch_key_reload() as get_key_object, + ): + mock_mgr.get_mcp_server_by_name.return_value = self._DELEGATE._bridge_delegate_server() + ( + auth_result, + _mcp_auth_header, + _mcp_servers, + mcp_server_auth_headers, + oauth2_headers, + raw_headers, + ) = await MCPRequestHandler.process_mcp_request(self._dual_scope(envelope, presented_token)) + + mock_auth.assert_awaited_once() + assert mock_auth.await_args.kwargs["api_key"] == f"Bearer {presented_token}" + assert auth_result is explicit_auth + get_key_object.assert_not_awaited() + assert mcp_server_auth_headers == { + "bridge_delegate_server": {"Authorization": "Bearer inner-upstream-access-token"} + } + assert oauth2_headers is None + assert all("llm_env_" not in str(v) for v in raw_headers.values()) + + async def test_dual_credential_principal_mismatch_is_403(self): + """An envelope minted under one key presented alongside a different key must not admit: + the request names two different principals, so it fails closed with + ``oauth_principal_mismatch`` rather than falling back onto either credential.""" + envelope = self._DELEGATE._mint_bridge_envelope(key_hash=self._KEY_HASH) + with ( + patch( + "litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp.user_api_key_auth", + new_callable=AsyncMock, + return_value=self._DELEGATE._reloaded_key(api_key="a-different-key-hash"), + ), + patch("litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager") as mock_mgr, + patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY), + self._DELEGATE._patch_key_reload(), + ): + mock_mgr.get_mcp_server_by_name.return_value = self._DELEGATE._bridge_delegate_server() + with pytest.raises(HTTPException) as exc_info: + await MCPRequestHandler.process_mcp_request(self._dual_scope(envelope, "sk-other-key")) + + assert exc_info.value.status_code == 403 + assert exc_info.value.detail == {"error": "oauth_principal_mismatch"} + + async def test_dual_credential_user_subject_envelope_matches_on_user_id(self): + """An interactive (user_id) envelope pairs with an explicit credential whose resolved + user_id is the same user; a different user is a 403, never a silent admit.""" + for presented_user, expected_status in (("sso-user-7", None), ("sso-user-9", 403)): + envelope = self._DELEGATE._mint_bridge_envelope(user_id="sso-user-7") + with ( + patch( + "litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp.user_api_key_auth", + new_callable=AsyncMock, + return_value=UserAPIKeyAuth(user_id=presented_user, api_key="any-hash"), + ), + patch( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager" + ) as mock_mgr, + patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY), + ): + mock_mgr.get_mcp_server_by_name.return_value = self._DELEGATE._bridge_delegate_server() + if expected_status is not None: + with pytest.raises(HTTPException) as exc_info: + await MCPRequestHandler.process_mcp_request(self._dual_scope(envelope, "sk-key")) + assert exc_info.value.status_code == expected_status + assert exc_info.value.detail == {"error": "oauth_principal_mismatch"} + else: + ( + auth_result, + _h, + _s, + mcp_server_auth_headers, + _o, + _r, + ) = await MCPRequestHandler.process_mcp_request(self._dual_scope(envelope, "sk-key")) + assert auth_result.user_id == "sso-user-7" + assert mcp_server_auth_headers == { + "bridge_delegate_server": {"Authorization": "Bearer inner-upstream-access-token"} + } + + async def test_dual_credential_invalid_envelope_is_401_challenge_not_silent_admit(self): + """A tampered envelope next to a perfectly valid key must still fail closed with the + scope's ``invalid_token`` challenge; the explicit key alone never unlocks a bridge + server's upstream token.""" + envelope = self._DELEGATE._mint_bridge_envelope(key_hash=self._KEY_HASH) + tampered = envelope[:-4] + "AAAA" + with ( + patch( + "litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp.user_api_key_auth", + new_callable=AsyncMock, + return_value=self._DELEGATE._reloaded_key(), + ), + patch("litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager") as mock_mgr, + patch("litellm.proxy.proxy_server.master_key", self._MASTER_KEY), + self._DELEGATE._patch_key_reload(), + ): + mock_mgr.get_mcp_server_by_name.return_value = self._DELEGATE._bridge_delegate_server() + with pytest.raises(HTTPException) as exc_info: + await MCPRequestHandler.process_mcp_request(self._dual_scope(tampered, "sk-explicit-key")) + + assert exc_info.value.status_code == 401 + assert "invalid_token" in str(exc_info.value.headers) + + @pytest.mark.asyncio class TestAggregateGatewayDcrChallenge: """The mcp_gateway_dcr front door: a 401 on the aggregate /mcp scope must diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_discoverable_endpoints.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_discoverable_endpoints.py index c1d5cedeba0..f9a0075e530 100644 --- a/tests/test_litellm/proxy/_experimental/mcp_server/test_discoverable_endpoints.py +++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_discoverable_endpoints.py @@ -6725,6 +6725,270 @@ async def test_bridge_mint_unresolvable_identity_is_500_before_upstream(): post.assert_not_called() +async def _exchange_for_bridge_server_with_jwt(jwt_auth_result, upstream_body=None): + """Drive exchange_token_with_server for a bridge oauth_delegate authorization_code request whose + presented credential is JWT-shaped, with _resolve_jwt_auth stubbed to a given result. Returns + (response, post_mock) so a test can assert the minted envelope's sealed identity or the mapped + error status.""" + from litellm.proxy._experimental.mcp_server.discoverable_endpoints import exchange_token_with_server + from litellm.types.mcp import MCPAuth + + request = _bridge_mock_request() + request.headers = {"x-litellm-api-key": "aaa.bbb.ccc"} + fake_http_response = MagicMock() + fake_http_response.json.return_value = upstream_body or { + "access_token": "UP", + "token_type": "Bearer", + "expires_in": 3600, + } + fake_http_response.raise_for_status = MagicMock() + fake_http_client = MagicMock() + fake_http_client.post = AsyncMock(return_value=fake_http_response) + server = _bridge_server(auth_type=MCPAuth.oauth_delegate) + with ( + patch( + "litellm.proxy._experimental.mcp_server.discoverable_endpoints.get_async_httpx_client", + return_value=fake_http_client, + ), + patch( + "litellm.proxy._experimental.mcp_server.bridge_token_flow._resolve_jwt_auth", + new=AsyncMock(return_value=jwt_auth_result), + ), + patch("litellm.proxy.proxy_server.master_key", _BRIDGE_MASTER_KEY), + ): + response = await exchange_token_with_server( + request=request, + mcp_server=server, + grant_type="authorization_code", + code="auth-code", + redirect_uri="https://claude.ai/api/mcp/auth_callback", + client_id="dcr-client-123", + client_secret=None, + code_verifier="verifier", + ) + return response, fake_http_client.post + + +@pytest.mark.asyncio +async def test_bridge_mint_unmapped_jwt_is_rejected_before_upstream(): + from litellm.proxy.auth.handle_jwt import JWTIdentity + + response, post = await _exchange_for_bridge_server_with_jwt( + JWTIdentity(user_id="jwt-user-5", user_object=None, agent_id=None) + ) + assert response.status_code == 400 + assert json.loads(response.body)["error"] == "invalid_request" + post.assert_not_called() + + +@pytest.mark.asyncio +async def test_bridge_mint_jwt_mapped_to_virtual_key_seals_key_hash_subject(): + from datetime import datetime, timezone + + from litellm.proxy._experimental.mcp_server.outbound_credentials.bridge_credentials import ( + BridgeEnvelopeAdmitted, + envelope_keys_from_master_key, + resolve_bridge_envelope, + ) + from litellm.proxy._types import UserAPIKeyAuth + + response, _post = await _exchange_for_bridge_server_with_jwt( + UserAPIKeyAuth(token="mapped-key-hash-99", user_id="mapped-user") + ) + assert response.status_code == 200 + token = json.loads(response.body)["access_token"] + keys = envelope_keys_from_master_key(_BRIDGE_MASTER_KEY) + opened = resolve_bridge_envelope(token, keys, datetime.now(timezone.utc), "bridge_srv") + assert isinstance(opened, BridgeEnvelopeAdmitted) + assert opened.identity.subject_type == "key_hash" + assert opened.identity.subject == "mapped-key-hash-99" + + +@pytest.mark.asyncio +@pytest.mark.parametrize("jwt_claims", [{"client_id": "allowed"}, {"client_id": "denied"}, {}]) +async def test_bridge_mint_jwt_cannot_drop_signed_client_policy(jwt_claims): + from litellm.proxy._types import UserAPIKeyAuth + + settings = { + "mcp_allowed_clients": [{"alias": "Allowed", "value": "allowed"}], + "mcp_client_id_header": "x-client-id", + "litellm_jwtauth": {"mcp_client_id_jwt_field": "client_id"}, + } + with patch("litellm.proxy.proxy_server.general_settings", settings): + response, post = await _exchange_for_bridge_server_with_jwt( + UserAPIKeyAuth(token="mapped-key-hash-99", jwt_claims=jwt_claims) + ) + assert response.status_code == 400 + assert json.loads(response.body)["error"] == "invalid_request" + assert "signed client identity" in json.loads(response.body)["error_description"] + post.assert_not_called() + + +@pytest.mark.asyncio +@pytest.mark.parametrize( + "settings", + [ + {}, + {"litellm_jwtauth": {"mcp_client_id_jwt_field": "client_id"}}, + { + "mcp_allowed_clients": [{"alias": "Allowed", "value": "allowed"}], + "mcp_client_id_header": "x-client-id", + }, + ], +) +async def test_bridge_mint_mapped_jwt_without_signed_client_policy(settings): + from litellm.proxy._types import UserAPIKeyAuth + + with patch("litellm.proxy.proxy_server.general_settings", settings): + response, post = await _exchange_for_bridge_server_with_jwt( + UserAPIKeyAuth(token="mapped-key-hash-99", jwt_claims={"client_id": "allowed"}) + ) + assert response.status_code == 200 + assert json.loads(response.body)["access_token"].startswith("llm_env_") + post.assert_awaited_once() + + +@pytest.mark.asyncio +async def test_bridge_mint_jwt_with_no_resolved_identity_is_400_before_upstream(): + """A JWT that resolves to nothing (or to an identity with no user_id) cannot back an envelope: + the mint returns 400 invalid_request WITHOUT consuming the single-use code upstream, matching + the no-credential path rather than hashing the raw JWT string.""" + response, post = await _exchange_for_bridge_server_with_jwt(None) + assert response.status_code == 400 + assert json.loads(response.body)["error"] == "invalid_request" + post.assert_not_called() + + from litellm.proxy.auth.handle_jwt import JWTIdentity + + response, post = await _exchange_for_bridge_server_with_jwt( + JWTIdentity(user_id=None, user_object=None, agent_id=None) + ) + assert response.status_code == 400 + assert json.loads(response.body)["error"] == "invalid_request" + post.assert_not_called() + + +def _jwt_auth_patches(mapped_key): + from contextlib import ExitStack + + from litellm.proxy._types import LiteLLM_JWTAuth + from litellm.proxy.auth.auth_checks import jwt_key_mapping_cache_key + from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache + + cache = UserApiKeyCache() + cache.set_cache(key=jwt_key_mapping_cache_key("sub", "mapped-client"), value=mapped_key.token) + cache.set_cache(key=mapped_key.token, value=mapped_key) + handler = MagicMock() + handler.litellm_jwtauth = LiteLLM_JWTAuth(virtual_key_claim_field="sub") + handler.auth_jwt = AsyncMock(return_value={"sub": "mapped-client"}) + stack = ExitStack() + stack.enter_context(patch("litellm.proxy.proxy_server.general_settings", {"enable_jwt_auth": True})) + stack.enter_context(patch("litellm.proxy.proxy_server.premium_user", True)) + stack.enter_context(patch("litellm.proxy.proxy_server.prisma_client", object())) + stack.enter_context(patch("litellm.proxy.proxy_server.jwt_handler", handler)) + stack.enter_context(patch("litellm.proxy.proxy_server.user_api_key_cache", cache)) + stack.enter_context( + patch( + "litellm.proxy._experimental.mcp_server.bridge_token_flow._key_owner_scim_deactivated", + new=AsyncMock(return_value=False), + ) + ) + return stack + + +@pytest.mark.asyncio +async def test_jwt_mapped_to_service_account_key_without_user_id_resolves(): + """A JWT mapped to a team or service-account virtual key (no user_id) is still an active + credential: _resolve_jwt_auth returns the mapped key, and the mint seals a key_hash-subject + envelope rather than 400ing with no_identity.""" + from litellm.proxy._experimental.mcp_server import bridge_token_flow + from litellm.proxy._types import UserAPIKeyAuth + from litellm.types.mcp import MCPAuth + + mapped_key = UserAPIKeyAuth(user_id=None, token="svc-key-hash-1") + request = _bridge_mock_request() + request.headers = {"x-litellm-api-key": "aaa.bbb.ccc"} + with ( + _jwt_auth_patches(mapped_key), + patch("litellm.proxy.proxy_server.master_key", _BRIDGE_MASTER_KEY), + ): + resolved = await bridge_token_flow._resolve_jwt_auth(request, "aaa.bbb.ccc", None) + assert isinstance(resolved, UserAPIKeyAuth) + assert resolved.token == mapped_key.token + assert resolved.api_key is None + assert resolved.user_id is None + + mint = await bridge_token_flow._prepare_bridge_mint( + request=request, + mcp_server=_bridge_server(auth_type=MCPAuth.oauth_delegate), + ) + assert isinstance(mint, bridge_token_flow._BridgeMintReady) + assert mint.identity.subject_type == "key_hash" + assert mint.identity.subject == "svc-key-hash-1" + + +@pytest.mark.asyncio +async def test_jwt_mapped_to_blocked_key_is_rejected(): + """The relaxed gate is still active-state gated: a JWT mapped to a blocked virtual key resolves + to None, so the mint cannot seal an envelope under it.""" + from litellm.proxy._experimental.mcp_server import bridge_token_flow + from litellm.proxy._types import UserAPIKeyAuth + + mapped_key = UserAPIKeyAuth(user_id=None, token="blocked-key-hash-1", blocked=True) + request = _bridge_mock_request() + request.headers = {"x-litellm-api-key": "aaa.bbb.ccc"} + with ( + _jwt_auth_patches(mapped_key), + patch("litellm.proxy.proxy_server.master_key", _BRIDGE_MASTER_KEY), + ): + resolved = await bridge_token_flow._resolve_jwt_auth(request, "aaa.bbb.ccc", None) + assert resolved is None + + mint = await bridge_token_flow._prepare_bridge_mint( + request=request, + mcp_server=_bridge_server(auth_type=MCPAuth.oauth_delegate), + ) + assert mint == "no_identity" + + +@pytest.mark.asyncio +async def test_master_key_at_token_endpoint_mints_key_hash_envelope(): + """The master key has no row in LiteLLM_VerificationTokenTable, but it is the proxy's root + credential: presented at the bridge /token endpoint it must mint a key_hash-subject envelope + (sealed under hash_token(master_key)) even with no database connection at all. A presented key + that is NOT the master key still hits the unresolvable gate when prisma is down, unchanged.""" + from litellm.proxy._experimental.mcp_server import bridge_token_flow + from litellm.proxy._types import hash_token + from litellm.types.mcp import MCPAuth + + master = "sk-test-master-key-mint-0000" + request = _bridge_mock_request() + request.headers = {"x-litellm-api-key": master} + with ( + patch("litellm.proxy.proxy_server.master_key", master), + patch("litellm.proxy.proxy_server.prisma_client", None), + ): + mint = await bridge_token_flow._prepare_bridge_mint( + request=request, + mcp_server=_bridge_server(auth_type=MCPAuth.oauth_delegate), + ) + assert isinstance(mint, bridge_token_flow._BridgeMintReady) + assert mint.identity.subject_type == "key_hash" + assert mint.identity.subject == hash_token(master) + + other = _bridge_mock_request() + other.headers = {"x-litellm-api-key": "sk-not-the-master-key"} + with ( + patch("litellm.proxy.proxy_server.master_key", master), + patch("litellm.proxy.proxy_server.prisma_client", None), + ): + mint = await bridge_token_flow._prepare_bridge_mint( + request=other, + mcp_server=_bridge_server(auth_type=MCPAuth.oauth_delegate), + ) + assert mint == "identity_unresolvable" + + @pytest.mark.asyncio async def test_bridge_mint_upstream_expired_lifetime_is_502(): """An upstream token response reporting an already-elapsed lifetime (a parseable non-positive diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server.py index b715fe67e20..ea82c9b069d 100644 --- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server.py +++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server.py @@ -1147,109 +1147,39 @@ async def test_mcp_read_resource_success(): assert result is read_result -def test_normalize_resource_contents_passes_metadata(): - """Test that _normalize_resource_contents preserves meta from ResourceContents (MCP 1.26.0+).""" - try: - from litellm.proxy._experimental.mcp_server.server import ( - _normalize_resource_contents, - ) - except ImportError: - pytest.skip("MCP server not available") +@pytest.mark.asyncio +@pytest.mark.parametrize( + "kind,metadata", + (("text", {"version": "1.0", "source": "test"}), ("blob", {"encoding": "base64"}), ("text", {}), ("text", None)), +) +async def test_read_resource_preserves_content_metadata(_mcp_request_ctx, kind, metadata): + from mcp.types import ReadResourceRequestParams + from litellm.proxy._experimental.mcp_server import operations, server - meta = {"version": "1.0", "source": "test"} - contents = [ - TextResourceContents( - uri="https://example.com/resource", - text="hello world", - mimeType="text/plain", - meta=meta, - ) - ] + uri: Final = "https://example.com/resource" + caller: Final = UserAPIKeyAuth(user_id="resource-caller") + upstream_server: Final = MCPServer(server_id="catalog", name="catalog", transport=MCPTransport.http) + content: Final = ( + TextResourceContents(uri=uri, text="hello world", mimeType="text/plain", meta=metadata) + if kind == "text" + else BlobResourceContents(uri=uri, blob="aGVsbG8=", mimeType="image/png", meta=metadata) + ) + with ( + patch.object(server, "get_or_extract_auth_context", AsyncMock(return_value=(caller, None, ["catalog"], None, None, None, None))), + patch.object(operations, "_get_allowed_mcp_servers", AsyncMock(return_value=[upstream_server])), + patch.object(operations.global_mcp_server_manager, "read_resource_from_server", AsyncMock(return_value=ReadResourceResult(contents=[content]))), + ): + result: Final = await server.read_resource(_mcp_request_ctx(), ReadResourceRequestParams(uri=uri)) - result = _normalize_resource_contents(contents) - - assert len(result) == 1 - assert result[0].content == "hello world" - assert result[0].mime_type == "text/plain" - assert result[0].meta == meta - - -def test_normalize_resource_contents_blob_with_metadata(): - """Test that _normalize_resource_contents preserves meta for BlobResourceContents.""" - try: - from litellm.proxy._experimental.mcp_server.server import ( - _normalize_resource_contents, - ) - except ImportError: - pytest.skip("MCP server not available") - - meta = {"encoding": "base64"} - contents = [ - BlobResourceContents( - uri="https://example.com/image.png", - blob="aGVsbG8=", - mimeType="image/png", - meta=meta, - ) - ] - - result = _normalize_resource_contents(contents) - - assert len(result) == 1 - assert result[0].content == "aGVsbG8=" - assert result[0].mime_type == "image/png" - assert result[0].meta == meta - - -def test_normalize_resource_contents_preserves_empty_metadata(): - """Test that empty dict meta is preserved (truthiness bug fix).""" - try: - from litellm.proxy._experimental.mcp_server.server import ( - _normalize_resource_contents, - ) - except ImportError: - pytest.skip("MCP server not available") - - empty_meta: dict = {} - contents = [ - TextResourceContents( - uri="https://example.com/resource", - text="hi", - mimeType="text/plain", - meta=empty_meta, - ) - ] - - result = _normalize_resource_contents(contents) - - assert len(result) == 1 - assert result[0].meta == empty_meta - assert result[0].meta is not None - assert result[0].meta == {} - - -def test_normalize_resource_contents_without_metadata(): - """Test that _normalize_resource_contents works when meta is absent (backward compat).""" - try: - from litellm.proxy._experimental.mcp_server.server import ( - _normalize_resource_contents, - ) - except ImportError: - pytest.skip("MCP server not available") - - contents = [ - TextResourceContents( - uri="https://example.com/resource", - text="hello", - mimeType="text/plain", - ) - ] - - result = _normalize_resource_contents(contents) - - assert len(result) == 1 - assert result[0].content == "hello" - assert result[0].meta is None + assert result.model_dump(mode="json", by_alias=True, exclude_none=True) == { + "cacheScope": "private", "resultType": "complete", "ttlMs": 0, + "contents": [{ + "uri": uri, + "mimeType": "text/plain" if kind == "text" else "image/png", + "text" if kind == "text" else "blob": "hello world" if kind == "text" else "aGVsbG8=", + **({"_meta": metadata} if metadata is not None else {}), + }], + } @pytest.mark.asyncio @@ -1859,14 +1789,12 @@ async def test_concurrent_initialize_session_managers(): original_initialized = mcp_server._SESSION_MANAGERS_INITIALIZED original_session_cm = mcp_server._session_manager_cm original_stateful_cm = mcp_server._session_manager_stateful_cm - original_sse_cm = mcp_server._sse_session_manager_cm original_cleanup_task = mcp_server._stateful_auth_context_cleanup_task try: mcp_server._SESSION_MANAGERS_INITIALIZED = False mcp_server._session_manager_cm = None mcp_server._session_manager_stateful_cm = None - mcp_server._sse_session_manager_cm = None # Create mock context managers for all three session managers mock_cm_stateless = AsyncMock() @@ -1877,10 +1805,6 @@ async def test_concurrent_initialize_session_managers(): mock_cm_stateful.__aenter__ = AsyncMock() mock_cm_stateful.__aexit__ = AsyncMock() - mock_cm_sse = AsyncMock() - mock_cm_sse.__aenter__ = AsyncMock() - mock_cm_sse.__aexit__ = AsyncMock() - with ( patch.object( mcp_server.session_manager_stateless, @@ -1892,11 +1816,6 @@ async def test_concurrent_initialize_session_managers(): "run", return_value=mock_cm_stateful, ) as mock_stateful_run, - patch.object( - mcp_server.sse_session_manager, - "run", - return_value=mock_cm_sse, - ) as mock_sse_run, patch("litellm.proxy._experimental.mcp_server.operations.verbose_logger"), ): # Create multiple concurrent tasks that call initialize_session_managers @@ -1918,10 +1837,6 @@ async def test_concurrent_initialize_session_managers(): assert mock_stateful_run.call_count == 1, ( f"Expected 1 call to session_manager_stateful.run(), got {mock_stateful_run.call_count}" ) - assert mock_sse_run.call_count == 1, ( - f"Expected 1 call to sse_session_manager.run(), got {mock_sse_run.call_count}" - ) - # The context managers should only be entered once each assert mock_cm_stateless.__aenter__.call_count == 1, ( f"Expected 1 call to stateless __aenter__, got {mock_cm_stateless.__aenter__.call_count}" @@ -1929,10 +1844,6 @@ async def test_concurrent_initialize_session_managers(): assert mock_cm_stateful.__aenter__.call_count == 1, ( f"Expected 1 call to stateful __aenter__, got {mock_cm_stateful.__aenter__.call_count}" ) - assert mock_cm_sse.__aenter__.call_count == 1, ( - f"Expected 1 call to sse __aenter__, got {mock_cm_sse.__aenter__.call_count}" - ) - # State should be properly set assert mcp_server._SESSION_MANAGERS_INITIALIZED is True @@ -1948,7 +1859,6 @@ async def test_concurrent_initialize_session_managers(): mcp_server._SESSION_MANAGERS_INITIALIZED = original_initialized mcp_server._session_manager_cm = original_session_cm mcp_server._session_manager_stateful_cm = original_stateful_cm - mcp_server._sse_session_manager_cm = original_sse_cm mcp_server._stateful_auth_context_cleanup_task = original_cleanup_task @@ -2263,7 +2173,7 @@ async def test_sse_endpoint_applies_the_same_client_allowlist( new_callable=AsyncMock, ), patch.object( # test-quality-ok: SSE manager is a module singleton; the downstream call is the observable - mcp_module.sse_session_manager, "handle_request", side_effect=handle_request + mcp_module.sse, "handle_post_message", side_effect=handle_request ), ): if admitted: @@ -6651,17 +6561,22 @@ class TestGatewayCreateInitializationOptions: ) captured = {} - async def record_request(scope, receive, send): + @contextlib.asynccontextmanager + async def connect_sse(scope, receive, send): + yield (None, None) + + async def record_request(read_stream, write_stream, options): captured["server_name"] = server.create_initialization_options().server_name scope = { "type": "http", - "method": "POST", + "method": "GET", "path": "/mcp/grafana", "headers": [], } with ( + patch.object(mcp_server.sse, "connect_sse", connect_sse), patch( "litellm.proxy._experimental.mcp_server.server.extract_mcp_auth_context", new_callable=AsyncMock, @@ -6697,8 +6612,8 @@ class TestGatewayCreateInitializationOptions: True, ), patch.object( - mcp_server.sse_session_manager, - "handle_request", + mcp_server.server, + "run", side_effect=record_request, ), ): @@ -8840,7 +8755,7 @@ def _call_tool_result(is_error: bool, text: str) -> CallToolResult: def _mock_mcp_logging_obj() -> MagicMock: logging_obj = MagicMock() logging_obj.model_call_details = {} - logging_obj.async_post_mcp_tool_call_hook = AsyncMock() + logging_obj.async_post_mcp_tool_call_hook = AsyncMock(side_effect=lambda **kwargs: kwargs["response_obj"]) logging_obj.async_success_handler = AsyncMock() logging_obj.async_failure_handler = AsyncMock() return logging_obj @@ -8942,6 +8857,64 @@ async def test_fire_mcp_tool_call_logging_success_path_unchanged(): proxy_logging_mock.post_call_failure_hook.assert_not_awaited() +@pytest.mark.asyncio +async def test_fire_mcp_tool_call_logging_applies_hook_content(): + from litellm.integrations.custom_logger import CustomLogger + from litellm.litellm_core_utils.litellm_logging import Logging + from litellm.proxy._experimental.mcp_server.server import ( + _fire_mcp_tool_call_logging, + ) + from litellm.types.mcp import MCPPostCallResponseObject + + class RedactingLogger(CustomLogger): + async def async_post_mcp_tool_call_hook( + self, + kwargs: dict[str, object], + response_obj: MCPPostCallResponseObject, + start_time: datetime, + end_time: datetime, + ) -> MCPPostCallResponseObject: + assert isinstance(response_obj.mcp_tool_call_response, list) + assert isinstance(response_obj.mcp_tool_call_response[0], TextContent) + response_obj.mcp_tool_call_response = [TextContent(type="text", text="[REDACTED]")] + return response_obj + + logging_obj = Logging( + model="MCP: weather/get_forecast", + messages=[{"role": "user", "content": "tool call"}], + stream=False, + call_type="call_mcp_tool", + start_time=datetime.now(), + litellm_call_id="test-mcp-hook-content", + function_id="test-fn", + dynamic_success_callbacks=[RedactingLogger()], + ) + proxy_logging_mock = _mock_mcp_proxy_logging() + result = CallToolResult( + content=[TextContent(type="text", text="SECRET-1234")], + structuredContent={"result": "SECRET-1234"}, + isError=False, + ) + + with patch( # test-quality-ok: [TQ008] inject proxy logging collaborator + "litellm.proxy.proxy_server.proxy_logging_obj", + proxy_logging_mock, + ): + hooked_result = await _fire_mcp_tool_call_logging( + logging_obj=logging_obj, + result=result, + start_time=datetime.now(), + end_time=datetime.now(), + user_api_key_auth=UserAPIKeyAuth(api_key="test-key", user_id="test-user"), + request_data={}, + ) + + assert isinstance(hooked_result.content[0], TextContent) + assert hooked_result.content[0].text == "[REDACTED]" + assert hooked_result.structured_content is None + assert hooked_result.is_error is True + + @pytest.mark.asyncio async def test_fire_mcp_tool_call_logging_iserror_without_auth_skips_failure_hook(): """Without a UserAPIKeyAuth the failure handlers still fire but the proxy @@ -8956,7 +8929,7 @@ async def test_fire_mcp_tool_call_logging_iserror_without_auth_skips_failure_hoo with patch("litellm.proxy.proxy_server.proxy_logging_obj", proxy_logging_mock): await _fire_mcp_tool_call_logging( logging_obj=logging_obj, - result={"isError": True, "content": [{"type": "text", "text": "denied"}]}, + result=_call_tool_result(True, "denied"), start_time=datetime.now(), end_time=datetime.now(), ) @@ -10260,7 +10233,10 @@ async def test_active_request_ctx_var_feeds_auth_resolution_recording(_mcp_reque ("1999-01-01", True), ], ) -async def test_streamable_http_rejects_modern_protocol_version(header_value: str, expected_rejected: bool) -> None: +@pytest.mark.parametrize("handler", ("handle_streamable_http_mcp", "handle_sse_mcp")) +async def test_streamable_http_rejects_modern_protocol_version( + header_value: str, expected_rejected: bool, handler: str +) -> None: from litellm.proxy._experimental.mcp_server import server as mcp_module from litellm.proxy._experimental.mcp_server.server import unsupported_protocol_version @@ -10283,7 +10259,7 @@ async def test_streamable_http_rejects_modern_protocol_version(header_value: str async def send(message: Message) -> None: sent.append(message) - await mcp_module.handle_streamable_http_mcp(scope, receive, send) + await getattr(mcp_module, handler)(scope, receive, send) start = next(m for m in sent if m["type"] == "http.response.start") assert start["status"] == 400 @@ -10333,3 +10309,124 @@ async def test_tool_listing_preserves_permission_denial_when_failure_logging_fai logger.post_call_failure_hook.assert_awaited_once() assert logger.post_call_failure_hook.await_args.kwargs["original_exception"] is denial assert logger.post_call_failure_hook.await_args.kwargs["user_api_key_dict"] == auth + + +@pytest.mark.asyncio +@pytest.mark.parametrize("prefix,suffix", (("", ""), ("/gateway", "/"))) +async def test_legacy_sse_mount_emits_message_endpoint(prefix: str, suffix: str) -> None: + from starlette.applications import Starlette + from starlette.routing import Mount + from litellm.proxy._experimental.mcp_server.faults.list_outcomes import AggregateToolListing + from litellm.proxy._experimental.mcp_server import server as mcp_server + + app: Final = Starlette(routes=[Mount("/mcp", app=mcp_server.app)]) + incoming: Final[asyncio.Queue[Message]] = asyncio.Queue() + outgoing: Final[asyncio.Queue[Message]] = asyncio.Queue() + await incoming.put({"type": "http.request", "body": b"", "more_body": False}) + path: Final = f"{prefix}/mcp/sse{suffix}" + scope: Final[Scope] = { + "type": "http", + "asgi": {"version": "3.0"}, + "http_version": "1.1", + "method": "GET", + "scheme": "http", + "path": path, + "raw_path": path.encode(), + "query_string": b"", + "root_path": prefix, + "server": ("localhost", 80), + "client": ("127.0.0.1", 1234), + "headers": [(b"accept", b"text/event-stream")], + } + auth: Final = UserAPIKeyAuth(api_key="test-owner") + with ( + patch.object( + mcp_server, "extract_mcp_auth_context", AsyncMock(return_value=(auth, None, None, None, None, None)) + ), + patch.object(mcp_server, "_raise_preemptive_401_for_unauthenticated_servers", AsyncMock()), + patch.object(mcp_server, "_check_passthrough_upstream_auth", AsyncMock()), + patch.object(mcp_server.operations, "_raise_if_initialize_grants_no_mcp_servers", AsyncMock()), + patch.object(mcp_server, "_SESSION_MANAGERS_INITIALIZED", True), + ): + task: Final = asyncio.create_task(app(scope, incoming.get, outgoing.put)) + try: + start: Final = await asyncio.wait_for(outgoing.get(), 2) + assert start["type"] == "http.response.start" + assert start["status"] == 200 + endpoint_frame: Final = await asyncio.wait_for(outgoing.get(), 2) + frame: Final = endpoint_frame["body"].decode() + assert "event: endpoint" in frame + endpoint: Final = frame.split("data: ", 1)[1].splitlines()[0] + assert endpoint.startswith(f"{prefix}/mcp/sse/messages?session_id=") + message_path, query = endpoint.split("?", 1) + + async def post(body: bytes) -> int: + messages: Final[asyncio.Queue[Message]] = asyncio.Queue() + requests: Final[asyncio.Queue[Message]] = asyncio.Queue() + await requests.put({"type": "http.request", "body": body, "more_body": False}) + post_scope: Final[Scope] = { + **scope, + "method": "POST", + "path": message_path + suffix, + "raw_path": (message_path + suffix).encode(), + "query_string": query.encode(), + "root_path": prefix, + "headers": [(b"content-type", b"application/json")], + } + await asyncio.wait_for(app(post_scope, requests.get, messages.put), 2) + return (await messages.get())["status"] + + initialization: Final = json.dumps( + { + "jsonrpc": "2.0", + "id": 1, + "method": "initialize", + "params": { + "protocolVersion": LATEST_HANDSHAKE_VERSION, + "capabilities": {}, + "clientInfo": {"name": "legacy-client", "version": "1"}, + }, + } + ).encode() + assert await post(initialization) == 202 + reply: Final = (await asyncio.wait_for(outgoing.get(), 2))["body"].decode() + initialized: Final = json.loads(reply.split("data: ", 1)[1].splitlines()[0]) + assert initialized["id"] == 1 + assert initialized["result"]["serverInfo"]["name"] == "litellm-mcp-server" + + assert await post(b'{"jsonrpc":"2.0","method":"notifications/initialized"}') == 202 + for request_id, marker in ((2, "first-post"), (3, "second-post")): + post_auth: Final = UserAPIKeyAuth(api_key="test-owner", user_id=marker) + listing: Final = AsyncMock(return_value=AggregateToolListing(tools=[], outcomes={})) + with ( + patch.object( + mcp_server, + "extract_mcp_auth_context", + AsyncMock(return_value=(post_auth, None, [marker], {marker: {"Authorization": marker}}, {"Authorization": marker}, {"x-request-marker": marker})), + ), + patch.object(mcp_server.operations, "_get_tools_from_mcp_servers", listing), + ): + assert ( + await post(json.dumps({"jsonrpc": "2.0", "id": request_id, "method": "tools/list"}).encode()) + == 202 + ) + listed_frame: Final = (await asyncio.wait_for(outgoing.get(), 2))["body"].decode() + listed: Final = json.loads(listed_frame.split("data: ", 1)[1].splitlines()[0]) + assert listed["id"] == request_id + assert listed["result"]["tools"] == [] + listing.assert_awaited_once() + assert listing.await_args.kwargs["user_api_key_auth"].user_id == marker + assert listing.await_args.kwargs["mcp_servers"] == [marker] + assert listing.await_args.kwargs["mcp_server_auth_headers"] == {marker: {"Authorization": marker}} + assert listing.await_args.kwargs["oauth2_headers"] == {"Authorization": marker} + assert listing.await_args.kwargs["raw_headers"] == {"x-request-marker": marker} + + stranger: Final = UserAPIKeyAuth(api_key="different-owner") + with patch.object( + mcp_server, "extract_mcp_auth_context", AsyncMock(return_value=(stranger, None, None, None, None, None)) + ): + assert await post(initialization) == 404 + finally: + await incoming.put({"type": "http.disconnect"}) + await asyncio.wait_for(task, 2) + assert await post(initialization) == 404 diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_utils.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_utils.py index 842859e5a1e..8d10219796b 100644 --- a/tests/test_litellm/proxy/_experimental/mcp_server/test_utils.py +++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_utils.py @@ -4,7 +4,7 @@ import pytest from fastapi import HTTPException from litellm.proxy._experimental.mcp_server.utils import ( - _upstream_credential_headers, + upstream_credential_headers, build_synthetic_mcp_request, logging_safe_mcp_headers, validate_and_normalize_mcp_server_payload, @@ -189,8 +189,8 @@ class TestLoggingSafeMcpHeaders: """clean_headers already strips authorization, and claiming it here would change which header authenticated_with_header resolves to on a config that lists it by design.""" with _configured_servers(_server_forwarding("Authorization", "X-GitHub-Token")): - assert "authorization" not in _upstream_credential_headers(["authorization", "x-github-token"]) - assert "x-github-token" in _upstream_credential_headers(["authorization", "x-github-token"]) + assert "authorization" not in upstream_credential_headers(["authorization", "x-github-token"]) + assert "x-github-token" in upstream_credential_headers(["authorization", "x-github-token"]) def test_keeps_headers_when_no_server_forwards_them(self): with _configured_servers(_server_forwarding("x-github-token")): diff --git a/tests/test_litellm/proxy/auth/test_auth_checks.py b/tests/test_litellm/proxy/auth/test_auth_checks.py index 14b739e60ba..ffba53a5b7a 100644 --- a/tests/test_litellm/proxy/auth/test_auth_checks.py +++ b/tests/test_litellm/proxy/auth/test_auth_checks.py @@ -8057,7 +8057,6 @@ def test_model_has_no_cost_mapping_no_model_or_router_is_false(): [ "azure/speech/azure-tts", "mistral/mistral-ocr-latest", - "vertex_ai/imagen-3.0-generate-001", "dashscope/qwen-flash", ], ) diff --git a/tests/test_litellm/proxy/auth/test_handle_jwt.py b/tests/test_litellm/proxy/auth/test_handle_jwt.py index 208af23f1c5..f8b9043a23f 100644 --- a/tests/test_litellm/proxy/auth/test_handle_jwt.py +++ b/tests/test_litellm/proxy/auth/test_handle_jwt.py @@ -7045,7 +7045,9 @@ async def test_resolve_team_from_header_denies_aliases_of_teams_the_jwt_does_not """An alias that exists but names a team outside the JWT's allowed teams is refused with the same 403 as an unknown value, and the detail names only what the caller sent, so the response reveals neither that the alias exists - nor which team id it maps to.""" + nor which team id it maps to. Because the id and the alias lookups both ran + before the denial, the detail says the value resolved to neither form and + lists the team ids the JWT does allow.""" aliases = {"alias_a": "team_a", "alias_b": "team_b"} with pytest.raises(HTTPException) as other_team: @@ -7057,6 +7059,10 @@ async def test_resolve_team_from_header_denies_aliases_of_teams_the_jwt_does_not assert unknown.value.status_code == 403 assert "team_b" not in other_team.value.detail assert other_team.value.detail.replace("alias_b", "") == unknown.value.detail.replace("no_such", "") + assert unknown.value.detail == ( + "x-litellm-team-id 'no_such' does not resolve to a team id or a unique team alias in your JWT's allowed " + "teams. Allowed team ids: ['team_a']" + ) @pytest.mark.asyncio @@ -7080,7 +7086,9 @@ async def test_resolve_team_from_header_under_db_fallback_tries_the_id_before_th with pytest.raises(HTTPException) as neither: await _resolve_header("ghost", set(), True, _teams_by_id(known_ids), _teams_by_alias(aliases)) assert neither.value.status_code == 403 - assert neither.value.detail == ("Team 'ghost' (from x-litellm-team-id header) is not in your team memberships.") + assert neither.value.detail == ( + "x-litellm-team-id 'ghost' does not resolve to a team id or a unique team alias among your team memberships." + ) @pytest.mark.asyncio @@ -7112,15 +7120,20 @@ async def test_resolve_team_from_header_under_db_fallback_never_aliases_a_team_i ) assert unreadable.value.status_code == 403 - assert unreadable.value.detail == ("Team 'team_a' (from x-litellm-team-id header) is not in your team memberships.") + assert unreadable.value.detail == ( + "x-litellm-team-id 'team_a' does not resolve to a team id or a unique team alias among your team memberships." + ) lookups_by_alias.assert_not_awaited() @pytest.mark.asyncio -async def test_resolve_team_from_header_treats_a_duplicate_alias_as_no_match_but_surfaces_lookup_errors(): - """An alias two teams share cannot name one team, so it is refused like an - unknown value (a 4xx from the lookup is a miss), while a lookup failure - (5xx) is not disguised as a denial and propagates as is.""" +async def test_resolve_team_from_header_denies_a_duplicate_alias_like_an_unknown_value_but_surfaces_lookup_errors(): + """An alias two teams share resolves to no single team, so it is denied with + the very 403 an unknown value gets, under claims and under the DB fallback + alike: the caller cannot be checked against either team, so telling it the + alias is shared would let any JWT probe which aliases exist. The detail says + the value resolved to no team id or unique alias, which is true for both. + A lookup failure (5xx) is not disguised as a denial and propagates as is.""" async def duplicate_alias(team_alias, **kwargs): raise HTTPException(status_code=400, detail={"error": f"Multiple teams found with alias '{team_alias}'."}) @@ -7130,8 +7143,26 @@ async def test_resolve_team_from_header_treats_a_duplicate_alias_as_no_match_but with pytest.raises(HTTPException) as duplicate: await _resolve_header("shared_alias", {"team_a"}, False, _team_lookup_404, duplicate_alias) + with pytest.raises(HTTPException) as unknown: + await _resolve_header("shared_alias", {"team_a"}, False, _team_lookup_404, _team_alias_lookup_404) assert duplicate.value.status_code == 403 - assert "Multiple teams" not in str(duplicate.value.detail) + assert duplicate.value.detail == unknown.value.detail + assert duplicate.value.detail == ( + "x-litellm-team-id 'shared_alias' does not resolve to a team id or a unique team alias in your JWT's " + "allowed teams. Allowed team ids: ['team_a']" + ) + + known_ids = frozenset({"team_a"}) + with pytest.raises(HTTPException) as duplicate_under_fallback: + await _resolve_header("shared_alias", set(), True, _teams_by_id(known_ids), duplicate_alias) + with pytest.raises(HTTPException) as unknown_under_fallback: + await _resolve_header("shared_alias", set(), True, _teams_by_id(known_ids), _team_alias_lookup_404) + assert duplicate_under_fallback.value.status_code == 403 + assert duplicate_under_fallback.value.detail == unknown_under_fallback.value.detail + assert duplicate_under_fallback.value.detail == ( + "x-litellm-team-id 'shared_alias' does not resolve to a team id or a unique team alias among your team " + "memberships." + ) with pytest.raises(HTTPException) as failure: await _resolve_header("alias_a", {"team_a"}, False, _team_lookup_404, db_down) diff --git a/tests/test_litellm/proxy/auth/test_route_checks.py b/tests/test_litellm/proxy/auth/test_route_checks.py index 8da93ba341b..e5179387f82 100644 --- a/tests/test_litellm/proxy/auth/test_route_checks.py +++ b/tests/test_litellm/proxy/auth/test_route_checks.py @@ -653,6 +653,10 @@ def test_virtual_key_llm_api_routes_denies_spend_logs_v2(): "/mcp-rest/tools/call", "/mcp/tools/list", "/token", + "/mcp/sse", + "/mcp/sse/", + "/mcp/sse/messages", + "/mcp/sse/messages/", ], ) def test_mcp_inference_routes_classified_as_llm_api(route): @@ -4310,3 +4314,26 @@ def test_project_delete_route_stays_proxy_admin_only(): valid_token=valid_token, request_data={}, ) + + +@pytest.mark.parametrize("route", ("/mcp/sse", "/mcp/sse/", "/mcp/sse/messages", "/mcp/sse/messages/")) +@pytest.mark.parametrize("route_group", ("mcp_routes", "llm_api_routes", "openai_routes")) +def test_legacy_sse_respects_virtual_key_route_permissions(route: str, route_group: str) -> None: + token: Final = UserAPIKeyAuth( + user_id="sse-caller", user_role=LitellmUserRoles.INTERNAL_USER, allowed_routes=[route_group] + ) + request: Final = Request({"type": "http", "method": "POST" if "messages" in route else "GET", "path": route}) + if route_group == "openai_routes": + with pytest.raises(HTTPException) as caught: + RouteChecks.is_virtual_key_allowed_to_call_route(route=route, valid_token=token, request=request) + assert caught.value.status_code == 403 + return + RouteChecks.non_proxy_admin_allowed_routes_check( + user_obj=None, + _user_role=LitellmUserRoles.INTERNAL_USER, + route=route, + request=request, + valid_token=token, + request_data={}, + ) + assert RouteChecks.is_virtual_key_allowed_to_call_route(route=route, valid_token=token, request=request) diff --git a/tests/test_litellm/proxy/common_utils/test_auth_cache_invalidation_pubsub.py b/tests/test_litellm/proxy/common_utils/test_auth_cache_invalidation_pubsub.py index 4e2059ac30b..96770ee01c4 100644 --- a/tests/test_litellm/proxy/common_utils/test_auth_cache_invalidation_pubsub.py +++ b/tests/test_litellm/proxy/common_utils/test_auth_cache_invalidation_pubsub.py @@ -1,17 +1,20 @@ import asyncio import hashlib import json -from typing import Iterable, List, Optional, Tuple +import time +from collections.abc import Iterable from unittest.mock import patch import pytest from redis.asyncio import Redis +import litellm.proxy.common_utils.auth_cache_invalidation_pubsub as pubsub_module from litellm.caching.in_memory_cache import InMemoryCache from litellm.proxy._types import UserAPIKeyAuth from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import ( AUTH_CACHE_INVALIDATION_CHANNEL, AuthCacheInvalidationSubscriber, + evict_and_broadcast, publish_auth_cache_invalidation, ) from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache @@ -19,13 +22,29 @@ from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache class _RecordingRedisClient(Redis): def __init__(self) -> None: - self.published: List[Tuple[str, str]] = [] + self.published: list[tuple[str, str]] = [] async def publish(self, channel: str, message: str) -> int: self.published.append((channel, message)) return 1 +class _WedgedPublishRedisClient(Redis): + def __init__(self) -> None: + self.attempted: list[str] = [] + self.in_flight = 0 + self.max_in_flight = 0 + self.release = asyncio.Event() + + async def publish(self, channel: str, message: str) -> int: + self.in_flight += 1 + self.max_in_flight = max(self.max_in_flight, self.in_flight) + self.attempted.append(message) + await self.release.wait() + self.in_flight -= 1 + return 1 + + class _FailingPublishRedisClient(Redis): def __init__(self) -> None: pass @@ -36,16 +55,16 @@ class _FailingPublishRedisClient(Redis): class _QueuePubSub: def __init__(self, initial_messages: Iterable[object] = ()) -> None: - self.queue: "asyncio.Queue[object]" = asyncio.Queue() + self.queue: asyncio.Queue[object] = asyncio.Queue() for message in initial_messages: self.queue.put_nowait(message) - self.subscribed_channels: List[str] = [] + self.subscribed_channels: list[str] = [] self.closed = False async def subscribe(self, *channels: str) -> None: self.subscribed_channels.extend(channels) - async def get_message(self, *, ignore_subscribe_messages: bool, timeout: float) -> Optional[object]: + async def get_message(self, *, ignore_subscribe_messages: bool, timeout: float) -> object | None: try: return await asyncio.wait_for(self.queue.get(), timeout) except asyncio.TimeoutError: @@ -64,7 +83,7 @@ class _ScriptedPubSubRedisClient(Redis): class _FakeRedisCache: - def __init__(self, client: object, namespace: Optional[str] = None) -> None: + def __init__(self, client: object, namespace: str | None = None) -> None: self._client = client self.namespace = namespace @@ -222,3 +241,49 @@ async def test_subscriber_ignores_malformed_messages() -> None: subscriber._apply_message(None) assert cache.in_memory_cache.get_cache("project_id:p-1") is not None + + +@pytest.mark.asyncio +async def test_evict_and_broadcast_evicts_locally_and_returns_while_redis_publish_never_answers() -> None: + cache = UserApiKeyCache() + cache.set_cache("user-wedged", UserAPIKeyAuth(user_id="user-wedged"), model_type=UserAPIKeyAuth) + client = _WedgedPublishRedisClient() + + with patch( + "litellm.proxy.common_utils.auth_cache_invalidation_pubsub.coordination_redis_cache", + return_value=_FakeRedisCache(client=client), + ): + started = time.monotonic() + await evict_and_broadcast(cache_keys=("user-wedged",), user_api_key_cache=cache) + elapsed = time.monotonic() - started + + assert elapsed < 0.1, f"handler waited {elapsed:.3f}s on a publish that never answers" + assert cache.get_cache("user-wedged", model_type=UserAPIKeyAuth) is None + assert client.attempted == [json.dumps({"cache_key": "user-wedged"})], "publish was not handed to redis" + client.release.set() + await asyncio.sleep(0) + + +@pytest.mark.asyncio +async def test_publish_holds_at_most_sixteen_redis_connections_while_redis_is_wedged( + monkeypatch: pytest.MonkeyPatch, +) -> None: + monkeypatch.setattr(pubsub_module, "_in_flight_publishes", asyncio.Semaphore(16)) + monkeypatch.setattr(pubsub_module, "_pending_publishes", set()) + client = _WedgedPublishRedisClient() + + with patch( + "litellm.proxy.common_utils.auth_cache_invalidation_pubsub.coordination_redis_cache", + return_value=_FakeRedisCache(client=client), + ): + for i in range(64): + await publish_auth_cache_invalidation(cache_key=f"user-{i}") + await asyncio.sleep(0) + await asyncio.sleep(0) + + assert client.max_in_flight == 16, f"publish tasks held {client.max_in_flight} redis connections at once" + assert len(client.attempted) == 16, "waiters called publish before a semaphore slot freed" + client.release.set() + await asyncio.gather(*pubsub_module._pending_publishes) # pyright: ignore[reportPrivateUsage] # drain module-level tasks + + assert len(client.attempted) == 64 diff --git a/tests/test_litellm/proxy/common_utils/test_config_sync_pubsub.py b/tests/test_litellm/proxy/common_utils/test_config_sync_pubsub.py index 2a0ebf9492a..0f64ef2b4ca 100644 --- a/tests/test_litellm/proxy/common_utils/test_config_sync_pubsub.py +++ b/tests/test_litellm/proxy/common_utils/test_config_sync_pubsub.py @@ -47,6 +47,7 @@ _EXPECTED_CONFIG_SYNCED_TABLE_NAMES = frozenset( "litellm_proxymodeltable", "litellm_searchtoolstable", "litellm_ssoconfig", + "litellm_uisettings", } ) @@ -702,6 +703,33 @@ async def test_model_repository_write_publishes_via_live_coordination_cache() -> assert json.loads(message) == {"object_type": "litellm_proxymodeltable"} +async def test_ui_settings_write_publishes_via_live_coordination_cache() -> None: + from litellm.proxy import proxy_server + from litellm.proxy.proxy_server import _set_redis_usage_cache + from litellm.repositories.table_repositories import UISettingsRepository + + client = _RecordingRedisClient() + prisma_client = MagicMock() + prisma_client.db.litellm_uisettings.upsert = AsyncMock(return_value={"id": "ui_settings"}) + table = UISettingsRepository(prisma_client).table + assert isinstance(table, _PublishOnWriteActions) + + previous_cache = proxy_server.redis_usage_cache + _set_redis_usage_cache(_FakeRedisCache(client)) + try: + await table.upsert( + where={"id": "ui_settings"}, + data={"create": {"id": "ui_settings"}, "update": {"ui_settings": "{}"}}, + ) + finally: + _set_redis_usage_cache(previous_cache) + + assert len(client.published) == 1 + channel, message = client.published[0] + assert channel == CONFIG_SYNC_CHANNEL + assert json.loads(message) == {"object_type": "litellm_uisettings"} + + async def _publish_calls_for_invalidated_param(param_name: str) -> List[Tuple[str, str]]: from litellm.proxy import proxy_server from litellm.proxy.proxy_server import _set_redis_usage_cache diff --git a/tests/test_litellm/proxy/common_utils/test_debug_utils.py b/tests/test_litellm/proxy/common_utils/test_debug_utils.py index 163ea530be9..a64c94c2991 100644 --- a/tests/test_litellm/proxy/common_utils/test_debug_utils.py +++ b/tests/test_litellm/proxy/common_utils/test_debug_utils.py @@ -1,16 +1,25 @@ +import json import os import socket +from collections.abc import Iterator, Mapping +from dataclasses import asdict from pathlib import Path import pytest +from fastapi import FastAPI +from fastapi.testclient import TestClient -from litellm.proxy._types import UserAPIKeyAuth +from litellm.proxy import proxy_server +from litellm.proxy._types import LitellmUserRoles, UserAPIKeyAuth +from litellm.proxy.auth.user_api_key_auth import user_api_key_auth +from litellm.proxy.bug_report_config import build_proxy_bug_report from litellm.proxy.common_utils.debug_utils import ( PSUTIL_MISSING_ERROR, _ProcFilesystemProcess, _summary_process_memory, get_memory_summary, ) +from litellm.proxy.common_utils.debug_utils import router as debug_router PAGE_SIZE = 4096 STATM_SIZE_PAGES = 100_000 @@ -67,3 +76,73 @@ async def test_memory_summary_names_the_host_and_worker_that_answered() -> None: assert summary["hostname"] == socket.gethostname() assert summary["worker_pid"] == os.getpid() assert summary["memory"]["ram_usage_mb"] > 0 + + +HOSTILE_CONFIG: Mapping[str, object] = { + "model_list": [ + { + "model_name": "acme-prod-gpt4", + "litellm_params": { + "model": "azure/acme-gpt4o-deployment", + "api_base": "https://acme-eastus.openai.azure.com", + "api_key": "sk-live-secret-1", + }, + } + ], + "litellm_settings": {"drop_params": True, "callbacks": ["langfuse", "acme_hooks.audit_logger"]}, +} + +HOSTILE_GENERAL_SETTINGS: Mapping[str, object] = { + "master_key": "sk-live-secret-master", + "database_url": "postgres://user:hunter2@10.0.0.7/litellm", + "store_model_in_db": True, +} + +HOSTILE_STRINGS = ("acme", "sk-live-secret", "hunter2", "10.0.0.7", "azure.com") + + +@pytest.fixture +def hostile_proxy_config(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]: + previous_config = proxy_server.proxy_config.get_config_state() + proxy_server.proxy_config.update_config_state(config=HOSTILE_CONFIG) + monkeypatch.setattr(proxy_server, "general_settings", dict(HOSTILE_GENERAL_SETTINGS)) + yield + proxy_server.proxy_config.update_config_state(config=previous_config) + + +def _debug_client(caller: UserAPIKeyAuth) -> TestClient: + app = FastAPI() + app.include_router(debug_router) + app.dependency_overrides[user_api_key_auth] = lambda: caller + return TestClient(app) + + +@pytest.mark.parametrize( + "caller", + [ + UserAPIKeyAuth(), + UserAPIKeyAuth(user_role=LitellmUserRoles.INTERNAL_USER), + UserAPIKeyAuth(user_role=LitellmUserRoles.PROXY_ADMIN_VIEW_ONLY), + ], +) +@pytest.mark.usefixtures("hostile_proxy_config") +def test_debug_report_refuses_everyone_but_proxy_admins(caller: UserAPIKeyAuth) -> None: + response = _debug_client(caller).get("/debug/report") + + assert response.status_code == 403, response.text + assert "litellm_version" not in response.text + + +@pytest.mark.usefixtures("hostile_proxy_config") +def test_debug_report_returns_what_the_bug_report_link_carries_and_nothing_from_the_operator() -> None: + response = _debug_client(UserAPIKeyAuth(user_role=LitellmUserRoles.PROXY_ADMIN)).get("/debug/report") + + assert response.status_code == 200, response.text + assert response.json() == json.loads(json.dumps(asdict(build_proxy_bug_report(RuntimeError("boom")).environment))) + assert response.json()["config_lines"] == [ + "general_settings.store_model_in_db = true", + "litellm_settings.drop_params = true", + "litellm_settings.callbacks = [langfuse]", + "model_list[*].provider = [azure]", + ] + assert not any(hostile in response.text for hostile in HOSTILE_STRINGS), response.text diff --git a/tests/test_litellm/proxy/common_utils/test_swagger_utils.py b/tests/test_litellm/proxy/common_utils/test_swagger_utils.py new file mode 100644 index 00000000000..659d2ad2941 --- /dev/null +++ b/tests/test_litellm/proxy/common_utils/test_swagger_utils.py @@ -0,0 +1,18 @@ +import inspect + +from litellm.exceptions import RateLimitError +from litellm.proxy.common_utils.swagger_utils import ERROR_RESPONSES, _error_description + + +class _ChildWithoutDoc(RateLimitError): + pass + + +def test_error_response_descriptions_carry_no_docstring_indentation(): + assert ERROR_RESPONSES[429]["description"] == inspect.cleandoc(RateLimitError.__doc__ or "") + for response in ERROR_RESPONSES.values(): + assert response["description"] == inspect.cleandoc(response["description"]) + + +def test_error_description_falls_back_to_the_class_name_without_an_own_docstring(): + assert _error_description(_ChildWithoutDoc) == "_ChildWithoutDoc" diff --git a/tests/test_litellm/proxy/db/conftest.py b/tests/test_litellm/proxy/db/conftest.py index bcb7794a20d..4d775142dd5 100644 --- a/tests/test_litellm/proxy/db/conftest.py +++ b/tests/test_litellm/proxy/db/conftest.py @@ -2,14 +2,15 @@ import json import os import signal import sys -import time from collections.abc import Generator from dataclasses import dataclass from pathlib import Path -from typing import Final, Optional +from typing import Optional import pytest +from tests._process_helpers import process_is_gone + DB_ENV_KEYS = ( "IAM_TOKEN_DB_AUTH", "AZURE_POSTGRESQL_AUTH", @@ -35,14 +36,6 @@ DB_ENV_KEYS = ( _db_env_snapshot_key = pytest.StashKey[dict[str, Optional[str]]]() -def _is_zombie(pid: int) -> bool: - try: - stat: Final = Path(f"/proc/{pid}/stat").read_text() - except OSError: - return False - return stat.rpartition(")")[2].split()[0] == "Z" - - def _db_env_snapshot() -> dict[str, Optional[str]]: return {key: os.environ.get(key) for key in DB_ENV_KEYS} @@ -130,24 +123,7 @@ class FakePrismaCli: return [json.loads(line) for line in self.calls_file.read_text().splitlines()] def grandchild_is_gone(self, within_seconds: float) -> bool: - pid: Final = int(self.grandchild_pidfile.read_text()) - deadline: Final = time.monotonic() + within_seconds - while time.monotonic() < deadline: - if os.name != "nt": - try: - reaped_pid, _ = os.waitpid(pid, os.WNOHANG) - if reaped_pid == pid: - return True - except ChildProcessError: - pass - try: - os.kill(pid, 0) - except ProcessLookupError: - return True - if _is_zombie(pid): - return True - time.sleep(0.05) - return False + return process_is_gone(int(self.grandchild_pidfile.read_text()), within_seconds=within_seconds) @pytest.fixture diff --git a/tests/test_litellm/proxy/db/test_daily_spend_bulk_upsert.py b/tests/test_litellm/proxy/db/test_daily_spend_bulk_upsert.py index 510f77cecec..7893fb82281 100644 --- a/tests/test_litellm/proxy/db/test_daily_spend_bulk_upsert.py +++ b/tests/test_litellm/proxy/db/test_daily_spend_bulk_upsert.py @@ -1,6 +1,8 @@ """Tests for the single-statement daily spend upsert (LIT-5291).""" import re +from collections.abc import AsyncIterator +from contextlib import AbstractAsyncContextManager, asynccontextmanager import pytest @@ -149,6 +151,13 @@ class _RecordingDb: self.statements.append((query, args)) return len(args) + @asynccontextmanager + async def _tx(self) -> AsyncIterator["_RecordingDb"]: + yield self + + def tx(self, timeout: object = None) -> AbstractAsyncContextManager["_RecordingDb"]: + return self._tx() + class _RecordingPrismaClient: def __init__(self) -> None: diff --git a/tests/test_litellm/proxy/db/test_db_spend_update_writer.py b/tests/test_litellm/proxy/db/test_db_spend_update_writer.py index a997939ed34..daa07c8224a 100644 --- a/tests/test_litellm/proxy/db/test_db_spend_update_writer.py +++ b/tests/test_litellm/proxy/db/test_db_spend_update_writer.py @@ -5,11 +5,11 @@ import logging import re -from collections.abc import Callable -from contextlib import asynccontextmanager -from datetime import datetime, timezone +from collections.abc import AsyncIterator, Callable +from contextlib import AbstractAsyncContextManager, asynccontextmanager +from datetime import datetime, timedelta, timezone from types import SimpleNamespace -from typing import Final +from typing import Final, cast from unittest.mock import AsyncMock, MagicMock, call, patch import httpx @@ -20,7 +20,7 @@ from redis.exceptions import DataError import litellm from litellm._logging import verbose_proxy_logger -from litellm.proxy._types import Litellm_EntityType, SpendUpdateQueueItem +from litellm.proxy._types import DailyTagSpendTransaction, Litellm_EntityType, SpendUpdateQueueItem from litellm.proxy.db.db_spend_update_writer import ( _TEAM_ADVISORY_LOCK_SQL, _TEAM_MEMBER_SPEND_SQL, @@ -28,6 +28,8 @@ from litellm.proxy.db.db_spend_update_writer import ( _SpendTableName, _spend_tables_left_to_send, ) +from litellm.proxy.db.db_transaction_queue.daily_spend_update_queue import DailySpendUpdateQueue +from litellm.proxy.db.db_transaction_queue.redis_update_buffer import RedisUpdateBuffer from litellm.proxy.db.db_transaction_queue.spend_update_queue import SpendUpdateQueue from litellm.proxy.db.db_transaction_queue.window_spend_update_queue import ( build_window_spend_transaction, @@ -303,6 +305,13 @@ class _RecordingDb: return self._execute_raw() return len(args) + @asynccontextmanager + async def _tx(self) -> AsyncIterator["_RecordingDb"]: + yield self + + def tx(self, timeout: timedelta | None = None) -> AbstractAsyncContextManager["_RecordingDb"]: + return self._tx() + class _RecordingPrisma: def __init__(self, execute_raw: Callable[[], int] | None = None) -> None: @@ -3770,8 +3779,15 @@ async def test_commit_spend_updates_does_not_retry_non_deadlock_data_error(monke @pytest.mark.asyncio async def test_update_daily_spend_retries_deadlock(monkeypatch): """The daily-spend upsert path retries a deadlock on the bulk upsert and then drains successfully.""" - mock_prisma_client = MagicMock() - mock_prisma_client.db.execute_raw = AsyncMock(side_effect=[_deadlock_error(), None]) + outcomes = iter([_deadlock_error(), None]) + + def first_attempt_deadlocks(): + outcome = next(outcomes) + if outcome is not None: + raise outcome + return 1 + + mock_prisma_client = _RecordingPrisma(execute_raw=first_attempt_deadlocks) proxy_logging = MagicMock() proxy_logging.failure_handler = AsyncMock() @@ -3786,7 +3802,7 @@ async def test_update_daily_spend_retries_deadlock(monkeypatch): entity_id_field="user_id", ) - assert mock_prisma_client.db.execute_raw.call_count == 2 + assert len(mock_prisma_client.db.statements) == 2 assert daily_spend_transactions == {} proxy_logging.failure_handler.assert_not_called() @@ -4247,3 +4263,241 @@ async def test_daily_transaction_attributes_caching_savings_only_with_an_injecti assert transaction["cache_creation_input_tokens"] == 1111 assert transaction["prompt_caching_savings_spend"] != 0.0 assert transaction["gateway_injected_caching_savings_spend"] == 0.0 + + +class _StallingDailySpendFakeDB(_DailySpendFakeDB): + """Holds the daily upsert aimed at one table until it is cancelled, like a starved pool does. + + The rollback of that transaction waits for ``rollback_release``: the query engine only + rolls back once the statement it is running has returned, which behind a lock takes + as long as the lock is held.""" + + def __init__(self, stalled_table: str) -> None: + super().__init__(failing_table=None) + self.stalled_table = stalled_table + self.stalled = asyncio.Event() + self.rollback_release = asyncio.Event() + self.rolled_back = asyncio.Event() + self.transaction_outcomes: list[str] = [] + + async def execute_raw(self, query: str, *args: object) -> int: + if self.stalled_table in query: + self.stalled.set() + await asyncio.Event().wait() + return await super().execute_raw(query, *args) + + @asynccontextmanager + async def _tx(self) -> AsyncIterator["_StallingDailySpendFakeDB"]: + try: + yield self + except BaseException: + await self.rollback_release.wait() + self.transaction_outcomes.append("rollback") + self.rolled_back.set() + raise + self.transaction_outcomes.append("commit") + + +def _daily_entity_txn(entity_id_field: str) -> dict: + return {key: value for key, value in _daily_txn().items() if key != "user_id"} | {entity_id_field: "entity-1"} + + +_DAILY_SPEND_ENTITIES: Final = [ + pytest.param("daily_spend_update_queue", "user", "user_id", "LiteLLM_DailyUserSpend", id="user"), + pytest.param("daily_team_spend_update_queue", "team", "team_id", "LiteLLM_DailyTeamSpend", id="team"), + pytest.param("daily_org_spend_update_queue", "org", "organization_id", "LiteLLM_DailyOrganizationSpend", id="org"), + pytest.param("daily_tag_spend_update_queue", "tag", "tag", "LiteLLM_DailyTagSpend", id="tag"), + pytest.param( + "daily_end_user_spend_update_queue", "end_user", "end_user_id", "LiteLLM_DailyEndUserSpend", id="end_user" + ), + pytest.param("daily_agent_spend_update_queue", "agent", "agent_id", "LiteLLM_DailyAgentSpend", id="agent"), +] + +_DAILY_SPEND_QUEUES: Final[dict[str, Callable[[DBSpendUpdateWriter], DailySpendUpdateQueue]]] = { + "daily_spend_update_queue": lambda writer: writer.daily_spend_update_queue, + "daily_team_spend_update_queue": lambda writer: writer.daily_team_spend_update_queue, + "daily_org_spend_update_queue": lambda writer: writer.daily_org_spend_update_queue, + "daily_tag_spend_update_queue": lambda writer: writer.daily_tag_spend_update_queue, + "daily_end_user_spend_update_queue": lambda writer: writer.daily_end_user_spend_update_queue, + "daily_agent_spend_update_queue": lambda writer: writer.daily_agent_spend_update_queue, +} + +_DAILY_SPEND_COMMITS: Final = { + "user": DBSpendUpdateWriter.update_daily_user_spend, + "team": DBSpendUpdateWriter.update_daily_team_spend, + "org": DBSpendUpdateWriter.update_daily_org_spend, + "tag": DBSpendUpdateWriter.update_daily_tag_spend, + "end_user": DBSpendUpdateWriter.update_daily_end_user_spend, + "agent": DBSpendUpdateWriter.update_daily_agent_spend, +} + + +@pytest.mark.parametrize(("queue_name", "entity_type", "entity_id_field", "table"), _DAILY_SPEND_ENTITIES) +@pytest.mark.asyncio +async def test_daily_spend_batch_cancelled_mid_flight_is_rolled_back_requeued_and_written_once_by_the_next_flush( + queue_name: str, entity_type: str, entity_id_field: str, table: str +): + """Shutdown cancels the scheduler tick while a drained batch waits on the database. The + batch has left the queue, so unless the cancellation puts it back, the final flush finds + nothing and the spend is gone (F2). The upsert runs in an interactive transaction so a + statement that did reach Postgres is rolled back with the cancel and the requeued rows + land exactly once.""" + db_writer = DBSpendUpdateWriter() + queue = _DAILY_SPEND_QUEUES[queue_name](db_writer) + await queue.add_update({"key-a": _daily_entity_txn(entity_id_field)}) + await queue.add_update({"key-a": _daily_entity_txn(entity_id_field)}) + db = _StallingDailySpendFakeDB(stalled_table=table) + proxy_logging_obj = MagicMock() + proxy_logging_obj.failure_handler = AsyncMock() + + def flush(prisma_db: _DailySpendFakeDB): + return db_writer._flush_daily_spend_queue( + queue=queue, + entity_type=entity_type, + commit=_DAILY_SPEND_COMMITS[entity_type], + n_retry_times=0, + prisma_client=_WindowSpendFakePrisma(prisma_db), + proxy_logging_obj=proxy_logging_obj, + ) + + tick = asyncio.ensure_future(flush(db)) + await asyncio.wait_for(db.stalled.wait(), timeout=5) + tick.cancel() + finished, _ = await asyncio.wait({tick}, timeout=1) + assert finished == {tick}, "the cancelled tick must return before the rolled-back statement unwinds" + with pytest.raises(asyncio.CancelledError): + tick.result() + + assert not queue.update_queue.empty(), "the cancelled batch must go back on the queue before the rollback lands" + assert db.transaction_outcomes == [] + db.rollback_release.set() + await asyncio.wait_for(db.rolled_back.wait(), timeout=5) + assert db.transaction_outcomes == ["rollback"] + assert _daily_upserts(db, table) == [] + + final_db = _DailySpendFakeDB(failing_table=None) + await flush(final_db) + + (upsert,) = _daily_upserts(final_db, table) + assert _row_values(upsert, entity_id_field) == ["entity-1"] + assert _row_values(upsert, "spend") == [pytest.approx(0.2)] + assert _row_values(upsert, "api_requests") == [2] + assert queue.update_queue.empty() + + +@pytest.mark.asyncio +async def test_cancelled_flush_of_an_empty_daily_queue_requeues_nothing(): + """A cancel that lands with nothing drained must not push an empty batch onto the queue.""" + db_writer = DBSpendUpdateWriter() + db = _StallingDailySpendFakeDB(stalled_table="LiteLLM_DailyUserSpend") + + class _CancellingQueue(type(db_writer.daily_spend_update_queue)): + async def flush_and_get_aggregated_daily_spend_update_transactions(self): + drained = await super().flush_and_get_aggregated_daily_spend_update_transactions() + asyncio.current_task().cancel() + await asyncio.sleep(0) + return drained + + queue = _CancellingQueue() + with pytest.raises(asyncio.CancelledError): + await db_writer._flush_daily_spend_queue( + queue=queue, + entity_type="user", + commit=DBSpendUpdateWriter.update_daily_user_spend, + n_retry_times=0, + prisma_client=_WindowSpendFakePrisma(db), + proxy_logging_obj=MagicMock(), + ) + + assert queue.update_queue.empty() + + +class _AnnouncingDailySpendFakeDB(_DailySpendFakeDB): + """Signals ``written`` the moment the daily upsert has been committed.""" + + def __init__(self) -> None: + super().__init__(failing_table=None) + self.written = asyncio.Event() + + async def execute_raw(self, query: str, *args: object) -> int: + rows = await super().execute_raw(query, *args) + self.written.set() + return rows + + +@pytest.mark.asyncio +async def test_cancel_that_lands_after_the_daily_batch_committed_does_not_requeue_it(): + """The commit has returned but the tick has not resumed yet when the cancel arrives. + Putting the batch back now would write the same spend twice on the final flush.""" + db_writer = DBSpendUpdateWriter() + queue = db_writer.daily_spend_update_queue + await queue.add_update({"key-a": _daily_txn()}) + db = _AnnouncingDailySpendFakeDB() + + tick = asyncio.ensure_future( + db_writer._flush_daily_spend_queue( + queue=queue, + entity_type="user", + commit=DBSpendUpdateWriter.update_daily_user_spend, + n_retry_times=0, + prisma_client=_WindowSpendFakePrisma(db), + proxy_logging_obj=MagicMock(), + ) + ) + await db.written.wait() + tick.cancel() + with pytest.raises(asyncio.CancelledError): + await tick + + assert len(_daily_upserts(db, "LiteLLM_DailyUserSpend")) == 1 + assert queue.update_queue.empty(), "a batch that already committed must not be requeued" + + +class _DrainedTagRedisBuffer: + """Hands out one drained tag batch and records whatever is restored.""" + + def __init__(self, drained: dict[str, DailyTagSpendTransaction]) -> None: + self.drained = drained + self.restored: list[dict[str, DailyTagSpendTransaction]] = [] + + async def get_all_daily_tag_spend_update_transactions_from_redis_buffer( + self, + ) -> dict[str, DailyTagSpendTransaction]: + return self.drained + + async def restore_transactions_to_redis( + self, daily_tag_spend_update_transactions: dict[str, DailyTagSpendTransaction] + ) -> None: + self.restored.append(daily_tag_spend_update_transactions) + + +@pytest.mark.asyncio +async def test_tag_batch_drained_from_redis_and_cancelled_mid_flight_is_restored_before_its_rollback_returns(): + """The Redis tag drain is destructive. A shutdown cancel used to leave the batch nowhere: + Redis no longer had it and the interactive transaction rolled the statement back.""" + db_writer = DBSpendUpdateWriter() + drained = {"key-a": cast(DailyTagSpendTransaction, _daily_entity_txn("tag"))} + redis_buffer = _DrainedTagRedisBuffer(drained) + db_writer.redis_update_buffer = cast(RedisUpdateBuffer, redis_buffer) + db = _StallingDailySpendFakeDB(stalled_table="LiteLLM_DailyTagSpend") + + tick = asyncio.ensure_future( + db_writer._drain_and_commit_daily_tag_spend_from_redis( + prisma_client=_WindowSpendFakePrisma(db), + n_retry_times=0, + proxy_logging_obj=MagicMock(), + ) + ) + await asyncio.wait_for(db.stalled.wait(), timeout=5) + tick.cancel() + finished, _ = await asyncio.wait({tick}, timeout=1) + assert finished == {tick}, "the cancelled drain must return before the rolled-back statement unwinds" + with pytest.raises(asyncio.CancelledError): + tick.result() + + assert redis_buffer.restored == [drained], "the drained tag batch must be back in Redis before the rollback lands" + assert db.transaction_outcomes == [] + db.rollback_release.set() + await asyncio.wait_for(db.rolled_back.wait(), timeout=5) + assert db.transaction_outcomes == ["rollback"] + assert _daily_upserts(db, "LiteLLM_DailyTagSpend") == [] diff --git a/tests/test_litellm/proxy/db/test_pgbouncer.py b/tests/test_litellm/proxy/db/test_pgbouncer.py index bf7df3077ea..c69c8d015a3 100644 --- a/tests/test_litellm/proxy/db/test_pgbouncer.py +++ b/tests/test_litellm/proxy/db/test_pgbouncer.py @@ -122,6 +122,13 @@ class TestPlanPgBouncer: "pgbouncer": "true", } + def test_an_upstream_that_already_disables_prepared_statements_gets_a_single_pgbouncer_flag(self): + pooled: Final = _plan("postgresql://app:pw@db/litellm?connection_limit=5&pgbouncer=true").pooled_url + assert urllib.parse.parse_qsl(urllib.parse.urlsplit(pooled).query) == [ + ("connection_limit", "5"), + ("pgbouncer", "true"), + ] + @pytest.mark.parametrize("hop_param", ["channel_binding=require", "gssencmode=require"]) def test_transport_params_for_the_postgres_hop_stay_off_the_plain_tcp_loopback_url(self, hop_param: str): pooled: Final = _plan(f"postgresql://app:pw@db/litellm?connection_limit=5&{hop_param}").pooled_url diff --git a/tests/test_litellm/proxy/guardrails/guardrail_hooks/test_cisco_ai_defense_mcp.py b/tests/test_litellm/proxy/guardrails/guardrail_hooks/test_cisco_ai_defense_mcp.py index 826edab694d..2e3bf760e68 100644 --- a/tests/test_litellm/proxy/guardrails/guardrail_hooks/test_cisco_ai_defense_mcp.py +++ b/tests/test_litellm/proxy/guardrails/guardrail_hooks/test_cisco_ai_defense_mcp.py @@ -827,3 +827,38 @@ class TestCiscoAIDefenseJsonRpcSuccessEnvelope: assert unwrapped is verdict else: assert unwrapped == expected + + +@pytest.mark.asyncio +@pytest.mark.parametrize("action", ["block", "redact"]) +async def test_cisco_native_hook_through_logging_preserves_sanitized_result(action): + from mcp.types import CallToolResult, TextContent + from litellm.litellm_core_utils.litellm_logging import Logging + + guardrail = _make_guardrail( + inspection_type="mcp", event_hook=["pre_mcp_call", "during_mcp_call"] + ) + verdict = ( + _violation_response(url=MCP_URL) if action == "block" + else _redact_response(sanitized_text="[REDACTED]", url=MCP_URL) + ) + result = CallToolResult( + content=[TextContent(type="text", text="SECRET-1234")], + structured_content={"result": "SECRET-1234"}, + ) + logging_obj = Logging( + model="MCP: probe/search", messages=[], stream=False, call_type="call_mcp_tool", + start_time=datetime.now(), litellm_call_id="cisco-hook", function_id="cisco-hook", + dynamic_success_callbacks=[guardrail], + ) + logging_obj.model_call_details.update({"name": "search", "arguments": {}, "original_response": result}) + with _patch_inspection_post(guardrail, AsyncMock(return_value=verdict)): + returned = await logging_obj.async_post_mcp_tool_call_hook( + kwargs=logging_obj.model_call_details, response_obj=result, + start_time=datetime.now(), end_time=datetime.now(), + ) + assert returned is result + assert "SECRET-1234" not in returned.model_dump_json() + assert returned.is_error is (action == "block") + assert ("Blocked by Cisco AI Defense" if action == "block" else "[REDACTED]") in returned.content[0].text + assert returned.structured_content == {"result": returned.content[0].text} diff --git a/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py b/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py index 76027d6b7e2..7a9d155cd67 100644 --- a/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py +++ b/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py @@ -701,3 +701,49 @@ class TestKeyUpdatedAuditLogObjectId: assert updated_values["project_id"] is None assert json.loads(audit_row.before_value)["project_id"] == "project-orbit" assert updated_values["max_budget"] == 2000.0 + + +@pytest.mark.asyncio +async def test_key_deleted_hook_writes_audit_log_for_alias_deletion(): + from litellm.proxy._types import ( + KeyRequest, + LiteLLM_AuditLogs, + LiteLLM_VerificationToken, + LitellmTableNames, + UserAPIKeyAuth, + ) + + captured: Final[list[LiteLLM_AuditLogs]] = [] + + async def capture_audit_log(request_data: LiteLLM_AuditLogs) -> None: + captured.append(request_data) + + with ( + patch("litellm.store_audit_logs", True), + patch( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + new=capture_audit_log, + ), + patch.object( + KeyManagementEventHooks, + "_delete_virtual_keys_from_secret_manager", + new_callable=AsyncMock, + ), + ): + await KeyManagementEventHooks.async_key_deleted_hook( + data=KeyRequest(key_aliases=["a"]), + keys_being_deleted=[LiteLLM_VerificationToken(token="hashed", key_alias="a")], + response={}, + user_api_key_dict=UserAPIKeyAuth(user_id="admin", token="callertok"), + ) + for _ in range(100): + if captured: + break + await asyncio.sleep(0.01) + + assert len(captured) == 1 + audit_row = captured[0] + assert audit_row.action == "deleted" + assert audit_row.object_id == "hashed" + assert audit_row.table_name == LitellmTableNames.KEY_TABLE_NAME + assert audit_row.changed_by == "admin" diff --git a/tests/test_litellm/proxy/hooks/test_parallel_request_limiter_v3.py b/tests/test_litellm/proxy/hooks/test_parallel_request_limiter_v3.py index 0f19675edb9..8c0dcd3383c 100644 --- a/tests/test_litellm/proxy/hooks/test_parallel_request_limiter_v3.py +++ b/tests/test_litellm/proxy/hooks/test_parallel_request_limiter_v3.py @@ -26,6 +26,7 @@ from litellm.proxy.hooks.parallel_request_limiter_v3 import ( PARALLEL_REQUEST_SLOT_TTL_SECONDS, ParallelSlotAcquisition, RateLimitDescriptor, + RateLimitedModel, RateLimitResponse, RequestRateLimiterStash, _request_stash, @@ -3367,7 +3368,7 @@ async def test_pre_call_hook_keeps_internal_stash_out_of_request_body(): stash = get_request_stash() assert stash is not None assert stash.reserved_tokens > 0 - assert stash.reserved_model == "gpt-4o-mini" + assert stash.reserved_model == RateLimitedModel(requested="gpt-4o-mini", group="gpt-4o-mini") assert stash.reserved_scopes == frozenset({("api_key", _api_key)}) @@ -6965,3 +6966,187 @@ def test_rate_limit_error_reports_reset_time_in_utc_on_a_non_utc_proxy(process_t "Rate limit exceeded for api_key: sk-test. Limit type: requests. " f"Current limit: 2, Remaining: 0. Limit resets at: {expected_reset}" ) + + +def _resolve_alias_to_target(model: str) -> str | None: + return "target" if model == "alias" else None + + +async def _rpm_request(handler: _PROXY_MaxParallelRequestsHandler, cache: DualCache, auth: UserAPIKeyAuth, model: str) -> None: + await handler.async_pre_call_hook(user_api_key_dict=auth, cache=cache, data={"model": model}, call_type="acompletion") + + +@pytest.mark.asyncio +@pytest.mark.parametrize("first_name, second_name", [("target", "alias"), ("alias", "target")]) +async def test_model_group_alias_shares_deployment_default_rpm_bucket_with_its_target( + monkeypatch: pytest.MonkeyPatch, first_name: str, second_name: str +) -> None: + import litellm.proxy.proxy_server as proxy_server + + router: Final = Router( + model_list=[ + { + "model_name": "target", + "litellm_params": {"model": "openai/gpt-test", "api_key": "test-key", "default_api_key_rpm_limit": 2}, + "model_info": {"id": "target-deployment"}, + } + ], + model_group_alias={"alias": "target"}, + ) + monkeypatch.setattr(proxy_server, "llm_router", router) + cache: Final = DualCache() + handler: Final = _PROXY_MaxParallelRequestsHandler(internal_usage_cache=InternalUsageCache(cache)) + auth: Final = UserAPIKeyAuth(api_key=hash_token("sk-alias-default")) + + await _rpm_request(handler, cache, auth, first_name) + await _rpm_request(handler, cache, auth, first_name) + with pytest.raises(HTTPException) as exc: + await _rpm_request(handler, cache, auth, second_name) + + assert exc.value.status_code == 429 + assert "model_per_key" in str(exc.value.detail) + assert f"{auth.api_key}:target" in str(exc.value.detail) + + +@pytest.mark.asyncio +@pytest.mark.parametrize("first_name, second_name", [("target", "alias"), ("alias", "target")]) +@pytest.mark.parametrize( + "limits, counter_scope", + [ + ({"metadata": {"model_rpm_limit": {"target": 1}}}, "model_per_key"), + ( + { + "team_id": "t", + "metadata": {"model_rpm_limit": {"other-model": 100}}, + "team_metadata": {"model_rpm_limit": {"target": 1}}, + }, + "model_per_team", + ), + ({"org_id": "o", "organization_metadata": {"model_rpm_limit": {"target": 1}}}, "model_per_organization"), + ({"project_id": "p", "project_metadata": {"model_rpm_limit": {"target": 1}}}, "model_per_project"), + ], + ids=["key_metadata", "team_metadata", "organization_metadata", "project_metadata"], +) +async def test_model_group_alias_shares_metadata_model_rpm_bucket_with_its_target( + limits: dict[str, object], counter_scope: str, first_name: str, second_name: str +) -> None: + cache: Final = DualCache() + handler: Final = _PROXY_MaxParallelRequestsHandler( + internal_usage_cache=InternalUsageCache(cache), model_group_resolver=_resolve_alias_to_target + ) + auth: Final = UserAPIKeyAuth(api_key=hash_token("sk-alias-metadata"), **limits) + + await _rpm_request(handler, cache, auth, first_name) + with pytest.raises(HTTPException) as exc: + await _rpm_request(handler, cache, auth, second_name) + + assert exc.value.status_code == 429 + assert counter_scope in str(exc.value.detail) + assert ":target" in str(exc.value.detail) + + +@pytest.mark.asyncio +async def test_model_rpm_limit_keyed_by_the_alias_name_still_limits_alias_requests_only() -> None: + cache: Final = DualCache() + handler: Final = _PROXY_MaxParallelRequestsHandler( + internal_usage_cache=InternalUsageCache(cache), model_group_resolver=_resolve_alias_to_target + ) + auth: Final = UserAPIKeyAuth(api_key=hash_token("sk-alias-keyed"), metadata={"model_rpm_limit": {"alias": 1}}) + + await _rpm_request(handler, cache, auth, "alias") + with pytest.raises(HTTPException) as exc: + await _rpm_request(handler, cache, auth, "alias") + assert exc.value.status_code == 429 + assert "model_per_key" in str(exc.value.detail) + + await _rpm_request(handler, cache, auth, "target") + + +@pytest.mark.parametrize( + "key_metadata, charges_team_model_pool", + [({}, True), ({"model_tpm_limit": {"target": 500}}, False)], + ids=["no_key_override", "key_owns_target_tpm_limit"], +) +def test_success_tpm_accounting_charges_the_alias_target_bucket( + key_metadata: dict[str, object], charges_team_model_pool: bool +) -> None: + handler: Final = _PROXY_MaxParallelRequestsHandler( + internal_usage_cache=InternalUsageCache(DualCache()), model_group_resolver=_resolve_alias_to_target + ) + response: Final = ModelResponse( + id="alias-tpm", + object="chat.completion", + created=int(datetime.now().timestamp()), + model="alias", + usage=Usage(prompt_tokens=100, completion_tokens=50, total_tokens=150), + choices=[], + ) + kwargs: Final = { + "standard_logging_object": { + "metadata": {"user_api_key_hash": hash_token("sk-alias-tpm"), "user_api_key_team_id": "t"} + }, + "litellm_params": { + "metadata": { + "model_group": "alias", + "user_api_key_metadata": key_metadata, + "user_api_key_team_metadata": {"model_tpm_limit": {"target": 500}}, + } + }, + "model": "alias", + } + + ops: Final = handler._build_success_event_pipeline_operations( + kwargs=kwargs, response_obj=response, rate_limit_type="output" + ) + + charged_keys: Final = {op["key"] for op in ops} + assert handler.create_rate_limit_keys("model_per_key", f"{hash_token('sk-alias-tpm')}:target", "tokens") in charged_keys + assert not any(":alias" in key for key in charged_keys) + team_pool_key: Final = handler.create_rate_limit_keys("model_per_team", "t:target", "tokens") + assert (team_pool_key in charged_keys) is charges_team_model_pool + + +@pytest.mark.asyncio +async def test_success_tpm_accounting_keeps_the_admission_target_after_an_alias_reload() -> None: + alias_map: Final[dict[str, str]] = {"alias": "target-a"} + cache: Final = DualCache() + handler: Final = _PROXY_MaxParallelRequestsHandler( + internal_usage_cache=InternalUsageCache(cache), model_group_resolver=alias_map.get + ) + key_metadata: Final = {"model_tpm_limit": {"target-a": 1000, "target-b": 1000}} + auth: Final = UserAPIKeyAuth(api_key=hash_token("sk-alias-reload"), metadata=key_metadata) + + await handler.async_pre_call_hook( + user_api_key_dict=auth, + cache=cache, + data={"model": "alias", "messages": [{"role": "user", "content": "hello"}], "max_tokens": 10}, + call_type="acompletion", + ) + stash: Final = get_request_stash() + assert stash is not None + assert stash.reserved_model == RateLimitedModel(requested="alias", group="target-a") + assert stash.reserved_tokens > 0 + + alias_map["alias"] = "target-b" + response: Final = ModelResponse( + id="alias-reload", + object="chat.completion", + created=int(datetime.now().timestamp()), + model="alias", + usage=Usage(prompt_tokens=100, completion_tokens=50, total_tokens=150), + choices=[], + ) + kwargs: Final = { + "standard_logging_object": {"metadata": {"user_api_key_hash": auth.api_key}}, + "litellm_params": {"metadata": {"model_group": "alias", "user_api_key_metadata": key_metadata}}, + "model": "alias", + } + + ops: Final = handler._build_success_event_pipeline_operations( + kwargs=kwargs, response_obj=response, rate_limit_type="total" + ) + + admission_bucket: Final = handler.create_rate_limit_keys("model_per_key", f"{auth.api_key}:target-a", "tokens") + charged: Final = {op["key"]: op["increment_value"] for op in ops} + assert charged[admission_bucket] == 150 - stash.reserved_tokens + assert not any(":target-b" in key for key in charged) diff --git a/tests/test_litellm/proxy/hooks/test_tpm_concurrent.py b/tests/test_litellm/proxy/hooks/test_tpm_concurrent.py index bdaca9ffc2d..e6795bb22f3 100644 --- a/tests/test_litellm/proxy/hooks/test_tpm_concurrent.py +++ b/tests/test_litellm/proxy/hooks/test_tpm_concurrent.py @@ -25,6 +25,7 @@ from litellm.proxy._types import UserAPIKeyAuth from litellm.proxy.hooks.parallel_request_limiter_v3 import ( PROJECT_ITPM_DESCRIPTOR_KEY, PROJECT_OTPM_DESCRIPTOR_KEY, + RateLimitedModel, _AUDIO_BYTES_PER_TOKEN, _PROXY_MaxParallelRequestsHandler_v3 as RateLimitHandler, ) @@ -308,7 +309,7 @@ async def test_model_scope_refund_targets_reserved_model(rate_limiter): stash = get_or_create_request_stash() stash.reserved_tokens = 100 - stash.reserved_model = reserved_model + stash.reserved_model = RateLimitedModel(requested=reserved_model, group=reserved_model) stash.reserved_scopes = frozenset({("model_per_team", f"{team_id}:{reserved_model}")}) mock_kwargs = { diff --git a/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py index a282ae731dd..ff3d19e8637 100644 --- a/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py +++ b/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py @@ -723,11 +723,13 @@ class TestAutoRouterBenchmarks: def test_savings_compare_only_the_current_estimated_cohort(self, estimated_turns: int) -> None: from litellm.proxy.management_endpoints.auto_router_endpoints import _benchmark_totals - row: Final = self.ROW.model_copy(update={ - "savings_estimated_turns": estimated_turns, - "savings_estimated_actual_spend": 2.0 if estimated_turns else 0.0, - "savings_estimated_saved_spend": -0.5 if estimated_turns else 0.0, - }) + row: Final = self.ROW.model_copy( + update={ + "savings_estimated_turns": estimated_turns, + "savings_estimated_actual_spend": 2.0 if estimated_turns else 0.0, + "savings_estimated_saved_spend": -0.5 if estimated_turns else 0.0, + } + ) totals: Final = _benchmark_totals(row) assert totals.spend == 10.0 assert totals.savings_estimated_turns == estimated_turns @@ -755,10 +757,16 @@ class TestAutoRouterBenchmarks: _summed_agg_row, ) - other = self.ROW.model_copy(update={ - "router_name": "auto-2", "sessions": 1, "turns": 10, "spend": 0.0, - "savings_estimated_turns": 10, "savings_estimated_actual_spend": 0.0, - }) + other = self.ROW.model_copy( + update={ + "router_name": "auto-2", + "sessions": 1, + "turns": 10, + "spend": 0.0, + "savings_estimated_turns": 10, + "savings_estimated_actual_spend": 0.0, + } + ) summed = _summed_agg_row([self.ROW, other]) totals = _benchmark_totals(summed) assert summed.sessions == 5 @@ -1091,18 +1099,27 @@ class TestAutoRouterSession: return lookups @pytest.mark.asyncio - @pytest.mark.parametrize("turns, estimated", [(3, True), (10, True), (10, False)], ids=["full", "partial", "legacy"]) + @pytest.mark.parametrize( + "turns, estimated", [(3, True), (10, True), (10, False)], ids=["full", "partial", "legacy"] + ) async def test_a_key_reads_its_own_session_with_the_baseline_its_turns_were_priced_against( - self, monkeypatch: pytest.MonkeyPatch, turns: int, estimated: bool, + self, + monkeypatch: pytest.MonkeyPatch, + turns: int, + estimated: bool, ) -> None: from litellm.proxy.management_endpoints.auto_router_endpoints import get_auto_router_session caller = UserAPIKeyAuth(api_key="sk-caller") - row: Final = {key: value for key, value in self.ROW.items() if estimated or not key.startswith("savings_estimated_")} + row: Final = { + key: value for key, value in self.ROW.items() if estimated or not key.startswith("savings_estimated_") + } spend: Final = 0.14 if turns == 3 else 10.0 if estimated and turns != 3: row["savings_estimated_saved_spend"] = -0.04 - self._rig(monkeypatch, [{**row, "api_key": caller.api_key, "session_id": "sess-1", "turns": turns, "spend": spend}]) + self._rig( + monkeypatch, [{**row, "api_key": caller.api_key, "session_id": "sess-1", "turns": turns, "spend": spend}] + ) response = await get_auto_router_session(user_api_key_dict=caller, session_id="sess-1") assert response.model_dump() == { "session_id": "sess-1", @@ -1159,10 +1176,18 @@ class TestAutoRouterSession: from litellm.proxy.management_endpoints.auto_router_endpoints import get_auto_router_session priced = {"anthropic/claude-opus-5": 2, "anthropic/claude-sonnet-5": 1} - self._rig(monkeypatch, [{ - **self.ROW, "api_key": ADMIN.api_key, "session_id": "s", - "baseline_models": {"old-baseline": 100}, "savings_estimated_baseline_models": priced, - }]) + self._rig( + monkeypatch, + [ + { + **self.ROW, + "api_key": ADMIN.api_key, + "session_id": "s", + "baseline_models": {"old-baseline": 100}, + "savings_estimated_baseline_models": priced, + } + ], + ) response = await get_auto_router_session(user_api_key_dict=ADMIN, session_id="s") assert response.baseline_model == "anthropic/claude-opus-5" assert response.baseline_models == priced @@ -3562,3 +3587,97 @@ async def test_start_shadow_eval_seeds_a_zero_funnel_row_per_leg(monkeypatch: py if "group_id" in call.kwargs.get("where", {}) ] assert group_reads == [] + + +@pytest.mark.asyncio +async def test_availability_counts_db_and_yaml_without_disclosing_router_names(monkeypatch): + from litellm.models.model import LiteLLM_ProxyModelTable + from litellm.proxy.management_helpers.auto_router_availability import build_auto_router_catalog + from litellm.types.management_endpoints.auto_router_endpoints import AutoRouterAvailabilityRequest + + row = LiteLLM_ProxyModelTable( + model_id="db-router", + model_name="private-team-router", + created_by="someone-else", + litellm_params={ + "model": "auto_router/complexity_router", + "complexity_router_config": {"classifier_type": "heuristic_v2"}, + }, + ) + yaml_row = { + "model_name": "private-yaml-router", + "litellm_params": { + "model": "auto_router/complexity_router", + "complexity_router_config": {"classifier_type": "capability"}, + }, + } + find_many = AsyncMock(side_effect=AssertionError("Availability must not query the model table")) + monkeypatch.setattr( + proxy_server, + "prisma_client", + SimpleNamespace(db=SimpleNamespace(litellm_proxymodeltable=SimpleNamespace(find_many=find_many))), + ) + monkeypatch.setattr(proxy_server.proxy_config, "auto_router_db_catalog", build_auto_router_catalog((row,))) + monkeypatch.setattr(proxy_server, "llm_router", SimpleNamespace(config_deployments=lambda: (yaml_row,))) + monkeypatch.setattr(proxy_server, "_license_check", SimpleNamespace(auto_router_capability_limit=lambda: 1)) + monkeypatch.setattr(proxy_server, "heuristic_v1_tuning_baselines", {}) + result = await auto_router_endpoints.get_auto_router_availability(AutoRouterAvailabilityRequest(), ADMIN) + assert {slot.key: slot.remaining for slot in result.allowances} == { + "heuristic_v2": 0, + "capability": 0, + "llm_v2": 1, + "tier_or_classifier_prompt": 1, + "heuristic_tuning": 1, + } + assert "private" not in result.model_dump_json() + edit = await auto_router_endpoints.get_auto_router_availability( + AutoRouterAvailabilityRequest( + saved_model_id="db-router", complexity_router_config={"classifier_type": "heuristic_v2"} + ), + ADMIN, + ) + assert edit.allowances[0].used_by_this_router + assert edit.allowances[0].remaining == 1 + assert edit.error is None + find_many.assert_not_awaited() + + +@pytest.mark.asyncio +async def test_availability_denies_another_teams_edit_exemption(monkeypatch): + from litellm.models.model import LiteLLM_ProxyModelTable + from litellm.proxy.management_helpers.auto_router_availability import build_auto_router_catalog + from litellm.types.management_endpoints.auto_router_endpoints import AutoRouterAvailabilityRequest + + row = LiteLLM_ProxyModelTable( + model_id="other-router", + model_name="other", + created_by="other", + model_info={"team_id": "other-team"}, + litellm_params={"model": "auto_router/complexity_router"}, + ) + find_many = AsyncMock(side_effect=AssertionError("Availability must not query the model table")) + monkeypatch.setattr( + proxy_server, + "prisma_client", + SimpleNamespace(db=SimpleNamespace(litellm_proxymodeltable=SimpleNamespace(find_many=find_many))), + ) + monkeypatch.setattr(proxy_server.proxy_config, "auto_router_db_catalog", build_auto_router_catalog((row,))) + monkeypatch.setattr(proxy_server, "llm_router", SimpleNamespace(config_deployments=lambda: ())) + monkeypatch.setattr(auto_router_endpoints, "_authorize_router_dry_run", AsyncMock(return_value=None)) + with pytest.raises(HTTPException) as error: + await auto_router_endpoints.get_auto_router_availability( + AutoRouterAvailabilityRequest(team_id="own-team", saved_model_id="other-router"), + UserAPIKeyAuth(user_role=LitellmUserRoles.INTERNAL_USER, user_id="owner"), + ) + assert error.value.status_code == 403 + + +@pytest.mark.asyncio +async def test_availability_waits_for_the_first_complete_catalog(monkeypatch): + from litellm.types.management_endpoints.auto_router_endpoints import AutoRouterAvailabilityRequest + + monkeypatch.setattr(proxy_server.proxy_config, "auto_router_db_catalog", None) + monkeypatch.setattr(proxy_server, "llm_router", SimpleNamespace(config_deployments=lambda: ())) + with pytest.raises(HTTPException) as error: + await auto_router_endpoints.get_auto_router_availability(AutoRouterAvailabilityRequest(), ADMIN) + assert error.value.status_code == 503 diff --git a/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py index f684e2040bd..0465572235b 100644 --- a/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py +++ b/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py @@ -1,6 +1,8 @@ +import asyncio import hashlib import json import logging +from collections.abc import Mapping, Sequence from datetime import datetime, timezone from types import SimpleNamespace from typing import Final @@ -36,6 +38,7 @@ from litellm.proxy.management_endpoints.internal_user_endpoints import ( ui_view_users, ) from litellm.proxy.proxy_server import app +from litellm.types.proxy.management_endpoints.internal_user_endpoints import InsensitiveContains from tests.test_litellm.proxy.management_endpoints.jwt_key_mapping_doubles import ( CascadingJWTMappingTable, JWTMappingRow, @@ -118,6 +121,70 @@ async def test_ui_view_users_proxy_admin_no_org_filter(mocker): ) +UserWhereCondition = InsensitiveContains | Sequence[Mapping[str, InsensitiveContains]] + + +def _matches_user_where(row: LiteLLM_UserTableFiltered, where: Mapping[str, UserWhereCondition]) -> bool: + def matches(field: str, condition: UserWhereCondition) -> bool: + if not isinstance(condition, Mapping): + return any(_matches_user_where(row, branch) for branch in condition) + value: Final = {"user_id": row.user_id, "user_email": row.user_email}[field] + return value is not None and condition["contains"].lower() in value.lower() + + return all(matches(field, condition) for field, condition in where.items()) + + +@pytest.mark.parametrize( + "params, expected_user_ids", + [ + ({"search": "SVC"}, ["svc-bot"]), + ({"search": "ali"}, ["alice-admin"]), + ({"search": "example.com"}, ["alice-admin"]), + ({"search": "admin"}, ["alice-admin"]), + ({"user_email": "svc"}, []), + ({"user_id": "svc"}, ["svc-bot"]), + ({"search": "ali", "user_id": "svc"}, []), + ], +) +def test_ui_view_users_search_matches_user_id_or_email( + mocker: MockerFixture, params: Mapping[str, str], expected_user_ids: list[str] +): + """ + search= returns users whose user_id or user_email contains the value (case-insensitive), + including users with no email; user_id=/user_email= keep filtering a single field and AND with search. + """ + from litellm.proxy.auth.user_api_key_auth import user_api_key_auth + + users = ( + LiteLLM_UserTableFiltered(user_id="alice-admin", user_email="alice@example.com"), + LiteLLM_UserTableFiltered(user_id="svc-bot", user_email=None), + LiteLLM_UserTableFiltered(user_id="bob", user_email="bob@corp.io"), + ) + + async def mock_find_many(*, where: Mapping[str, UserWhereCondition], **_: object): + return [user for user in users if _matches_user_where(user, where)] + + mock_prisma_client = mocker.MagicMock() + mock_prisma_client.db.litellm_usertable.find_many = mock_find_many + mocker.patch( # test-quality-ok: endpoint reads settings via module global; same seam as sibling tests + "litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints.get_ui_settings_cached", + return_value={}, + ) + mocker.patch( # test-quality-ok: endpoint reads prisma_client via module global; same seam as sibling tests + "litellm.proxy.proxy_server.prisma_client", mock_prisma_client + ) + app.dependency_overrides[user_api_key_auth] = lambda: UserAPIKeyAuth( + user_id="admin", user_role=LitellmUserRoles.PROXY_ADMIN + ) + try: + response = client.get("/user/filter/ui", params=params) + finally: + app.dependency_overrides.pop(user_api_key_auth, None) + + assert response.status_code == 200, response.text + assert [user["user_id"] for user in response.json()] == expected_user_ids + + @pytest.mark.asyncio async def test_ui_view_users_org_admin_filtered_by_org(mocker): """ @@ -4779,3 +4846,62 @@ def test_user_routes_answer_503_no_db_connection_when_the_callers_user_read_hits assert response.status_code == 503, response.text assert response.json() == _DB_OUTAGE_503_BODY + + +@pytest.mark.asyncio +async def test_delete_user_writes_deleted_audit_log_for_user_keys(mocker): + from litellm.proxy._types import ( + DeleteUserRequest, + LiteLLM_VerificationToken, + LitellmTableNames, + UserAPIKeyAuth, + ) + from litellm.proxy.management_endpoints.internal_user_endpoints import delete_user + + mock_prisma_client = mocker.MagicMock() + + mock_user_row = mocker.MagicMock() + mock_user_row.user_id = "doomed-user" + mock_user_row.user_email = "doomed@example.com" + mock_user_row.teams = [] + mock_user_row.model_dump_json.return_value = "{}" + mock_user_row.model_dump.return_value = {"user_id": "doomed-user", "user_email": "doomed@example.com", "teams": []} + + mock_prisma_client.db.litellm_usertable.find_unique = mocker.AsyncMock(return_value=mock_user_row) + mock_prisma_client.db.litellm_teamtable.find_many = mocker.AsyncMock(return_value=[]) + + user_key = LiteLLM_VerificationToken(token="hashed-user-key", user_id="doomed-user") + mock_prisma_client.db.litellm_verificationtoken.find_many = mocker.AsyncMock(return_value=[user_key]) + mock_prisma_client.db.litellm_verificationtoken.delete_many = mocker.AsyncMock(return_value=1) + mock_prisma_client.db.litellm_invitationlink.delete_many = mocker.AsyncMock(return_value=0) + mock_prisma_client.db.litellm_organizationmembership.delete_many = mocker.AsyncMock(return_value=0) + mock_prisma_client.db.litellm_teammembership.delete_many = mocker.AsyncMock(return_value=0) + mock_prisma_client.db.litellm_jwtkeymapping.find_many = mocker.AsyncMock(return_value=[]) + mock_prisma_client.db.litellm_usertable.delete_many = mocker.AsyncMock(return_value=1) + + mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client) + mocker.patch("litellm.store_audit_logs", True) + captured: Final[list] = [] + + async def _capture(request_data): + captured.append(request_data) + + mocker.patch( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + new=_capture, + ) + + caller = UserAPIKeyAuth(user_id="proxy-admin", user_role=LitellmUserRoles.PROXY_ADMIN) + await delete_user(data=DeleteUserRequest(user_ids=["doomed-user"]), user_api_key_dict=caller) + for _ in range(100): + if captured: + break + await asyncio.sleep(0.01) + + key_rows: Final = [r for r in captured if r.table_name == LitellmTableNames.KEY_TABLE_NAME] + assert len(key_rows) == 1 + audit_row: Final = key_rows[0] + assert audit_row.action == "deleted" + assert audit_row.object_id == user_key.token + assert audit_row.changed_by + assert json.loads(audit_row.before_value)["token"] == user_key.token diff --git a/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py index 8eaa4901c59..cd929dfeeb3 100644 --- a/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py +++ b/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py @@ -609,10 +609,7 @@ async def test_generate_key_debug_log_never_contains_raw_token(monkeypatch, capl mock_prisma_client.insert_data = AsyncMock(side_effect=_insert_data_side_effect) monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", mock_prisma_client) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) from litellm.proxy._types import GenerateKeyRequest, LitellmUserRoles from litellm.proxy.auth.user_api_key_auth import UserAPIKeyAuth @@ -1494,18 +1491,12 @@ async def test_list_keys_full_object_returns_lifetime_total_spend(): @pytest.mark.asyncio async def test_get_new_token_with_valid_key(monkeypatch): """Test get_new_token function when provided with a valid key that starts with 'sk-'""" - from unittest.mock import AsyncMock - from litellm.proxy._types import RegenerateKeyRequest from litellm.proxy.management_endpoints.key_management_endpoints import ( get_new_token, ) - # Mock get_ui_settings_cached to return setting disabled (custom keys allowed) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) # Test with valid new_key data = RegenerateKeyRequest(new_key="sk-test1234567890abc") @@ -1517,8 +1508,6 @@ async def test_get_new_token_with_valid_key(monkeypatch): @pytest.mark.asyncio async def test_get_new_token_with_invalid_key(monkeypatch): """Test get_new_token function when provided with an invalid key that doesn't start with 'sk-'""" - from unittest.mock import AsyncMock - from fastapi import HTTPException from litellm.proxy._types import RegenerateKeyRequest @@ -1526,11 +1515,7 @@ async def test_get_new_token_with_invalid_key(monkeypatch): get_new_token, ) - # Mock get_ui_settings_cached to return setting disabled (custom keys allowed) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) # Test with invalid new_key (doesn't start with 'sk-') data = RegenerateKeyRequest(new_key="invalid-key-123") @@ -1546,8 +1531,6 @@ async def test_get_new_token_with_invalid_key(monkeypatch): async def test_get_new_token_rejects_short_new_key(monkeypatch): """Regression test for LIT-4355: a short custom key like sk-99 must be rejected, otherwise the stored key_name (sk-...{last 4 chars}) reveals the entire key.""" - from unittest.mock import AsyncMock - from fastapi import HTTPException from litellm.proxy._types import RegenerateKeyRequest @@ -1555,10 +1538,7 @@ async def test_get_new_token_rejects_short_new_key(monkeypatch): get_new_token, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) data = RegenerateKeyRequest(new_key="sk-99") @@ -1588,10 +1568,7 @@ async def test_generate_key_fn_rejects_short_custom_key(monkeypatch, short_key): ) monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", mock_prisma_client) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) assert len(short_key) < 16 @@ -1628,10 +1605,7 @@ async def test_generate_key_fn_accepts_custom_key_at_minimum_length(monkeypatch) ) monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", mock_prisma_client) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) custom_key = "sk-abcdefghijklm" assert len(custom_key) == 16 @@ -1649,18 +1623,13 @@ async def test_generate_key_fn_accepts_custom_key_at_minimum_length(monkeypatch) @pytest.mark.asyncio async def test_check_custom_key_allowed_when_disabled(monkeypatch): """_check_custom_key_allowed raises 403 when disable_custom_api_keys is true.""" - from unittest.mock import AsyncMock - from fastapi import HTTPException from litellm.proxy.management_endpoints.key_management_endpoints import ( _check_custom_key_allowed, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={"disable_custom_api_keys": True}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {"disable_custom_api_keys": True}) with pytest.raises(HTTPException) as exc_info: await _check_custom_key_allowed("sk-custom-key-123") @@ -1672,16 +1641,11 @@ async def test_check_custom_key_allowed_when_disabled(monkeypatch): @pytest.mark.asyncio async def test_check_custom_key_allowed_when_enabled(monkeypatch): """_check_custom_key_allowed does nothing when disable_custom_api_keys is false.""" - from unittest.mock import AsyncMock - from litellm.proxy.management_endpoints.key_management_endpoints import ( _check_custom_key_allowed, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={"disable_custom_api_keys": False}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {"disable_custom_api_keys": False}) # Should not raise await _check_custom_key_allowed("sk-custom-key-123") @@ -1690,35 +1654,133 @@ async def test_check_custom_key_allowed_when_enabled(monkeypatch): @pytest.mark.asyncio async def test_check_custom_key_allowed_when_unset(monkeypatch): """_check_custom_key_allowed does nothing when setting is not present.""" - from unittest.mock import AsyncMock - from litellm.proxy.management_endpoints.key_management_endpoints import ( _check_custom_key_allowed, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) # Should not raise await _check_custom_key_allowed("sk-custom-key-123") @pytest.mark.asyncio -async def test_check_custom_key_allowed_none_key_always_passes(monkeypatch): - """_check_custom_key_allowed does nothing when key is None, even if setting is on.""" - from unittest.mock import AsyncMock +async def test_check_custom_key_allowed_honours_the_config_file(monkeypatch): + """A config-file general_settings.disable_custom_api_keys is enforced with no stored UI row.""" + from fastapi import HTTPException + from litellm.proxy.config_resolvers import SettingsStore from litellm.proxy.management_endpoints.key_management_endpoints import ( _check_custom_key_allowed, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={"disable_custom_api_keys": True}), + general_settings = SettingsStore("general_settings") + general_settings.load_yaml({"disable_custom_api_keys": True}) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", general_settings) + + with pytest.raises(HTTPException) as exc_info: + await _check_custom_key_allowed("sk-custom-key-123456") + + assert exc_info.value.status_code == 403 + + +@pytest.mark.parametrize( + ("config_value", "blocked"), + [ + (True, True), + ("true", True), + ("True", True), + (1, True), + (False, False), + ("false", False), + ("False", False), + (0, False), + ], +) +@pytest.mark.asyncio +async def test_check_custom_key_allowed_coerces_a_non_bool_config_value(monkeypatch, config_value, blocked): + """A YAML value that is not a bare bool, such as a quoted "true", still decides the gate.""" + from fastapi import HTTPException + + from litellm.proxy.config_resolvers import SettingsStore + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _check_custom_key_allowed, ) + general_settings = SettingsStore("general_settings") + general_settings.load_yaml({"disable_custom_api_keys": config_value}) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", general_settings) + + rejected = False + try: + await _check_custom_key_allowed("sk-custom-key-123456") + except HTTPException as e: + rejected = e.status_code == 403 + + assert rejected is blocked + + +@pytest.mark.asyncio +async def test_check_custom_key_allowed_config_file_beats_the_stored_ui_row(monkeypatch): + """The config file owns the flag, so a stored UI row saying false cannot re-open custom keys.""" + from fastapi import HTTPException + + from litellm.proxy.config_resolvers import SettingsStore + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _check_custom_key_allowed, + ) + from litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints import ( + apply_runtime_general_settings_flags, + ) + + general_settings = SettingsStore("general_settings") + general_settings.load_yaml({"disable_custom_api_keys": True}) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", general_settings) + + apply_runtime_general_settings_flags({"disable_custom_api_keys": False}) + + with pytest.raises(HTTPException) as exc_info: + await _check_custom_key_allowed("sk-custom-key-123456") + + assert exc_info.value.status_code == 403 + + +@pytest.mark.asyncio +async def test_check_custom_key_allowed_picks_up_a_ui_write_without_the_serving_pod(monkeypatch): + """A pod that never served the PATCH enforces the new value after its own settings sync.""" + from fastapi import HTTPException + + from litellm.proxy.config_resolvers import SettingsStore + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _check_custom_key_allowed, + ) + from litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints import ( + apply_runtime_general_settings_flags, + ) + + general_settings = SettingsStore("general_settings") + general_settings.load_yaml({}) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", general_settings) + + await _check_custom_key_allowed("sk-custom-key-123456") + + apply_runtime_general_settings_flags({"disable_custom_api_keys": True}) + + with pytest.raises(HTTPException) as exc_info: + await _check_custom_key_allowed("sk-custom-key-123456") + + assert exc_info.value.status_code == 403 + + +@pytest.mark.asyncio +async def test_check_custom_key_allowed_none_key_always_passes(monkeypatch): + """_check_custom_key_allowed does nothing when key is None, even if setting is on.""" + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _check_custom_key_allowed, + ) + + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {"disable_custom_api_keys": True}) + # Should not raise — None means auto-generate await _check_custom_key_allowed(None) @@ -1726,8 +1788,6 @@ async def test_check_custom_key_allowed_none_key_always_passes(monkeypatch): @pytest.mark.asyncio async def test_get_new_token_rejected_when_custom_keys_disabled(monkeypatch): """get_new_token raises 403 when new_key is set and disable_custom_api_keys is true.""" - from unittest.mock import AsyncMock - from fastapi import HTTPException from litellm.proxy._types import RegenerateKeyRequest @@ -1735,10 +1795,7 @@ async def test_get_new_token_rejected_when_custom_keys_disabled(monkeypatch): get_new_token, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={"disable_custom_api_keys": True}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {"disable_custom_api_keys": True}) data = RegenerateKeyRequest(new_key="sk-custom-regen-key") @@ -1751,17 +1808,12 @@ async def test_get_new_token_rejected_when_custom_keys_disabled(monkeypatch): @pytest.mark.asyncio async def test_get_new_token_auto_generates_when_custom_keys_disabled(monkeypatch): """get_new_token auto-generates a key when new_key is None, even if setting is on.""" - from unittest.mock import AsyncMock - from litellm.proxy._types import RegenerateKeyRequest from litellm.proxy.management_endpoints.key_management_endpoints import ( get_new_token, ) - monkeypatch.setattr( - "litellm.proxy.management_endpoints.key_management_endpoints.get_ui_settings_cached", - AsyncMock(return_value={"disable_custom_api_keys": True}), - ) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {"disable_custom_api_keys": True}) data = RegenerateKeyRequest() # no new_key result = await get_new_token(data) @@ -3037,6 +3089,50 @@ async def test_update_key_by_alias_only(monkeypatch): assert result["key"] == hashed_token +@pytest.mark.asyncio +async def test_update_key_changed_alias_must_match_key_alias_pattern(monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.management_endpoints.key_management_endpoints import ( + update_key_fn, + ) + + monkeypatch.setattr(litellm, "key_alias_pattern", r"^[a-z0-9]+(-[a-z0-9]+)*$") + hashed_token = "0d62f396c1317066f55a96086517047c737087c61eb2bf016b72e6298927b15b" + key_in_db = LiteLLM_VerificationToken(token=hashed_token, key_alias="Legacy Alias", user_id="test-user") + + mock_prisma_client = AsyncMock() + mock_prisma_client.db.litellm_verificationtoken.find_unique = AsyncMock(return_value=key_in_db) + mock_prisma_client.db.litellm_verificationtoken.find_many = AsyncMock(return_value=[key_in_db]) + mock_prisma_client.db.litellm_verificationtoken.find_first = AsyncMock(return_value=None) + mock_prisma_client.update_data = AsyncMock(return_value={"data": {"max_budget": 50.0}}) + _setup_update_key_mocks(monkeypatch, mock_prisma_client) + user_api_key_dict = UserAPIKeyAuth( + user_role=LitellmUserRoles.PROXY_ADMIN, api_key="sk-admin", user_id="admin-user" + ) + + with pytest.raises(ProxyException) as exc_info: + await update_key_fn( + request=MagicMock(), + data=UpdateKeyRequest(key=hashed_token, key_alias="Prod Key"), + user_api_key_dict=user_api_key_dict, + litellm_changed_by=None, + ) + assert str(exc_info.value.code) == "400" + assert "key_alias_pattern" in str(exc_info.value.message) + mock_prisma_client.update_data.assert_not_awaited() + + with patch( + "litellm.proxy.management_endpoints.key_management_endpoints._delete_cache_key_object", + return_value=None, + ): + await update_key_fn( + request=MagicMock(), + data=UpdateKeyRequest(key=hashed_token, key_alias="Legacy Alias", max_budget=50.0), + user_api_key_dict=user_api_key_dict, + litellm_changed_by=None, + ) + mock_prisma_client.update_data.assert_awaited_once() + + @pytest.mark.asyncio async def test_update_key_by_alias_not_found_returns_404(monkeypatch): """ @@ -10510,6 +10606,10 @@ class TestValidateKeyAliasFormat: def reset_key_alias_flag(self, monkeypatch: pytest.MonkeyPatch) -> None: monkeypatch.setattr(litellm, "enable_key_alias_format_validation", False) + @pytest.fixture(autouse=True) + def reset_key_alias_pattern(self, monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(litellm, "key_alias_pattern", None) + def test_validation_skipped_when_flag_disabled(self): """When enable_key_alias_format_validation is False (default), no charset/length validation occurs.""" from litellm.proxy.management_endpoints.key_management_endpoints import ( @@ -10592,6 +10692,67 @@ class TestValidateKeyAliasFormat: assert str(exc.value.code) == "400" assert "Invalid key_alias format" in str(exc.value.message) + def test_configured_pattern_applies_with_flag_off(self, monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _validate_key_alias_format, + ) + + monkeypatch.setattr(litellm, "key_alias_pattern", r"^[a-z0-9]+(-[a-z0-9]+)*$") + with pytest.raises(ProxyException) as exc: + _validate_key_alias_format("Prod Key") + assert str(exc.value.code) == "400" + assert exc.value.param == "key_alias" + assert "key_alias_pattern" in str(exc.value.message) + assert r"^[a-z0-9]+(-[a-z0-9]+)*$" in str(exc.value.message) + assert _validate_key_alias_format("prod-key-001") is None + assert _validate_key_alias_format(None) is None + + def test_configured_pattern_must_match_the_whole_alias(self, monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _validate_key_alias_format, + ) + + monkeypatch.setattr(litellm, "key_alias_pattern", r"team-[a-z]+") + _validate_key_alias_format("team-search") + for partial_match in ("team-search-2", "xteam-search"): + with pytest.raises(ProxyException): + _validate_key_alias_format(partial_match) + + def test_configured_pattern_replaces_the_builtin_rule(self, monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _validate_key_alias_format, + ) + + monkeypatch.setattr(litellm, "enable_key_alias_format_validation", True) + monkeypatch.setattr(litellm, "key_alias_pattern", r"^[a-z ]+$") + _validate_key_alias_format("alias with spaces") + with pytest.raises(ProxyException) as exc: + _validate_key_alias_format("Uppercase") + assert "key_alias_pattern" in str(exc.value.message) + + def test_configured_pattern_keeps_the_baseline_safety_check(self, monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _validate_key_alias_format, + ) + + monkeypatch.setattr(litellm, "key_alias_pattern", r".*") + with pytest.raises(ProxyException) as exc: + _validate_key_alias_format("../../../other-app/creds") + assert str(exc.value.code) == "400" + assert "key_alias_pattern" not in str(exc.value.message) + + def test_configured_pattern_bounds_the_alias_length(self, monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _validate_key_alias_format, + ) + + monkeypatch.setattr(litellm, "key_alias_pattern", r"^[a-z]+$") + _validate_key_alias_format("a" * 255) + with pytest.raises(ProxyException) as exc: + _validate_key_alias_format("a" * 256) + assert str(exc.value.code) == "400" + assert "at most 255 characters" in str(exc.value.message) + @pytest.mark.asyncio async def test_check_org_key_limits_on_update_within_bounds(): @@ -12682,6 +12843,55 @@ async def test_execute_virtual_key_regeneration_rejects_over_limit_duration(monk assert mock_prisma_client.db.litellm_verificationtoken.update.await_count == 0 +@pytest.mark.asyncio +async def test_execute_virtual_key_regeneration_changed_alias_must_match_key_alias_pattern( + monkeypatch: pytest.MonkeyPatch, +) -> None: + from litellm.proxy._types import RegenerateKeyRequest + from litellm.proxy.management_endpoints.key_management_endpoints import ( + _execute_virtual_key_regeneration, + ) + + monkeypatch.setattr(litellm, "key_alias_pattern", r"^[a-z0-9]+(-[a-z0-9]+)*$") + mock_prisma_client = _make_regenerate_mock_prisma() + + with ( + patch( + "litellm.proxy.management_endpoints.key_management_endpoints.get_new_token", + new_callable=AsyncMock, + return_value="sk-newtoken1234ab12", + ), + patch( + "litellm.proxy.management_endpoints.key_management_endpoints._insert_deprecated_key", + new_callable=AsyncMock, + ), + patch( + "litellm.proxy.management_endpoints.key_management_endpoints._persist_deleted_verification_tokens", + new_callable=AsyncMock, + ), + patch( + "litellm.proxy.management_endpoints.key_management_endpoints._delete_cache_key_object", + new_callable=AsyncMock, + ), + ): + with pytest.raises(ProxyException) as exc_info: + await _execute_virtual_key_regeneration( + prisma_client=mock_prisma_client, + key_in_db=_make_regenerate_existing_key(), + hashed_api_key="abc123", + key="abc123", + data=RegenerateKeyRequest(key_alias="Regenerated Key"), + user_api_key_dict=_make_regenerate_user_api_key_dict(), + litellm_changed_by=None, + user_api_key_cache=MagicMock(), + proxy_logging_obj=MagicMock(), + ) + assert str(exc_info.value.code) == "400" + assert exc_info.value.param == "key_alias" + assert r"^[a-z0-9]+(-[a-z0-9]+)*$" in str(exc_info.value.message) + assert mock_prisma_client.db.litellm_verificationtoken.update.await_count == 0 + + @pytest.mark.asyncio async def test_execute_virtual_key_regeneration_allows_within_limit_duration(monkeypatch): """Regenerate must accept durations within upperbound_key_generate_params.duration.""" diff --git a/tests/test_litellm/proxy/management_endpoints/test_model_management_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_model_management_endpoints.py index bd252169131..8d618f4699b 100644 --- a/tests/test_litellm/proxy/management_endpoints/test_model_management_endpoints.py +++ b/tests/test_litellm/proxy/management_endpoints/test_model_management_endpoints.py @@ -3,6 +3,7 @@ import asyncio import contextlib import json from collections.abc import Iterator, Mapping +from types import SimpleNamespace from typing import Dict, Final, Optional from unittest.mock import AsyncMock, MagicMock, patch @@ -1222,6 +1223,117 @@ class TestDeleteModelClearsRouterRegistry: assert mock_router.complexity_routers.get("shared-name") is config_router +@pytest.fixture +def deleted_auto_router_catalog(monkeypatch): + from litellm.proxy import proxy_server + from litellm.proxy.management_helpers.auto_router_availability import build_auto_router_catalog + + rows = tuple( + LiteLLM_ProxyModelTable( + model_id=model_id, + model_name=f"model_name_{team_id}_{model_id}", + litellm_params={ + "model": "auto_router/complexity_router", + "complexity_router_config": {"classifier_type": classifier}, + }, + model_info={"id": model_id, "team_id": team_id}, + created_by="admin", + updated_by="admin", + blocked=True, + ) + for model_id, team_id, classifier in ( + ("deleted-router", "deleted-team", "heuristic_v2"), + ("surviving-router", "surviving-team", "llm_v2"), + ) + ) + config = proxy_server.ProxyConfig() + config.auto_router_db_catalog = build_auto_router_catalog(rows) + monkeypatch.setattr(proxy_server, "proxy_config", config) + monkeypatch.setattr(proxy_server, "MODEL_RECONCILE_LOCK", asyncio.Lock()) + monkeypatch.setattr(proxy_server, "llm_router", Router(model_list=[])) + monkeypatch.setattr(proxy_server, "_license_check", SimpleNamespace(auto_router_capability_limit=lambda: 1)) + monkeypatch.setattr(proxy_server, "heuristic_v1_tuning_baselines", {}) + return config, rows + + +class TestDeletedAutoRouterAvailability: + @pytest.mark.asyncio + @pytest.mark.parametrize("delete_succeeds,has_router", ((True, True), (True, False), (False, True))) + async def test_single_delete_releases_allowance_only_after_success( + self, monkeypatch, deleted_auto_router_catalog, delete_succeeds, has_router + ): + from litellm.proxy import proxy_server + from litellm.proxy.management_endpoints.auto_router_endpoints import get_auto_router_availability + from litellm.proxy.management_endpoints.model_management_endpoints import ModelInfoDelete, delete_model + from litellm.types.management_endpoints.auto_router_endpoints import AutoRouterAvailabilityRequest + + config, rows = deleted_auto_router_catalog + original = config.auto_router_db_catalog + row = rows[0].model_copy(update={"model_info": {"id": rows[0].model_id}}) + table = SimpleNamespace( + find_unique=AsyncMock(return_value=row), + delete=AsyncMock(return_value=row, side_effect=None if delete_succeeds else RuntimeError("delete failed")), + ) + prisma = SimpleNamespace( + db=SimpleNamespace(litellm_proxymodeltable=table, query_raw=AsyncMock(return_value=[])) + ) + monkeypatch.setattr(proxy_server, "prisma_client", prisma) + monkeypatch.setattr(proxy_server, "store_model_in_db", True) + admin = UserAPIKeyAuth(user_id="admin", user_role=LitellmUserRoles.PROXY_ADMIN) + request = AutoRouterAvailabilityRequest(complexity_router_config={"classifier_type": "heuristic_v2"}) + before = await get_auto_router_availability(request, admin) + assert before.error is not None + if not has_router: + monkeypatch.setattr(proxy_server, "llm_router", None) + + if not delete_succeeds: + with pytest.raises(ProxyException, match="delete failed"): + await delete_model(ModelInfoDelete(id=row.model_id), admin) + assert config.auto_router_db_catalog == original + return + + await delete_model(ModelInfoDelete(id=row.model_id), admin) + monkeypatch.setattr(proxy_server, "llm_router", Router(model_list=[])) + after = await get_auto_router_availability(request, admin) + assert after.error is None + assert {slot.key: slot.remaining for slot in after.allowances} == { + "heuristic_v2": 1, + "capability": 1, + "llm_v2": 0, + "tier_or_classifier_prompt": 1, + "heuristic_tuning": 1, + } + + @pytest.mark.asyncio + @pytest.mark.parametrize("has_router", (True, False)) + async def test_team_delete_releases_only_its_routers_allowance( + self, monkeypatch, deleted_auto_router_catalog, has_router + ): + from litellm.proxy import proxy_server + from litellm.proxy.management_endpoints.auto_router_endpoints import get_auto_router_availability + from litellm.types.management_endpoints.auto_router_endpoints import AutoRouterAvailabilityRequest + + _, rows = deleted_auto_router_catalog + prisma = _TxPrismaClient(rows) + deleted = await delete_team_models( + team_ids=["deleted-team"], prisma_client=prisma, llm_router=proxy_server.llm_router if has_router else None + ) + + assert deleted == ["deleted-router"] + after = await get_auto_router_availability( + AutoRouterAvailabilityRequest(complexity_router_config={"classifier_type": "heuristic_v2"}), + UserAPIKeyAuth(user_id="admin", user_role=LitellmUserRoles.PROXY_ADMIN), + ) + assert after.error is None + assert {slot.key: slot.remaining for slot in after.allowances} == { + "heuristic_v2": 1, + "capability": 1, + "llm_v2": 0, + "tier_or_classifier_prompt": 1, + "heuristic_tuning": 1, + } + + class TestUpdateModel: """ Tests for the update_model (POST /model/update) handler. @@ -5274,7 +5386,7 @@ class TestDeleteEvictionsHoldTheReconcileLock: """ @staticmethod - async def _assert_evicts_under_lock(monkeypatch, call_endpoint, model_id: str) -> None: + async def _assert_evicts_under_lock(monkeypatch, call_endpoint, model_id: str, config) -> None: """Run ``call_endpoint`` with the lock already held and assert it blocks. Holding MODEL_RECONCILE_LOCK stands in for a reconcile that is mid-flight. If @@ -5291,6 +5403,7 @@ class TestDeleteEvictionsHoldTheReconcileLock: """ lock = asyncio.Lock() monkeypatch.setattr("litellm.proxy.proxy_server.MODEL_RECONCILE_LOCK", lock) + stale_catalog = config.auto_router_db_catalog async with lock: task = asyncio.create_task(call_endpoint()) @@ -5301,16 +5414,19 @@ class TestDeleteEvictionsHoldTheReconcileLock: f"deleting {model_id} did not wait for MODEL_RECONCILE_LOCK -- an " f"in-flight reconcile can resurrect the deployment it just evicted" ) + config.auto_router_db_catalog = stale_catalog await asyncio.wait_for(task, timeout=5) + assert tuple(row.model_id for row in config.auto_router_db_catalog) == ("surviving-router",) @pytest.mark.asyncio - async def test_delete_model_waits_for_an_in_flight_reconcile(self, monkeypatch): + async def test_delete_model_waits_for_an_in_flight_reconcile(self, monkeypatch, deleted_auto_router_catalog): from litellm.proxy.management_endpoints.model_management_endpoints import ( ModelInfoDelete, delete_model, ) - model_id = "m-doomed" + config, rows = deleted_auto_router_catalog + model_id = rows[0].model_id row = MagicMock() row.model_dump.return_value = { "model_name": "gpt-4o", @@ -5347,16 +5463,17 @@ class TestDeleteEvictionsHoldTheReconcileLock: ), ) - await self._assert_evicts_under_lock(monkeypatch, call, model_id) + await self._assert_evicts_under_lock(monkeypatch, call, model_id, config) router.delete_deployment.assert_called_once_with(id=model_id) @pytest.mark.asyncio - async def test_delete_team_models_waits_for_an_in_flight_reconcile(self, monkeypatch): + async def test_delete_team_models_waits_for_an_in_flight_reconcile(self, monkeypatch, deleted_auto_router_catalog): from litellm.proxy.management_endpoints.model_management_endpoints import ( delete_team_models, ) - model_id = "m-team-doomed" + config, rows = deleted_auto_router_catalog + model_id = rows[0].model_id router = MagicMock() router.delete_deployment = MagicMock(return_value=True) @@ -5392,7 +5509,7 @@ class TestDeleteEvictionsHoldTheReconcileLock: team_ids=["team-1"], prisma_client=prisma, llm_router=router ) - await self._assert_evicts_under_lock(monkeypatch, call, model_id) + await self._assert_evicts_under_lock(monkeypatch, call, model_id, config) router.delete_deployment.assert_called_once_with(id=model_id) @@ -6092,7 +6209,8 @@ class TestStrategyRouterWriteValidation: _TUNED_A = {"classifier_type": "heuristic", "tiers": {"SIMPLE": "gpt-4o-mini", "MEDIUM": "gpt-4o"}} _TUNED_A_EDITED = {**_TUNED_A, "dimension_weights": {"codePresence": 0.9}} _TUNED_B = {"classifier_type": "heuristic", "tiers": {"SIMPLE": "gpt-4o-mini", "MEDIUM": "gpt-4.1"}} - _TUNED_B_EDITED = {**_TUNED_B, "tiers": {"SIMPLE": "gpt-4o", "MEDIUM": "gpt-4.1"}} + _TUNED_B_EDITED = {**_TUNED_B, "code_keywords": ["internal-api"]} + _MODELS_ONLY_B = {**_TUNED_B, "tiers": {"SIMPLE": "fast-model", "MEDIUM": "capable-model"}} @staticmethod def _db_router_row(model_id: str, config: Mapping[str, object]) -> dict[str, object]: @@ -6110,7 +6228,9 @@ class TestStrategyRouterWriteValidation: (1, ["a", "b"], {"a": "_TUNED_A", "b": "_TUNED_B"}, "a", "_TUNED_A_EDITED", "allowed"), (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "a", "_TUNED_A_EDITED", "allowed"), (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "b", "_TUNED_B_EDITED", "refused"), - (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "c", "_TUNED_B", "refused"), + (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "c", "_TUNED_B_EDITED", "refused"), + (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "c", "_TUNED_B", "allowed"), + (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "b", "_MODELS_ONLY_B", "allowed"), (1, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "b", "_TUNED_B", "allowed"), (None, ["a", "b"], {"a": "_TUNED_A_EDITED", "b": "_TUNED_B"}, "b", "_TUNED_B_EDITED", "allowed"), (1, [], {}, "c", "_TUNED_B", "allowed"), @@ -6138,6 +6258,7 @@ class TestStrategyRouterWriteValidation: "_TUNED_A_EDITED": self._TUNED_A_EDITED, "_TUNED_B": self._TUNED_B, "_TUNED_B_EDITED": self._TUNED_B_EDITED, + "_MODELS_ONLY_B": self._MODELS_ONLY_B, } baselines = snapshot_tuning_baselines( [self._db_router_row(row_id, configs["_TUNED_A" if row_id == "a" else "_TUNED_B"]) for row_id in baseline_rows] @@ -6172,7 +6293,7 @@ class TestStrategyRouterWriteValidation: async with _auto_router_capability_slot(fake, effective_params=effective_params, model_id=candidate_id): pass assert exc_info.value.status_code == 403 - assert "changed heuristic scorer settings or tier models" in str(exc_info.value.detail) + assert "changed heuristic scoring rules" in str(exc_info.value.detail) assert "'auto_router' feature lifts the limit" in str(exc_info.value.detail) return async with _auto_router_capability_slot(fake, effective_params=effective_params, model_id=candidate_id) as table: @@ -6222,13 +6343,13 @@ class TestStrategyRouterWriteValidation: model_params=Deployment( model_name="second-tuned", litellm_params=LiteLLM_Params( - model="auto_router/complexity_router", complexity_router_config=self._TUNED_B + model="auto_router/complexity_router", complexity_router_config=self._TUNED_B_EDITED ), ), user_api_key_dict=admin, ) assert exc_info.value.code == "403" - assert "changed heuristic scorer settings or tier models" in str(exc_info.value.message) + assert "changed heuristic scoring rules" in str(exc_info.value.message) fake.tx_obj.litellm_proxymodeltable.create.assert_not_awaited() fake.litellm_proxymodeltable.create.assert_not_awaited() diff --git a/tests/test_litellm/proxy/management_endpoints/test_router_settings_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_router_settings_endpoints.py index 3fcda310435..ec1af0518c6 100644 --- a/tests/test_litellm/proxy/management_endpoints/test_router_settings_endpoints.py +++ b/tests/test_litellm/proxy/management_endpoints/test_router_settings_endpoints.py @@ -6,20 +6,22 @@ Tests the GET endpoints for router settings and router fields. from collections.abc import Mapping from typing import Any, Final -from unittest.mock import AsyncMock, MagicMock, patch import pytest from fastapi.testclient import TestClient - from litellm.proxy import proxy_server from litellm.proxy._types import LitellmUserRoles, UserAPIKeyAuth +from litellm.proxy.config_resolvers import SettingsStore from litellm.proxy.management_endpoints.router_settings_endpoints import ( + RouterFieldsResponse, + RouterSettingsResponse, + get_router_fields, get_router_settings, ) -from litellm.proxy.config_resolvers import SettingsStore from litellm.proxy.proxy_server import app from litellm.router import Router +from litellm.types.router import RoutingGroup client = TestClient(app) @@ -157,3 +159,91 @@ class TestRouterSettingsEndpoints: rg_field = next(f for f in response.fields if f.field_name == "routing_groups") assert rg_field.field_value == groups + + @pytest.mark.asyncio + @pytest.mark.parametrize("metadata_only", (True, False)) + async def test_priority_is_advertised_for_groups_only( + self, monkeypatch: pytest.MonkeyPatch, metadata_only: bool + ) -> None: + monkeypatch.setattr(proxy_server, "llm_router", None) + monkeypatch.setattr( + proxy_server, + "proxy_config", + _StubProxyConfig(SettingsStore("router_settings"), {}), + ) + admin_user: Final = UserAPIKeyAuth( + user_role=LitellmUserRoles.PROXY_ADMIN, api_key="sk-test" + ) + + response: Final[RouterFieldsResponse | RouterSettingsResponse] = ( + await get_router_fields(user_api_key_dict=admin_user) + if metadata_only + else await get_router_settings(user_api_key_dict=admin_user) + ) + + global_options: Final = next( + field.options + for field in response.fields + if field.field_name == "routing_strategy" + ) + assert global_options is not None + assert "priority" not in global_options + assert response.model_dump(mode="json")["routing_group_strategies"] == [*global_options, "priority"] + + @pytest.mark.asyncio + @pytest.mark.parametrize("from_config", (False, True)) + async def test_settings_retains_explicit_model_priorities( + self, monkeypatch: pytest.MonkeyPatch, from_config: bool + ) -> None: + group: Final = RoutingGroup( + group_name="ordered-chat", + models=["primary", "backup"], + routing_strategy="priority", + model_priorities={"primary": 1, "backup": 2}, + ) + llm_router: Final = Router( + model_list=[ + { + "model_name": model, + "litellm_params": { + "model": "openai/gpt-5.4-nano", + "api_key": "sk-test", + }, + } + for model in group.models + ], + routing_groups=[group], + ) + expected: Final = [ + { + "group_name": "ordered-chat", + "models": ["primary", "backup"], + "routing_strategy": "priority", + "routing_strategy_args": None, + "model_priorities": ( + {"primary": 8, "backup": 3} + if from_config + else {"primary": 1, "backup": 2} + ), + } + ] + config: Final = {"routing_groups": expected} if from_config else {} + store: Final = SettingsStore("router_settings") + store.load_yaml(config) + monkeypatch.setattr(proxy_server, "llm_router", llm_router) + monkeypatch.setattr( + proxy_server, "proxy_config", _StubProxyConfig(store, config) + ) + admin_user: Final = UserAPIKeyAuth( + user_role=LitellmUserRoles.PROXY_ADMIN, api_key="sk-test" + ) + + response: Final[RouterSettingsResponse] = await get_router_settings( + user_api_key_dict=admin_user + ) + + assert response.current_values["routing_groups"] == expected + groups_field: Final = next( + field for field in response.fields if field.field_name == "routing_groups" + ) + assert groups_field.field_value == expected diff --git a/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py index 8bf9c598b1a..7a9b6b66946 100644 --- a/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py +++ b/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py @@ -5129,6 +5129,168 @@ async def test_team_member_delete_cleans_verification_tokens( ) +@pytest.mark.asyncio +async def test_team_member_delete_writes_deleted_audit_log_for_member_keys( + mock_db_client, mock_admin_auth +): + from litellm.proxy._types import ( + LiteLLM_VerificationToken, + LitellmTableNames, + TeamMemberDeleteRequest, + ) + from litellm.proxy.management_endpoints.team_endpoints import team_member_delete + + test_team_id = "team-del-audit-123" + test_user_id = "user-audit@example.com" + member_key = LiteLLM_VerificationToken(token="hashed-member-key", team_id=test_team_id, user_id=test_user_id) + + mock_team_row = MagicMock() + mock_team_row.model_dump.return_value = { + "team_id": test_team_id, + "members_with_roles": [ + {"user_id": test_user_id, "user_email": None, "role": "user"} + ], + "team_member_permissions": [], + "metadata": {}, + "models": [], + "spend": 0.0, + } + + mock_db_client.db.litellm_teamtable.find_unique = AsyncMock( + return_value=mock_team_row + ) + mock_db_client.db.litellm_teamtable.update = AsyncMock(return_value=mock_team_row) + + mock_user_row = MagicMock() + mock_user_row.user_id = test_user_id + mock_user_row.teams = [test_team_id] + mock_db_client.db.litellm_usertable.find_many = AsyncMock( + return_value=[mock_user_row] + ) + mock_db_client.db.litellm_usertable.update = AsyncMock(return_value=MagicMock()) + + mock_db_client.db.litellm_teammembership = MagicMock() + mock_db_client.db.litellm_teammembership.delete_many = AsyncMock( + return_value=MagicMock() + ) + + mock_db_client.db.litellm_verificationtoken = MagicMock() + mock_db_client.db.litellm_verificationtoken.find_many = AsyncMock(return_value=[member_key]) + mock_db_client.db.litellm_verificationtoken.delete_many = AsyncMock( + return_value=MagicMock() + ) + mock_db_client.db.litellm_jwtkeymapping = MagicMock() + mock_db_client.db.litellm_jwtkeymapping.find_many = AsyncMock(return_value=[]) + mock_db_client.db.litellm_deletedverificationtoken = MagicMock() + mock_db_client.db.litellm_deletedverificationtoken.create_many = AsyncMock(return_value=MagicMock()) + + _wire_member_delete_tx(mock_db_client) + + captured: Final[list] = [] + + async def _capture(request_data): + captured.append(request_data) + + with ( + patch("litellm.store_audit_logs", True), + patch( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + new=_capture, + ), + ): + await team_member_delete( + data=TeamMemberDeleteRequest(team_id=test_team_id, user_id=test_user_id), + user_api_key_dict=mock_admin_auth, + ) + for _ in range(100): + if captured: + break + await asyncio.sleep(0.01) + + key_rows: Final = [r for r in captured if r.table_name == LitellmTableNames.KEY_TABLE_NAME] + assert len(key_rows) == 1 + audit_row: Final = key_rows[0] + assert audit_row.action == "deleted" + assert audit_row.object_id == member_key.token + assert audit_row.changed_by + assert json.loads(audit_row.before_value)["token"] == member_key.token + + +@pytest.mark.asyncio +async def test_delete_team_writes_deleted_audit_log_for_team_keys( + monkeypatch, +): + from litellm.proxy._types import DeleteTeamRequest, LiteLLM_VerificationToken, LitellmTableNames + from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache + + team = LiteLLM_TeamTable( + team_id="team-doomed", + team_alias="doomed-team", + members_with_roles=[], + metadata={}, + model_max_budget={}, + model_spend={}, + ) + team_key = LiteLLM_VerificationToken(token="hashed-doomed-key", team_id="team-doomed") + + mock_prisma_client = AsyncMock() + mock_prisma_client.db.litellm_teamtable.find_unique = AsyncMock(return_value=team) + mock_prisma_client.delete_data = AsyncMock(return_value={"deleted_teams": ["team-doomed"]}) + mock_prisma_client.db.litellm_deletedteamtable.create_many = AsyncMock() + mock_prisma_client.db.litellm_deletedverificationtoken.create_many = AsyncMock() + mock_prisma_client.db.litellm_verificationtoken.find_many = AsyncMock(return_value=[team_key]) + mock_prisma_client.db.execute_raw = AsyncMock() + mock_prisma_client.db.litellm_teammembership.delete_many = AsyncMock() + mock_prisma_client.get_data = AsyncMock(return_value=None) + + mock_tx = AsyncMock() + mock_tx.litellm_proxymodeltable.find_many = AsyncMock(return_value=[]) + mock_tx_cm = MagicMock() + mock_tx_cm.__aenter__ = AsyncMock(return_value=mock_tx) + mock_tx_cm.__aexit__ = AsyncMock(return_value=False) + mock_prisma_client.db.tx = MagicMock(return_value=mock_tx_cm) + _wire_team_delete_tx(mock_prisma_client) + + monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", mock_prisma_client) + monkeypatch.setattr("litellm.proxy.proxy_server.user_api_key_cache", UserApiKeyCache()) + monkeypatch.setattr("litellm.proxy.proxy_server.create_audit_log_for_update", AsyncMock()) + monkeypatch.setattr("litellm.proxy.proxy_server.litellm_proxy_admin_name", "admin") + + caller = UserAPIKeyAuth( + user_id="admin-user", + api_key="sk-admin", + user_role=LitellmUserRoles.PROXY_ADMIN.value, + ) + captured: Final[list] = [] + + async def _capture(request_data): + captured.append(request_data) + + monkeypatch.setattr("litellm.store_audit_logs", True) + monkeypatch.setattr( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + _capture, + ) + await delete_team( + data=DeleteTeamRequest(team_ids=["team-doomed"]), + http_request=MagicMock(), + user_api_key_dict=caller, + litellm_changed_by="admin-user", + ) + for _ in range(100): + if captured: + break + await asyncio.sleep(0.01) + + key_rows: Final = [r for r in captured if r.table_name == LitellmTableNames.KEY_TABLE_NAME] + assert len(key_rows) == 1 + audit_row: Final = key_rows[0] + assert audit_row.action == "deleted" + assert audit_row.object_id == team_key.token + assert audit_row.changed_by + assert json.loads(audit_row.before_value)["token"] == team_key.token + + @pytest.mark.asyncio async def test_team_member_delete_reads_on_the_lock_holding_transaction( mock_db_client, mock_admin_auth diff --git a/tests/test_litellm/proxy/management_helpers/test_auto_router_availability.py b/tests/test_litellm/proxy/management_helpers/test_auto_router_availability.py new file mode 100644 index 00000000000..027930d9ebb --- /dev/null +++ b/tests/test_litellm/proxy/management_helpers/test_auto_router_availability.py @@ -0,0 +1,196 @@ +from collections.abc import Mapping +from typing import Final +from types import SimpleNamespace + +from litellm.proxy.common_utils.encrypt_decrypt_utils import encrypt_value_helper + +import pytest + +from litellm.proxy.management_helpers.auto_router_availability import ( + auto_router_availability, + build_auto_router_catalog, +) +from litellm.router_utils.auto_router_tuning_baseline import snapshot_tuning_baselines + + +def deployment( + model_id: str, + classifier: str, + *, + model: str = "solver", + tuned: bool = False, + config: Mapping[str, object] | None = None, +) -> Mapping[str, object]: + return { + "model_name": model_id, + "model_info": {"id": model_id, "db_model": True}, + "litellm_params": { + "model": "auto_router/complexity_router", + "complexity_router_config": { + "classifier_type": classifier, + "tiers": {"SIMPLE": [model]}, + **({"code_keywords": ["internal-api"]} if tuned else {}), + **(config or {}), + }, + }, + } + + +@pytest.mark.parametrize("classifier", ("heuristic_v2", "capability", "llm_v2")) +def test_occupied_allowance_blocks_new_router_but_not_owner(classifier: str) -> None: + existing: Final = deployment("existing", classifier) + candidate: Final = deployment("new", classifier) + new: Final = auto_router_availability(others=(existing,), existing=None, candidate=candidate, baselines={}, limit=1) + edit: Final = auto_router_availability(others=(), existing=existing, candidate=existing, baselines={}, limit=1) + new_slot: Final = next(slot for slot in new.allowances if slot.key == classifier) + edit_slot: Final = next(slot for slot in edit.allowances if slot.key == classifier) + assert (new_slot.remaining, new_slot.used_by_this_router, new.error is not None) == (0, False, True) + assert (edit_slot.remaining, edit_slot.used_by_this_router, edit.error) == (1, True, None) + + +def test_edit_does_not_exempt_another_classifier_allowance() -> None: + existing: Final = deployment("existing", "capability") + result: Final = auto_router_availability( + others=(deployment("other", "llm_v2"),), + existing=existing, + candidate=deployment("existing", "llm_v2"), + baselines={}, + limit=1, + ) + assert result.error is not None + assert next(slot for slot in result.allowances if slot.key == "llm_v2").remaining == 0 + + +def test_model_selection_does_not_claim_occupied_scoring_allowance() -> None: + original: Final = deployment("legacy", "heuristic") + changed: Final = deployment("other", "heuristic", tuned=True) + baselines: Final = snapshot_tuning_baselines((original,)) + unchanged: Final = auto_router_availability( + others=(changed,), + existing=original, + candidate=original, + baselines=baselines, + limit=1, + ) + edited: Final = auto_router_availability( + others=(changed,), + existing=original, + candidate=deployment("legacy", "heuristic", model="new"), + baselines=baselines, + limit=1, + ) + assert unchanged.error is None + assert next(slot for slot in unchanged.allowances if slot.key == "heuristic_tuning").remaining == 0 + assert edited.error is None + tuned: Final = auto_router_availability( + others=(changed,), + existing=original, + candidate=deployment("legacy", "heuristic", tuned=True), + baselines=baselines, + limit=1, + ) + assert tuned.error is not None + assert "weights, thresholds, keywords, and custom dimensions" in tuned.error + + +def test_missing_baselines_are_reported_as_unknown() -> None: + result: Final = auto_router_availability( + others=(), + existing=None, + candidate=deployment("new", "heuristic"), + baselines=None, + limit=1, + ) + slot: Final = next(slot for slot in result.allowances if slot.key == "heuristic_tuning") + assert (slot.available, slot.remaining, slot.limit) == (False, None, 1) + + +def test_unlimited_entitlement_does_not_report_exhausted_allowances() -> None: + result: Final = auto_router_availability( + others=(deployment("other", "heuristic_v2"),), + existing=None, + candidate=deployment("new", "heuristic_v2"), + baselines=None, + limit=None, + ) + assert all(slot.available and slot.limit is None and slot.remaining is None for slot in result.allowances) + assert result.error is None + + +@pytest.mark.parametrize( + "customization", + ( + {"tier_definitions": [{"name": "SIMPLE"}, {"name": "AUDIT", "description": "Review risks"}]}, + {"classification_prompt": "Use the simplest sufficient tier"}, + {"classification_examples": "Review this code -> COMPLEX"}, + {"classifier_llm_config": {"model": "judge", "system_prompt": "Route by urgency"}}, + ), +) +def test_customization_owner_can_edit_models_and_restoring_defaults_clears_the_gate( + customization: Mapping[str, object], +) -> None: + owner: Final = deployment("owner", "llm", config=customization) + blocked: Final = auto_router_availability( + others=(owner,), existing=None, candidate=deployment("new", "llm", config=customization), baselines={}, limit=1 + ) + assert blocked.error is not None + assert "Custom tiers or classifier instructions" in blocked.error + edited: Final = auto_router_availability( + others=(), + existing=owner, + candidate=deployment("owner", "llm", model="new", config=customization), + baselines={}, + limit=1, + ) + assert edited.error is None + assert next(slot for slot in edited.allowances if slot.key == "tier_or_classifier_prompt").used_by_this_router + restored: Final = auto_router_availability( + others=(owner,), existing=None, candidate=deployment("new", "llm"), baselines={}, limit=1 + ) + assert restored.error is None + assert next(slot for slot in restored.allowances if slot.key == "tier_or_classifier_prompt").remaining == 0 + + +def test_restoring_tiers_does_not_exempt_a_retained_custom_prompt() -> None: + prompt: Final = {"classification_prompt": "Use the simplest sufficient tier"} + result: Final = auto_router_availability( + others=(deployment("owner", "llm", config=prompt),), + existing=None, + candidate=deployment("new", "llm", config=prompt), + baselines={}, + limit=1, + ) + assert result.error is not None + assert "Custom tiers or classifier instructions" in result.error + + +@pytest.mark.parametrize("blocked", (False, True)) +def test_catalog_keeps_unloaded_routers_and_ownership_without_provider_credentials(blocked: bool, monkeypatch) -> None: + monkeypatch.setenv("LITELLM_SALT_KEY", "catalog-test-key") + source: Final = SimpleNamespace( + model_id="saved", + created_by="owner", + model_info={"team_id": "team"}, + blocked=blocked, + litellm_params={ + "model": encrypt_value_helper("auto_router/complexity_router"), + "api_key": "private-key", + "complexity_router_config": {"classifier_type": "heuristic_v2"}, + }, + ) + provider: Final = SimpleNamespace(model_id="provider", litellm_params={"model": "openai/model"}) + catalog: Final = build_auto_router_catalog((source, provider)) + assert catalog is not None and len(catalog) == 1 + assert (catalog[0].model_id, catalog[0].team_id, catalog[0].created_by) == ("saved", "team", "owner") + assert catalog[0].deployment == { + "model_info": {"id": "saved", "db_model": True}, + "litellm_params": { + "model": "auto_router/complexity_router", + "complexity_router_config": {"classifier_type": "heuristic_v2"}, + }, + } + + +def test_catalog_distinguishes_missing_data_from_an_empty_model_table() -> None: + assert build_auto_router_catalog(()) == () + assert build_auto_router_catalog((SimpleNamespace(model_id="incomplete"),)) is None diff --git a/tests/test_litellm/proxy/management_helpers/test_bulk_user_deletion.py b/tests/test_litellm/proxy/management_helpers/test_bulk_user_deletion.py index 3c05068c4b0..32e5bea613c 100644 --- a/tests/test_litellm/proxy/management_helpers/test_bulk_user_deletion.py +++ b/tests/test_litellm/proxy/management_helpers/test_bulk_user_deletion.py @@ -1,3 +1,4 @@ +import asyncio import copy import json from collections.abc import Callable, Mapping, Sequence @@ -7,7 +8,7 @@ from typing import Final import pytest from pydantic import BaseModel, ConfigDict, ValidationError -from litellm.proxy._types import LiteLLM_TeamTable, LitellmUserRoles, Member, UserAPIKeyAuth +from litellm.proxy._types import LiteLLM_TeamTable, LitellmTableNames, LitellmUserRoles, Member, UserAPIKeyAuth from litellm.proxy.auth.auth_checks import jwt_key_mapping_cache_key from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache from litellm.proxy.list_api.common import ManagementProblem @@ -748,3 +749,96 @@ def test_request_models_reject_unknown_fields(): BulkTeamMemberDeleteRequest.model_validate({"members": [{"user_id": "u1", "role": "admin"}]}) with pytest.raises(ValidationError, match="dry_run"): BulkDeleteUserRequest.model_validate({"user_ids": ["u1"], "dry_run": True}) + + +@pytest.mark.asyncio +async def test_bulk_delete_writes_deleted_audit_log_for_deleted_keys(mocker): + prisma = _FakePrisma( + users=[_user("u1", "t1"), _user("keep", "t1")], + teams=[_team("t1", "u1", "keep")], + tokens=[ + {"token": "team-key", "user_id": "u1", "team_id": "t1"}, + {"token": "personal-key", "user_id": "u1"}, + {"token": "keep-key", "user_id": "keep", "team_id": "t1"}, + ], + ) + + captured: Final[list] = [] + + async def _capture(request_data): + captured.append(request_data) + + mocker.patch("litellm.store_audit_logs", True) + mocker.patch( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + new=_capture, + ) + await _delete(prisma, ["u1"]) + for _ in range(100): + if len([r for r in captured if r.table_name == LitellmTableNames.KEY_TABLE_NAME]) >= 2: + break + await asyncio.sleep(0.01) + + key_rows: Final = [r for r in captured if r.table_name == LitellmTableNames.KEY_TABLE_NAME] + assert {r.object_id for r in key_rows} == {"team-key", "personal-key"} + assert {r.action for r in key_rows} == {"deleted"} + assert all(r.changed_by for r in key_rows) + assert {json.loads(r.before_value)["token"] for r in key_rows} == {"team-key", "personal-key"} + + +@pytest.mark.asyncio +async def test_bulk_member_delete_writes_deleted_audit_log_for_removed_team_keys(mocker): + prisma = _FakePrisma( + users=[_user("u1", "t1"), _user("keep", "t1")], + teams=[_team("t1", "u1", "keep")], + tokens=[ + {"token": "team-key", "user_id": "u1", "team_id": "t1"}, + {"token": "keep-key", "user_id": "keep", "team_id": "t1"}, + ], + ) + + captured: Final[list] = [] + + async def _capture(request_data): + captured.append(request_data) + + mocker.patch("litellm.store_audit_logs", True) + mocker.patch( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + new=_capture, + ) + await _remove(prisma, "t1", [{"user_id": "u1"}]) + for _ in range(100): + if captured: + break + await asyncio.sleep(0.01) + + key_rows: Final = [r for r in captured if r.table_name == LitellmTableNames.KEY_TABLE_NAME] + assert len(key_rows) == 1 + audit_row: Final = key_rows[0] + assert audit_row.action == "deleted" + assert audit_row.object_id == "team-key" + assert audit_row.changed_by + assert json.loads(audit_row.before_value)["token"] == "team-key" + + +@pytest.mark.asyncio +async def test_bulk_delete_skips_the_key_audit_log_when_the_tx_rolls_back(mocker): + prisma = _FakePrisma( + users=[_user("u1", "a-good", "z-bad"), _user("u2", "a-good")], + teams=[_team("a-good", "u1", "u2"), _team("z-bad", "u1")], + tokens=[{"token": "k1", "user_id": "u1", "team_id": "a-good"}], + fail_locks=frozenset({"z-bad"}), + ) + cache = _cache_with("k1") + + mocker.patch("litellm.store_audit_logs", True) + mock_audit_write = mocker.patch( + "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update", + new=mocker.AsyncMock(), + ) + results = await _delete(prisma, ["u1", "u2"], cache=cache) + + assert [(r.user_id, r.success) for r in results] == [("u1", False), ("u2", False)] + assert [t["token"] for t in prisma.db.litellm_verificationtoken.rows] == ["k1"] + mock_audit_write.assert_not_called() diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py b/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py index ba8b5fa3ac4..094320225cd 100644 --- a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py +++ b/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py @@ -588,43 +588,6 @@ class TestAzureAnthropicCostCalculation: == "claude-3-5-haiku-20241022" ) - def test_passthrough_logging_sets_response_cost_with_server_tool_use_dict(self): - from litellm.types.utils import Choices, Message, ModelResponse - - logging_obj = self._create_mock_logging_obj(model="claude-3-7-sonnet-20250219") - logging_obj.get_router_model_id.return_value = None - logging_obj.litellm_params = {} - - response = ModelResponse( - id="test-id", - choices=[ - Choices( - finish_reason="stop", - index=0, - message=Message(content="test", role="assistant"), - ) - ], - created=1234567890, - model="claude-3-7-sonnet-20250219", - usage={ - "prompt_tokens": 10, - "completion_tokens": 5, - "total_tokens": 15, - "server_tool_use": {"web_search_requests": 1}, - }, - ) - - kwargs = AnthropicPassthroughLoggingHandler._create_anthropic_response_logging_payload( - litellm_model_response=response, - model="claude-3-7-sonnet-20250219", - kwargs={}, - start_time=datetime.now(), - end_time=datetime.now(), - logging_obj=logging_obj, - ) - - assert "response_cost" in kwargs - assert kwargs["response_cost"] > 0 class TestAnthropicBatchPassthroughCostTracking: @@ -2355,42 +2318,6 @@ class TestAnthropicResponseCostRecordedOnModelCallDetails: model_call_details["response_cost"], not from kwargs, so the streaming payload builder must record it there or streaming pass-through logs $0.""" - def test_create_payload_records_response_cost_on_model_call_details(self): - from litellm.types.utils import Choices, Message, ModelResponse - - logging_obj = MagicMock() - logging_obj.model_call_details = {} - logging_obj.get_router_model_id.return_value = None - logging_obj.litellm_params = {} - logging_obj.litellm_call_id = "test-call-id" - - response = ModelResponse( - id="test-id", - choices=[ - Choices( - finish_reason="stop", - index=0, - message=Message(content="hello", role="assistant"), - ) - ], - created=1234567890, - model="claude-3-7-sonnet-20250219", - usage={"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15}, - ) - - kwargs = AnthropicPassthroughLoggingHandler._create_anthropic_response_logging_payload( - litellm_model_response=response, - model="claude-3-7-sonnet-20250219", - kwargs={}, - start_time=datetime.now(), - end_time=datetime.now(), - logging_obj=logging_obj, - ) - - assert ( - logging_obj.model_call_details["response_cost"] == kwargs["response_cost"] - ) - assert logging_obj.model_call_details["response_cost"] > 0 class TestAnthropicPassthroughFastMode: diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py b/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py index fd81fcc8e72..353ffadfa46 100644 --- a/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py +++ b/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py @@ -7200,6 +7200,46 @@ class TestFalAIPassthroughRoute: assert "no pricing entry" in response.text assert not route.calls + def test_submit_to_catalog_key_the_pricer_cannot_price_returns_400_without_upstream_call( + self, client: TestClient, monkeypatch: pytest.MonkeyPatch + ) -> None: + monkeypatch.setitem( + litellm.model_cost, + "fal_ai/fal-ai/priceless-model", + {"litellm_provider": "fal_ai", "mode": "image_generation"}, + ) + with respx.mock(assert_all_called=False) as upstream: + route = upstream.post("https://queue.fal.run/fal-ai/priceless-model").mock( + return_value=httpx.Response(200, json={"request_id": "req-1"}) + ) + response = client.post("/fal_ai/fal-ai/priceless-model", json={"image_url": "https://example.com/in.png"}) + + assert response.status_code == 400, response.text + assert "no pricing entry" in response.text + assert not route.calls + + def test_submit_gate_prices_the_request_body_not_an_empty_one( + self, client: TestClient, monkeypatch: pytest.MonkeyPatch + ) -> None: + monkeypatch.setitem( + litellm.model_cost, + "fal_ai/fal-ai/keyed-only-model", + {"litellm_provider": "fal_ai", "mode": "image_generation", "output_cost_per_image_512": 0.02}, + ) + with respx.mock(assert_all_called=False) as upstream: + route = upstream.post("https://queue.fal.run/fal-ai/keyed-only-model").mock( + return_value=httpx.Response(200, json={"request_id": "req-1"}) + ) + priced = client.post( + "/fal_ai/fal-ai/keyed-only-model", json={"image_url": "https://example.com/in.png", "resolution": "512"} + ) + unpriced = client.post("/fal_ai/fal-ai/keyed-only-model", json={"image_url": "https://example.com/in.png"}) + + assert priced.status_code == 200, priced.text + assert unpriced.status_code == 400, unpriced.text + assert "no pricing entry" in unpriced.text + assert len(route.calls) == 1 + def test_status_get_on_unpriced_endpoint_forwards(self, client: TestClient) -> None: with respx.mock(assert_all_called=True) as upstream: upstream.get("https://queue.fal.run/fal-ai/unpriced-model/requests/req-9/status").mock( diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py b/tests/test_litellm/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py index 1d2d7d4d5c3..46f024366ec 100644 --- a/tests/test_litellm/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py +++ b/tests/test_litellm/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py @@ -462,30 +462,6 @@ class TestVertexAIBatchPassthroughHandler: assert mock_store.call_args[1]["unified_object_id"] assert mock_store.call_args[1]["is_batch_create"] is expected - def test_batch_cost_calculation_integration(self): - """Single Vertex AI response → non-zero cost with correct token counts.""" - from litellm.batches.batch_utils import calculate_vertex_ai_batch_cost_and_usage - - vertex_ai_batch_responses = [ - { - "response": { - "usageMetadata": { - "promptTokenCount": 10, - "candidatesTokenCount": 5, - "totalTokenCount": 15, - } - } - } - ] - - result = calculate_vertex_ai_batch_cost_and_usage( - vertex_ai_batch_responses, model_name="gemini-2.0-flash-001" - ) - - assert result.usage.total_tokens == 15 - assert result.usage.prompt_tokens == 10 - assert result.usage.completion_tokens == 5 - assert result.cost > 0, "batch_cost_calculator should return a non-zero cost" def test_batch_response_transformation(self): """Test transformation of Vertex AI batch responses to OpenAI format""" @@ -639,76 +615,7 @@ class TestVertexAIBatchCostCalculation: batch_cost_calculator — no VertexGeminiConfig transformation involved. """ - def test_should_aggregate_cost_and_usage_across_responses(self): - """Two successful responses → costs and token counts are summed.""" - from litellm.batches.batch_utils import calculate_vertex_ai_batch_cost_and_usage - responses = [ - { - "response": { - "usageMetadata": { - "promptTokenCount": 10, - "candidatesTokenCount": 5, - "totalTokenCount": 15, - } - } - }, - { - "response": { - "usageMetadata": { - "promptTokenCount": 8, - "candidatesTokenCount": 3, - "totalTokenCount": 11, - } - } - }, - ] - - result = calculate_vertex_ai_batch_cost_and_usage( - responses, model_name="gemini-2.0-flash-001" - ) - - assert result.usage.prompt_tokens == 18 - assert result.usage.completion_tokens == 8 - assert result.usage.total_tokens == 26 - assert result.cost > 0, "batch_cost_calculator should return a non-zero cost" - - def test_should_skip_responses_with_null_response_body(self): - """Failed lines (response: None) are skipped without error.""" - from litellm.batches.batch_utils import calculate_vertex_ai_batch_cost_and_usage - - responses = [ - { - "response": { - "usageMetadata": { - "promptTokenCount": 10, - "candidatesTokenCount": 5, - "totalTokenCount": 15, - } - } - }, - {"status": "JOB_STATE_FAILED", "response": None}, - { - "response": { - "usageMetadata": { - "promptTokenCount": 8, - "candidatesTokenCount": 3, - "totalTokenCount": 11, - } - } - }, - ] - - result = calculate_vertex_ai_batch_cost_and_usage( - responses, model_name="gemini-2.0-flash-001" - ) - - assert result.usage.prompt_tokens == 18 - assert result.usage.completion_tokens == 8 - assert result.usage.total_tokens == 26 - assert result.cost > 0 - assert result.successful_requests == 2 - assert result.failed_requests == 1 def test_should_return_zeros_for_empty_response_list(self): """Empty input → zero cost and zero usage.""" @@ -739,143 +646,4 @@ class TestVertexAIBatchCostCalculation: assert result.usage.completion_tokens == 0 assert result.usage.total_tokens == 0 - @pytest.mark.asyncio - async def test_openai_shaped_output_records_nonzero_cost_and_usage(self): - """ - Regression test for the bug where Vertex batch cost/usage was always 0. - After PR #25627 (transform_file_content_response), the GCS predictions.jsonl - is rewritten into OpenAI batch shape before the cost-tracking path sees it. - With disable_vertex_batch_output_transformation=False (default), the cost - dispatch must fall through to the generic aggregation path rather than - calling calculate_vertex_ai_batch_cost_and_usage (which only reads raw - usageMetadata fields). - """ - import litellm - from litellm.batches.batch_utils import calculate_batch_cost_and_usage - - openai_shaped_responses = [ - { - "id": "batch_req_abc123", - "custom_id": "request-1", - "response": { - "status_code": 200, - "request_id": "chatcmpl-xyz", - "body": { - "id": "chatcmpl-xyz", - "object": "chat.completion", - "model": "gemini-2.0-flash-001", - "choices": [ - { - "index": 0, - "message": {"role": "assistant", "content": "Hello!"}, - "finish_reason": "stop", - } - ], - "usage": { - "prompt_tokens": 10, - "completion_tokens": 5, - "total_tokens": 15, - }, - }, - }, - "error": None, - }, - { - "id": "batch_req_def456", - "custom_id": "request-2", - "response": { - "status_code": 200, - "request_id": "chatcmpl-uvw", - "body": { - "id": "chatcmpl-uvw", - "object": "chat.completion", - "model": "gemini-2.0-flash-001", - "choices": [ - { - "index": 0, - "message": {"role": "assistant", "content": "World!"}, - "finish_reason": "stop", - } - ], - "usage": { - "prompt_tokens": 8, - "completion_tokens": 3, - "total_tokens": 11, - }, - }, - }, - "error": None, - }, - ] - - original_flag = getattr( - litellm, "disable_vertex_batch_output_transformation", False - ) - try: - litellm.disable_vertex_batch_output_transformation = False - - result = await calculate_batch_cost_and_usage( - file_content_dictionary=openai_shaped_responses, - custom_llm_provider="vertex_ai", - model_name="gemini-2.0-flash-001", - ) - finally: - litellm.disable_vertex_batch_output_transformation = original_flag - - assert ( - result.usage.prompt_tokens == 18 - ), f"expected 18 prompt tokens, got {result.usage.prompt_tokens}" - assert ( - result.usage.completion_tokens == 8 - ), f"expected 8 completion tokens, got {result.usage.completion_tokens}" - assert ( - result.usage.total_tokens == 26 - ), f"expected 26 total tokens, got {result.usage.total_tokens}" - assert ( - result.cost > 0 - ), f"expected non-zero cost for completed Vertex batch, got {result.cost}" - - @pytest.mark.asyncio - async def test_raw_vertex_output_still_works_when_transformation_disabled(self): - """ - When disable_vertex_batch_output_transformation=True the GCS file is returned - as raw Vertex predictions.jsonl; the specialized reader must be used. - """ - import litellm - from litellm.batches.batch_utils import calculate_batch_cost_and_usage - - raw_vertex_responses = [ - { - "request": {"contents": [{"role": "user", "parts": [{"text": "hi"}]}]}, - "status": "", - "response": { - "candidates": [{"content": {"parts": [{"text": "Hello!"}]}}], - "usageMetadata": { - "promptTokenCount": 10, - "candidatesTokenCount": 5, - "totalTokenCount": 15, - }, - }, - "processed_time": "2026-01-01T00:00:00Z", - }, - ] - - original_flag = getattr( - litellm, "disable_vertex_batch_output_transformation", False - ) - try: - litellm.disable_vertex_batch_output_transformation = True - - result = await calculate_batch_cost_and_usage( - file_content_dictionary=raw_vertex_responses, - custom_llm_provider="vertex_ai", - model_name="gemini-2.0-flash-001", - ) - finally: - litellm.disable_vertex_batch_output_transformation = original_flag - - assert result.usage.prompt_tokens == 10 - assert result.usage.completion_tokens == 5 - assert result.usage.total_tokens == 15 - assert result.cost > 0, "raw Vertex shape should also produce non-zero cost" diff --git a/tests/test_litellm/proxy/policy_engine/test_policy_matcher.py b/tests/test_litellm/proxy/policy_engine/test_policy_matcher.py index b07137893ec..27153e67ab5 100644 --- a/tests/test_litellm/proxy/policy_engine/test_policy_matcher.py +++ b/tests/test_litellm/proxy/policy_engine/test_policy_matcher.py @@ -6,14 +6,23 @@ Tests: - Scope matching via attachments (teams, keys, models) """ +import logging +from typing import Final + import pytest +from hypothesis import given, settings +from hypothesis import strategies as st import litellm.proxy.policy_engine.attachment_registry as attachment_registry_module import litellm.proxy.policy_engine.policy_registry as policy_registry_module from litellm.proxy.policy_engine.attachment_registry import AttachmentRegistry from litellm.proxy.policy_engine.policy_matcher import PolicyMatcher from litellm.proxy.policy_engine.policy_registry import PolicyRegistry +from litellm.proxy.policy_engine.policy_resolver import PolicyResolver from litellm.types.proxy.policy_engine import ( + Policy, + PolicyCondition, + PolicyGuardrails, PolicyMatchContext, PolicyScope, ) @@ -221,6 +230,34 @@ def _global_registries(monkeypatch): return policies +def _inherited_registries(monkeypatch, parent_condition=None): + policies = PolicyRegistry() + policies.load_policies( + { + "parent": { + "guardrails": {"add": ["y"]}, + **({"condition": parent_condition} if parent_condition else {}), + }, + "child": { + "inherit": "parent", + "guardrails": {"add": ["x"]}, + "condition": {"model": "claude.*"}, + }, + "fallback": {"guardrails": {"add": ["z"]}}, + } + ) + attachments = AttachmentRegistry() + attachments.load_attachments( + [ + {"policy": "child", "scope": "*"}, + {"policy": "fallback", "scope": "*", "default": True}, + ] + ) + monkeypatch.setattr(policy_registry_module, "get_policy_registry", lambda: policies) + monkeypatch.setattr(attachment_registry_module, "get_attachment_registry", lambda: attachments) + return policies + + class TestGetMatchingPoliciesFallback: def test_condition_failing_opt_in_falls_back_to_default(self, monkeypatch): _global_registries(monkeypatch) @@ -244,3 +281,154 @@ class TestGetMatchingPoliciesFallback: PolicyMatcher.get_matching_policies(context=context) assert len(calls) == 1 + + def test_condition_missing_child_with_unconditional_parent_still_matches(self, monkeypatch): + _inherited_registries(monkeypatch) + context = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-5.5") + + assert PolicyMatcher.get_matching_policies(context=context) == ["child"] + + def test_child_whose_whole_chain_misses_falls_back_to_default(self, monkeypatch): + _inherited_registries(monkeypatch, parent_condition={"model": "claude.*"}) + context = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-5.5") + + assert PolicyMatcher.get_matching_policies(context=context) == ["fallback"] + + def test_get_policies_with_matching_conditions_keeps_missing_policy_out(self): + policies = { + "real": Policy( + guardrails=PolicyGuardrails(add=["g"]), + condition=PolicyCondition(model="claude.*"), + ), + } + context = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-5.5") + + assert ( + PolicyMatcher.get_policies_with_matching_conditions( + policy_names=["nope"], context=context, policies=policies + ) + == [] + ) + + +_MODELS: Final = ("gpt-4o", "gpt-5.5", "claude-opus-4-1") + + +def _policy_forest(draw: st.DrawFn) -> dict[str, Policy]: # mutable-ok: PolicyResolver takes dict[str, Policy] + names: Final = tuple(f"p{i}" for i in range(draw(st.integers(min_value=1, max_value=6)))) + return { # mutable-ok: PolicyResolver takes dict[str, Policy] + name: Policy( + inherit=draw(st.sampled_from((None, *names[:i]))), + guardrails=PolicyGuardrails(add=[f"g-{name}"]), # mutable-ok: pydantic list field + condition=draw(st.sampled_from((None, *(PolicyCondition(model=m) for m in _MODELS)))), + ) + for i, name in enumerate(names) + } + + +@st.composite +def _forest_and_request( + draw: st.DrawFn, +) -> tuple[dict[str, Policy], tuple[str, ...], PolicyMatchContext]: # mutable-ok: PolicyResolver takes dict + policies: Final = _policy_forest(draw) + attached: Final = tuple(draw(st.lists(st.sampled_from(sorted(policies)), unique=True))) + context: Final = PolicyMatchContext(team_alias="t", key_alias="k", model=draw(st.sampled_from(_MODELS))) + return policies, attached, context + + +def _own_condition_applies(policy: Policy, context: PolicyMatchContext) -> bool: + return policy.condition is None or policy.condition.model == context.model + + +def _applicable_chain( + policies: dict[str, Policy], # mutable-ok: PolicyResolver takes dict[str, Policy] + name: str, + context: PolicyMatchContext, +) -> tuple[str, ...]: + chain: Final = PolicyResolver.resolve_inheritance_chain(policy_name=name, policies=policies) + return tuple(member for member in chain if _own_condition_applies(policies[member], context)) + + +class TestChainMatchingProperties: + @given(_forest_and_request()) + @settings(max_examples=400, deadline=None) + def test_chain_matching_only_widens_to_applicable_ancestor_guardrails( + self, + case: tuple[dict[str, Policy], tuple[str, ...], PolicyMatchContext], # mutable-ok: PolicyResolver takes dict + ): + policies, attached, context = case + head: Final = tuple( + PolicyMatcher.get_policies_with_matching_conditions( + policy_names=attached, context=context, policies=policies + ) + ) + base: Final = tuple(name for name in attached if _own_condition_applies(policies[name], context)) + expected_head: Final = tuple(name for name in attached if _applicable_chain(policies, name, context)) + + assert head == expected_head, "a policy applies exactly when some chain member's own condition applies" + assert frozenset(base) <= frozenset(head), "head must never drop a policy base applied" + + for name in head: + resolved = PolicyResolver.resolve_policy_guardrails(policy_name=name, policies=policies, context=context) + assert sorted(resolved.guardrails) == sorted( + f"g-{member}" for member in _applicable_chain(policies, name, context) + ) + if name not in base: + assert f"g-{name}" not in resolved.guardrails, "a condition-missed child must not add its own guardrail" + + +class TestAncestorAdmissionLogging: + @staticmethod + def _chain() -> dict[str, Policy]: # mutable-ok: PolicyResolver takes dict[str, Policy] + return { # mutable-ok: PolicyResolver takes dict[str, Policy] + "parent": Policy(guardrails=PolicyGuardrails(add=["g-parent"])), # mutable-ok: pydantic list field + "child": Policy( + inherit="parent", + guardrails=PolicyGuardrails(add=["g-child"]), # mutable-ok: pydantic list field + condition=PolicyCondition(model="gpt-5.5"), + ), + } + + def test_logs_when_admitted_through_ancestor_only(self, caplog): + context: Final = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-4o") + with caplog.at_level(logging.INFO, logger="LiteLLM Proxy"): + result: Final = PolicyMatcher.policy_applies(context, self._chain())("child") + records: Final = [r for r in caplog.records if "applied through ancestor" in r.getMessage()] + assert result is True + assert len(records) == 1 + assert "applied through ancestor 'parent'" in records[0].getMessage() + assert "'child'" in records[0].getMessage() + + def test_no_log_when_own_condition_matches(self, caplog): + context: Final = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-5.5") + with caplog.at_level(logging.INFO, logger="LiteLLM Proxy"): + result: Final = PolicyMatcher.policy_applies(context, self._chain())("child") + assert result is True + assert not [r for r in caplog.records if "applied through ancestor" in r.getMessage()] + + def test_no_log_when_no_chain_member_applies(self, caplog): + policies: Final = { # mutable-ok: PolicyResolver takes dict[str, Policy] + "parent": Policy( + guardrails=PolicyGuardrails(add=["g-parent"]), # mutable-ok: pydantic list field + condition=PolicyCondition(model="claude-opus-4-1"), + ), + "child": Policy( + inherit="parent", + guardrails=PolicyGuardrails(add=["g-child"]), # mutable-ok: pydantic list field + condition=PolicyCondition(model="gpt-5.5"), + ), + } + context: Final = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-4o") + with caplog.at_level(logging.INFO, logger="LiteLLM Proxy"): + result: Final = PolicyMatcher.policy_applies(context, policies)("child") + assert result is False + assert not [r for r in caplog.records if "applied through ancestor" in r.getMessage()] + + def test_condition_filter_logs_nothing(self, caplog): + context: Final = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-4o") + with caplog.at_level(logging.INFO, logger="LiteLLM Proxy"): + result: Final = PolicyMatcher.get_policies_with_matching_conditions( + policy_names=["child"], context=context, policies=self._chain() + ) + assert result == ["child"] + assert not [r for r in caplog.records if "applied through ancestor" in r.getMessage()] diff --git a/tests/test_litellm/proxy/policy_engine/test_policy_resolver.py b/tests/test_litellm/proxy/policy_engine/test_policy_resolver.py index b9ce22d749e..3d2f547a744 100644 --- a/tests/test_litellm/proxy/policy_engine/test_policy_resolver.py +++ b/tests/test_litellm/proxy/policy_engine/test_policy_resolver.py @@ -11,6 +11,8 @@ import pytest from litellm.proxy.policy_engine.policy_resolver import PolicyResolver from litellm.types.proxy.policy_engine import ( + GuardrailPipeline, + PipelineStep, Policy, PolicyCondition, PolicyGuardrails, @@ -199,3 +201,55 @@ class TestPolicyResolverWithConditions: ) assert "pii_blocker" in resolved_gpt35.guardrails assert "child_guardrail" not in resolved_gpt35.guardrails + + def test_resolve_guardrails_for_context_with_condition_missing_child_keeps_inherited_parent(self): + """Test a matched child whose condition misses still contributes unconditional parent guardrails.""" + policies = { + "parent": Policy( + guardrails=PolicyGuardrails(add=["y"]), + ), + "child": Policy( + inherit="parent", + guardrails=PolicyGuardrails(add=["x"]), + condition=PolicyCondition(model="claude.*"), + ), + } + + context_miss = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-5.5") + assert PolicyResolver.resolve_guardrails_for_context( + context=context_miss, policies=policies, policy_names=["child"] + ) == ["y"] + + context_hit = PolicyMatchContext(team_alias="t", key_alias="k", model="claude-haiku") + assert set( + PolicyResolver.resolve_guardrails_for_context( + context=context_hit, policies=policies, policy_names=["child"] + ) + ) == {"x", "y"} + + def test_resolve_pipelines_for_context_skips_pipeline_when_own_condition_misses(self): + """Test a matched child whose own condition misses does not run its pipeline.""" + pipeline = GuardrailPipeline(mode="pre_call", steps=[PipelineStep(guardrail="child-guard")]) + policies = { + "parent": Policy( + guardrails=PolicyGuardrails(add=["y"]), + ), + "child": Policy( + inherit="parent", + pipeline=pipeline, + condition=PolicyCondition(model="gpt-5.5"), + ), + } + + context_miss = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-4o") + assert ( + PolicyResolver.resolve_pipelines_for_context( + context=context_miss, policies=policies, policy_names=["child"] + ) + == [] + ) + + context_hit = PolicyMatchContext(team_alias="t", key_alias="k", model="gpt-5.5") + assert PolicyResolver.resolve_pipelines_for_context( + context=context_hit, policies=policies, policy_names=["child"] + ) == [("child", pipeline)] diff --git a/tests/test_litellm/proxy/proxy_server/test_lifecycle.py b/tests/test_litellm/proxy/proxy_server/test_lifecycle.py index 9954351fa2e..36d2e16d261 100644 --- a/tests/test_litellm/proxy/proxy_server/test_lifecycle.py +++ b/tests/test_litellm/proxy/proxy_server/test_lifecycle.py @@ -920,7 +920,7 @@ def test_proxy_startup_event_warns_for_global_budget_without_database(): @pytest.mark.asyncio -async def test_tuning_baseline_v2_is_created_alongside_the_legacy_row(): +async def test_tuning_baseline_v3_is_created_alongside_the_legacy_row(): from litellm.router_utils.auto_router_tuning_baseline import DEFAULT_TUNING_FINGERPRINT prisma_client = MagicMock() @@ -935,11 +935,61 @@ async def test_tuning_baseline_v2_is_created_alongside_the_legacy_row(): assert result == {'yaml:["a",[]]': DEFAULT_TUNING_FINGERPRINT} assert prisma_client.db.litellm_config.create.await_args.kwargs["data"] == { - "param_name": "auto_router_tuning_baseline_v2", + "param_name": "auto_router_tuning_baseline_v3", "param_value": json.dumps(dict(result)), } +@pytest.mark.asyncio +async def test_scorer_baseline_upgrade_preserves_existing_routers_and_is_not_refreshed_on_restart(): + from litellm.router_utils.auto_router_tuning_baseline import mutable_tuned_identities, snapshot_tuning_baselines + + deployments = [ + { + "model_name": name, + "litellm_params": { + "model": "auto_router/complexity_router", + "complexity_router_config": {"tiers": {"SIMPLE": name}, "code_keywords": [name]}, + }, + } + for name in ("a", "b") + ] + prisma_client = MagicMock() + prisma_client.db.litellm_config.find_unique = AsyncMock( + side_effect=lambda where: ( + MagicMock(param_value='{"legacy-router":"old-combined-hash"}') + if where["param_name"] == "auto_router_tuning_baseline_v2" + else None + ) + ) + prisma_client.db.litellm_config.create = AsyncMock() + + baseline = await ProxyStartupEvent._load_heuristic_v1_tuning_baselines(prisma_client, deployments) + + assert baseline == snapshot_tuning_baselines(deployments) + assert mutable_tuned_identities(deployments, baseline) == frozenset() + prisma_client.db.litellm_config.create.assert_awaited_once_with( + data={"param_name": "auto_router_tuning_baseline_v3", "param_value": json.dumps(dict(baseline))} + ) + prisma_client.db.litellm_config.find_unique.side_effect = None + prisma_client.db.litellm_config.find_unique.return_value = MagicMock(param_value=json.dumps(dict(baseline))) + changed = [ + { + "model_name": "a", + "litellm_params": { + "model": "auto_router/complexity_router", + "complexity_router_config": {"tiers": {"SIMPLE": "different-model"}, "code_keywords": ["new-rule"]}, + }, + } + ] + + reloaded = await ProxyStartupEvent._load_heuristic_v1_tuning_baselines(prisma_client, changed) + + assert reloaded == baseline + assert mutable_tuned_identities(changed, reloaded) == frozenset({'yaml:["a",[]]'}) + prisma_client.db.litellm_config.create.assert_awaited_once() + + @pytest.mark.asyncio async def test_tuning_baseline_waits_for_a_complete_db_model_census(monkeypatch): prisma_client = MagicMock() diff --git a/tests/test_litellm/proxy/proxy_server/test_proxy_config.py b/tests/test_litellm/proxy/proxy_server/test_proxy_config.py index 462489f48b0..89cb8356289 100644 --- a/tests/test_litellm/proxy/proxy_server/test_proxy_config.py +++ b/tests/test_litellm/proxy/proxy_server/test_proxy_config.py @@ -32,6 +32,7 @@ from litellm.proxy.proxy_server import ( _scrub_guardrail_inner, resolve_complexity_router_plugins, resolve_routing_plugins, + validate_deployment_access_windows, validate_deployment_complexity_router_placement, validate_deployment_max_agentic_loops, validate_auto_router_capability_limits, @@ -874,9 +875,7 @@ class _ConfigTable: await asyncio.sleep(0) return _ConfigRow(param_value=value) if value is not None else None - async def upsert( - self, *, where: Mapping[str, str], data: Mapping[str, Mapping[str, str]] - ) -> _ConfigRow: + async def upsert(self, *, where: Mapping[str, str], data: Mapping[str, Mapping[str, str]]) -> _ConfigRow: param_name: Final = where["param_name"] value: Final = _CONFIG_VALUE.validate_json(data["update"]["param_value"]) self.rows[param_name] = value @@ -925,7 +924,9 @@ class _ConfigPrisma: self.db.litellm_config.upserted_param_names.append(param_name) -def _db_backed_proxy_config(monkeypatch, rows: Mapping[str, Mapping[str, JsonValue]]) -> tuple[ProxyConfig, _ConfigTable]: +def _db_backed_proxy_config( + monkeypatch, rows: Mapping[str, Mapping[str, JsonValue]] +) -> tuple[ProxyConfig, _ConfigTable]: table: Final = _ConfigTable(rows) monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", _ConfigPrisma(db=_ConfigDb(litellm_config=table))) monkeypatch.setattr("litellm.proxy.proxy_server.store_model_in_db", True) @@ -2197,6 +2198,34 @@ async def test_ProxyConfig_load_config_wires_general_settings_url_validation(tmp litellm.provider_url_destination_allowed_hosts = original_provider_hosts +@pytest.mark.asyncio +async def test_ssrf_block_message_names_a_config_section_load_config_honors(tmp_path, monkeypatch): + """Regression for LIT-8349: the remediation in the SSRF block message must point at a section that works.""" + from litellm.litellm_core_utils.url_utils import SSRFError, validate_url + + monkeypatch.setattr(litellm, "user_url_allowed_hosts", []) + monkeypatch.setattr(litellm, "user_url_validation", True) + with pytest.raises(SSRFError) as blocked: + validate_url("http://10.96.3.245:10002/agent.json") + section_match = re.search(r"add the host to `user_url_allowed_hosts` in (\w+)\.", str(blocked.value)) + assert section_match is not None, str(blocked.value) + section: Final = section_match.group(1) + assert section == "litellm_settings", f"block message points admins at {section}, which the docs contradict" + + f = tmp_path / "c.yaml" + f.write_text(f"model_list: []\n{section}:\n user_url_allowed_hosts:\n - '10.96.3.245:10002'\n") + monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", None) + monkeypatch.setattr("litellm.proxy.proxy_server.store_model_in_db", False) + monkeypatch.delenv("LITELLM_CONFIG_BUCKET_NAME", raising=False) + await ProxyConfig().load_config(router=None, config_file_path=str(f)) + + assert litellm.user_url_allowed_hosts == ["10.96.3.245:10002"], f"{section} did not apply the allowlist" + assert validate_url("http://10.96.3.245:10002/agent.json") == ( + "http://10.96.3.245:10002/agent.json", + "10.96.3.245:10002", + ) + + @pytest.mark.asyncio async def test_ProxyConfig_load_config_wires_config_reload_interval(tmp_path, monkeypatch): """general_settings.proxy_config_reload_interval_seconds must reach the proxy_server @@ -4714,3 +4743,80 @@ def test_websearch_interception_settings_can_be_named_in_supported_db_objects(mo monkeypatch.setattr(proxy_server, "general_settings", {"supported_db_objects": ["models"]}) assert proxy_server.should_load_db_object(object_type="websearch_interception_settings") is False + + +def test_validate_deployment_access_windows_rejects_malformed_time(): + model = { + "model_name": "gpt-4o-shared", + "litellm_params": {"model": "gpt-4o"}, + "model_info": { + "access_windows": [{"start": "25:00", "end": "06:00", "timezone": "America/New_York", "team_ids": ["t"]}] + }, + } + + with pytest.raises(ValueError, match="access_windows") as exc_info: + validate_deployment_access_windows(model) + + assert "gpt-4o-shared" in str(exc_info.value) + + +def test_validate_deployment_access_windows_rejects_unknown_timezone(): + model = { + "model_name": "gpt-4o-shared", + "litellm_params": {"model": "gpt-4o"}, + "model_info": { + "access_windows": [{"start": "22:00", "end": "06:00", "timezone": "Mars/Olympus", "team_ids": ["t"]}] + }, + } + + with pytest.raises(ValueError, match="Mars/Olympus"): + validate_deployment_access_windows(model) + + +def test_validate_deployment_access_windows_accepts_valid_and_absent(): + assert ( + validate_deployment_access_windows( + { + "model_name": "gpt-4o-shared", + "litellm_params": {"model": "gpt-4o"}, + "model_info": { + "access_windows": [ + {"start": "22:00", "end": "06:00", "timezone": "America/New_York", "team_ids": ["t"]} + ] + }, + } + ) + is None + ) + assert validate_deployment_access_windows({"model_name": "m", "litellm_params": {"model": "m"}}) is None + assert ( + validate_deployment_access_windows( + {"model_name": "m", "litellm_params": {"model": "m"}, "model_info": {"id": "x"}} + ) + is None + ) + + +@pytest.mark.asyncio +async def test_model_refresh_updates_availability_catalog_and_retains_it_on_db_failure(): + pc = ProxyConfig() + row = SimpleNamespace( + model_id="gated", + created_by="owner", + model_info={}, + litellm_params={ + "model": "auto_router/complexity_router", + "complexity_router_config": {"classifier_type": "heuristic_v2"}, + }, + ) + find_many = AsyncMock(side_effect=[[row], RuntimeError("database unavailable"), []]) + client = SimpleNamespace(db=SimpleNamespace(litellm_proxymodeltable=SimpleNamespace(find_many=find_many))) + assert pc.auto_router_db_catalog is None + assert await pc._get_models_from_db(client) == [row] + loaded = pc.auto_router_db_catalog + assert loaded is not None and loaded[0].model_id == "gated" + assert await pc._get_models_from_db(client) is None + assert pc.auto_router_db_catalog == loaded + assert await pc._get_models_from_db(client) == [] + assert pc.auto_router_db_catalog == () + assert find_many.await_count == 3 diff --git a/tests/test_litellm/proxy/public_endpoints/test_public_endpoints.py b/tests/test_litellm/proxy/public_endpoints/test_public_endpoints.py index 0f1ff3b024d..0dec44af402 100644 --- a/tests/test_litellm/proxy/public_endpoints/test_public_endpoints.py +++ b/tests/test_litellm/proxy/public_endpoints/test_public_endpoints.py @@ -1218,13 +1218,13 @@ def test_get_autorouter_presets_local_mode_serves_bundled_catalog( assert "anthropic_family" in payload assert payload["1m_context"]["complexity_router_config"]["classifier_type"] == "heuristic_v2" assert payload["1m_context"]["complexity_router_config"]["tiers"] == { - "SIMPLE": ["gpt-5.6-luna"], + "SIMPLE": ["gpt-6-luna"], "MEDIUM": ["gpt-5.6-terra"], - "COMPLEX": ["gpt-5.6-sol"], - "REASONING": ["claude-opus-5"], + "COMPLEX": ["gpt-6-sol"], + "REASONING": ["claude-opus-5-5"], } assert payload["1m_context"]["complexity_router_config"]["tier_model_configs"] == { - "REASONING": [{"model_name": "claude-opus-5", "litellm_params": {"reasoning_effort": "high"}}] + "REASONING": [{"model_name": "claude-opus-5-5", "litellm_params": {"reasoning_effort": "high"}}] } for preset in payload.values(): assert isinstance(preset["label"], str) diff --git a/tests/test_litellm/proxy/spend_tracking/test_budget_reservation.py b/tests/test_litellm/proxy/spend_tracking/test_budget_reservation.py index 13488106df4..9df8e6f4d67 100644 --- a/tests/test_litellm/proxy/spend_tracking/test_budget_reservation.py +++ b/tests/test_litellm/proxy/spend_tracking/test_budget_reservation.py @@ -1,10 +1,8 @@ from __future__ import annotations -import json import math from datetime import datetime, timedelta, timezone -from types import MappingProxyType -from typing import Final, cast +from typing import Final import pytest @@ -24,16 +22,12 @@ from litellm.proxy.common_utils.user_api_key_cache import ( ) from litellm.proxy.spend_tracking.budget_reservation import ( _get_team_member_budget_counter, - count_request_input_tokens, estimate_request_max_cost, release_unbound_budget_reservation, reserve_budget_for_request, ) from litellm.proxy.utils import ProxyLogging from litellm.router import Router -from litellm.rust_bridge import bindings, configuration -from litellm.rust_bridge import token_counter as rust_token_counter -from litellm.rust_bridge import tokenizer as tokenizer_dispatch from litellm.types.router import Deployment, LiteLLM_Params, ModelInfo TOKEN_COUNTING_ROUTES: Final = ( @@ -222,249 +216,6 @@ def test_deployment_pricing_update_invalidates_cached_estimate() -> None: assert math.isclose(after, before * 1000) -ANTHROPIC_TOKENIZER_MODEL: Final = "claude-sonnet-4-5-20250929" -CL100K_MODEL: Final = "gpt-4" -O200K_MODEL: Final = "gpt-4o" -RUST_COUNTED_BODY: Final = {"model": ANTHROPIC_TOKENIZER_MODEL, "max_tokens": 16, "messages": ANTHROPIC_MESSAGES} -RUST_INPUT_TOKENS: Final = 4_321 -RUST_INPUT_TOKENS_BY_TOKENIZER: Final = MappingProxyType( - {"anthropic": RUST_INPUT_TOKENS, "cl100k_base": 1_234, "o200k_base": 2_345} -) - - -class _FakeDeclined(Exception): - pass - - -class _FakeUpstream(Exception): - pass - - -class _FakeTokenizer: - """Stands in for one shared native `Tokenizer`; only its name identifies it.""" - - def __init__(self, name: str, json: str | None = None) -> None: - self.name = name - self.json = json - - -def _fake_native_tokenizers(monkeypatch: pytest.MonkeyPatch, anthropic_json: str | None = None) -> None: - """Point the counter's tokenizer lookups at fakes; the codec path keeps falling back to Python.""" - fakes: Final = {name: _FakeTokenizer(name) for name in ("cl100k_base", "o200k_base")} - anthropic: Final = _FakeTokenizer("anthropic", anthropic_json) - monkeypatch.setattr(tokenizer_dispatch, "native_encoding", fakes.__getitem__) - monkeypatch.setattr(tokenizer_dispatch, "native_anthropic", lambda: anthropic) - - -class _FakeNative: - RustBridgeDeclined = _FakeDeclined - RustUpstreamError = _FakeUpstream - - -class _RecordingCounter: - """Stands in for one native counter; records `(tokenizer, body)` on the shared factory.""" - - def __init__(self, factory: _RecordingFactory, tokenizer: rust_token_counter.RustTokenizer) -> None: - self.factory = factory - self.tokenizer = tokenizer - - async def acount_request(self, body: bytes) -> object: - self.factory.calls.append((self.tokenizer, body)) - return {"model": "", "input_tokens": RUST_INPUT_TOKENS_BY_TOKENIZER[self.tokenizer]} - - -class _RecordingFactory: - """Stands in for the native `TokenCounter` class, built over a loaded `Tokenizer`.""" - - def __init__(self) -> None: - self.calls: list[tuple[rust_token_counter.RustTokenizer, bytes]] = [] - - def from_tokenizer(self, tokenizer: _FakeTokenizer, fast: bool = False) -> _RecordingCounter: - return _RecordingCounter(self, cast(rust_token_counter.RustTokenizer, tokenizer.name)) - - -class _DecliningCounter: - async def acount_request(self, body: bytes) -> object: - raise _FakeDeclined("unsupported content block") - - -class _DecliningFactory: - def from_tokenizer(self, tokenizer: _FakeTokenizer, fast: bool = False) -> _DecliningCounter: - return _DecliningCounter() - - -@pytest.fixture -def rust_counter(monkeypatch: pytest.MonkeyPatch): - monkeypatch.setattr(bindings, "get_native_bridge", lambda: _FakeNative()) - _fake_native_tokenizers(monkeypatch) - rust_token_counter._counter.cache_clear() - configuration.reset_rust_configuration() - yield - rust_token_counter.TOKEN_COUNTER.reset() - rust_token_counter._counter.cache_clear() - configuration.reset_rust_configuration() - - -@pytest.mark.asyncio -@pytest.mark.parametrize( - ("route", "request_body"), - ( - ("/v1/messages", RUST_COUNTED_BODY), - ("/v1/chat/completions", {"model": ANTHROPIC_TOKENIZER_MODEL, "messages": ANTHROPIC_MESSAGES}), - ("/v1/completions", {"model": ANTHROPIC_TOKENIZER_MODEL, "prompt": "hi"}), - ("/v1/responses", {"model": ANTHROPIC_TOKENIZER_MODEL, "input": "hi"}), - ("/v1/embeddings", {"model": ANTHROPIC_TOKENIZER_MODEL, "input": ["hi"]}), - ("/v1/rerank", {"model": ANTHROPIC_TOKENIZER_MODEL, "query": "hi", "documents": ["a"]}), - ), -) -async def test_rust_count_replaces_python_tokenizing_on_every_llm_route( - rust_counter: None, route: str, request_body: dict -) -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - rust_token_counter.TOKEN_COUNTER.override(factory) - raw_body: Final = json.dumps(request_body).encode() - - counts: Final = await count_request_input_tokens( - request_body=request_body, route=route, llm_router=None, raw_body=raw_body - ) - - assert dict(counts) == {ANTHROPIC_TOKENIZER_MODEL: RUST_INPUT_TOKENS} - assert factory.calls == [("anthropic", raw_body)] - - -@pytest.mark.asyncio -@pytest.mark.parametrize("model", (CL100K_MODEL, "azure/gpt-35-turbo", "gemini/gemini-2.5-pro", "my-router-alias")) -async def test_tiktoken_cl100k_models_are_counted_by_rust(rust_counter: None, model: str) -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - rust_token_counter.TOKEN_COUNTER.override(factory) - body: Final = {"model": model, "messages": ANTHROPIC_MESSAGES} - raw_body: Final = json.dumps(body).encode() - - counts: Final = await count_request_input_tokens( - request_body=body, route="/v1/chat/completions", llm_router=None, raw_body=raw_body - ) - - assert dict(counts) == {model: RUST_INPUT_TOKENS_BY_TOKENIZER["cl100k_base"]} - assert factory.calls == [("cl100k_base", raw_body)] - - -@pytest.mark.asyncio -@pytest.mark.parametrize("model", (O200K_MODEL, "gpt-5", "o3", "gpt-4.1", "chatgpt-4o-latest")) -async def test_tiktoken_o200k_models_are_counted_by_rust(rust_counter: None, model: str) -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - rust_token_counter.TOKEN_COUNTER.override(factory) - body: Final = {"model": model, "messages": ANTHROPIC_MESSAGES} - raw_body: Final = json.dumps(body).encode() - - counts: Final = await count_request_input_tokens( - request_body=body, route="/v1/chat/completions", llm_router=None, raw_body=raw_body - ) - - assert dict(counts) == {model: RUST_INPUT_TOKENS_BY_TOKENIZER["o200k_base"]} - assert factory.calls == [("o200k_base", raw_body)] - - -@pytest.mark.asyncio -async def test_multi_model_request_counts_once_per_tokenizer_and_python_for_the_rest(rust_counter: None) -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - rust_token_counter.TOKEN_COUNTER.override(factory) - models: Final = ( - CL100K_MODEL, - ANTHROPIC_TOKENIZER_MODEL, - "gemini/gemini-2.5-pro", - O200K_MODEL, - "gpt-5", - "replicate/meta/llama-2-70b-chat", - ) - body: Final = {"model": list(models), "messages": ANTHROPIC_MESSAGES} - raw_body: Final = json.dumps(body).encode() - python_counts: Final = await count_request_input_tokens( - request_body=body, route="/v1/chat/completions", llm_router=None - ) - - counts: Final = await count_request_input_tokens( - request_body=body, route="/v1/chat/completions", llm_router=None, raw_body=raw_body - ) - - assert factory.calls == [("cl100k_base", raw_body), ("anthropic", raw_body), ("o200k_base", raw_body)] - assert dict(counts) == { - CL100K_MODEL: RUST_INPUT_TOKENS_BY_TOKENIZER["cl100k_base"], - "gemini/gemini-2.5-pro": RUST_INPUT_TOKENS_BY_TOKENIZER["cl100k_base"], - ANTHROPIC_TOKENIZER_MODEL: RUST_INPUT_TOKENS, - O200K_MODEL: RUST_INPUT_TOKENS_BY_TOKENIZER["o200k_base"], - "gpt-5": RUST_INPUT_TOKENS_BY_TOKENIZER["o200k_base"], - "replicate/meta/llama-2-70b-chat": python_counts["replicate/meta/llama-2-70b-chat"], - } - assert counts["replicate/meta/llama-2-70b-chat"] not in RUST_INPUT_TOKENS_BY_TOKENIZER.values() - - -@pytest.mark.asyncio -@pytest.mark.parametrize("model", (ANTHROPIC_TOKENIZER_MODEL, CL100K_MODEL, O200K_MODEL)) -async def test_rust_decline_falls_back_to_python_count(rust_counter: None, model: str) -> None: - litellm.rust(True) - rust_token_counter.TOKEN_COUNTER.override(_DecliningFactory()) - body: Final = {**RUST_COUNTED_BODY, "model": model} - python_counts: Final = await count_request_input_tokens(request_body=body, route="/v1/messages", llm_router=None) - - counts: Final = await count_request_input_tokens( - request_body=body, - route="/v1/messages", - llm_router=None, - raw_body=json.dumps(body).encode(), - ) - - assert dict(counts) == dict(python_counts) - assert counts[model] not in RUST_INPUT_TOKENS_BY_TOKENIZER.values() - - -@pytest.mark.asyncio -async def test_disabled_rust_never_sees_the_raw_body(rust_counter: None) -> None: - factory: Final = _RecordingFactory() - litellm.rust(False) - rust_token_counter.TOKEN_COUNTER.override(factory) - body: Final = {"model": [ANTHROPIC_TOKENIZER_MODEL, CL100K_MODEL, O200K_MODEL], "messages": ANTHROPIC_MESSAGES} - - counts: Final = await count_request_input_tokens( - request_body=body, - route="/v1/chat/completions", - llm_router=None, - raw_body=json.dumps(body).encode(), - ) - - assert factory.calls == [] - assert set(counts) == {ANTHROPIC_TOKENIZER_MODEL, CL100K_MODEL, O200K_MODEL} - assert not set(counts.values()) & set(RUST_INPUT_TOKENS_BY_TOKENIZER.values()) - - -@pytest.mark.asyncio -@pytest.mark.parametrize("model", ("replicate/meta/llama-2-70b-chat", "meta-llama/Llama-3-8b", "text-davinci-003")) -async def test_models_without_a_rust_tokenizer_stay_in_python( - rust_counter: None, monkeypatch: pytest.MonkeyPatch, model: str -) -> None: - monkeypatch.setattr( - litellm, "open_ai_chat_completion_models", litellm.open_ai_chat_completion_models | {"text-davinci-003"} - ) - factory: Final = _RecordingFactory() - litellm.rust(True) - rust_token_counter.TOKEN_COUNTER.override(factory) - body: Final = {"model": model, "messages": ANTHROPIC_MESSAGES} - python_counts: Final = await count_request_input_tokens( - request_body=body, route="/v1/chat/completions", llm_router=None - ) - - counts: Final = await count_request_input_tokens( - request_body=body, route="/v1/chat/completions", llm_router=None, raw_body=json.dumps(body).encode() - ) - - assert factory.calls == [] - assert dict(counts) == dict(python_counts) - assert counts[model] not in RUST_INPUT_TOKENS_BY_TOKENIZER.values() - - @pytest.mark.asyncio @pytest.mark.parametrize( "expiry_offset, expected_max_budget", diff --git a/tests/test_litellm/proxy/spend_tracking/test_input_tokens.py b/tests/test_litellm/proxy/spend_tracking/test_input_tokens.py index 49bbe148386..a1da6c79cd7 100644 --- a/tests/test_litellm/proxy/spend_tracking/test_input_tokens.py +++ b/tests/test_litellm/proxy/spend_tracking/test_input_tokens.py @@ -2,180 +2,18 @@ from __future__ import annotations -import json from types import MappingProxyType -from typing import Final, cast +from typing import Final import pytest -import litellm from litellm.proxy.spend_tracking.input_tokens import ( TOKENIZE_OFF_EVENT_LOOP_MIN_CHARS, count_input_tokens, count_input_tokens_for_model, ) -from litellm.rust_bridge import bindings, configuration, token_counter -from litellm.rust_bridge import tokenizer as tokenizer_dispatch -from litellm.rust_bridge.token_counter import RustTokenizer -ANTHROPIC_MODEL: Final = "claude-sonnet-4-5-20250929" CL100K_MODEL: Final = "gpt-4" -O200K_MODEL: Final = "gpt-4o" -PYTHON_ONLY_MODEL: Final = "replicate/meta/llama-2-70b-chat" -MESSAGES: Final = [{"role": "user", "content": "hello"}] -RUST_TOKENS: Final = 777 - - -class _FakeDeclined(Exception): - pass - - -class _FakeUpstream(Exception): - pass - - -class _FakeTokenizer: - """Stands in for one shared native `Tokenizer`; only its name identifies it.""" - - def __init__(self, name: str, json: str | None = None) -> None: - self.name = name - self.json = json - - -def _fake_native_tokenizers(monkeypatch: pytest.MonkeyPatch, anthropic_json: str | None = None) -> None: - """Point the counter's tokenizer lookups at fakes; the codec path keeps falling back to Python.""" - fakes: Final = {name: _FakeTokenizer(name) for name in ("cl100k_base", "o200k_base")} - anthropic: Final = _FakeTokenizer("anthropic", anthropic_json) - monkeypatch.setattr(tokenizer_dispatch, "native_encoding", fakes.__getitem__) - monkeypatch.setattr(tokenizer_dispatch, "native_anthropic", lambda: anthropic) - - -class _FakeNative: - RustBridgeDeclined = _FakeDeclined - RustUpstreamError = _FakeUpstream - - -class _RecordingCounter: - def __init__(self, factory: _RecordingFactory, tokenizer: RustTokenizer) -> None: - self.factory = factory - self.tokenizer = tokenizer - - async def acount_request(self, body: bytes) -> object: - self.factory.calls.append((self.tokenizer, body)) - return {"model": "", "input_tokens": RUST_TOKENS} - - -class _RecordingFactory: - def __init__(self) -> None: - self.calls: list[tuple[RustTokenizer, bytes]] = [] - - def from_tokenizer(self, tokenizer: _FakeTokenizer, fast: bool = False) -> _RecordingCounter: - return _RecordingCounter(self, cast(RustTokenizer, tokenizer.name)) - - -class _DecliningCounter: - async def acount_request(self, body: bytes) -> object: - raise _FakeDeclined("unsupported request shape") - - -class _DecliningFactory: - def from_tokenizer(self, tokenizer: _FakeTokenizer, fast: bool = False) -> _DecliningCounter: - return _DecliningCounter() - - -@pytest.fixture(autouse=True) -def _reset_bridge(monkeypatch: pytest.MonkeyPatch): - monkeypatch.setattr(bindings, "get_native_bridge", lambda: _FakeNative()) - _fake_native_tokenizers(monkeypatch) - token_counter.TOKEN_COUNTER.reset() - token_counter._counter.cache_clear() - configuration.reset_rust_configuration() - yield - token_counter.TOKEN_COUNTER.reset() - token_counter._counter.cache_clear() - configuration.reset_rust_configuration() - - -def _body(model: object) -> tuple[dict[str, object], bytes]: - body: Final = {"model": model, "messages": MESSAGES} - return body, json.dumps(body).encode() - - -@pytest.mark.asyncio -async def test_models_sharing_a_tokenizer_are_counted_once_and_merged() -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - token_counter.TOKEN_COUNTER.override(factory) - request_body, raw_body = _body([ANTHROPIC_MODEL, CL100K_MODEL, O200K_MODEL, "gpt-5", PYTHON_ONLY_MODEL]) - - counts: Final = await count_input_tokens( - request_body=request_body, - raw_body=raw_body, - models=(ANTHROPIC_MODEL, CL100K_MODEL, O200K_MODEL, "gpt-5", PYTHON_ONLY_MODEL), - ) - - assert factory.calls == [("anthropic", raw_body), ("cl100k_base", raw_body), ("o200k_base", raw_body)] - assert dict(counts) == { - ANTHROPIC_MODEL: RUST_TOKENS, - CL100K_MODEL: RUST_TOKENS, - O200K_MODEL: RUST_TOKENS, - "gpt-5": RUST_TOKENS, - PYTHON_ONLY_MODEL: count_input_tokens_for_model(request_body=request_body, model=PYTHON_ONLY_MODEL), - } - - -@pytest.mark.asyncio -async def test_rust_disabled_counts_everything_in_python() -> None: - factory: Final = _RecordingFactory() - litellm.rust(False) - token_counter.TOKEN_COUNTER.override(factory) - request_body, raw_body = _body([ANTHROPIC_MODEL, CL100K_MODEL]) - - counts: Final = await count_input_tokens( - request_body=request_body, raw_body=raw_body, models=(ANTHROPIC_MODEL, CL100K_MODEL) - ) - - assert factory.calls == [] - assert dict(counts) == { - model: count_input_tokens_for_model(request_body=request_body, model=model) - for model in (ANTHROPIC_MODEL, CL100K_MODEL) - } - - -@pytest.mark.asyncio -async def test_missing_raw_body_counts_in_python() -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - token_counter.TOKEN_COUNTER.override(factory) - request_body, _ = _body(ANTHROPIC_MODEL) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=None, models=(ANTHROPIC_MODEL,)) - - assert factory.calls == [] - assert counts[ANTHROPIC_MODEL] == count_input_tokens_for_model(request_body=request_body, model=ANTHROPIC_MODEL) - - -@pytest.mark.asyncio -async def test_missing_binding_counts_in_python() -> None: - litellm.rust(True) - token_counter.TOKEN_COUNTER.override(None) - request_body, raw_body = _body(ANTHROPIC_MODEL) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=raw_body, models=(ANTHROPIC_MODEL,)) - - assert counts[ANTHROPIC_MODEL] == count_input_tokens_for_model(request_body=request_body, model=ANTHROPIC_MODEL) - - -@pytest.mark.asyncio -async def test_declined_request_counts_in_python() -> None: - litellm.rust(True) - token_counter.TOKEN_COUNTER.override(_DecliningFactory()) - request_body, raw_body = _body(ANTHROPIC_MODEL) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=raw_body, models=(ANTHROPIC_MODEL,)) - - assert counts[ANTHROPIC_MODEL] == count_input_tokens_for_model(request_body=request_body, model=ANTHROPIC_MODEL) - assert counts[ANTHROPIC_MODEL] != RUST_TOKENS @pytest.mark.asyncio diff --git a/tests/test_litellm/proxy/spend_tracking/test_savings.py b/tests/test_litellm/proxy/spend_tracking/test_savings.py index 004f07da431..de413a86521 100644 --- a/tests/test_litellm/proxy/spend_tracking/test_savings.py +++ b/tests/test_litellm/proxy/spend_tracking/test_savings.py @@ -634,25 +634,6 @@ def test_equal_modeled_usage_is_zero_under_equivalent_model_names() -> None: assert _savings("claude-opus-5", "anthropic/claude-opus-5", usage, usage) == 0.0 -def test_baseline_is_priced_under_its_own_provider(): - """Two providers can serve the same bare model name at different rates, so dropping - the provider prices the baseline against a vendor the operator never named. Here it - decides whether routing reads as a saving or a loss.""" - usage = Usage(prompt_tokens=100_000, completion_tokens=10_000, total_tokens=110_000) - azure = compute_autorouter_savings( - baseline_model="azure_ai/deepseek-r1", - selected_model="claude-haiku-4-5", - selected_provider="anthropic", - usage=usage, - ) - deepseek = compute_autorouter_savings( - baseline_model="deepseek/deepseek-r1", - selected_model="claude-haiku-4-5", - selected_provider="anthropic", - usage=usage, - ) - assert azure != pytest.approx(deepseek) - assert azure > 0 > deepseek def test_unresolvable_baseline_remains_unknown(): diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_management_endpoints.py b/tests/test_litellm/proxy/spend_tracking/test_spend_management_endpoints.py index 9de6679472e..c6a4173b583 100644 --- a/tests/test_litellm/proxy/spend_tracking/test_spend_management_endpoints.py +++ b/tests/test_litellm/proxy/spend_tracking/test_spend_management_endpoints.py @@ -139,6 +139,15 @@ def _reconstruct_ui_where_from_sql(sql_query, params): where["cache_hit"] = "hit" elif cond == "(cache_hit IS NULL OR LOWER(cache_hit) != 'true')": where["cache_hit"] = "miss" + elif "call_type" in cond: + if "call_type NOT IN" in cond: + where["span_type"] = "llm" + elif "call_mcp_tool" in cond: + where["span_type"] = "mcp" + elif "call_type = 'asend_message'" in cond: + where["span_type"] = "agent" + elif "acreate_batch" in cond: + where["span_type"] = "batch" elif sess: where["session_id"] = {"contains": str(params[int(sess.group(1)) - 1]).strip("%")} elif status: @@ -248,6 +257,8 @@ from litellm.constants import LITTELM_INTERNAL_HEALTH_SERVICE_ACCOUNT_NAME from litellm.proxy._types import ( LitellmUserRoles, Member, + ProxyException, + SpendCalculateRequest, SpendLogsPayload, UserAPIKeyAuth, ) @@ -3418,6 +3429,95 @@ async def test_ui_view_spend_logs_with_cache_hit_filter(client, monkeypatch): app.dependency_overrides.pop(ps.user_api_key_auth, None) +@pytest.mark.asyncio +async def test_ui_view_spend_logs_with_span_type_filter(client, monkeypatch): + base = { + "api_key": "sk-test-key", + "user": "test_user_1", + "team_id": "team1", + "spend": 0.05, + "startTime": datetime.datetime.now(timezone.utc).isoformat(), + "model": "gpt-4", + "status": "success", + } + mock_spend_logs = [ + {**base, "id": "log1", "request_id": "req-llm", "call_type": "acompletion"}, + {**base, "id": "log2", "request_id": "req-agent", "call_type": "asend_message"}, + {**base, "id": "log3", "request_id": "req-mcp", "call_type": "call_mcp_tool"}, + {**base, "id": "log4", "request_id": "req-batch", "call_type": "aretrieve_batch"}, + ] + + call_types_by_span = { + "llm": lambda ct: ct not in {"call_mcp_tool", "list_mcp_tools", "asend_message"} + and ct not in {"acreate_batch", "create_batch", "aretrieve_batch", "retrieve_batch"}, + "agent": lambda ct: ct == "asend_message", + "mcp": lambda ct: ct in {"call_mcp_tool", "list_mcp_tools"}, + "batch": lambda ct: ct + in {"acreate_batch", "create_batch", "aretrieve_batch", "retrieve_batch"}, + } + + def filter_by_span_type(where): + span_type = where.get("span_type") + if span_type is None: + return mock_spend_logs + return [log for log in mock_spend_logs if call_types_by_span[span_type](log["call_type"])] + + monkeypatch.setattr( + "litellm.proxy.proxy_server.prisma_client", + make_ui_spend_logs_mock_prisma(mock_spend_logs, filter_by_span_type), + ) + + start_date, end_date = _default_date_range() + + app.dependency_overrides[ps.user_api_key_auth] = lambda: UserAPIKeyAuth( + user_role=LitellmUserRoles.PROXY_ADMIN + ) + try: + for span_type, expected_ids in [ + ("batch", ["req-batch"]), + ("llm", ["req-llm"]), + ("mcp", ["req-mcp"]), + ("agent", ["req-agent"]), + ]: + response = client.get( + "/spend/logs/ui", + params={ + "span_type": span_type, + "start_date": start_date, + "end_date": end_date, + }, + headers={"Authorization": "Bearer sk-test"}, + ) + assert response.status_code == 200, response.text + data = response.json() + assert data["total"] == len(expected_ids) + assert [row["request_id"] for row in data["data"]] == expected_ids + + response = client.get( + "/spend/logs/ui", + params={ + "start_date": start_date, + "end_date": end_date, + }, + headers={"Authorization": "Bearer sk-test"}, + ) + assert response.status_code == 200 + assert response.json()["total"] == 4 + + response = client.get( + "/spend/logs/ui", + params={ + "span_type": "invalid", + "start_date": start_date, + "end_date": end_date, + }, + headers={"Authorization": "Bearer sk-test"}, + ) + assert response.status_code == 400 + finally: + app.dependency_overrides.pop(ps.user_api_key_auth, None) + + @pytest.mark.asyncio async def test_ui_view_spend_logs_with_model(client, monkeypatch): mock_spend_logs = [ @@ -3789,179 +3889,7 @@ class TestSpendLogsPayload: } return mock_response - @pytest.mark.asyncio - async def test_spend_logs_payload_success_log_with_api_base(self, monkeypatch): - from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler - # Clear any env overrides that would change the recorded api_base - monkeypatch.delenv("ANTHROPIC_BASE_URL", raising=False) - monkeypatch.delenv("ANTHROPIC_API_BASE", raising=False) - - litellm.callbacks = [_ProxyDBLogger(message_logging=False)] - # litellm._turn_on_debug() - - client = AsyncHTTPHandler() - - with ( - patch.object( - litellm.proxy.db.db_spend_update_writer.DBSpendUpdateWriter, - "_insert_spend_log_to_db", - ) as mock_client, - patch.object(litellm.proxy.proxy_server, "prisma_client"), - patch.object(client, "post", side_effect=self.mock_anthropic_response), - ): - response = await litellm.acompletion( - model="claude-4-sonnet-20250514", - messages=[{"role": "user", "content": "Hello, world!"}], - metadata={"user_api_key_end_user_id": "test_user_1"}, - client=client, - ) - - assert response.choices[0].message.content == "Hi! My name is Claude." - - await _wait_for_mock_call(mock_client) - - kwargs = mock_client.call_args.kwargs - payload: SpendLogsPayload = kwargs["payload"] - expected_payload = SpendLogsPayload( - **{ - "request_id": "chatcmpl-34df56d5-4807-45c1-bb99-61e52586b802", - "call_type": "acompletion", - "api_key": "", - "cache_hit": "None", - "startTime": datetime.datetime( - 2025, 3, 24, 22, 2, 42, 975883, tzinfo=datetime.timezone.utc - ), - "endTime": datetime.datetime( - 2025, 3, 24, 22, 2, 42, 989132, tzinfo=datetime.timezone.utc - ), - "completionStartTime": datetime.datetime( - 2025, 3, 24, 22, 2, 42, 989132, tzinfo=datetime.timezone.utc - ), - "model": "claude-4-sonnet-20250514", - "user": "", - "team_id": "", - "metadata": '{"applied_guardrails": [], "attempted_fallbacks": null, "original_model_group": null, "batch_models": null, "batch_successful_requests": null, "batch_failed_requests": null, "mcp_tool_call_metadata": null, "vector_store_request_metadata": null, "routing_decision": null, "internal_call_origin": null, "guardrail_information": null, "compression_savings": null, "litellm_gateway_injected_cache": null, "router_metadata": null, "autorouter_savings_estimate": null, "autorouter_baseline_observation": null, "azure_spillover": null, "usage_object": {"completion_tokens": 503, "prompt_tokens": 2095, "total_tokens": 2598, "completion_tokens_details": null, "prompt_tokens_details": {"audio_tokens": null, "cached_tokens": 0}, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}, "model_map_information": {"model_map_key": "claude-4-sonnet-20250514", "model_map_value": {"key": "claude-4-sonnet-20250514", "max_tokens": 128000, "max_input_tokens": 200000, "max_output_tokens": 128000, "input_cost_per_token": 3e-06, "cache_creation_input_token_cost": 3.75e-06, "cache_read_input_token_cost": 3e-07, "input_cost_per_character": null, "input_cost_per_token_above_128k_tokens": null, "input_cost_per_token_above_200k_tokens": null, "input_cost_per_query": null, "input_cost_per_second": null, "input_cost_per_audio_token": null, "input_cost_per_token_batches": null, "output_cost_per_token_batches": null, "output_cost_per_token": 1.5e-05, "output_cost_per_audio_token": null, "output_cost_per_character": null, "output_cost_per_token_above_128k_tokens": null, "output_cost_per_character_above_128k_tokens": null, "output_cost_per_token_above_200k_tokens": null, "output_cost_per_second": null, "output_cost_per_image": null, "output_vector_size": null, "litellm_provider": "anthropic", "mode": "chat", "supports_system_messages": null, "supports_response_schema": true, "supports_vision": true, "supports_function_calling": true, "supports_tool_choice": true, "supports_assistant_prefill": true, "supports_prompt_caching": true, "supports_audio_input": false, "supports_audio_output": false, "supports_pdf_input": true, "supports_embedding_image_input": false, "supports_native_streaming": null, "supports_web_search": false, "supports_reasoning": true, "search_context_cost_per_query": null, "tpm": null, "rpm": null, "supported_openai_params": ["stream", "stop", "temperature", "top_p", "max_tokens", "max_completion_tokens", "tools", "tool_choice", "extra_headers", "parallel_tool_calls", "response_format", "user", "reasoning_effort", "thinking"]}}, "additional_usage_values": {"completion_tokens_details": {"accepted_prediction_tokens": null, "audio_tokens": null, "reasoning_tokens": null, "rejected_prediction_tokens": null, "text_tokens": 503, "image_tokens": null}, "prompt_tokens_details": {"audio_tokens": null, "cached_tokens": 0, "text_tokens": null, "image_tokens": null}, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}}', - "cache_key": "Cache OFF", - "spend": 0.01383, - "total_tokens": 2598, - "prompt_tokens": 2095, - "completion_tokens": 503, - "request_tags": "[]", - "end_user": "test_user_1", - "api_base": "https://api.anthropic.com/v1/messages", - "model_group": "", - "model_id": "", - "requester_ip_address": None, - "custom_llm_provider": "anthropic", - "messages": "{}", - "response": "{}", - "proxy_server_request": "{}", - "status": "success", - "mcp_namespaced_tool_name": None, - "agent_id": None, - } - ) - - differences = _compare_nested_dicts( - payload, expected_payload, ignore_keys=ignored_keys - ) - if differences: - pytest.fail(f"Dictionary mismatch: {differences}") - - @pytest.mark.asyncio - async def test_spend_logs_payload_success_log_with_router(self, monkeypatch): - from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler - - # Clear any env overrides that would change the recorded api_base - monkeypatch.delenv("ANTHROPIC_BASE_URL", raising=False) - monkeypatch.delenv("ANTHROPIC_API_BASE", raising=False) - - litellm.callbacks = [_ProxyDBLogger(message_logging=False)] - # litellm._turn_on_debug() - - client = AsyncHTTPHandler() - - router = Router( - model_list=[ - { - "model_name": "my-anthropic-model-group", - "litellm_params": { - "model": "claude-4-sonnet-20250514", - }, - "model_info": { - "id": "my-unique-model-id", - }, - } - ] - ) - - with ( - patch.object( - litellm.proxy.db.db_spend_update_writer.DBSpendUpdateWriter, - "_insert_spend_log_to_db", - ) as mock_client, - patch.object(litellm.proxy.proxy_server, "prisma_client"), - patch.object(client, "post", side_effect=self.mock_anthropic_response), - ): - response = await router.acompletion( - model="my-anthropic-model-group", - messages=[{"role": "user", "content": "Hello, world!"}], - metadata={"user_api_key_end_user_id": "test_user_1"}, - client=client, - ) - - assert response.choices[0].message.content == "Hi! My name is Claude." - - await _wait_for_mock_call(mock_client) - - kwargs = mock_client.call_args.kwargs - payload: SpendLogsPayload = kwargs["payload"] - expected_payload = SpendLogsPayload( - **{ - "request_id": "chatcmpl-34df56d5-4807-45c1-bb99-61e52586b802", - "call_type": "acompletion", - "api_key": "", - "cache_hit": "None", - "startTime": datetime.datetime( - 2025, 3, 24, 22, 2, 42, 975883, tzinfo=datetime.timezone.utc - ), - "endTime": datetime.datetime( - 2025, 3, 24, 22, 2, 42, 989132, tzinfo=datetime.timezone.utc - ), - "completionStartTime": datetime.datetime( - 2025, 3, 24, 22, 2, 42, 989132, tzinfo=datetime.timezone.utc - ), - "model": "claude-4-sonnet-20250514", - "user": "", - "team_id": "", - "metadata": '{"applied_guardrails": [], "attempted_fallbacks": 0, "original_model_group": "my-anthropic-model-group", "batch_models": null, "batch_successful_requests": null, "batch_failed_requests": null, "mcp_tool_call_metadata": null, "vector_store_request_metadata": null, "routing_decision": null, "internal_call_origin": null, "guardrail_information": null, "compression_savings": null, "litellm_gateway_injected_cache": null, "router_metadata": null, "autorouter_savings_estimate": null, "autorouter_baseline_observation": null, "azure_spillover": null, "usage_object": {"completion_tokens": 503, "prompt_tokens": 2095, "total_tokens": 2598, "completion_tokens_details": null, "prompt_tokens_details": {"audio_tokens": null, "cached_tokens": 0}, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}, "model_map_information": {"model_map_key": "claude-4-sonnet-20250514", "model_map_value": {"key": "claude-4-sonnet-20250514", "max_tokens": 128000, "max_input_tokens": 200000, "max_output_tokens": 128000, "input_cost_per_token": 3e-06, "cache_creation_input_token_cost": 3.75e-06, "cache_read_input_token_cost": 3e-07, "input_cost_per_character": null, "input_cost_per_token_above_128k_tokens": null, "input_cost_per_token_above_200k_tokens": null, "input_cost_per_query": null, "input_cost_per_second": null, "input_cost_per_audio_token": null, "input_cost_per_token_batches": null, "output_cost_per_token_batches": null, "output_cost_per_token": 1.5e-05, "output_cost_per_audio_token": null, "output_cost_per_character": null, "output_cost_per_token_above_128k_tokens": null, "output_cost_per_character_above_128k_tokens": null, "output_cost_per_token_above_200k_tokens": null, "output_cost_per_second": null, "output_cost_per_image": null, "output_vector_size": null, "litellm_provider": "anthropic", "mode": "chat", "supports_system_messages": null, "supports_response_schema": true, "supports_vision": true, "supports_function_calling": true, "supports_tool_choice": true, "supports_assistant_prefill": true, "supports_prompt_caching": true, "supports_audio_input": false, "supports_audio_output": false, "supports_pdf_input": true, "supports_embedding_image_input": false, "supports_native_streaming": null, "supports_web_search": false, "supports_reasoning": true, "search_context_cost_per_query": null, "tpm": null, "rpm": null, "supported_openai_params": ["stream", "stop", "temperature", "top_p", "max_tokens", "max_completion_tokens", "tools", "tool_choice", "extra_headers", "parallel_tool_calls", "response_format", "user", "reasoning_effort", "thinking"]}}, "additional_usage_values": {"completion_tokens_details": {"accepted_prediction_tokens": null, "audio_tokens": null, "reasoning_tokens": null, "rejected_prediction_tokens": null, "text_tokens": 503, "image_tokens": null}, "prompt_tokens_details": {"audio_tokens": null, "cached_tokens": 0, "text_tokens": null, "image_tokens": null}, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}}', - "cache_key": "Cache OFF", - "spend": 0.01383, - "total_tokens": 2598, - "prompt_tokens": 2095, - "completion_tokens": 503, - "request_tags": "[]", - "end_user": "test_user_1", - "api_base": "https://api.anthropic.com/v1/messages", - "model_group": "my-anthropic-model-group", - "model_id": "my-unique-model-id", - "requester_ip_address": None, - "custom_llm_provider": "anthropic", - "messages": "{}", - "response": "{}", - "proxy_server_request": "{}", - "status": "success", - "mcp_namespaced_tool_name": None, - "agent_id": None, - } - ) - - differences = _compare_nested_dicts( - payload, expected_payload, ignore_keys=ignored_keys - ) - if differences: - pytest.fail(f"Dictionary mismatch: {differences}") def _compare_nested_dicts( @@ -7909,3 +7837,18 @@ def test_ui_view_request_response_internal_user_missing_row_forbidden(client, mo assert custom_logger.requested_ids == [] finally: app.dependency_overrides.pop(ps.user_api_key_auth, None) + + +@pytest.mark.asyncio +async def test_calculate_spend_unpriced_model_returns_400(): + model = "openrouter/unit-test-unpriced-model" + with patch("litellm.proxy.proxy_server.llm_router", None): + with pytest.raises(ProxyException) as exc_info: + await spend_management_endpoints.calculate_spend( + SpendCalculateRequest(model=model, messages=[{"role": "user", "content": "hi"}]) + ) + + assert exc_info.value.code == "400" + assert exc_info.value.type == "invalid_request_error" + assert exc_info.value.param == "model" + assert model in exc_info.value.message diff --git a/tests/test_litellm/proxy/test_bug_report_config.py b/tests/test_litellm/proxy/test_bug_report_config.py index 06bca8c66fb..6cffa55781e 100644 --- a/tests/test_litellm/proxy/test_bug_report_config.py +++ b/tests/test_litellm/proxy/test_bug_report_config.py @@ -5,7 +5,7 @@ from collections.abc import Iterator, Mapping import pytest from litellm.proxy import proxy_server -from litellm.proxy.bug_report_config import build_proxy_bug_report, safe_config_lines +from litellm.proxy.bug_report_config import build_proxy_bug_report, build_proxy_environment_report, safe_config_lines CUSTOMER_STRINGS = ( "acme", @@ -193,6 +193,14 @@ def loaded_proxy_config(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]: def test_build_proxy_bug_report_reads_the_loaded_proxy_config(): report = build_proxy_bug_report(RuntimeError("boom"), stream=False) - assert report.surface == "proxy" + assert report.environment.surface == "proxy" assert report.stream is False - assert report.config_lines == safe_config_lines(CUSTOMER_CONFIG, CUSTOMER_GENERAL_SETTINGS) + assert report.environment.config_lines == safe_config_lines(CUSTOMER_CONFIG, CUSTOMER_GENERAL_SETTINGS) + + +@pytest.mark.usefixtures("loaded_proxy_config") +def test_proxy_environment_report_matches_the_bug_report_environment(): + environment = build_proxy_environment_report() + + assert environment == build_proxy_bug_report(RuntimeError("boom")).environment + assert environment.config_lines == safe_config_lines(CUSTOMER_CONFIG, CUSTOMER_GENERAL_SETTINGS) diff --git a/tests/test_litellm/proxy/test_common_request_processing.py b/tests/test_litellm/proxy/test_common_request_processing.py index 360122cde25..5b9cd761dda 100644 --- a/tests/test_litellm/proxy/test_common_request_processing.py +++ b/tests/test_litellm/proxy/test_common_request_processing.py @@ -35,10 +35,12 @@ from litellm.proxy.common_request_processing import ( _buffer_first_chunk_honoring_disconnect, _cancel_llm_call_on_client_disconnect, _ClientDisconnectedBeforeFirstChunk, + attach_guardrail_information, _extract_error_from_sse_chunk, _get_cost_breakdown_from_logging_obj, CostBreakdownHeaderValues, _has_attribute_error_in_chain, + include_guardrail_response_requested, _is_azure_model_router_request, open_sse_before_first_byte, resolve_litellm_call_id, @@ -61,6 +63,132 @@ from litellm.proxy.utils import ProxyLogging from litellm.router import Router +def test_attach_guardrail_information_copies_recorded_entries_onto_model_response(): + recorded = [ + {"guardrail_name": "first", "guardrail_status": "success"}, + {"guardrail_name": "second", "guardrail_status": "success"}, + ] + response = litellm.ModelResponse() + + result = attach_guardrail_information( + response=response, + request_data={"metadata": {"standard_logging_guardrail_information": recorded}}, + ) + + assert isinstance(result, litellm.ModelResponse) + assert result.model_dump()["guardrail_information"] == recorded + assert "guardrail_information" not in response.model_dump() + + +def test_attach_guardrail_information_reports_empty_list_when_nothing_ran(): + response = litellm.ModelResponse() + + result = attach_guardrail_information(response=response, request_data={}) + + assert isinstance(result, litellm.ModelResponse) + assert result.model_dump()["guardrail_information"] == [] + assert "guardrail_information" not in response.model_dump() + + +def test_attach_guardrail_information_sets_key_on_dict_response(): + recorded = [{"guardrail_name": "first", "guardrail_status": "success"}] + response = {"id": "x"} + + result = attach_guardrail_information( + response=response, + request_data={"metadata": {"standard_logging_guardrail_information": recorded}}, + ) + + assert isinstance(result, dict) + assert result == {"id": "x", "guardrail_information": recorded} + assert response == {"id": "x"} + + +def test_attach_guardrail_information_redacts_matched_content(): + recorded = [ + { + "guardrail_name": "cf", + "guardrail_status": "success", + "guardrail_response": [ + {"type": "blocked_word", "keyword": "secret-word", "action": "MASK"} + ], + "match_details": [{"snippet": "secret-word", "detection_method": "keyword"}], + } + ] + + result = attach_guardrail_information( + response={"id": "x"}, + request_data={"metadata": {"standard_logging_guardrail_information": recorded}}, + ) + + assert isinstance(result, dict) + guardrail_information = result["guardrail_information"] + assert isinstance(guardrail_information, list) + assert guardrail_information[0]["guardrail_response"][0]["keyword"] == "[REDACTED]" + assert guardrail_information[0]["match_details"][0]["snippet"] == "[REDACTED]" + assert guardrail_information[0]["match_details"][0]["detection_method"] == "keyword" + assert "secret-word" not in json.dumps(result) + + +def test_attach_guardrail_information_leaves_cached_dict_response_untouched(): + recorded = [{"guardrail_name": "cf", "guardrail_status": "success"}] + cached = {"id": "x", "content": []} + + result = attach_guardrail_information( + response=cached, + request_data={ + "metadata": { + "include_guardrail_response": True, + "standard_logging_guardrail_information": recorded, + } + }, + ) + + assert "guardrail_information" not in cached + assert result is not cached + assert isinstance(result, dict) + assert result["guardrail_information"] == recorded + + original = litellm.ModelResponse() + copied = attach_guardrail_information( + response=original, + request_data={"metadata": {"standard_logging_guardrail_information": recorded}}, + ) + + assert "guardrail_information" not in original.model_dump() + assert isinstance(copied, litellm.ModelResponse) + assert copied.model_dump()["guardrail_information"] == recorded + + +def test_include_guardrail_response_requested_reads_flag_from_metadata_when_router_seeded_litellm_metadata(): + recorded = [ + {"guardrail_name": "first", "guardrail_status": "success"}, + {"guardrail_name": "second", "guardrail_status": "success"}, + ] + request_data = { + "metadata": { + "include_guardrail_response": True, + "standard_logging_guardrail_information": recorded, + }, + "litellm_metadata": {}, + } + + assert include_guardrail_response_requested(request_data) is True + + response = litellm.ModelResponse() + result = attach_guardrail_information(response=response, request_data=request_data) + + assert isinstance(result, litellm.ModelResponse) + assert result.model_dump()["guardrail_information"] == recorded + + +def test_include_guardrail_response_requested_is_false_without_exact_true(): + assert include_guardrail_response_requested( + {"metadata": {"include_guardrail_response": "true"}, "litellm_metadata": {}} + ) is False + assert include_guardrail_response_requested({}) is False + + class TestProxyBaseLLMRequestProcessing: @pytest.mark.asyncio async def test_base_passthrough_process_llm_request_preserves_litellm_headers_for_non_streaming_response( diff --git a/tests/test_litellm/proxy/test_component_allowlists.py b/tests/test_litellm/proxy/test_component_allowlists.py index 3073908fa54..3641a2d9be9 100644 --- a/tests/test_litellm/proxy/test_component_allowlists.py +++ b/tests/test_litellm/proxy/test_component_allowlists.py @@ -23,8 +23,10 @@ import (which raises on a non-postgres ``DATABASE_URL`` scheme and can mint an RDS IAM token when ``IAM_TOKEN_DB_AUTH`` is set). """ +import json import os import sys +from typing import Final # Importing ``litellm.proxy.proxy_server`` runs its module-level setup, which # reads ``DATABASE_URL`` (Prisma) and ``LITELLM_MASTER_KEY``. Tier-zero CI @@ -49,17 +51,10 @@ _REPO_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", if _REPO_ROOT not in sys.path: sys.path.insert(0, _REPO_ROOT) -from backend.routes.allowlist import ( - BACKEND_EXACT_PATHS, - BACKEND_MOUNT_PATHS, - BACKEND_PATH_PREFIXES, -) -from gateway.routes.allowlist import ( - GATEWAY_EXACT_PATHS, - GATEWAY_MOUNT_PATHS, - GATEWAY_PATH_PREFIXES, -) +from backend.routes.allowlist import BACKEND_MOUNT_PATHS +from gateway.routes.allowlist import GATEWAY_MOUNT_PATHS from litellm.proxy.proxy_server import app +from tests.test_litellm_rust.support.child_interpreter import run_child_interpreter for _key, _previous in _PRE_EXISTING_ENV.items(): if _previous is None: @@ -87,40 +82,69 @@ for _key, _previous in _PRE_DB_ENV.items(): os.environ[_key] = _previous -def _component_paths(routes, exact_paths, path_prefixes) -> set[str]: - """Reproduce ``gateway.main._is_gateway_route`` / ``backend.main._is_backend_route``.""" - out: set[str] = set() - for route in routes: - if isinstance(route, Mount): - continue - path = getattr(route, "path", None) - if path is None: - continue - if path in exact_paths or any(path.startswith(p) for p in path_prefixes): - out.add(path) - return out +_COVERAGE_PROBE: Final = """ +import json, os, sys +sys.path.insert(0, os.environ["LITELLM_COMPONENT_ALLOWLIST_REPO_ROOT"]) +from fastapi.routing import Mount +from backend.routes.allowlist import BACKEND_EXACT_PATHS, BACKEND_PATH_PREFIXES +from gateway.routes.allowlist import GATEWAY_EXACT_PATHS, GATEWAY_PATH_PREFIXES +from litellm.proxy._lazy_features import loaded_lazy_modules +from litellm.proxy.proxy_server import app + +all_paths = { + r.path for r in app.router.routes + if not isinstance(r, Mount) and getattr(r, "path", None) is not None +} + + +def covered(exact, prefixes): + return {p for p in all_paths if p in exact or any(p.startswith(x) for x in prefixes)} + + +json.dump({ + "lazy_loaded": sorted(loaded_lazy_modules(app)), + "route_count": len(all_paths), + "uncovered": sorted(all_paths - ( + covered(GATEWAY_EXACT_PATHS, GATEWAY_PATH_PREFIXES) + | covered(BACKEND_EXACT_PATHS, BACKEND_PATH_PREFIXES) + )), +}, sys.stdout) +""" def test_gateway_plus_backend_covers_full_app(): - """Every route on the proxy app must be served by gateway or backend.""" - all_paths = { - getattr(r, "path") - for r in app.router.routes - if not isinstance(r, Mount) and getattr(r, "path", None) is not None - } - gateway_paths = _component_paths( - app.router.routes, GATEWAY_EXACT_PATHS, GATEWAY_PATH_PREFIXES + """Every route on the proxy app must be served by gateway or backend. + + ``gateway.main`` and ``backend.main`` trim the route table once, inside the + lifespan, so the set this has to cover is the one registered at startup. A + lazy feature appends its router on demand, after that trim, and whether a + sibling test in the same xdist worker has triggered one is not something + this test can control. Measuring in a fresh interpreter is what makes the + route table deterministic; nothing is subtracted, so every route the trim + will actually see stays in the assertion. + """ + env: Final = {**os.environ, "LITELLM_COMPONENT_ALLOWLIST_REPO_ROOT": _REPO_ROOT} + for key, value in _THROWAWAY_ENV.items(): + env.setdefault(key, value) + + probe: Final = run_child_interpreter(_COVERAGE_PROBE, env=env, timeout=90) + assert probe.returncode == 0, f"route probe failed:\n{probe.stderr}" + report: Final = json.loads(probe.stdout) + + assert not report["lazy_loaded"], ( + "route probe was not pristine; it loaded lazy features " + f"{report['lazy_loaded']}, so its route table is not the startup one" ) - backend_paths = _component_paths( - app.router.routes, BACKEND_EXACT_PATHS, BACKEND_PATH_PREFIXES + assert report["route_count"] > 100, ( + f"route probe only saw {report['route_count']} routes, so an empty " + "uncovered set would not mean anything" ) - uncovered = all_paths - (gateway_paths | backend_paths) - + uncovered: Final = report["uncovered"] assert not uncovered, ( f"{len(uncovered)} route(s) are not exposed on either component. " f"Update gateway/routes/allowlist.py or backend/routes/allowlist.py to cover:\n " - + "\n ".join(sorted(uncovered)) + + "\n ".join(uncovered) ) diff --git a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py b/tests/test_litellm/proxy/test_litellm_pre_call_utils.py index 9257a2dd23d..0d4b9e8d21f 100644 --- a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py +++ b/tests/test_litellm/proxy/test_litellm_pre_call_utils.py @@ -34,6 +34,7 @@ from litellm.proxy.litellm_pre_call_utils import ( add_provider_specific_headers_to_request, check_if_token_is_service_account, clean_headers, + move_guardrails_to_metadata, ) from litellm.litellm_core_utils.core_helpers import get_litellm_metadata_from_kwargs from litellm.litellm_core_utils.internal_call_metadata import MODEL_ACCESS_GROUP_METADATA_KEY @@ -4376,6 +4377,45 @@ def test_match_and_track_policies_preserves_attachment_and_request_body_order(): assert applied_policy_names == policy_names +def test_match_and_track_policies_keeps_condition_missing_child_alongside_unconditional_sibling(): + from litellm.proxy.policy_engine.attachment_registry import AttachmentRegistry + from litellm.types.proxy.policy_engine import ( + Policy, + PolicyCondition, + PolicyGuardrails, + PolicyMatchContext, + ) + + policies = { + "baseline": Policy(guardrails=PolicyGuardrails(add=["baseline_guardrail"])), + "parent": Policy(guardrails=PolicyGuardrails(add=["pii_blocker"])), + "child": Policy( + inherit="parent", + guardrails=PolicyGuardrails(add=["child_guard"]), + condition=PolicyCondition(model="claude.*"), + ), + } + attachment_registry = AttachmentRegistry() + attachment_registry.load_attachments( + [ + {"policy": "baseline", "scope": "*"}, + {"policy": "child", "scope": "*"}, + ] + ) + data = {"metadata": {}} + + applied_policy_names, _ = _match_and_track_policies( + data=data, + context=PolicyMatchContext(model="gpt-5.5"), + request_body_policies=[], + policies_override=policies, + attachment_registry_override=attachment_registry, + ) + + assert applied_policy_names == ["baseline", "child"] + assert data["metadata"]["applied_policies"] == ["baseline", "child"] + + @pytest.mark.asyncio async def test_add_guardrails_from_policy_engine_keeps_a_policy_added_guardrail_its_pipeline_also_steps(): from litellm.proxy.policy_engine.attachment_registry import get_attachment_registry @@ -4418,6 +4458,48 @@ async def test_add_guardrails_from_policy_engine_keeps_a_policy_added_guardrail_ assert [pipeline.mode for _policy_name, pipeline in data["metadata"]["_guardrail_pipelines"]] == ["post_call"] +@pytest.mark.asyncio +async def test_add_guardrails_from_policy_engine_applies_inherited_parent_guardrail_when_child_condition_misses(): + from litellm.proxy.policy_engine.attachment_registry import get_attachment_registry + from litellm.proxy.policy_engine.policy_registry import get_policy_registry + from litellm.types.proxy.policy_engine import ( + Policy, + PolicyAttachment, + PolicyCondition, + PolicyGuardrails, + ) + + data = {"model": "gpt-5.5", "messages": [{"role": "user", "content": "Hello"}], "metadata": {}} + policy_registry = get_policy_registry() + policy_registry._policies = { + "parent": Policy(guardrails=PolicyGuardrails(add=["pii_blocker"])), + "child": Policy( + inherit="parent", + guardrails=PolicyGuardrails(add=["child_guard"]), + condition=PolicyCondition(model="claude.*"), + ), + } + policy_registry._initialized = True + attachment_registry = get_attachment_registry() + attachment_registry._attachments = [PolicyAttachment(policy="child", scope="*")] + attachment_registry._initialized = True + + try: + await add_guardrails_from_policy_engine( + data=data, + metadata_variable_name="metadata", + user_api_key_dict=UserAPIKeyAuth(api_key="test-key"), + ) + finally: + policy_registry._policies = {} + policy_registry._initialized = False + attachment_registry._attachments = [] + attachment_registry._initialized = False + + assert "pii_blocker" in data["metadata"]["guardrails"] + assert "child_guard" not in data["metadata"]["guardrails"] + + @pytest.mark.asyncio async def test_add_guardrails_from_policy_engine_accepts_dynamic_policies_and_pops_from_data(): """ @@ -5187,6 +5269,45 @@ def test_clean_headers_strips_x_api_key_when_byok_enabled_but_x_api_key_was_auth # --------------------------------------------------------------------------- +@pytest.mark.asyncio +async def test_move_guardrails_to_metadata_moves_include_guardrail_response_before_the_no_guardrail_early_out(): + policy_registry = MagicMock() + policy_registry.is_initialized.return_value = False + user_api_key_dict = UserAPIKeyAuth(api_key="test-key") + + true_data = { + "model": "gpt-4.1-mini", + "messages": [{"role": "user", "content": "Hello"}], + "metadata": {}, + "include_guardrail_response": True, + } + with patch("litellm.proxy.policy_engine.policy_registry.get_policy_registry", return_value=policy_registry): + await move_guardrails_to_metadata( + data=true_data, + _metadata_variable_name="metadata", + user_api_key_dict=user_api_key_dict, + ) + + assert "include_guardrail_response" not in true_data + assert true_data["metadata"]["include_guardrail_response"] is True + + string_data = { + "model": "gpt-4.1-mini", + "messages": [{"role": "user", "content": "Hello"}], + "metadata": {}, + "include_guardrail_response": "true", + } + with patch("litellm.proxy.policy_engine.policy_registry.get_policy_registry", return_value=policy_registry): + await move_guardrails_to_metadata( + data=string_data, + _metadata_variable_name="metadata", + user_api_key_dict=user_api_key_dict, + ) + + assert "include_guardrail_response" not in string_data + assert string_data["metadata"]["include_guardrail_response"] is False + + @pytest.mark.asyncio async def test_team_guardrail_merges_with_global_policy(): """ @@ -8198,3 +8319,45 @@ def test_default_team_settings_bool_turn_off_message_logging_redacts(): ) is True ) + + +@pytest.mark.asyncio +@pytest.mark.parametrize("path", ["/mcp-rest/tools/call", "/v1/responses", "/v1/chat/completions"]) +@pytest.mark.parametrize("custom_auth", ["x-mcp-auth", "x-private-mcp-token"]) +async def test_mcp_credentials_only_removed_from_logging_copies(path: str, custom_auth: str): + from litellm.types.mcp_server.mcp_server_manager import MCPServer + + metadata_name: Final = "litellm_metadata" if path == "/v1/responses" else "metadata" + secrets: Final = { + "X-MCP-Deepwiki-Authorization": "upstream-sentinel", + custom_auth: "client-auth-sentinel", + "x-service-token": "configured-secret-sentinel", + } + attribution: Final = {"x-app-id": "app-a", "x-nuid": "user-a", "x-user-id": "identity-a"} + request: Final = _make_request_mock(path, {"Content-Type": "application/json", **secrets, **attribution}) + request.headers = Headers(request.headers) + settings: Final = {"mcp_client_side_auth_header_name": custom_auth, "user_header_name": "x-user-id"} + server: Final = MCPServer( + server_id="header-test", name="header-test", transport="http", url="https://example.com/mcp", + extra_headers=["x-service-token", "x-user-id"], + ) + with ( + patch("litellm.proxy.proxy_server.general_settings", settings), + patch.dict( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager.config_mcp_servers", + {"header-test": server}, clear=True, + ), + ): + updated: Final = await add_litellm_data_to_request( + data={"model": "test-model", "messages": [{"role": "user", "content": "hello"}]}, + request=request, user_api_key_dict=UserAPIKeyAuth(api_key="hashed-key"), + proxy_config=MagicMock(), general_settings=settings, version="test", + ) + for header_dict in _all_header_dicts(updated, metadata_name): + assert not any(value in json.dumps(header_dict) for value in secrets.values()) + assert updated[metadata_name]["headers"] == updated["proxy_server_request"]["headers"] + for name, value in attribution.items(): + assert updated[metadata_name]["headers"][name] == value + for name, value in secrets.items(): + assert updated["secret_fields"]["raw_headers"][name.lower()] == value + assert request.headers[name] == value diff --git a/tests/test_litellm/proxy/test_native_compaction.py b/tests/test_litellm/proxy/test_native_compaction.py index d24624aacc5..778c1715530 100644 --- a/tests/test_litellm/proxy/test_native_compaction.py +++ b/tests/test_litellm/proxy/test_native_compaction.py @@ -7,6 +7,7 @@ import pytest from fastapi import FastAPI, Request from pydantic import TypeAdapter +import litellm from litellm.caching.caching import DualCache from litellm.exceptions import BadRequestError from litellm.litellm_core_utils.initialize_dynamic_callback_params import inherit_message_logging_privacy @@ -112,8 +113,10 @@ async def test_real_proxy_child_auth_privacy_and_body_policy( }))) return asyncio.sleep(0, result=ModelResponse(id="private-summary", model="compactor")) + monkeypatch.setattr(litellm, "max_budget", 0) monkeypatch.setattr(proxy_server.app, "dependency_overrides", {}) monkeypatch.setattr(proxy_server, "master_key", "sk-master-fixture") + monkeypatch.setattr(litellm, "max_budget", 0.0) monkeypatch.setattr(proxy_server, "prisma_client", object()) monkeypatch.setattr(proxy_server, "user_api_key_cache", cache) monkeypatch.setattr(proxy_server, "llm_router", None) diff --git a/tests/test_litellm/proxy/test_proxy_cli.py b/tests/test_litellm/proxy/test_proxy_cli.py index a38470d1fdf..b84efda3308 100644 --- a/tests/test_litellm/proxy/test_proxy_cli.py +++ b/tests/test_litellm/proxy/test_proxy_cli.py @@ -10,6 +10,8 @@ import pytest import builtins +import runpy +import sys import types import urllib.parse as urlparse @@ -18,6 +20,7 @@ import yaml from uvicorn.config import LOOP_FACTORIES from uvicorn.importer import import_from_string +from litellm.proxy import proxy_cli from litellm.proxy.proxy_cli import ProxyInitializationHelpers, run_server @@ -636,6 +639,36 @@ class TestProxyInitializationHelpers: ), f"exit_code={result.exit_code}, output={result.output}" mock_uvicorn_run.assert_called_once() + @patch("uvicorn.run") + @patch("atexit.register") + @patch("litellm.proxy.db.prisma_client.PrismaManager.setup_database") + @patch("litellm.proxy.db.prisma_client.should_update_prisma_schema", return_value=False) + def test_script_boot_imports_the_package_proxy_server( + self, mock_should_update, mock_setup_db, mock_atexit_register, mock_uvicorn_run + ): + package_proxy_server = MagicMock( + app=MagicMock(), + ProxyConfig=MagicMock(), + KeyManagementSettings=MagicMock(), + save_worker_config=MagicMock(), + ) + sibling_proxy_server = types.ModuleType("proxy_server") + clean_env = {k: v for k, v in os.environ.items() if k not in ("DATABASE_URL", "DIRECT_URL")} + with ( + patch.dict(os.environ, clean_env, clear=True), + patch.dict( + "sys.modules", + {"proxy_server": sibling_proxy_server, "litellm.proxy.proxy_server": package_proxy_server}, + ), + patch.object(sys, "argv", ["proxy_cli.py", "--skip_server_startup"]), + patch.object(sys, "path", list(sys.path)), + pytest.raises(SystemExit) as exit_info, + ): + runpy.run_path(proxy_cli.__file__, run_name="__main__") + + assert exit_info.value.code == 0 + package_proxy_server.save_worker_config.assert_called_once() + @patch("uvicorn.run") @patch("atexit.register") @patch("litellm.proxy.db.prisma_client.PrismaManager.setup_database") @@ -1174,6 +1207,172 @@ class TestProxyInitializationHelpers: else: assert "pgbouncer" not in appended_params + @pytest.mark.parametrize( + "env_value, config_value, expect_pgbouncer", + [ + ("true", None, True), + ("1", None, True), + ("false", None, False), + (None, None, False), + ("true", False, True), + ("false", True, True), + ], + ) + @patch("subprocess.run") + @patch("atexit.register") + @patch("litellm.proxy.db.prisma_client.PrismaManager.setup_database") + @patch( + "litellm.proxy.db.prisma_client.should_update_prisma_schema", return_value=False + ) + def test_disable_prepared_statements_env_var_forwarded_to_url( + self, + mock_should_update, + mock_setup_db, + mock_atexit_register, + mock_subprocess_run, + env_value, + config_value, + expect_pgbouncer, + ): + from click.testing import CliRunner + + from litellm.proxy.proxy_cli import run_server + + runner = CliRunner() + mock_subprocess_run.return_value = MagicMock(returncode=0) + + general_settings = {"database_url": "postgresql://test:test@localhost:5432/test"} + if config_value is not None: + general_settings["database_disable_prepared_statements"] = config_value + mock_proxy_module = MagicMock( + app=MagicMock(), + ProxyConfig=MagicMock(), + KeyManagementSettings=MagicMock(), + save_worker_config=MagicMock(), + ) + mock_proxy_module.ProxyConfig.return_value.get_config = AsyncMock( + return_value={"general_settings": general_settings} + ) + + clean_env = { + k: v + for k, v in os.environ.items() + if k not in ("DATABASE_URL", "DIRECT_URL", "DATABASE_DISABLE_PREPARED_STATEMENTS") + } + if env_value is not None: + clean_env["DATABASE_DISABLE_PREPARED_STATEMENTS"] = env_value + + with ( + patch.dict(os.environ, clean_env, clear=True), + patch.dict( + "sys.modules", + { + "proxy_server": mock_proxy_module, + "litellm.proxy.proxy_server": mock_proxy_module, + }, + ), + patch( + "litellm.proxy.proxy_cli.ProxyInitializationHelpers._get_default_unvicorn_init_args" + ) as mock_get_args, + patch( + "litellm.proxy.proxy_cli.append_query_params", + side_effect=lambda url, params: str(url), + ) as mock_append_query_params, + ): + mock_get_args.return_value = { + "app": "litellm.proxy.proxy_server:app", + "host": "localhost", + "port": 8000, + } + + result = runner.invoke( + run_server, + ["--local", "--config", "test-config.yaml", "--skip_server_startup"], + ) + + assert ( + result.exit_code == 0 + ), f"exit_code={result.exit_code}, output={result.output}" + appended_params = mock_append_query_params.call_args.args[1] + if expect_pgbouncer: + assert appended_params["pgbouncer"] == "true", appended_params + else: + assert "pgbouncer" not in appended_params, appended_params + + @patch("subprocess.run") + @patch("atexit.register") + @patch("litellm.proxy.db.prisma_client.PrismaManager.setup_database") + @patch( + "litellm.proxy.db.prisma_client.should_update_prisma_schema", return_value=False + ) + def test_malformed_disable_prepared_statements_env_var_is_rejected_even_when_config_enables_it( + self, + mock_should_update, + mock_setup_db, + mock_atexit_register, + mock_subprocess_run, + ): + from click.testing import CliRunner + + from litellm.proxy.proxy_cli import run_server + + runner = CliRunner() + mock_subprocess_run.return_value = MagicMock(returncode=0) + + mock_proxy_module = MagicMock( + app=MagicMock(), + ProxyConfig=MagicMock(), + KeyManagementSettings=MagicMock(), + save_worker_config=MagicMock(), + ) + mock_proxy_module.ProxyConfig.return_value.get_config = AsyncMock( + return_value={ + "general_settings": { + "database_url": "postgresql://test:test@localhost:5432/test", + "database_disable_prepared_statements": True, + } + } + ) + + clean_env = { + k: v + for k, v in os.environ.items() + if k not in ("DATABASE_URL", "DIRECT_URL", "DATABASE_DISABLE_PREPARED_STATEMENTS") + } + clean_env["DATABASE_DISABLE_PREPARED_STATEMENTS"] = "enabled" + + with ( + patch.dict(os.environ, clean_env, clear=True), + patch.dict( + "sys.modules", + { + "proxy_server": mock_proxy_module, + "litellm.proxy.proxy_server": mock_proxy_module, + }, + ), + patch( + "litellm.proxy.proxy_cli.ProxyInitializationHelpers._get_default_unvicorn_init_args" + ) as mock_get_args, + patch( + "litellm.proxy.proxy_cli.append_query_params", + side_effect=lambda url, params: str(url), + ) as mock_append_query_params, + ): + mock_get_args.return_value = { + "app": "litellm.proxy.proxy_server:app", + "host": "localhost", + "port": 8000, + } + + result = runner.invoke( + run_server, + ["--local", "--config", "test-config.yaml", "--skip_server_startup"], + ) + + assert isinstance(result.exception, ValueError), f"exit_code={result.exit_code}, output={result.output}" + assert "DATABASE_DISABLE_PREPARED_STATEMENTS" in str(result.exception), result.exception + mock_append_query_params.assert_not_called() + @patch("uvicorn.run") @patch("atexit.register") @patch("litellm.proxy.db.prisma_client.PrismaManager.setup_database") @@ -1779,13 +1978,18 @@ class TestProxyInitializationHelpers: mock_proxy_config_instance.get_config = mock_get_config mock_proxy_config.return_value = mock_proxy_config_instance - mock_proxy_server_module = MagicMock(app=mock_app) + mock_proxy_server_module = MagicMock( + app=mock_app, + ProxyConfig=mock_proxy_config, + KeyManagementSettings=mock_key_mgmt, + save_worker_config=mock_save_worker_config, + ) # Only remove DATABASE_URL and DIRECT_URL to prevent the database setup # code path from running. Do NOT use clear=True as it removes PATH, HOME, # etc., which causes imports inside run_server to break in CI (the real - # litellm.proxy.proxy_server import at line 820 of proxy_cli.py has heavy - # side effects that fail without a proper environment). + # litellm.proxy.proxy_server import has heavy side effects that fail + # without a proper environment). env_overrides = { "DATABASE_URL": "", "DIRECT_URL": "", @@ -1801,18 +2005,7 @@ class TestProxyInitializationHelpers: with ( patch.dict( "sys.modules", - { - "proxy_server": MagicMock( - app=mock_app, - ProxyConfig=mock_proxy_config, - KeyManagementSettings=mock_key_mgmt, - save_worker_config=mock_save_worker_config, - ), - # Also mock litellm.proxy.proxy_server to prevent the real - # import at line 820 of proxy_cli.py which has heavy side - # effects (FastAPI app init, logging setup, etc.) - "litellm.proxy.proxy_server": mock_proxy_server_module, - }, + {"litellm.proxy.proxy_server": mock_proxy_server_module}, ), patch( "litellm.proxy.proxy_cli.ProxyInitializationHelpers._get_default_unvicorn_init_args" diff --git a/tests/test_litellm/proxy/test_proxy_server.py b/tests/test_litellm/proxy/test_proxy_server.py index 26bfd5c52bd..89fd9c5c9d4 100644 --- a/tests/test_litellm/proxy/test_proxy_server.py +++ b/tests/test_litellm/proxy/test_proxy_server.py @@ -3200,7 +3200,7 @@ def test_normalize_datetime_for_sorting(): @pytest.mark.asyncio -async def test_add_proxy_budget_to_db_only_creates_user_no_keys(): +async def test_add_proxy_budget_to_db_only_creates_user_no_keys(monkeypatch: pytest.MonkeyPatch): """ Test that _add_proxy_budget_to_db only creates a user and no keys are added. @@ -3218,8 +3218,8 @@ async def test_add_proxy_budget_to_db_only_creates_user_no_keys(): from litellm.proxy.proxy_server import ProxyStartupEvent # Set up required litellm settings - litellm.budget_duration = "30d" - litellm.max_budget = 100.0 + monkeypatch.setattr(litellm, "budget_duration", "30d") + monkeypatch.setattr(litellm, "max_budget", 100.0) litellm_proxy_budget_name = "litellm-proxy-budget" @@ -3258,7 +3258,7 @@ async def test_add_proxy_budget_to_db_only_creates_user_no_keys(): @pytest.mark.asyncio -async def test_add_proxy_budget_to_db_backfills_budget_reset_at(): +async def test_add_proxy_budget_to_db_backfills_budget_reset_at(monkeypatch: pytest.MonkeyPatch): """ Test that _upsert_proxy_budget_with_reset_at_backfill issues a conditional update_many with `WHERE budget_reset_at IS NULL` to backfill the column on @@ -3276,8 +3276,8 @@ async def test_add_proxy_budget_to_db_backfills_budget_reset_at(): import litellm from litellm.proxy.proxy_server import ProxyStartupEvent - litellm.budget_duration = "30d" - litellm.max_budget = 100.0 + monkeypatch.setattr(litellm, "budget_duration", "30d") + monkeypatch.setattr(litellm, "max_budget", 100.0) litellm_proxy_budget_name = "litellm-proxy-budget" mock_prisma = MagicMock() @@ -3555,6 +3555,23 @@ async def test_load_config_rejects_malformed_role_permissions(tmp_path): await ProxyConfig().load_config(router=MagicMock(), config_file_path=str(config_file)) +@pytest.mark.asyncio +async def test_load_config_compiles_key_alias_pattern_at_startup(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy.proxy_server import ProxyConfig + + monkeypatch.setattr(litellm, "key_alias_pattern", None) + config_file: Final = tmp_path / "config.yaml" + + config_file.write_text(yaml.dump({"model_list": [], "litellm_settings": {"key_alias_pattern": "^team-("}})) + with pytest.raises(Exception, match=r"litellm_settings\.key_alias_pattern"): + await ProxyConfig().load_config(router=MagicMock(), config_file_path=str(config_file)) + assert litellm.key_alias_pattern is None + + config_file.write_text(yaml.dump({"model_list": [], "litellm_settings": {"key_alias_pattern": "^team-[a-z]+$"}})) + await ProxyConfig().load_config(router=MagicMock(), config_file_path=str(config_file)) + assert litellm.key_alias_pattern == "^team-[a-z]+$" + + def test_os_environ_resolution_leaves_the_config_layer_holding_the_reference(monkeypatch): from litellm.proxy.proxy_server import ProxyConfig diff --git a/tests/test_litellm/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py b/tests/test_litellm/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py index eecee2fd0f1..0140fcaba21 100644 --- a/tests/test_litellm/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py +++ b/tests/test_litellm/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py @@ -1,5 +1,6 @@ import json import os +from typing import Final import pytest from fastapi.testclient import TestClient @@ -90,6 +91,16 @@ def mock_auth(): app.dependency_overrides.pop(user_api_key_auth, None) +@pytest.fixture(autouse=True) +def fresh_settings_store(monkeypatch: pytest.MonkeyPatch) -> None: + from litellm.proxy import proxy_server + from litellm.proxy.config_resolvers.settings_store import SettingsStore + + store: Final = SettingsStore("general_settings") + monkeypatch.setattr(proxy_server.proxy_config, "settings", store) + monkeypatch.setattr(proxy_server, "general_settings", store) + + class TestProxySettingEndpoints: def test_get_internal_user_settings(self, mock_proxy_config, mock_auth): """Test getting the internal user settings""" @@ -3670,6 +3681,91 @@ class TestPtuCostAttributionUISetting: assert not mock_prisma.db.litellm_uisettings.upsert.called +class TestApplyUserBudgetToTeamKeysUISetting: + """``apply_user_budget_to_team_keys`` mirrors general_settings on every GET. + + The proxy enforces the key owner's user budget on team keys only when + ``general_settings.apply_user_budget_to_team_keys`` is on, so the dashboard + shows the owner's budget gate on a team key iff this derived value is true. + Like the other derived settings it is read-only and never persisted. + """ + + @staticmethod + def _mock_prisma(monkeypatch, stored=None): + from unittest.mock import AsyncMock, MagicMock + + mock_prisma = MagicMock() + mock_record = None + if stored is not None: + mock_record = MagicMock() + mock_record.ui_settings = stored + mock_prisma.db.litellm_uisettings.find_unique = AsyncMock(return_value=mock_record) + mock_prisma.db.litellm_uisettings.upsert = AsyncMock() + monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", mock_prisma) + return mock_prisma + + def test_reported_false_when_general_settings_lacks_the_flag(self, mock_auth, monkeypatch): + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) + self._mock_prisma(monkeypatch) + + response = client.get("/get/ui_settings") + + assert response.status_code == 200 + assert response.json()["values"]["apply_user_budget_to_team_keys"] is False + + def test_reported_true_when_general_settings_enables_the_flag(self, mock_auth, monkeypatch): + monkeypatch.setattr( + "litellm.proxy.proxy_server.general_settings", + {"apply_user_budget_to_team_keys": True}, + ) + self._mock_prisma(monkeypatch) + + response = client.get("/get/ui_settings") + + assert response.status_code == 200 + assert response.json()["values"]["apply_user_budget_to_team_keys"] is True + + def test_non_json_values_elsewhere_in_general_settings_do_not_break_get(self, mock_auth, monkeypatch): + """general_settings holds non-JSON values at runtime (e.g. RoleBasedPermissions + instances under "role_permissions"); only the flag itself may be inspected.""" + monkeypatch.setattr( + "litellm.proxy.proxy_server.general_settings", + {"role_permissions": [object()], "apply_user_budget_to_team_keys": True}, + ) + self._mock_prisma(monkeypatch) + + response = client.get("/get/ui_settings") + + assert response.status_code == 200 + assert response.json()["values"]["apply_user_budget_to_team_keys"] is True + + def test_reads_only_the_flag_key(self): + from litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints import ( + _apply_user_budget_to_team_keys_enabled, + ) + + assert _apply_user_budget_to_team_keys_enabled({"apply_user_budget_to_team_keys": True}) is True + assert _apply_user_budget_to_team_keys_enabled({}) is False + assert _apply_user_budget_to_team_keys_enabled({"apply_user_budget_to_team_keys": "true"}) is False + + def test_a_persisted_true_cannot_forge_the_derived_value(self, mock_auth, monkeypatch): + """A row written before the allowlist existed must not be able to turn the feature on.""" + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) + self._mock_prisma(monkeypatch, stored={"apply_user_budget_to_team_keys": True}) + + response = client.get("/get/ui_settings") + + assert response.status_code == 200 + assert response.json()["values"]["apply_user_budget_to_team_keys"] is False + + def test_is_not_an_allowlisted_persisted_setting(self): + from litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints import ( + ALLOWED_UI_SETTINGS_FIELDS, + ) + + assert "apply_user_budget_to_team_keys" not in ALLOWED_UI_SETTINGS_FIELDS + + class TestTeamAdminEditableTeamFieldsSetting: """team_admin_editable_team_fields: the proxy-wide allow-list update_team applies to team admins.""" @@ -3796,6 +3892,31 @@ class TestTeamAdminEditableTeamFieldsSetting: assert "tpm_limit" in field_schema["items"]["enum"] assert "projects" in field_schema["items"]["enum"] + @pytest.mark.parametrize(("stored", "patched"), [(["tpm_limit"], []), (["rpm_limit"], ["max_budget"])]) + def test_get_reports_its_own_db_row_whatever_an_earlier_test_patched(self, monkeypatch, stored, patched): + """A booted proxy keeps its runtime settings in one shared store. Each case PATCHes a list into + that store, so whichever case ran second used to read the other's list instead of its own DB row.""" + from unittest.mock import AsyncMock, MagicMock + + from litellm.proxy import proxy_server + + mock_prisma = self._as_proxy_admin(monkeypatch) + mock_db_record = MagicMock() + mock_db_record.ui_settings = {"team_admin_editable_team_fields": stored} + mock_prisma.db.litellm_uisettings.find_unique = AsyncMock(return_value=mock_db_record) + monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {}) + + try: + fetched = client.get("/get/ui_settings") + proxy_server._bind_general_settings_store(proxy_server.proxy_config.settings) + response = client.patch("/update/ui_settings", json={"team_admin_editable_team_fields": patched}) + finally: + app.dependency_overrides.clear() + + assert fetched.json()["values"]["team_admin_editable_team_fields"] == stored + assert response.status_code == 200 + assert proxy_server.general_settings["team_admin_editable_team_fields"] == patched + class TestSyncUiSettingsToGeneralSettings: """The DB re-read each pod runs on startup and on every config reload.""" @@ -3877,6 +3998,32 @@ class TestSyncUiSettingsToGeneralSettings: assert general_settings["forward_client_headers_to_llm_api"] is True assert general_settings.source("forward_client_headers_to_llm_api") == "db" + def test_every_runtime_flag_reaches_a_reader_once_applied(self, monkeypatch): + """A flag the settings rules do not route to the ui_settings row is stored but never read back.""" + from litellm.proxy import proxy_server + from litellm.proxy.config_resolvers import SettingsStore + from litellm.proxy.ui_crud_endpoints.proxy_setting_endpoints import ( + TEAM_ADMIN_EDITABLE_TEAM_FIELDS_SETTING, + _RUNTIME_GENERAL_SETTINGS_FLAGS, + apply_runtime_general_settings_flags, + ) + + general_settings = SettingsStore("general_settings") + general_settings.load_yaml({}) + monkeypatch.setattr(proxy_server, "general_settings", general_settings) + + stored = { + key: (["tpm_limit"] if key == TEAM_ADMIN_EDITABLE_TEAM_FIELDS_SETTING else True) + for key in _RUNTIME_GENERAL_SETTINGS_FLAGS + } + assert stored + + apply_runtime_general_settings_flags(stored) + + read_back = {key: general_settings.get(key) for key in stored} + + assert read_back == stored + def test_applied_runtime_flags_cannot_override_the_config_file(self, monkeypatch): from litellm.proxy import proxy_server from litellm.proxy.config_resolvers import SettingsStore @@ -3890,3 +4037,4 @@ class TestSyncUiSettingsToGeneralSettings: assert general_settings["forward_client_headers_to_llm_api"] is False assert general_settings.source("forward_client_headers_to_llm_api") == "config" + diff --git a/tests/test_litellm/proxy/utils/proxy_logging/test_post_call_failure_hook.py b/tests/test_litellm/proxy/utils/proxy_logging/test_post_call_failure_hook.py index a4bb7d63548..0046721fd9c 100644 --- a/tests/test_litellm/proxy/utils/proxy_logging/test_post_call_failure_hook.py +++ b/tests/test_litellm/proxy/utils/proxy_logging/test_post_call_failure_hook.py @@ -5,16 +5,18 @@ from __future__ import annotations import asyncio from datetime import datetime -from typing import Any, Final +from types import MappingProxyType +from typing import Final from unittest.mock import AsyncMock, MagicMock import pytest from fastapi import HTTPException import litellm +from litellm.constants import PROXY_REJECTED_BEFORE_ROUTING_KEY from litellm.exceptions import GuardrailRaisedException from litellm.integrations.custom_logger import CustomLogger -from litellm.proxy._types import AlertType, ProxyErrorTypes, UserAPIKeyAuth +from litellm.proxy._types import ProxyErrorTypes, UserAPIKeyAuth from litellm.proxy.utils import ProxyLogging @@ -99,6 +101,499 @@ async def test_post_call_failure_hook_no_callbacks_returns_none( } +@pytest.mark.asyncio +async def test_post_call_failure_hook_attributes_single_router_deployment( + proxy_logging, make_user_api_key_auth, monkeypatch +): + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + "model_info": {"provider": "acme"}, + } + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": "internal-model", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=403, detail="blocked"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs["custom_llm_provider"] == "openai" + assert kwargs["litellm_params"]["custom_llm_provider"] == "openai" + assert kwargs["litellm_params"]["metadata"]["model_info"]["provider"] == "acme" + assert kwargs["litellm_params"]["metadata"]["deployment"] == "openai/gpt-4.1" + assert kwargs["litellm_params"][PROXY_REJECTED_BEFORE_ROUTING_KEY] is True + assert kwargs["standard_logging_object"]["custom_llm_provider"] == "openai" + assert ( + kwargs["standard_logging_object"]["model_id"] == proxy_server.llm_router.get_model_list()[0]["model_info"]["id"] + ) + + +@pytest.mark.asyncio +async def test_pre_routing_reject_spend_log_keeps_public_model_group(proxy_logging, make_user_api_key_auth, monkeypatch): + from litellm.proxy import proxy_server + from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + } + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": "internal-model", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=401, detail="blocked key"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + assert recorded[0]["standard_logging_object"]["model_group"] == "internal-model" + now: Final = datetime.now() + payload = get_logging_payload( + kwargs={**recorded[0], "completion_start_time": now}, response_obj=None, start_time=now, end_time=now + ) + assert payload["model"] == "openai/gpt-4.1" + assert payload["model_group"] == "internal-model" + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_keeps_router_stamped_metadata_for_post_call_failures( + proxy_logging, make_user_api_key_auth, monkeypatch +): + """A post-call guardrail block arrives after the provider handoff with the router's own + ``model_info`` in the request metadata. The pre-routing flag must stay off so deployment + metrics keep attributing the failure to the deployment that actually served the call.""" + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + "model_info": {"id": "routed-deployment"}, + } + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + request_data = { + "litellm_call_id": "post-call-guardrail", + "model": "internal-model", + "messages": [{"role": "user", "content": "hi"}], + "metadata": {"model_info": {"id": "routed-deployment", "served": True}}, + } + logging_obj, request_data = litellm.utils.function_setup( + original_function="acompletion", rules_obj=litellm.utils.Rules(), start_time=datetime.now(), **request_data + ) + logging_obj.model_call_details["first_api_call_start_time"] = datetime.now() + request_data["litellm_logging_obj"] = logging_obj + + await proxy_logging.post_call_failure_hook( + request_data=request_data, + original_exception=GuardrailRaisedException(guardrail_name="g", message="response blocked"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs["litellm_params"]["metadata"]["model_info"] == {"id": "routed-deployment", "served": True} + assert PROXY_REJECTED_BEFORE_ROUTING_KEY not in kwargs["litellm_params"] + assert kwargs["standard_logging_object"]["model_id"] == "routed-deployment" + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_flags_pre_routing_reject_despite_caller_model_info( + proxy_logging, make_user_api_key_auth, monkeypatch +): + """A key allowed to override pricing keeps caller-supplied ``metadata.model_info``. A reject + before any provider handoff must still carry the pre-routing flag so deployment metrics do + not record an outage for a deployment the request never reached.""" + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + "model_info": {"id": "real-deployment"}, + } + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={ + "model": "internal-model", + "messages": [{"role": "user", "content": "hi"}], + "metadata": {"model_info": {"id": "spoofed-deployment"}}, + }, + original_exception=HTTPException(status_code=429, detail="key over limit"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs["litellm_params"][PROXY_REJECTED_BEFORE_ROUTING_KEY] is True + assert kwargs["litellm_params"]["custom_llm_provider"] == "openai" + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_attribution_does_not_count_against_the_deployment( + proxy_logging, make_user_api_key_auth, monkeypatch +): + """The router's failure callbacks run on this path too. A proxy-side reject must not + bump the deployment's failure or rpm counters, or a key hitting its own limit + could cool down the only deployment for everyone.""" + from litellm.proxy import proxy_server + + router = litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test", "rpm": 100}, + } + ] + ) + monkeypatch.setattr(proxy_server, "llm_router", router) + proxy_logging.alert_types = [] + deployment_id = router.get_model_list()[0]["model_info"]["id"] + + for status in (403, 429): + await proxy_logging.post_call_failure_hook( + request_data={"model": "internal-model", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=status, detail="blocked"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + pending = asyncio.all_tasks() - {asyncio.current_task()} + await asyncio.gather(*pending, return_exceptions=True) + + deployment_keys = [key for key in router.cache.in_memory_cache.cache_dict if deployment_id in key] + assert deployment_keys == [], f"proxy reject was counted against the deployment: {deployment_keys}" + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_attributes_the_keys_team_deployment_over_the_global_group( + proxy_logging, make_user_api_key_auth, monkeypatch +): + """A team key requesting its team public model name must be attributed to the team's + deployment, not to a global group that happens to share the public name.""" + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "shared-name", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + "model_info": {"id": "global-deployment"}, + }, + { + "model_name": "shared-name_test-team_deadbeef", + "litellm_params": {"model": "anthropic/claude-sonnet-4-5", "api_key": "sk-test"}, + "model_info": { + "id": "team-deployment", + "team_id": "test-team", + "team_public_model_name": "shared-name", + }, + }, + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": "shared-name", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=429, detail="rate limited"), + user_api_key_dict=make_user_api_key_auth(team_id="test-team", request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs["custom_llm_provider"] == "anthropic" + assert kwargs["litellm_params"]["metadata"]["deployment"] == "anthropic/claude-sonnet-4-5" + assert kwargs["standard_logging_object"]["model_id"] == "team-deployment" + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_omits_provider_for_mixed_router_deployments( + proxy_logging, make_user_api_key_auth, monkeypatch +): + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + }, + { + "model_name": "internal-model", + "litellm_params": {"model": "anthropic/claude-sonnet-4-5", "api_key": "sk-test"}, + }, + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": "internal-model", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=403, detail="blocked"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs.get("custom_llm_provider") is None + assert "model_info" not in (kwargs["litellm_params"].get("metadata") or {}) + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_omits_provider_when_a_deployment_does_not_resolve( + proxy_logging, make_user_api_key_auth, monkeypatch +): + """One deployment resolves to openai and its sibling resolves to nothing: the group + is not known to be single-provider, so no provider is stamped on the failure.""" + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + router = MagicMock() + router.get_model_list.return_value = [ + {"model_name": "internal-model", "litellm_params": {"model": "openai/gpt-4.1"}}, + {"model_name": "internal-model", "litellm_params": {"model": "unmapped-model-with-no-provider"}}, + ] + monkeypatch.setattr(proxy_server, "llm_router", router) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": "internal-model", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=403, detail="blocked"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs.get("custom_llm_provider") is None + assert kwargs["litellm_params"].get("custom_llm_provider") is None + + +@pytest.mark.asyncio +async def test_handle_logging_proxy_only_path_attributes_with_read_only_metadata( + proxy_logging, make_user_api_key_auth, monkeypatch +): + """With a logging object already on the request, its metadata is taken as given; + a read-only mapping there must not crash the stamp, and the failure handler + still receives the provider attribution.""" + from litellm.proxy import proxy_server + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + "model_info": {"provider": "acme"}, + } + ] + ), + ) + logging_obj = MagicMock() + logging_obj.call_type = "acompletion" + logging_obj.model_call_details = {} + logging_obj.async_failure_handler = AsyncMock() + + await proxy_logging._handle_logging_proxy_only_error( + request_data={ + "litellm_logging_obj": logging_obj, + "model": "internal-model", + "messages": [{"role": "user", "content": "hi"}], + "metadata": MappingProxyType({"user_api_key_alias": "frozen"}), + }, + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + original_exception=HTTPException(status_code=403, detail="blocked"), + ) + + assert logging_obj.async_failure_handler.called + update_kwargs = logging_obj.update_environment_variables.call_args.kwargs + assert update_kwargs["custom_llm_provider"] == "openai" + assert update_kwargs["litellm_params"]["custom_llm_provider"] == "openai" + assert update_kwargs["litellm_params"]["metadata"] == {"user_api_key_alias": "frozen"} + + +@pytest.mark.asyncio +async def test_post_call_failure_hook_fires_without_router_attribution( + proxy_logging, make_user_api_key_auth, monkeypatch +): + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "different-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + } + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": "internal-model", "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=403, detail="blocked"), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs.get("custom_llm_provider") is None + assert "model_info" not in (kwargs["litellm_params"].get("metadata") or {}) + + +@pytest.mark.asyncio +@pytest.mark.parametrize("model", [123, ["internal-model"], {"name": "internal-model"}, None]) +async def test_post_call_failure_hook_fires_for_non_string_model( + proxy_logging, make_user_api_key_auth, monkeypatch, model: object +): + """A body whose ``model`` is not a string is rejected by the proxy before routing; its + failure callback must still fire, unattributed, instead of a TypeError escaping the hook.""" + from litellm.proxy import proxy_server + + recorded: list[dict] = [] + + class _RecordingLogger(CustomLogger): + async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time): + recorded.append(kwargs) + + monkeypatch.setattr( + proxy_server, + "llm_router", + litellm.Router( + model_list=[ + { + "model_name": "internal-model", + "litellm_params": {"model": "openai/gpt-4.1", "api_key": "sk-test"}, + } + ] + ), + ) + monkeypatch.setattr(litellm, "callbacks", [_RecordingLogger()]) + proxy_logging.alert_types = [] + + await proxy_logging.post_call_failure_hook( + request_data={"model": model, "messages": [{"role": "user", "content": "hi"}]}, + original_exception=HTTPException(status_code=400, detail="'model' must be a string."), + user_api_key_dict=make_user_api_key_auth(request_route="/chat/completions"), + route="/chat/completions", + ) + + assert len(recorded) == 1 + kwargs = recorded[0] + assert kwargs.get("custom_llm_provider") is None + assert "model_info" not in (kwargs["litellm_params"].get("metadata") or {}) + + @pytest.mark.asyncio async def test_post_call_failure_hook_callback_returns_http_exception( proxy_logging, make_user_api_key_auth, monkeypatch diff --git a/tests/test_litellm/proxy/vector_store_endpoints/test_vector_store_endpoints.py b/tests/test_litellm/proxy/vector_store_endpoints/test_vector_store_endpoints.py index 20484e787bd..2f7d4b350be 100644 --- a/tests/test_litellm/proxy/vector_store_endpoints/test_vector_store_endpoints.py +++ b/tests/test_litellm/proxy/vector_store_endpoints/test_vector_store_endpoints.py @@ -2189,6 +2189,7 @@ async def test_new_vector_store_persists_embedding_reference_without_credentials mock_registry = MagicMock() mock_registry.add_vector_store_to_registry = MagicMock() + mock_registry.is_config_vector_store.return_value = False with ( patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client), @@ -2267,6 +2268,7 @@ async def test_new_vector_store_auto_resolves_from_router(): mock_registry = MagicMock() mock_registry.add_vector_store_to_registry = MagicMock() + mock_registry.is_config_vector_store.return_value = False with ( patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client), @@ -3061,3 +3063,196 @@ def test_vector_store_search_rejects_caller_embedding_selection_params(blocked_k assert response.status_code == 400, response.json() assert blocked_key in str(response.json()) + + +class TestConfigOwnedVectorStores: + """Stores declared under ``vector_store_registry`` in config.yaml are owned by the config file""" + + CONFIG_ID = "vs_from_config" + DB_ID = "vs_from_db" + + def _registry(self): + from litellm.vector_stores.vector_store_registry import VectorStoreRegistry + + registry = VectorStoreRegistry(vector_stores=[]) + registry.load_vector_stores_from_config( + [ + { + "vector_store_name": "config-store", + "litellm_params": {"vector_store_id": self.CONFIG_ID, "custom_llm_provider": "openai"}, + } + ] + ) + registry.add_vector_store_to_registry(self._db_row(self.DB_ID, "db-store")) + registry.add_vector_store_to_registry(self._db_row("vs_stale", "deleted-elsewhere")) + return registry + + @staticmethod + def _db_row(vector_store_id: str, vector_store_name: str) -> dict: + return { + "vector_store_id": vector_store_id, + "custom_llm_provider": "openai", + "vector_store_name": vector_store_name, + "litellm_params": {}, + "created_at": datetime.now(timezone.utc), + "updated_at": datetime.now(timezone.utc), + } + + @staticmethod + def _admin() -> UserAPIKeyAuth: + return UserAPIKeyAuth(user_role=LitellmUserRoles.PROXY_ADMIN, user_id="admin") + + @pytest.mark.asyncio + async def test_list_keeps_config_store_that_has_no_db_row(self): + from litellm.proxy.vector_store_endpoints.management_endpoints import list_vector_stores + + registry = self._registry() + prisma = MagicMock() + prisma.db.litellm_managedvectorstorestable.find_many = AsyncMock(return_value=[self._db_row(self.DB_ID, "db-store")]) + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", registry), + ): + first = await list_vector_stores(user_api_key_dict=self._admin()) + second = await list_vector_stores(user_api_key_dict=self._admin()) + + assert [(vs["vector_store_id"], vs["is_config"]) for vs in first["data"]] == [(self.DB_ID, False), (self.CONFIG_ID, True)] + assert second["data"] == first["data"] + assert [vs["vector_store_id"] for vs in registry.vector_stores] == [self.CONFIG_ID, self.DB_ID] + + @pytest.mark.asyncio + async def test_list_keeps_config_store_and_db_row_with_same_id_does_not_overwrite_it(self): + from litellm.proxy.vector_store_endpoints.management_endpoints import list_vector_stores + + registry = self._registry() + prisma = MagicMock() + prisma.db.litellm_managedvectorstorestable.find_many = AsyncMock( + return_value=[self._db_row(self.DB_ID, "db-store"), self._db_row(self.CONFIG_ID, "renamed-in-db")] + ) + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", registry), + ): + response = await list_vector_stores(user_api_key_dict=self._admin()) + + by_id = {vs["vector_store_id"]: vs for vs in response["data"]} + assert set(by_id) == {self.CONFIG_ID, self.DB_ID}, response + assert (by_id[self.CONFIG_ID]["vector_store_name"], by_id[self.CONFIG_ID]["is_config"]) == ("config-store", True) + assert (by_id[self.DB_ID]["vector_store_name"], by_id[self.DB_ID]["is_config"]) == ("db-store", False) + assert [vs["vector_store_id"] for vs in registry.vector_stores] == [self.CONFIG_ID, self.DB_ID] + assert registry.get_litellm_managed_vector_store_from_registry(self.CONFIG_ID)["vector_store_name"] == "config-store" + + @pytest.mark.asyncio + async def test_info_reports_config_ownership(self): + from litellm.proxy.vector_store_endpoints.management_endpoints import get_vector_store_info + from litellm.types.vector_stores import VectorStoreInfoRequest + + with ( + patch("litellm.proxy.proxy_server.prisma_client", MagicMock()), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", self._registry()), + ): + config_info = await get_vector_store_info( + data=VectorStoreInfoRequest(vector_store_id=self.CONFIG_ID), user_api_key_dict=self._admin() + ) + db_info = await get_vector_store_info( + data=VectorStoreInfoRequest(vector_store_id=self.DB_ID), user_api_key_dict=self._admin() + ) + + assert config_info["vector_store"].is_config is True + assert db_info["vector_store"].is_config is False + + @pytest.mark.asyncio + async def test_new_with_config_store_id_is_rejected_before_db_write(self): + prisma = MagicMock() + prisma.db.litellm_managedvectorstorestable.find_unique = AsyncMock(return_value=None) + prisma.db.litellm_managedvectorstorestable.create = AsyncMock() + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", self._registry()), + pytest.raises(HTTPException) as exc_info, + ): + await new_vector_store( + vector_store={"vector_store_id": self.CONFIG_ID, "custom_llm_provider": "openai"}, + user_api_key_dict=self._admin(), + ) + + assert exc_info.value.status_code == 400, exc_info.value.detail + assert exc_info.value.detail["vector_store_id"] == self.CONFIG_ID + assert "config file" in exc_info.value.detail["error"] + prisma.db.litellm_managedvectorstorestable.create.assert_not_called() + + @pytest.mark.asyncio + async def test_update_of_config_store_is_rejected_before_db_write(self): + from litellm.proxy.vector_store_endpoints.management_endpoints import update_vector_store + from litellm.types.vector_stores import VectorStoreUpdateRequest + + prisma = MagicMock() + prisma.db.litellm_managedvectorstorestable.find_unique = AsyncMock(return_value=None) + prisma.db.litellm_managedvectorstorestable.update = AsyncMock() + registry = self._registry() + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", registry), + pytest.raises(HTTPException) as exc_info, + ): + await update_vector_store( + data=VectorStoreUpdateRequest(vector_store_id=self.CONFIG_ID, vector_store_name="renamed"), + user_api_key_dict=self._admin(), + ) + + assert exc_info.value.status_code == 400, exc_info.value.detail + assert exc_info.value.detail["vector_store_id"] == self.CONFIG_ID + prisma.db.litellm_managedvectorstorestable.update.assert_not_called() + assert registry.get_litellm_managed_vector_store_from_registry(self.CONFIG_ID)["vector_store_name"] == "config-store" + + @pytest.mark.asyncio + async def test_delete_of_config_store_is_rejected_and_store_stays_registered(self): + from litellm.proxy.vector_store_endpoints.management_endpoints import delete_vector_store + from litellm.types.vector_stores import VectorStoreDeleteRequest + + prisma = MagicMock() + prisma.db.litellm_managedvectorstorestable.find_unique = AsyncMock(return_value=None) + prisma.db.litellm_managedvectorstorestable.delete = AsyncMock() + registry = self._registry() + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", registry), + pytest.raises(HTTPException) as exc_info, + ): + await delete_vector_store( + data=VectorStoreDeleteRequest(vector_store_id=self.CONFIG_ID), user_api_key_dict=self._admin() + ) + + assert exc_info.value.status_code == 400, exc_info.value.detail + assert exc_info.value.detail["vector_store_id"] == self.CONFIG_ID + prisma.db.litellm_managedvectorstorestable.delete.assert_not_called() + assert registry.is_config_vector_store(self.CONFIG_ID) is True + + @pytest.mark.asyncio + async def test_delete_of_db_store_still_works(self): + from litellm.proxy.vector_store_endpoints.management_endpoints import delete_vector_store + from litellm.types.vector_stores import VectorStoreDeleteRequest + + row = MagicMock() + row.model_dump = MagicMock(return_value=self._db_row(self.DB_ID, "db-store")) + prisma = MagicMock() + prisma.db.litellm_managedvectorstorestable.find_unique = AsyncMock(return_value=row) + prisma.db.litellm_managedvectorstorestable.delete = AsyncMock() + registry = self._registry() + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), # test-quality-ok: proxy_server global, no seam + patch.object(litellm, "vector_store_registry", registry), + ): + response = await delete_vector_store( + data=VectorStoreDeleteRequest(vector_store_id=self.DB_ID), user_api_key_dict=self._admin() + ) + + assert response["status"] == "success", response + prisma.db.litellm_managedvectorstorestable.delete.assert_awaited_once_with(where={"vector_store_id": self.DB_ID}) + assert registry.get_litellm_managed_vector_store_from_registry(self.DB_ID) is None diff --git a/tests/test_litellm/rerank_api/test_main.py b/tests/test_litellm/rerank_api/test_main.py index aca0c970dd5..f56673fec30 100644 --- a/tests/test_litellm/rerank_api/test_main.py +++ b/tests/test_litellm/rerank_api/test_main.py @@ -239,7 +239,6 @@ async def test_arerank_error_is_mapped_to_litellm_exception(respx_mock: respx.Mo @pytest.mark.asyncio -@pytest.mark.timeout(300) async def test_arerank_declared_authenticating_provider_skips_resolution(monkeypatch): """Regression for the event-loop hazard in arerank's provider pre-resolution: get_llm_provider runs the blocking OAuth device flow for github_copilot/chatgpt, @@ -257,6 +256,9 @@ async def test_arerank_declared_authenticating_provider_skips_resolution(monkeyp raise BaseLLMException(status_code=401, message='{"error":"bad key"}') monkeypatch.setattr(litellm, "get_llm_provider", record_resolution) + monkeypatch.setattr( + "litellm.litellm_core_utils.llm_response_utils.get_api_base.get_llm_provider", record_resolution + ) monkeypatch.setattr("litellm.rerank_api.main.rerank", rerank_raises_provider_error) with pytest.raises(litellm.AuthenticationError) as exc_info: diff --git a/tests/test_litellm/responses/mcp/test_chat_completions_handler.py b/tests/test_litellm/responses/mcp/test_chat_completions_handler.py index 6e049d7634c..54e98cc2b6c 100644 --- a/tests/test_litellm/responses/mcp/test_chat_completions_handler.py +++ b/tests/test_litellm/responses/mcp/test_chat_completions_handler.py @@ -159,6 +159,7 @@ async def test_acompletion_with_mcp_passes_mcp_server_auth_headers_to_process_to secret_fields=secret_fields, ) + assert captured_process_kwargs["raw_headers"] == secret_fields["raw_headers"] assert "mcp_server_auth_headers" in captured_process_kwargs mcp_server_auth_headers = captured_process_kwargs["mcp_server_auth_headers"] assert mcp_server_auth_headers is not None diff --git a/tests/test_litellm/responses/mcp/test_litellm_proxy_mcp_handler.py b/tests/test_litellm/responses/mcp/test_litellm_proxy_mcp_handler.py index 83537c236a3..57cebf489a2 100644 --- a/tests/test_litellm/responses/mcp/test_litellm_proxy_mcp_handler.py +++ b/tests/test_litellm/responses/mcp/test_litellm_proxy_mcp_handler.py @@ -1,13 +1,15 @@ +import importlib import subprocess import sys import textwrap import types +from typing import Any, Final, cast from unittest.mock import AsyncMock, MagicMock import pytest from fastapi import HTTPException +from mcp.types import CallToolResult, TextContent from openai.types.responses.tool_param import Mcp -import importlib from litellm.proxy._experimental.mcp_server.faults.list_outcomes import AggregateToolListing from litellm.responses import main as responses_main @@ -15,10 +17,9 @@ from litellm.responses.mcp import litellm_proxy_mcp_handler as mcp_handler_modul from litellm.responses.mcp.litellm_proxy_mcp_handler import ( LiteLLM_Proxy_MCP_Handler, ) -from typing import Any, cast from litellm.types.llms.openai import ResponsesAPIResponse -from litellm.types.utils import ModelResponse from litellm.types.responses.main import OutputFunctionToolCall +from litellm.types.utils import ModelResponse class _DummyMCPResult: @@ -492,6 +493,157 @@ async def test_execute_tool_calls_threads_logging_obj_into_call_tool(monkeypatch assert call_tool_mock.await_args.kwargs["litellm_logging_obj"] is sentinel_logging_obj +@pytest.mark.asyncio +async def test_execute_tool_calls_applies_post_call_hook_content(monkeypatch): + proxy_module = types.SimpleNamespace(proxy_logging_obj=None) + monkeypatch.setitem(sys.modules, "litellm.proxy.proxy_server", proxy_module) + + result = CallToolResult( + content=[TextContent(type="text", text="SECRET-1234")], + structuredContent={"result": "SECRET-1234"}, + isError=False, + ) + fake_manager = types.SimpleNamespace( + get_registry=MagicMock(return_value={}), + call_tool=AsyncMock(return_value=result), + _get_mcp_server_from_tool_name=MagicMock(return_value=None), + get_mcp_server_by_name=MagicMock(return_value=None), + ) + monkeypatch.setattr( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager", + fake_manager, + ) + + logging_obj = MagicMock() + logging_obj.model_call_details = {} + logging_obj.async_post_mcp_tool_call_hook = AsyncMock(return_value=CallToolResult(content=[TextContent(type="text", text="[REDACTED]")], is_error=True)) + logging_obj.async_success_handler = AsyncMock() + handler_module = importlib.import_module("litellm.responses.mcp.litellm_proxy_mcp_handler") + monkeypatch.setattr(handler_module, "function_setup", lambda *_args, **_kwargs: (logging_obj, None)) + + tool_name = "deepwiki-read_wiki_structure" + results = await LiteLLM_Proxy_MCP_Handler._execute_tool_calls( + tool_server_map={tool_name: "deepwiki"}, + tool_calls=[{"id": "call-1", "function": {"name": tool_name, "arguments": "{}"}}], + user_api_key_auth=None, + ) + + assert results == [{"tool_call_id": "call-1", "result": "[REDACTED]", "name": tool_name}] + assert logging_obj.async_success_handler.await_args.kwargs["result"].content[0].text == "[REDACTED]" + assert logging_obj.async_success_handler.await_args.kwargs["result"].structured_content is None + + +@pytest.mark.asyncio +async def test_execute_tool_calls_returns_proxy_result_without_logging(monkeypatch): + result = CallToolResult(content=[TextContent(type="text", text="ok")], isError=False) + proxy_logging_obj = MagicMock() + proxy_logging_obj.post_mcp_call_hook = AsyncMock(side_effect=lambda response, **_: response) + monkeypatch.setitem( + sys.modules, "litellm.proxy.proxy_server", types.SimpleNamespace(proxy_logging_obj=proxy_logging_obj) + ) + + fake_manager = types.SimpleNamespace( + get_registry=MagicMock(return_value={}), + call_tool=AsyncMock(return_value=result), + _get_mcp_server_from_tool_name=MagicMock(return_value=None), + get_mcp_server_by_name=MagicMock(return_value=None), + ) + monkeypatch.setattr( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager", + fake_manager, + ) + handler_module = importlib.import_module("litellm.responses.mcp.litellm_proxy_mcp_handler") + monkeypatch.setattr(handler_module, "function_setup", lambda *_args, **_kwargs: (None, None)) + + tool_name = "deepwiki-read_wiki_structure" + results = await LiteLLM_Proxy_MCP_Handler._execute_tool_calls( + tool_server_map={tool_name: "deepwiki"}, + tool_calls=[{"id": "call-1", "function": {"name": tool_name, "arguments": "{}"}}], + user_api_key_auth=None, + ) + + assert results == [{"tool_call_id": "call-1", "result": "ok", "name": tool_name}] + proxy_logging_obj.post_mcp_call_hook.assert_awaited_once() + + +@pytest.mark.asyncio +async def test_execute_tool_calls_passes_logging_details_to_proxy_hook(monkeypatch): + result = CallToolResult(content=[TextContent(type="text", text="ok")], isError=False) + proxy_logging_obj = MagicMock() + proxy_logging_obj.post_mcp_call_hook = AsyncMock(side_effect=lambda response, **_: response) + monkeypatch.setitem( + sys.modules, "litellm.proxy.proxy_server", types.SimpleNamespace(proxy_logging_obj=proxy_logging_obj) + ) + + fake_manager = types.SimpleNamespace( + get_registry=MagicMock(return_value={}), + call_tool=AsyncMock(return_value=result), + _get_mcp_server_from_tool_name=MagicMock(return_value=None), + get_mcp_server_by_name=MagicMock(return_value=None), + ) + monkeypatch.setattr( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager", + fake_manager, + ) + logging_obj = MagicMock() + logging_obj.model_call_details = {"request_id": "request-1"} + logging_obj.async_post_mcp_tool_call_hook = AsyncMock(return_value=result) + logging_obj.async_success_handler = AsyncMock() + handler_module = importlib.import_module("litellm.responses.mcp.litellm_proxy_mcp_handler") + monkeypatch.setattr(handler_module, "function_setup", lambda *_args, **_kwargs: (logging_obj, None)) + + tool_name = "deepwiki-read_wiki_structure" + results = await LiteLLM_Proxy_MCP_Handler._execute_tool_calls( + tool_server_map={tool_name: "deepwiki"}, + tool_calls=[{"id": "call-1", "function": {"name": tool_name, "arguments": "{}"}}], + user_api_key_auth=None, + ) + + assert results == [{"tool_call_id": "call-1", "result": "ok", "name": tool_name}] + assert proxy_logging_obj.post_mcp_call_hook.await_args.kwargs["request_data"] == logging_obj.model_call_details + + +@pytest.mark.asyncio +@pytest.mark.parametrize("failure_stage", ["post_call_hook", "success_handler"]) +async def test_execute_tool_calls_continues_when_post_call_logging_fails(monkeypatch, failure_stage: str): + proxy_module = types.SimpleNamespace(proxy_logging_obj=None) + monkeypatch.setitem(sys.modules, "litellm.proxy.proxy_server", proxy_module) + + result = CallToolResult(content=[TextContent(type="text", text="ok")], isError=False) + fake_manager = types.SimpleNamespace( + get_registry=MagicMock(return_value={}), + call_tool=AsyncMock(return_value=result), + _get_mcp_server_from_tool_name=MagicMock(return_value=None), + get_mcp_server_by_name=MagicMock(return_value=None), + ) + monkeypatch.setattr( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager", + fake_manager, + ) + + logging_obj = MagicMock() + logging_obj.model_call_details = {} + logging_obj.post_call = MagicMock() + logging_obj.async_post_mcp_tool_call_hook = AsyncMock( + side_effect=RuntimeError("hook failed") if failure_stage == "post_call_hook" else None, + return_value=result, + ) + logging_obj.async_success_handler = AsyncMock( + side_effect=RuntimeError("success logging failed") if failure_stage == "success_handler" else None + ) + handler_module = importlib.import_module("litellm.responses.mcp.litellm_proxy_mcp_handler") + monkeypatch.setattr(handler_module, "function_setup", lambda *_args, **_kwargs: (logging_obj, None)) + + tool_name = "deepwiki-read_wiki_structure" + results = await LiteLLM_Proxy_MCP_Handler._execute_tool_calls( + tool_server_map={tool_name: "deepwiki"}, + tool_calls=[{"id": "call-1", "function": {"name": tool_name, "arguments": "{}"}}], + user_api_key_auth=None, + ) + + assert results == [{"tool_call_id": "call-1", "result": "ok", "name": tool_name}] + + @pytest.mark.asyncio async def test_get_mcp_tools_from_manager_enables_list_tools_logging(monkeypatch): """ @@ -1074,6 +1226,7 @@ async def test_mcp_follow_up_call_is_stateless_when_store_is_false( ) async def fake_process(**kwargs: Any) -> tuple[list[Any], dict[str, str]]: + assert kwargs["raw_headers"] == {"x-app-id": "follow-up-caller"} return ([], {"foo": "litellm_proxy"}) async def fake_execute(**kwargs: Any) -> list[dict[str, Any]]: @@ -1093,6 +1246,7 @@ async def test_mcp_follow_up_call_is_stateless_when_store_is_false( model="gpt-5", tools=[{"type": "mcp", "server_url": "litellm_proxy", "require_approval": "never"}], litellm_metadata={"guardrails": ["block-all"]}, + secret_fields={"raw_headers": {"x-app-id": "follow-up-caller"}}, store=store, previous_response_id=caller_previous_response_id, ) @@ -1105,3 +1259,39 @@ async def test_mcp_follow_up_call_is_stateless_when_store_is_false( item for item in follow_up_call["input"] if isinstance(item, dict) and item.get("type") == "reasoning" ] assert bool(reasoning_items) is (store is False) + + +@pytest.mark.asyncio +async def test_responses_discovery_logs_sanitized_caller_headers(monkeypatch: pytest.MonkeyPatch): + from litellm.proxy._experimental.mcp_server import operations + from litellm.proxy._experimental.mcp_server import mcp_server_manager + + headers: Final = { + "x-app-id": "app-a", "x-nuid": "user-a", "x-user-id": "identity-a", + "x-mcp-deepwiki-authorization": "upstream-sentinel", "authorization": "proxy-sentinel", + } + manager: Final = types.SimpleNamespace( + get_registry=MagicMock(return_value={}), + get_allowed_mcp_servers=AsyncMock(return_value=[]), + get_mcp_servers_from_ids=MagicMock(return_value=[]), + ) + logger: Final = MagicMock(model_call_details={}) + logger.async_success_handler = AsyncMock() + setup: Final = MagicMock(return_value=(logger, None)) + monkeypatch.setattr(mcp_server_manager, "global_mcp_server_manager", manager) + monkeypatch.setattr(operations, "_get_allowed_mcp_servers", AsyncMock(return_value=[])) + monkeypatch.setattr(operations, "function_setup", setup) + response: Final = ResponsesAPIResponse( + id="resp_test", created_at=1234567891, model="test-model", object="response", + status="completed", output=[], parallel_tool_calls=False, tool_choice="auto", tools=[], + ) + monkeypatch.setattr(responses_main, "aresponses", AsyncMock(return_value=response)) + result: Final = await responses_main.aresponses_api_with_mcp( + input="hi", model="test-model", tools=[{"type": "mcp", "server_url": "litellm_proxy"}], + secret_fields={"raw_headers": headers}, + ) + assert result is response + logger.async_success_handler.assert_awaited_once() + logged: Final = setup.call_args.kwargs["metadata"]["headers"] + assert logged == {"x-app-id": "app-a", "x-nuid": "user-a", "x-user-id": "identity-a"} + assert headers["x-mcp-deepwiki-authorization"] == "upstream-sentinel" diff --git a/tests/test_litellm/responses/test_metadata_codex_callback.py b/tests/test_litellm/responses/test_metadata_codex_callback.py index f151f36be63..d5c411d63db 100644 --- a/tests/test_litellm/responses/test_metadata_codex_callback.py +++ b/tests/test_litellm/responses/test_metadata_codex_callback.py @@ -48,72 +48,6 @@ class MetadataCaptureCallback(CustomLogger): self.event.set() -@pytest.mark.asyncio -async def test_metadata_passed_to_custom_callback_codex_models(): - """ - Test that metadata passed to completion() is available in custom callback - when using codex models (responses API bridge path). - - Codex models have mode=responses and route through responses_api_bridge, - which passes litellm_metadata. The fix ensures this is preserved as - litellm_params.metadata for callback compatibility. - """ - from litellm.types.llms.openai import ResponsesAPIResponse - - mock_response = ResponsesAPIResponse.model_construct( - id="resp-test", - created_at=0, - output=[ - { - "type": "message", - "id": "msg-1", - "status": "completed", - "role": "assistant", - "content": [{"type": "output_text", "text": "Hello!"}], - } - ], - object="response", - model="gpt-5.1-codex", - status="completed", - usage={ - "input_tokens": 5, - "output_tokens": 10, - "total_tokens": 15, - }, - ) - - test_metadata = {"foo": "bar", "trace_id": "test-123"} - callback = MetadataCaptureCallback() - original_callbacks = litellm.callbacks.copy() if litellm.callbacks else [] - litellm.callbacks = [callback] - - try: - with patch( - "litellm.llms.custom_httpx.http_handler.AsyncHTTPHandler.post", - new_callable=AsyncMock, - ) as mock_post: - mock_post.return_value = _make_mock_http_response( - mock_response.model_dump() - ) - # gpt-5.1-codex has mode=responses - routes through responses bridge - await litellm.acompletion( - model="gpt-5.1-codex", - messages=[{"role": "user", "content": "Hello"}], - metadata=test_metadata, - ) - - await asyncio.wait_for(callback.event.wait(), timeout=5.0) - - assert callback.captured_kwargs is not None, "Callback should have been invoked" - - litellm_params = callback.captured_kwargs.get("litellm_params", {}) - metadata = litellm_params.get("metadata") or {} - - assert "foo" in metadata, "metadata['foo'] should be accessible in callback" - assert metadata["foo"] == "bar" - assert metadata.get("trace_id") == "test-123" - finally: - litellm.callbacks = original_callbacks @pytest.mark.asyncio diff --git a/tests/test_litellm/responses/test_responses_api_bridge_flag.py b/tests/test_litellm/responses/test_responses_api_bridge_flag.py index 16135106b41..642495fab86 100644 --- a/tests/test_litellm/responses/test_responses_api_bridge_flag.py +++ b/tests/test_litellm/responses/test_responses_api_bridge_flag.py @@ -66,6 +66,30 @@ class TestUseResponsesApiBridgeFlag: mock_bridge_handler.assert_called_once() + @patch.object( + import_module("litellm.responses.main").litellm_completion_transformation_handler, "response_api_handler" + ) + @patch.object( + import_module("litellm.responses.main").ProviderConfigManager, "get_provider_responses_api_config" + ) + def test_provider_affinity_header_is_forwarded_through_bridge(self, mock_get_config, mock_bridge_handler): + mock_get_config.return_value = litellm.OpenAIResponsesAPIConfig() + mock_bridge_handler.return_value = MagicMock() + + litellm.responses( + model="openai/my-custom-model", + input="Hello", + use_chat_completions_api=True, + litellm_session_id="session-bridge", + provider_affinity_header="X-Conversation-Id", + extra_headers={"X-Customer-Header": "customer-value"}, + litellm_logging_obj=MagicMock(), + ) + + forwarded_headers = mock_bridge_handler.call_args.kwargs["extra_headers"] + assert forwarded_headers["X-Conversation-Id"] == "session-bridge" + assert forwarded_headers["X-Customer-Header"] == "customer-value" + @patch.object( import_module("litellm.responses.main").litellm_completion_transformation_handler, "response_api_handler" ) diff --git a/tests/test_litellm/router_strategy/test_router_routing_groups.py b/tests/test_litellm/router_strategy/test_router_routing_groups.py index 506563a82fb..425f68dda18 100644 --- a/tests/test_litellm/router_strategy/test_router_routing_groups.py +++ b/tests/test_litellm/router_strategy/test_router_routing_groups.py @@ -9,7 +9,8 @@ import asyncio import datetime import time import uuid -from collections.abc import Callable +from collections.abc import Callable, Mapping +from typing import Final, Literal from unittest.mock import patch import pytest @@ -18,7 +19,7 @@ from pydantic import ValidationError import litellm from litellm import Router from litellm.integrations.custom_logger import CustomLogger -from litellm.types.router import RoutingGroup, RoutingStrategy +from litellm.types.router import DeploymentTypedDict, FallbackAccessCheck, RoutingGroup, RoutingStrategy from litellm.utils import Rules, function_setup @@ -1676,3 +1677,475 @@ async def test_group_call_429_cools_down_member_across_retries(): ) cooldown_ids = await _call_and_get_cooldowns(router, "quality") assert "deploy-3" in cooldown_ids + + +def _priority_group( + name: str = "priority-group", primary: int = 1, backup: int = 2 +) -> RoutingGroup: + return RoutingGroup.model_validate({ + "group_name": name, + "models": ["filtered-model", "other-model"], + "routing_strategy": "priority", + "model_priorities": {"filtered-model": primary, "other-model": backup}, + }) + + +def _priority_deployments( + primary_response: str = "primary", primary_blocked: bool = False, backup_response: str = "backup" +) -> list[DeploymentTypedDict]: + return [ + { + **deployment, + "litellm_params": { + **deployment["litellm_params"], + "mock_response": ( + primary_response if deployment["model_name"] == "filtered-model" else backup_response + ), + "order": 10 if deployment["model_name"] == "filtered-model" else 1, + }, + "model_info": { + **deployment["model_info"], + "blocked": primary_blocked and deployment["model_name"] == "filtered-model", + }, + } + for deployment in _model_list() + ] + + +def test_priority_group_affinity_scope_follows_group_aliases_and_settings_reload() -> None: + router: Final = Router( + model_list=_priority_deployments(), + routing_groups=[ + _priority_group(), + RoutingGroup(group_name="legacy", models=["filtered-model"], routing_strategy="simple-shuffle"), + ], + model_group_alias={"priority-alias": "priority-group"}, + ) + requested_models: Final = ( + "priority-group", "priority-alias", "filtered-model", "other-model", "legacy", "missing" + ) + assert tuple(router._is_priority_routing_group(model) for model in requested_models) == ( + True, True, False, False, False, False + ) + + router.update_settings(routing_groups=[{ + "group_name": "priority-group", + "models": ["filtered-model", "other-model"], + "routing_strategy": "simple-shuffle", + }]) + assert tuple(router._is_priority_routing_group(model) for model in requested_models) == (False,) * 6 + + +@pytest.mark.parametrize("asynchronous", [False, True]) +@pytest.mark.parametrize("requested_model", ["priority-group", "priority-alias"]) +@pytest.mark.asyncio +async def test_priority_group_always_uses_primary_when_healthy( + asynchronous: bool, requested_model: str +) -> None: + router: Final = Router( + model_list=_priority_deployments(), + routing_groups=[_priority_group()], + model_group_alias={"priority-alias": "priority-group"}, + num_retries=0, + ) + request: Final = {"model": requested_model, "messages": [{"role": "user", "content": "hi"}]} + response: Final = ( + await router.acompletion(**request) if asynchronous else router.completion(**request) + ) + assert response.choices[0].message.content == "primary" + + +@pytest.mark.parametrize("requested_model", ["priority-group", "priority-alias"]) +@pytest.mark.asyncio +async def test_priority_group_fails_over_without_retries_and_leaves_direct_calls_unchanged( + requested_model: str, +) -> None: + router: Final = Router( + model_list=_priority_deployments(primary_response="litellm.RateLimitError"), + routing_groups=[_priority_group()], + model_group_alias={"priority-alias": "priority-group"}, + num_retries=0, + disable_cooldowns=True, + ) + response: Final = await router.acompletion( + model=requested_model, messages=[{"role": "user", "content": "hi"}] + ) + assert response.choices[0].message.content == "backup" + with pytest.raises(litellm.RateLimitError): + await router.acompletion(model="filtered-model", messages=[{"role": "user", "content": "hi"}]) + + +@pytest.mark.asyncio +async def test_opposite_priority_groups_preserve_deployments_and_legacy_member_policy() -> None: + router: Final = Router( + model_list=_priority_deployments(), + routing_strategy="latency-based-routing", + routing_groups=[ + RoutingGroup(group_name="legacy", models=["filtered-model"], routing_strategy="least-busy"), + _priority_group(), + _priority_group("reverse-group", primary=2, backup=1), + ], + ) + before: Final = router.get_model_list(model_name="filtered-model") + forward: Final = await router.acompletion( + model="priority-group", messages=[{"role": "user", "content": "hi"}] + ) + reverse: Final = await router.acompletion( + model="reverse-group", messages=[{"role": "user", "content": "hi"}] + ) + assert (forward.choices[0].message.content, reverse.choices[0].message.content) == ("primary", "backup") + assert router._get_routing_context("filtered-model")[0] == "least-busy" + assert router._get_routing_context("other-model")[0] == "latency-based-routing" + assert router.get_model_list(model_name="filtered-model") == before + assert all(deployment["litellm_params"]["order"] == 10 for deployment in before) + + +@pytest.mark.parametrize("backup_priority, expected", [(1, "backup"), (2, "primary")]) +@pytest.mark.asyncio +async def test_priority_group_weights_select_only_within_the_first_eligible_level( + backup_priority: int, expected: str +) -> None: + router: Final = Router( + model_list=_priority_deployments(), routing_groups=[_priority_group(backup=backup_priority)] + ) + response: Final = await router.acompletion( + model="priority-group", + messages=[{"role": "user", "content": "hi"}], + _router_weights={"priority-group": {"deploy-1": 0, "deploy-2": 0, "deploy-3": 1}}, + ) + assert response.choices[0].message.content == expected + + +@pytest.mark.asyncio +async def test_priority_group_skips_paused_primary_and_returns_to_it_after_recovery() -> None: + router: Final = Router( + model_list=_priority_deployments(primary_blocked=True), routing_groups=[_priority_group()] + ) + paused: Final = await router.acompletion( + model="priority-group", messages=[{"role": "user", "content": "hi"}] + ) + router.set_model_list(_priority_deployments()) + recovered: Final = await router.acompletion( + model="priority-group", messages=[{"role": "user", "content": "hi"}] + ) + assert (paused.choices[0].message.content, recovered.choices[0].message.content) == ("backup", "primary") + + +@pytest.mark.parametrize("controls", [{"disable_fallbacks": True}, {"max_fallbacks": 0}]) +@pytest.mark.asyncio +async def test_priority_group_respects_request_fallback_controls(controls: dict[str, object]) -> None: + router: Final = Router( + model_list=_priority_deployments(primary_response="litellm.RateLimitError"), + routing_groups=[_priority_group()], + num_retries=0, + disable_cooldowns=True, + ) + with pytest.raises(litellm.RateLimitError): + await router.acompletion( + model="priority-group", messages=[{"role": "user", "content": "hi"}], **controls + ) + + +@pytest.mark.parametrize( + "priorities", + [None, {}, {"filtered-model": 1}, {"filtered-model": 1, "other-model": 2, "extra": 3}], +) +def test_priority_group_requires_exact_member_priorities(priorities: object) -> None: + with pytest.raises(ValidationError): + RoutingGroup.model_validate({ + "group_name": "priority-group", + "models": ["filtered-model", "other-model"], + "routing_strategy": "priority", + "model_priorities": priorities, + }) + + +@pytest.mark.parametrize("priority", [True, 0, -1, 1.5, "1", 9007199254740992]) +def test_priority_group_rejects_invalid_priority_values(priority: object) -> None: + with pytest.raises(ValidationError): + RoutingGroup.model_validate({ + "group_name": "priority-group", + "models": ["filtered-model"], + "routing_strategy": "priority", + "model_priorities": {"filtered-model": priority}, + }) + + +@pytest.mark.parametrize("models", [[], ["filtered-model", "filtered-model"]]) +def test_priority_group_requires_nonempty_unique_members(models: list[str]) -> None: + with pytest.raises(ValidationError): + RoutingGroup.model_validate({ + "group_name": "priority-group", + "models": models, + "routing_strategy": "priority", + "model_priorities": {model: 1 for model in models}, + }) + + +@pytest.mark.parametrize( + "changes", [{"routing_strategy": "simple-shuffle"}, {"routing_strategy_args": {"ttl": 60}}] +) +def test_priority_group_rejects_conflicting_strategy_settings(changes: dict[str, object]) -> None: + with pytest.raises(ValidationError): + RoutingGroup.model_validate({ + "group_name": "priority-group", + "models": ["filtered-model"], + "routing_strategy": "priority", + "model_priorities": {"filtered-model": 1}, + **changes, + }) + + +@pytest.mark.parametrize("group_name", ["filtered-model", "priority-alias"]) +def test_priority_group_rejects_names_shadowed_by_a_model_or_alias(group_name: str) -> None: + with pytest.raises(ValueError, match=r"shadow|collid|conflict"): + Router( + model_list=_priority_deployments(), + routing_groups=[_priority_group(name=group_name)], + model_group_alias={"priority-alias": "filtered-model"}, + ) + + +def test_priority_is_rejected_as_a_top_level_strategy() -> None: + with pytest.raises(ValueError, match="routing_strategy"): + _build_router(routing_strategy="priority") + + +@pytest.mark.asyncio +async def test_priority_group_settings_roundtrip_replaces_the_order() -> None: + router: Final = Router(model_list=_priority_deployments(), routing_groups=[_priority_group()]) + replacement: Final = _priority_group(primary=9007199254740991, backup=1) + router.update_settings(routing_groups=[replacement.model_dump()]) + stored: Final = router.get_settings()["routing_groups"] + assert stored == [replacement.model_dump()] + response: Final = await router.acompletion( + model="priority-group", messages=[{"role": "user", "content": "hi"}] + ) + assert response.choices[0].message.content == "backup" + + +def _priority_auto_router_deployment() -> DeploymentTypedDict: + return { + "model_name": "smart-router", + "litellm_params": { + "model": "auto_router/complexity_router", + "complexity_router_config": { + "classifier_type": "heuristic", + "adaptive": False, + "tiers": { + tier: "priority-group" + for tier in ("SIMPLE", "MEDIUM", "COMPLEX", "REASONING") + }, + }, + "complexity_router_default_model": "filtered-model", + }, + } + + +@pytest.mark.asyncio +async def test_auto_router_selected_priority_group_fails_over_inside_the_group() -> None: + router: Final = Router( + model_list=[ + *_priority_deployments(primary_response="litellm.RateLimitError"), + _priority_auto_router_deployment(), + ], + routing_groups=[_priority_group()], + num_retries=0, + disable_cooldowns=True, + ) + response: Final = await router.acompletion( + model="smart-router", messages=[{"role": "user", "content": "hi"}] + ) + assert response.choices[0].message.content == "backup" + + +@pytest.mark.parametrize("endpoint_request", [{"input": "hi"}, {"messages": [{"role": "user", "content": "hi"}]}]) +@pytest.mark.asyncio +async def test_priority_generic_fallback_keeps_routing_controls_out_of_provider_kwargs( + endpoint_request: dict[str, object], +) -> None: + async def provider(model: str, **provider_kwargs: object) -> str: + assert "_target_order" not in provider_kwargs + assert "model_priorities" not in provider_kwargs + model_info: Final = provider_kwargs["model_info"] + assert isinstance(model_info, dict) + if model_info["id"] != "deploy-3": + raise litellm.RateLimitError(message="primary refused", model=model, llm_provider="openai") + return "backup" + + router: Final = Router( + model_list=_priority_deployments(), + routing_groups=[_priority_group()], + num_retries=0, + disable_cooldowns=True, + ) + response: Final = await router._ageneric_api_call_with_fallbacks( + model="priority-group", original_function=provider, **endpoint_request + ) + assert response == "backup" + + +@pytest.mark.parametrize("provider_model_id", [None, "resolved-downstream-id"]) +@pytest.mark.asyncio +async def test_priority_generic_fallback_dict_preserves_served_model_id(provider_model_id: str | None) -> None: + async def provider(model: str, **provider_kwargs: object) -> dict[str, object]: + model_info: Final = provider_kwargs["model_info"] + assert isinstance(model_info, dict) + if model_info["id"] == "deploy-1": + raise litellm.NotFoundError(message="primary missing", model=model, llm_provider="openai") + assert model_info["id"] == "deploy-3" + return { + "content": "backup", + **({"_hidden_params": {"model_id": provider_model_id}} if provider_model_id is not None else {}), + } + + router: Final = Router( + model_list=_priority_deployments()[::2], + routing_groups=[_priority_group()], + num_retries=0, + disable_cooldowns=True, + ) + outer_metadata: Final[dict[str, object]] = {} + response: Final = await router._ageneric_api_call_with_fallbacks( + model="priority-group", + original_function=provider, + messages=[{"role": "user", "content": "hi"}], + litellm_metadata=outer_metadata, + ) + primary_info: Final = outer_metadata["model_info"] + assert isinstance(primary_info, dict) + assert primary_info["id"] == "deploy-1" + assert response["content"] == "backup" + assert response["_hidden_params"]["model_id"] == (provider_model_id or "deploy-3") + assert response["_hidden_params"]["additional_headers"]["x-litellm-attempted-fallbacks"] == 1 + + +@pytest.mark.asyncio +async def test_priority_group_ignores_cached_backup_affinity() -> None: + from litellm.router_utils.prompt_caching_cache import PromptCachingCache + + router: Final = Router( + model_list=_priority_deployments(), + routing_groups=[_priority_group()], + optional_pre_call_checks=["prompt_caching"], + ) + messages: Final = [{ + "role": "user", + "content": [{"type": "text", "text": "word " * 5000, "cache_control": {"type": "ephemeral"}}], + }] + cache: Final = PromptCachingCache(cache=router.cache) + await cache.async_add_model_id(model_id="deploy-3", messages=messages, tools=None) + assert await cache.async_get_model_id(messages=messages, tools=None) == {"model_id": "deploy-3"} + response: Final = await router.acompletion(model="priority-group", messages=messages) + assert response.choices[0].message.content == "primary" + + +@pytest.mark.asyncio +async def test_priority_group_preserves_responses_continuity_on_a_backup() -> None: + from litellm.responses.utils import ResponsesAPIRequestUtils + + router: Final = Router( + model_list=_priority_deployments(), + routing_groups=[_priority_group()], + optional_pre_call_checks=["responses_api_deployment_check"], + ) + previous_response_id: Final = ResponsesAPIRequestUtils._build_responses_api_response_id( + custom_llm_provider="openai", model_id="deploy-3", response_id="resp-prior" + ) + deployment: Final = await router.async_get_available_deployment( + model="priority-group", input="continue", request_kwargs={"previous_response_id": previous_response_id} + ) + assert deployment["model_info"]["id"] == "deploy-3" + + +def _recording_fallback_gate(allowed: frozenset[str], checked: list[str]) -> FallbackAccessCheck: + async def check(*, model: str, request_kwargs: Mapping[str, object], llm_router: Router) -> bool: + checked.append(model) + return model in allowed + + return check + + +@pytest.mark.parametrize("budget_admits_group", [False, True]) +@pytest.mark.asyncio +async def test_auto_priority_advance_preserves_access_scope_and_checks_paid_group_budget( + budget_admits_group: bool, +) -> None: + access_checks: Final[list[str]] = [] + budget_checks: Final[list[str]] = [] + router: Final = Router( + model_list=[ + *_priority_deployments(primary_response="litellm.RateLimitError"), + _priority_auto_router_deployment(), + ], + routing_groups=[_priority_group()], + num_retries=0, + disable_cooldowns=True, + fallback_access_check=_recording_fallback_gate(frozenset({"smart-router"}), access_checks), + fallback_budget_check=_recording_fallback_gate( + frozenset({"priority-group"}) if budget_admits_group else frozenset(), budget_checks + ), + ) + if budget_admits_group: + response: Final = await router.acompletion( + model="smart-router", messages=[{"role": "user", "content": "hi"}] + ) + assert response.choices[0].message.content == "backup" + else: + with pytest.raises(litellm.RateLimitError): + await router.acompletion(model="smart-router", messages=[{"role": "user", "content": "hi"}]) + assert access_checks == [] + assert budget_checks == ["priority-group"] + + +@pytest.mark.asyncio +async def test_auto_priority_group_exhaustion_still_checks_external_fallback_access() -> None: + access_checks: Final[list[str]] = [] + router: Final = Router( + model_list=[ + *_priority_deployments( + primary_response="litellm.RateLimitError", backup_response="litellm.RateLimitError" + ), + _priority_auto_router_deployment(), + { + **_model_list()[2], + "model_name": "external", + "litellm_params": {**_model_list()[2]["litellm_params"], "mock_response": "external"}, + "model_info": {"id": "external-deployment"}, + }, + ], + routing_groups=[_priority_group()], + fallbacks=[{"priority-group": ["external"]}], + num_retries=0, + disable_cooldowns=True, + fallback_access_check=_recording_fallback_gate(frozenset({"smart-router"}), access_checks), + ) + with pytest.raises(litellm.RateLimitError): + await router.acompletion(model="smart-router", messages=[{"role": "user", "content": "hi"}]) + assert access_checks and set(access_checks) == {"external"} + + +@pytest.mark.parametrize("check_kind", ["access", "budget"]) +@pytest.mark.parametrize("metadata_bucket", ["metadata", "litellm_metadata"]) +@pytest.mark.asyncio +async def test_caller_cannot_spoof_a_priority_group_to_bypass_fallback_gates( + check_kind: Literal["access", "budget"], metadata_bucket: str, +) -> None: + checked: Final[list[str]] = [] + check: Final = _recording_fallback_gate(frozenset({"filtered-model"}), checked) + router: Final = Router( + model_list=_priority_deployments(primary_response="litellm.RateLimitError"), + routing_groups=[_priority_group()], + fallbacks=[{"filtered-model": ["priority-group"]}], + num_retries=0, + disable_cooldowns=True, + fallback_access_check=check if check_kind == "access" else None, + fallback_budget_check=check if check_kind == "budget" else None, + ) + with pytest.raises(litellm.RateLimitError): + await router.acompletion( + model="filtered-model", + messages=[{"role": "user", "content": "hi"}], + **{metadata_bucket: {"pre_routing_selected_model": "priority-group"}}, + ) + assert checked == ["priority-group"] diff --git a/tests/test_litellm/router_utils/test_access_windows.py b/tests/test_litellm/router_utils/test_access_windows.py new file mode 100644 index 00000000000..a797a788b4e --- /dev/null +++ b/tests/test_litellm/router_utils/test_access_windows.py @@ -0,0 +1,190 @@ +from datetime import datetime, time, timezone +from typing import Final + + +from litellm.router_utils.access_windows import ( + access_windows_config_error, + filter_reserved_deployments, + is_window_active, +) +from litellm.types.router import ModelAccessWindow + +_NIGHT_NY: Final = ModelAccessWindow( + start=time(22, 0), + end=time(6, 0), + timezone="America/New_York", + team_ids=("team-nightly",), +) + + +def _window(start: str, end: str, tz: str = "UTC", team_ids=("team-a",)) -> ModelAccessWindow: + return ModelAccessWindow( + start=time.fromisoformat(start), + end=time.fromisoformat(end), + timezone=tz, + team_ids=tuple(team_ids), + ) + + +def _deployment(windows: object = None) -> dict: + if windows is None: + return {"model_info": {}} + return {"model_info": {"access_windows": windows}} + + +def test_same_day_window_active_and_inactive(): + window: Final = _window("09:00", "17:00") + assert is_window_active(window, datetime(2026, 3, 9, 12, 0, tzinfo=timezone.utc)) is True + assert is_window_active(window, datetime(2026, 3, 9, 20, 0, tzinfo=timezone.utc)) is False + + +def test_cross_midnight_window(): + window: Final = _window("22:00", "06:00") + assert is_window_active(window, datetime(2026, 3, 9, 23, 0, tzinfo=timezone.utc)) is True + assert is_window_active(window, datetime(2026, 3, 10, 5, 59, tzinfo=timezone.utc)) is True + assert is_window_active(window, datetime(2026, 3, 9, 12, 0, tzinfo=timezone.utc)) is False + + +def test_start_boundary_inclusive_and_end_boundary_exclusive(): + window: Final = _window("22:00", "06:00") + assert is_window_active(window, datetime(2026, 3, 9, 22, 0, tzinfo=timezone.utc)) is True + assert is_window_active(window, datetime(2026, 3, 10, 6, 0, tzinfo=timezone.utc)) is False + + +def test_dst_spring_forward_gap_uses_real_local_time(): + window: Final = ModelAccessWindow( + start=time(1, 30), + end=time(3, 30), + timezone="America/New_York", + team_ids=("team-a",), + ) + assert is_window_active(window, datetime(2026, 3, 8, 6, 30, tzinfo=timezone.utc)) is True + assert is_window_active(window, datetime(2026, 3, 8, 7, 0, tzinfo=timezone.utc)) is True + assert is_window_active(window, datetime(2026, 3, 8, 7, 30, tzinfo=timezone.utc)) is False + + +def test_naive_now_is_treated_as_utc(): + window: Final = _window("09:00", "17:00") + assert is_window_active(window, datetime(2026, 3, 9, 12, 0)) is True + + +def test_team_in_second_window_is_kept(): + deployments: Final = ( + _deployment([ + {"start": "01:00", "end": "02:00", "timezone": "UTC", "team_ids": ["team-other"]}, + {"start": "20:00", "end": "23:59", "timezone": "UTC", "team_ids": ["team-a"]}, + ]), + ) + result: Final = filter_reserved_deployments( + deployments, "team-a", now=datetime(2026, 3, 9, 21, 0, tzinfo=timezone.utc) + ) + assert result.deployments == deployments + assert result.blocking_window is None + + +def test_unlisted_team_is_dropped_with_blocking_window(): + deployments: Final = (_deployment([_NIGHT_NY.model_dump()]),) + result: Final = filter_reserved_deployments( + deployments, "team-b", now=datetime(2026, 3, 10, 4, 0, tzinfo=timezone.utc) + ) + assert result.deployments == () + assert result.blocking_window == _NIGHT_NY + + +def test_missing_team_id_is_dropped(): + result: Final = filter_reserved_deployments( + (_deployment([_NIGHT_NY.model_dump()]),), + None, + now=datetime(2026, 3, 10, 4, 0, tzinfo=timezone.utc), + ) + assert result.deployments == () + assert result.blocking_window == _NIGHT_NY + + +def test_listed_team_is_kept(): + deployments: Final = (_deployment([_NIGHT_NY.model_dump()]),) + result: Final = filter_reserved_deployments( + deployments, "team-nightly", now=datetime(2026, 3, 10, 4, 0, tzinfo=timezone.utc) + ) + assert result.deployments == deployments + assert result.blocking_window is None + + +def test_deployment_without_windows_kept_for_anyone(): + deployments: Final = (_deployment(),) + result: Final = filter_reserved_deployments( + deployments, None, now=datetime(2026, 3, 10, 4, 0, tzinfo=timezone.utc) + ) + assert result.deployments == deployments + assert result.blocking_window is None + + +def test_inactive_window_keeps_deployment_for_unlisted_team(): + deployments: Final = (_deployment([_NIGHT_NY.model_dump()]),) + result: Final = filter_reserved_deployments( + deployments, "team-b", now=datetime(2026, 3, 10, 16, 0, tzinfo=timezone.utc) + ) + assert result.deployments == deployments + assert result.blocking_window is None + + +def test_unreserved_deployment_survives_for_other_team(): + reserved: Final = _deployment([_NIGHT_NY.model_dump()]) + open_deployment: Final = _deployment() + result: Final = filter_reserved_deployments( + (reserved, open_deployment), + "team-b", + now=datetime(2026, 3, 10, 4, 0, tzinfo=timezone.utc), + ) + assert result.deployments == (open_deployment,) + assert result.blocking_window == _NIGHT_NY + + +def test_config_error_unknown_timezone(): + error: Final = access_windows_config_error( + {"access_windows": [{"start": "22:00", "end": "06:00", "timezone": "Mars/Olympus", "team_ids": ["t"]}]}, + model_name="nightly-model", + ) + assert error is not None + assert "nightly-model" in error + assert "access_windows" in error + assert "Mars/Olympus" in error + + +def test_config_error_bad_time(): + error: Final = access_windows_config_error( + {"access_windows": [{"start": "25:00", "end": "06:00", "timezone": "UTC", "team_ids": ["t"]}]}, + model_name="m", + ) + assert error is not None + assert "access_windows" in error + + +def test_config_error_empty_team_ids(): + error: Final = access_windows_config_error( + {"access_windows": [{"start": "22:00", "end": "06:00", "timezone": "UTC", "team_ids": []}]}, + model_name="m", + ) + assert error is not None + + +def test_config_error_start_equals_end(): + error: Final = access_windows_config_error( + {"access_windows": [{"start": "22:00", "end": "22:00", "timezone": "UTC", "team_ids": ["t"]}]}, + model_name="m", + ) + assert error is not None + + +def test_config_error_none_when_absent(): + assert access_windows_config_error({}, model_name="m") is None + assert access_windows_config_error({"access_windows": None}, model_name="m") is None + + +def test_config_error_offset_aware_time(): + error: Final = access_windows_config_error( + {"access_windows": [{"start": "22:00+05:00", "end": "06:00", "timezone": "UTC", "team_ids": ["t"]}]}, + model_name="m", + ) + assert error is not None + assert "UTC offset" in error diff --git a/tests/test_litellm/router_utils/test_auto_router_tuning_baseline.py b/tests/test_litellm/router_utils/test_auto_router_tuning_baseline.py index 75c115cd3ab..9307668d66f 100644 --- a/tests/test_litellm/router_utils/test_auto_router_tuning_baseline.py +++ b/tests/test_litellm/router_utils/test_auto_router_tuning_baseline.py @@ -33,21 +33,6 @@ _HISTORICAL_FINGERPRINTS: Final = ( {"custom_dimensions": [{"name": "sqlDdl", "weight": 0.4, "patterns": [r"\bCREATE\s{1,4}TABLE\b"]}]}, "814ce0017fc7f60a160b262f658d910e9bdf784e6139a4ba4f1e2657aa203950", ), - ( - { - "tiers": _TIERS, - "dimension_weights": {"codePresence": 0.3}, - "custom_dimensions": [ - { - "name": "internalFrameworks", - "weight": 0.2, - "keywords": ["orbitmesh", "fluxgate"], - "patterns": [r"\bALTER\s{1,4}TABLE\b"], - } - ], - }, - "38970dc9224e265ab38c89674563d8d0537822591f9239b45251db6f5ca6cc39", - ), ) @@ -78,11 +63,9 @@ class TestTuningFingerprint: {"tiers": {"SIMPLE": "x"}} ) - @pytest.mark.parametrize("field", sorted(set(HEURISTIC_V1_TUNING_FIELDS) - {"tier_model_configs"})) + @pytest.mark.parametrize("field", HEURISTIC_V1_TUNING_FIELDS) def test_every_tuning_field_changes_the_fingerprint(self, field: str) -> None: samples: dict[str, object] = { - "tiers": _ALT_TIERS, - "classifier_type": "heuristic_first", "tier_boundaries": {"simple_medium": 0.2, "medium_complex": 0.4, "complex_reasoning": 0.7}, "reasoning_override_min_score": 0.05, "token_thresholds": {"simple": 20, "complex": 500}, @@ -97,9 +80,6 @@ class TestTuningFingerprint: "keyword_tier_rules": [{"keywords": ["urgent"], "tier": "COMPLEX"}], } config: dict[str, object] = {field: samples[field]} - if field == "classifier_type": - config["heuristic_first_max_tier"] = "MEDIUM" - config["classifier_llm_config"] = {"model": "judge"} assert tuning_fingerprint(config) != DEFAULT_TUNING_FINGERPRINT def test_explicit_empty_tier_model_configs_follow_omission(self) -> None: @@ -126,12 +106,33 @@ class TestTuningFingerprint: != historical ) - def test_tier_model_overrides_change_the_fingerprint(self) -> None: + def test_tier_model_overrides_do_not_change_the_fingerprint(self) -> None: plain = tuning_fingerprint({"tiers": {"SIMPLE": "x"}}) with_override = tuning_fingerprint( {"tiers": {"SIMPLE": {"model_name": "x", "litellm_params": {"temperature": 0.1}}}} ) - assert plain != with_override + assert plain == with_override == DEFAULT_TUNING_FINGERPRINT + + @pytest.mark.parametrize("classifier_type", ("heuristic", "heuristic_first", "hybrid")) + def test_model_selection_and_classifier_switching_do_not_claim_tuning(self, classifier_type: str) -> None: + config: Final = { + "classifier_type": classifier_type, + **({"classifier_llm_config": {"model": "judge"}} if classifier_type != "heuristic" else {}), + **({"heuristic_first_max_tier": "MEDIUM"} if classifier_type == "heuristic_first" else {}), + **({"hybrid_boundary_margin": 0.1} if classifier_type == "hybrid" else {}), + "tiers": _ALT_TIERS, + "escalation_keywords": ["LITELLM ESCALATE"], + "tier_model_configs": {"COMPLEX": [{"model_name": "other-strong", "litellm_params": {"temperature": 0.1}}]}, + } + tuned: Final = _router("tuned", {"dimension_weights": {"codePresence": 0.9}}) + model_only: Final = _router("model-only", {"tiers": _TIERS}) + candidate: Final = _router("another", config) + assert tuning_fingerprint(config) == DEFAULT_TUNING_FINGERPRINT + assert tuning_quota_violation(candidate=candidate, others=(tuned, model_only), baselines={}, limit=1) is None + + def test_disabling_or_replacing_escalation_is_still_a_custom_rule(self) -> None: + assert tuning_fingerprint({"escalation_keywords": []}) != DEFAULT_TUNING_FINGERPRINT + assert tuning_fingerprint({"escalation_keywords": ["USE A STRONGER MODEL"]}) != DEFAULT_TUNING_FINGERPRINT def test_non_tuning_fields_do_not_change_the_fingerprint(self) -> None: assert ( @@ -230,17 +231,18 @@ class TestQuota: def test_router_added_after_snapshot_is_mutable_only_when_tuned(self) -> None: baselines = snapshot_tuning_baselines([_router("a", {"tiers": _TIERS})]) assert mutable_tuned_identities([_router("new", {})], baselines) == frozenset() - assert mutable_tuned_identities([_router("new", {"tiers": _TIERS})], baselines) == { - router_identity(_router("new", {})) - } + assert mutable_tuned_identities([_router("new", {"tiers": _TIERS})], baselines) == frozenset() + assert mutable_tuned_identities( + [_router("new", {"tiers": _TIERS, "code_keywords": ["internal-api"]})], baselines + ) == {router_identity(_router("new", {}))} def test_quota_matrix(self) -> None: legacy_a = _router("a", {"tiers": _TIERS}) legacy_b = _router("b", {"tiers": _ALT_TIERS}) baselines = snapshot_tuning_baselines([legacy_a, legacy_b]) edited_a = _router("a", {"tiers": _TIERS, "dimension_weights": {"codePresence": 0.9}}) - edited_b = _router("b", {"tiers": _TIERS}) - new_c = _router("c", {"tiers": _TIERS}) + edited_b = _router("b", {"tiers": _TIERS, "code_keywords": ["internal-api"]}) + new_c = _router("c", {"tiers": _TIERS, "code_keywords": ["internal-api"]}) assert tuning_quota_violation(candidate=edited_a, others=[legacy_b], baselines=baselines, limit=1) is None assert ( @@ -260,7 +262,7 @@ class TestQuota: legacy_a = _router("a", {"tiers": _TIERS}) legacy_b = _router("b", {"tiers": _ALT_TIERS}) baselines = snapshot_tuning_baselines([legacy_a, legacy_b]) - edited_b = _router("b", {"tiers": _TIERS}) + edited_b = _router("b", {"tiers": _TIERS, "code_keywords": ["internal-api"]}) assert tuning_quota_violation(candidate=edited_b, others=[legacy_a], baselines=baselines, limit=1) is None assert ( tuning_quota_violation(candidate=edited_b, others=[legacy_a, edited_b], baselines=baselines, limit=1) @@ -304,5 +306,6 @@ class TestQuota: assert message is not None assert "At most 1 auto-router(s)" in message assert "revert the other changed router to its baseline" in message + assert "Selecting models does not use this allowance" in message assert tuning_limit_violation(held=1, limit=1) is None assert tuning_limit_violation(held=5, limit=None) is None diff --git a/tests/test_litellm/router_utils/test_reasoning_effort_capability.py b/tests/test_litellm/router_utils/test_reasoning_effort_capability.py index adee44aa8a3..4617839c5e3 100644 --- a/tests/test_litellm/router_utils/test_reasoning_effort_capability.py +++ b/tests/test_litellm/router_utils/test_reasoning_effort_capability.py @@ -418,6 +418,25 @@ class TestGpt6AstraAdvertisesItsDocumentedLevels: ) +class TestGpt6SolAndLunaAdvertiseNoneThroughMax: + @pytest.mark.parametrize("model", ["gpt-6-sol", "gpt-6-luna"]) + def test_the_entry_advertises_none_through_max(self, local_model_cost_map, model): + """OpenAI documents none, low, medium (default), high, xhigh and max for both. Unlike + gpt-6-astra they take none.""" + from litellm.utils import _get_model_info_helper + + model_info = dict(_get_model_info_helper(model=model, custom_llm_provider="openai")) + + assert resolve_supported_reasoning_efforts(model_info, deployment_is_mapped=True) == ( + "none", + "low", + "medium", + "high", + "xhigh", + "max", + ) + + class TestNearestDeclaredReasoningEffort: def test_a_declared_level_is_kept(self): assert nearest_declared_reasoning_effort("high", ("none", "high")) == "high" diff --git a/tests/test_litellm/rust_bridge/test_catalog.py b/tests/test_litellm/rust_bridge/test_catalog.py index 82e3766e8a2..45c35dc6802 100644 --- a/tests/test_litellm/rust_bridge/test_catalog.py +++ b/tests/test_litellm/rust_bridge/test_catalog.py @@ -11,6 +11,7 @@ from litellm.rust_bridge.catalog import ( CacheRule, Context, Delivery, + LoggerContext, Route, RouteContext, RouteRule, @@ -53,10 +54,6 @@ def test_shipped_decisions( enabled: Final = environment == "1" if environment is not None else process is not False assert catalog.rollout(context) is Rollout.RUST_OPT_OUT assert catalog.decision(context) is (Decision.RUST_WITH_FALLBACK if enabled else Decision.PYTHON) - elif route in (Route.MESSAGES, Route.TOKEN_COUNTER, Route.TOKENIZER): - enabled: Final = environment == "1" if environment is not None else process is True - assert catalog.rollout(context) is Rollout.RUST_OPT_IN - assert catalog.decision(context) is (Decision.RUST_WITH_FALLBACK if enabled else Decision.PYTHON) elif route is Route.TRANSCRIPTION and provider == "bedrock": assert catalog.rollout(context) is Rollout.RUST_REQUIRED assert catalog.decision(context) is Decision.RUST_REQUIRED @@ -93,6 +90,13 @@ def test_backend_rollouts_stay_on_python_when_global_rust_is_enabled( assert catalog.decision(context) is Decision.PYTHON +def test_logger_rollout_obeys_the_global_switch() -> None: + assert catalog.rollout(LoggerContext()) is Rollout.RUST_OPT_IN + assert catalog.decision(LoggerContext()) is Decision.PYTHON + configuration.rust(True) + assert catalog.decision(LoggerContext()) is Decision.RUST_WITH_FALLBACK + + def test_response_cache_rules_select_the_whole_backend_runtime() -> None: rules: Final = ( CacheRule(Rollout.RUST_REQUIRED, backends=frozenset({"local"})), diff --git a/tests/test_litellm/rust_bridge/test_logger.py b/tests/test_litellm/rust_bridge/test_logger.py new file mode 100644 index 00000000000..aff385b9344 --- /dev/null +++ b/tests/test_litellm/rust_bridge/test_logger.py @@ -0,0 +1,137 @@ +import logging +from typing import Final + +import pytest + +import litellm +from litellm._logging import ( + DiagnosticProcessingFilter, + _python_process_diagnostic, + redact_secrets, + session_id_var, + trace_id_var, + verbose_logger, +) +from litellm.constants import MINIMUM_CUSTOM_KEY_LENGTH +from litellm.litellm_core_utils.secret_redaction import ( + _python_redact_internal_details, + _python_redact_string, + _python_redact_structured_value, +) +from litellm.rust_bridge import diagnostics, logger + + +def test_native_records_preserve_metadata_and_redact_before_custom_handlers( + caplog: pytest.LogCaptureFixture, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setattr(verbose_logger, "handlers", []) + secret: Final = "sk-" + "a" * 48 + message: Final = f"Authorization: Bearer {secret}" + with caplog.at_level(logging.WARNING, logger="LiteLLM"): + logger.emit( + logging.WARNING, message, "native.rs", 42, "litellm_http", {"retry": True, "api_key": secret}, ("", "") + ) + + record: Final = caplog.records[0] + assert len(caplog.records) == 1 + assert record.getMessage() == redact_secrets(message) + assert secret not in record.getMessage() + assert (record.pathname, record.lineno, record.funcName) == ("native.rs", 42, "litellm_http") + assert record.__dict__["rust_fields"]["retry"] is True + assert secret not in str(record.__dict__["rust_fields"]) + + +def test_native_context_is_scoped_and_respects_correlation_setting( + caplog: pytest.LogCaptureFixture, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setattr(litellm, "request_correlation_in_logs", True) + context_before: Final = logger.context() + with caplog.at_level(logging.WARNING, logger="LiteLLM"): + logger.emit(logging.WARNING, "native", "native.rs", 1, "litellm_http", {}, ("session", "trace")) + monkeypatch.setattr(litellm, "request_correlation_in_logs", False) + logger.emit(logging.WARNING, "disabled", "native.rs", 2, "litellm_http", {}, ("hidden", "hidden")) + + first, second = caplog.records + assert (first.__dict__["session_id"], first.__dict__["trace_id"]) == ("session", "trace") + assert "session_id" not in second.__dict__ + assert "trace_id" not in second.__dict__ + assert (session_id_var.get(), trace_id_var.get()) == context_before + + +def test_native_logging_observes_level_changes(caplog: pytest.LogCaptureFixture) -> None: + with caplog.at_level(logging.ERROR, logger="LiteLLM"): + assert not logger.enabled(logging.WARNING) + logger.emit(logging.WARNING, "filtered", "native.rs", 1, "litellm_http", {}, ("", "")) + with caplog.at_level(logging.WARNING, logger="LiteLLM"): + assert logger.enabled(logging.WARNING) + logger.emit(logging.WARNING, "visible", "native.rs", 1, "litellm_http", {}, ("", "")) + + assert [record.getMessage() for record in caplog.records] == ["visible"] + + +@pytest.mark.parametrize( + "text", + ( + "Authorization: Bearer abcdefghijklmnop", + "s3_secret_access_key=secret123", + "postgres://user:pass@database.internal/name", + '{"type":"service_account","private_key":"secret123"}', + "GET /v1?key=abcdefghij&page=2", + ), +) +def test_native_credential_patterns_match_python(text: str) -> None: + pytest.importorskip("litellm.rust_bridge._native") + from litellm.rust_bridge._native import NativeDiagnosticProcessor + + processor: Final = NativeDiagnosticProcessor(MINIMUM_CUSTOM_KEY_LENGTH) + assert processor.redact_text(text) == _python_redact_string(text) + assert processor.redact_structured_text("api_key", "secret123") == _python_redact_structured_value( + "api_key", "secret123" + ) + + +def test_native_client_redaction_matches_python() -> None: + pytest.importorskip("litellm.rust_bridge._native") + from litellm.rust_bridge._native import NativeDiagnosticProcessor + + text: Final = "error at /etc/secrets/config on db.internal\nTraceback (most recent call last):\nsecret" + processor: Final = NativeDiagnosticProcessor(MINIMUM_CUSTOM_KEY_LENGTH) + assert processor.redact_client_message(text) == _python_redact_internal_details(text) + + +def test_native_diagnostic_batch_matches_python() -> None: + pytest.importorskip("litellm.rust_bridge._native") + from litellm.rust_bridge._native import NativeDiagnosticProcessor + + message: Final = "é" * 110 + "sk-" + "q" * 48 + "界" * 1000 + exception: Final = "document=" + "Q" * 200 + stack: Final = "api_key=secret123" + leaves: Final = (("api_key", "secret123"), (None, "safe")) + processor: Final = NativeDiagnosticProcessor(MINIMUM_CUSTOM_KEY_LENGTH) + rust: Final = processor.process_diagnostic(message, exception, stack, leaves, (True, 20, 500)) + python: Final = _python_process_diagnostic(message, exception, stack, leaves, True, 20, 500) + + assert rust[:3] == python[:3] + assert tuple(rust[3]) == python[3] + assert rust[4] == python[4] + assert "sk-qq" not in rust[0] + assert len(rust[0]) <= 500 + assert rust[3] == ["REDACTED", "safe"] + + +def test_missing_native_diagnostic_processor_falls_back_before_record_mutation( + monkeypatch: pytest.MonkeyPatch, +) -> None: + monkeypatch.setenv("LITELLM_RUST", "1") + diagnostics.PROCESSOR.override(None) + try: + record: Final = logging.makeLogRecord({"name": "LiteLLM", "levelno": logging.INFO, "msg": "api_key=secret123"}) + assert DiagnosticProcessingFilter().filter(record) is True + assert record.getMessage() == "REDACTED" + finally: + diagnostics.PROCESSOR.reset() + + +def test_unsupported_unicode_uses_safe_python_redaction(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setenv("LITELLM_RUST", "1") + assert redact_secrets("broken\ud800 api_key=secret123") == "broken\ud800 REDACTED" diff --git a/tests/test_litellm/rust_bridge/test_settings.py b/tests/test_litellm/rust_bridge/test_settings.py index 3a86a69ed8b..216961ab640 100644 --- a/tests/test_litellm/rust_bridge/test_settings.py +++ b/tests/test_litellm/rust_bridge/test_settings.py @@ -1,4 +1,3 @@ -import logging from typing import Final import httpx @@ -11,6 +10,7 @@ from litellm.rust_bridge import settings from litellm.secret_managers.main import get_secret_str from litellm.types.secret_managers.main import KeyManagementSettings, KeyManagementSystem + def test_url_policy_reads_the_litellm_globals(monkeypatch: pytest.MonkeyPatch) -> None: monkeypatch.setattr(litellm, "user_url_validation", False) monkeypatch.setattr(litellm, "user_url_allowed_hosts", ["docs.internal:8443"]) @@ -57,13 +57,6 @@ def test_http_settings_ignores_environment_overrides(monkeypatch: pytest.MonkeyP assert result.ssl_verify is True -def test_warn_reaches_the_litellm_logger(caplog: pytest.LogCaptureFixture) -> None: - with caplog.at_level(logging.WARNING, logger="LiteLLM"): - settings.warn("ssl_ecdh_curve 'secp521r1' is not supported") - - assert [record.getMessage() for record in caplog.records] == ["ssl_ecdh_curve 'secp521r1' is not supported"] - - class _VaultSecrets(CustomSecretManager): def __init__(self, secrets: dict[str, str]) -> None: super().__init__(secret_manager_name="rust_bridge_settings_test") diff --git a/tests/test_litellm/rust_bridge/test_token_counter.py b/tests/test_litellm/rust_bridge/test_token_counter.py index 3da291c898d..3af7127a9b3 100644 --- a/tests/test_litellm/rust_bridge/test_token_counter.py +++ b/tests/test_litellm/rust_bridge/test_token_counter.py @@ -1,8 +1,7 @@ -"""Tests for the Rust input token counter bridge. +"""Tests for the Rust input token counter bridge, called directly rather than through the route catalog. -The native factory is dependency-injected through ``TOKEN_COUNTER.override`` -so the fallback cases run without the compiled extension present. The parity -cases need the extension and are skipped when it is not built. +The factory is passed into ``native_count`` so the caching cases run without the compiled extension +present. The parity cases need the extension and are skipped when it is not built. """ from __future__ import annotations @@ -16,8 +15,7 @@ import pytest import litellm from litellm.constants import TIKTOKEN_ENCODE_CHUNK_SIZE_CHARS from litellm.litellm_core_utils.token_counter import openai_tokenizer_encoding -from litellm.proxy.spend_tracking.input_tokens import count_input_tokens, count_input_tokens_for_model -from litellm.rust_bridge import bindings, configuration +from litellm.proxy.spend_tracking.input_tokens import count_input_tokens_for_model from litellm.rust_bridge import token_counter as bridge from litellm.rust_bridge import tokenizer as tokenizer_dispatch from litellm.rust_bridge._native import Tokenizer @@ -38,14 +36,6 @@ def _counted(body: dict[str, object], model: str) -> tuple[bytes, dict[str, obje return raw, json.loads(raw) -class _FakeDeclined(Exception): - pass - - -class _FakeUpstream(Exception): - pass - - class _FakeTokenizer: """Stands in for one shared native `Tokenizer`; only its name identifies it.""" @@ -54,29 +44,6 @@ class _FakeTokenizer: self.json = json -def _fake_native_tokenizers(monkeypatch: pytest.MonkeyPatch, anthropic_json: str | None = None) -> None: - """Point the counter's tokenizer lookups at fakes while the bridge is faked; the codec path - keeps falling back to Python. Parity tests that restore the real extension get the real - lookups back.""" - fakes: Final = {name: _FakeTokenizer(name) for name in ("cl100k_base", "o200k_base")} - anthropic: Final = _FakeTokenizer("anthropic", anthropic_json) - real_encoding: Final = tokenizer_dispatch.native_encoding - real_anthropic: Final = tokenizer_dispatch.native_anthropic - - def faked() -> bool: - return isinstance(bindings.get_native_bridge(), _FakeNative) - - monkeypatch.setattr( - tokenizer_dispatch, "native_encoding", lambda name: fakes[name] if faked() else real_encoding(name) - ) - monkeypatch.setattr(tokenizer_dispatch, "native_anthropic", lambda: anthropic if faked() else real_anthropic()) - - -class _FakeNative: - RustBridgeDeclined = _FakeDeclined - RustUpstreamError = _FakeUpstream - - class _RecordingCounter: def __init__(self, tokenizer: _FakeTokenizer, fast: bool) -> None: self.tokenizer = tokenizer @@ -100,57 +67,25 @@ class _RecordingFactory: return counter -class _RaisingCounter: - def __init__(self, error: Exception) -> None: - self.error = error - - async def acount_request(self, body: bytes) -> object: - raise self.error - - -class _RaisingFactory: - """Every counter it builds, for either tokenizer, raises `error` on count.""" - - def __init__(self, error: Exception) -> None: - self.error = error - - def from_tokenizer(self, tokenizer: _FakeTokenizer, fast: bool = False) -> _RaisingCounter: - return _RaisingCounter(self.error) - - @pytest.fixture(autouse=True) -def _reset_bridge(monkeypatch: pytest.MonkeyPatch): - bridge.TOKEN_COUNTER.reset() +def _reset_counters(): bridge._counter.cache_clear() - configuration.reset_rust_configuration() - monkeypatch.setattr(bindings, "get_native_bridge", lambda: _FakeNative()) - _fake_native_tokenizers(monkeypatch, anthropic_json=claude_json_str) yield - bridge.TOKEN_COUNTER.reset() bridge._counter.cache_clear() - configuration.reset_rust_configuration() + + +@pytest.fixture +def fake_tokenizers(monkeypatch: pytest.MonkeyPatch) -> None: + """Point the counter's tokenizer lookups at fakes so a recording factory sees which one it was built over.""" + fakes: Final = {name: _FakeTokenizer(name) for name in ("cl100k_base", "o200k_base")} + anthropic: Final = _FakeTokenizer("anthropic", claude_json_str) + monkeypatch.setattr(tokenizer_dispatch, "native_encoding", fakes.__getitem__) + monkeypatch.setattr(tokenizer_dispatch, "native_anthropic", lambda: anthropic) @pytest.mark.asyncio -@pytest.mark.parametrize("tokenizer", TOKENIZERS) -async def test_disabled_bridge_never_constructs_a_counter(tokenizer: bridge.RustTokenizer) -> None: +async def test_native_count_returns_typed_count_and_reuses_one_counter(fake_tokenizers: None) -> None: factory: Final = _RecordingFactory() - litellm.rust(False) - bridge.TOKEN_COUNTER.override(factory) - model: Final = MODEL_BY_TOKENIZER[tokenizer] - raw, request_body = _counted({"messages": [{"role": "user", "content": "hello"}]}, model) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=raw, models=(model,)) - - assert counts[model] == count_input_tokens_for_model(request_body=request_body, model=model) - assert factory.counters == [] - - -@pytest.mark.asyncio -async def test_enabled_bridge_returns_typed_count_and_reuses_one_counter() -> None: - factory: Final = _RecordingFactory() - litellm.rust(True) - bridge.TOKEN_COUNTER.override(factory) first: Final = await bridge.native_count(factory, "anthropic", BODY) second: Final = await bridge.native_count(factory, "anthropic", BODY) @@ -166,10 +101,10 @@ async def test_enabled_bridge_returns_typed_count_and_reuses_one_counter() -> No @pytest.mark.asyncio @pytest.mark.parametrize("tokenizer", ("cl100k_base", "o200k_base")) -async def test_tiktoken_counter_is_built_over_the_shared_encoding_once(tokenizer: bridge.RustTokenizer) -> None: +async def test_tiktoken_counter_is_built_over_the_shared_encoding_once( + fake_tokenizers: None, tokenizer: bridge.RustTokenizer +) -> None: factory: Final = _RecordingFactory() - litellm.rust(True) - bridge.TOKEN_COUNTER.override(factory) first: Final = await bridge.native_count(factory, tokenizer, BODY) second: Final = await bridge.native_count(factory, tokenizer, BODY) @@ -183,10 +118,8 @@ async def test_tiktoken_counter_is_built_over_the_shared_encoding_once(tokenizer @pytest.mark.asyncio -async def test_each_tokenizer_gets_its_own_cached_counter() -> None: +async def test_each_tokenizer_gets_its_own_cached_counter(fake_tokenizers: None) -> None: factory: Final = _RecordingFactory() - litellm.rust(True) - bridge.TOKEN_COUNTER.override(factory) await bridge.native_count(factory, "anthropic", BODY) await bridge.native_count(factory, "cl100k_base", BODY) @@ -198,43 +131,6 @@ async def test_each_tokenizer_gets_its_own_cached_counter() -> None: assert [len(counter.bodies) for counter in factory.counters] == [2, 1, 2] -@pytest.mark.asyncio -async def test_missing_native_module_falls_back(monkeypatch: pytest.MonkeyPatch) -> None: - litellm.rust(True) - monkeypatch.setattr(bindings, "get_native_bridge", lambda: None) - raw, request_body = _counted({"messages": [{"role": "user", "content": "hello"}]}, MODEL) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=raw, models=(MODEL,)) - - assert counts[MODEL] == count_input_tokens_for_model(request_body=request_body, model=MODEL) - - -@pytest.mark.asyncio -@pytest.mark.parametrize("tokenizer", TOKENIZERS) -async def test_declined_request_falls_back(tokenizer: bridge.RustTokenizer) -> None: - litellm.rust(True) - bridge.TOKEN_COUNTER.override(_RaisingFactory(_FakeDeclined("request has no messages"))) - model: Final = MODEL_BY_TOKENIZER[tokenizer] - raw, request_body = _counted({"messages": [{"role": "user", "content": "hello"}]}, model) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=raw, models=(model,)) - - assert counts[model] == count_input_tokens_for_model(request_body=request_body, model=model) - - -@pytest.mark.asyncio -@pytest.mark.parametrize("tokenizer", TOKENIZERS) -async def test_runtime_failure_falls_back(tokenizer: bridge.RustTokenizer) -> None: - litellm.rust(True) - bridge.TOKEN_COUNTER.override(_RaisingFactory(RuntimeError("encode failed"))) - model: Final = MODEL_BY_TOKENIZER[tokenizer] - raw, request_body = _counted({"messages": [{"role": "user", "content": "hello"}]}, model) - - counts: Final = await count_input_tokens(request_body=request_body, raw_body=raw, models=(model,)) - - assert counts[model] == count_input_tokens_for_model(request_body=request_body, model=model) - - @pytest.mark.parametrize( ("model", "expected"), ( @@ -252,7 +148,6 @@ async def test_runtime_failure_falls_back(tokenizer: bridge.RustTokenizer) -> No ("gpt-4o", "o200k_base"), ("gpt-4o-mini", "o200k_base"), ("gpt-4o-2024-08-06", "o200k_base"), - ("chatgpt-4o-latest", "o200k_base"), ("gpt-4.1", "o200k_base"), ("gpt-5", "o200k_base"), ("gpt-5-mini", "o200k_base"), @@ -416,39 +311,34 @@ PARITY_MODELS: Final[tuple[tuple[str, bridge.RustTokenizer], ...]] = ( @pytest.mark.parametrize(("model", "tokenizer"), PARITY_MODELS) @pytest.mark.parametrize("request_body", PARITY_REQUESTS) async def test_native_count_matches_python_budget_counter( - monkeypatch: pytest.MonkeyPatch, request_body: dict[str, object], model: str, tokenizer: bridge.RustTokenizer + request_body: dict[str, object], model: str, tokenizer: bridge.RustTokenizer ) -> None: native: Final = pytest.importorskip("litellm.rust_bridge._native") - monkeypatch.setattr(bindings, "get_native_bridge", lambda: native) - litellm.rust(True) body: Final = json.dumps(request_body).replace(MODEL, model) + parsed: Final = json.loads(body) - request_body_parsed: Final = json.loads(body) - counts: Final = await count_input_tokens(request_body=request_body_parsed, raw_body=body.encode(), models=(model,)) - python_count: Final = count_input_tokens_for_model(request_body=request_body_parsed, model=model) + counted: Final = await bridge.native_count(native.TokenCounter, tokenizer, body.encode()) - assert counts[model] == python_count + assert counted.input_tokens == count_input_tokens_for_model(request_body=parsed, model=model) @pytest.mark.asyncio @pytest.mark.parametrize(("model", "tokenizer"), ((CL100K_MODEL, "cl100k_base"), (O200K_MODEL, "o200k_base"))) async def test_tiktoken_counts_long_text_exactly_where_python_chunks( - monkeypatch: pytest.MonkeyPatch, model: str, tokenizer: bridge.RustTokenizer + model: str, tokenizer: bridge.RustTokenizer ) -> None: """Python encodes tiktoken text in fixed-size chunks (drift of up to one token per chunk boundary); Rust does not.""" native: Final = pytest.importorskip("litellm.rust_bridge._native") - monkeypatch.setattr(bindings, "get_native_bridge", lambda: native) - litellm.rust(True) text: Final = "x " * 20_000 body: Final = {"model": model, "messages": [{"role": "user", "content": text}]} encoding: Final = Tokenizer.from_tiktoken(tokenizer) exact: Final = 3 + encoding.count("user") + encoding.count(text) + 3 chunks: Final = -(-len(text) // TIKTOKEN_ENCODE_CHUNK_SIZE_CHARS) - counts: Final = await count_input_tokens(request_body=body, raw_body=json.dumps(body).encode(), models=(model,)) + counted: Final = await bridge.native_count(native.TokenCounter, tokenizer, json.dumps(body).encode()) python_count: Final = count_input_tokens_for_model(request_body=body, model=model) - assert counts[model] == exact + assert counted.input_tokens == exact assert python_count is not None assert exact < python_count <= exact + chunks @@ -470,14 +360,10 @@ DECLINED_REQUESTS: Final[tuple[dict[str, object], ...]] = ( @pytest.mark.parametrize("tokenizer", TOKENIZERS) @pytest.mark.parametrize("request_body", DECLINED_REQUESTS) async def test_native_declines_shapes_python_prices_differently( - monkeypatch: pytest.MonkeyPatch, request_body: dict[str, object], tokenizer: bridge.RustTokenizer + request_body: dict[str, object], tokenizer: bridge.RustTokenizer ) -> None: native: Final = pytest.importorskip("litellm.rust_bridge._native") - monkeypatch.setattr(bindings, "get_native_bridge", lambda: native) - litellm.rust(True) - model: Final = MODEL_BY_TOKENIZER[tokenizer] - raw, parsed = _counted(request_body, model) + raw, _ = _counted(request_body, MODEL_BY_TOKENIZER[tokenizer]) - counts: Final = await count_input_tokens(request_body=parsed, raw_body=raw, models=(model,)) - - assert counts.get(model) == count_input_tokens_for_model(request_body=parsed, model=model) + with pytest.raises(native.RustBridgeDeclined): + await bridge.native_count(native.TokenCounter, tokenizer, raw) diff --git a/tests/test_litellm/rust_bridge/test_tokenizer.py b/tests/test_litellm/rust_bridge/test_tokenizer.py index 0de7ad50b1e..188aa81093f 100644 --- a/tests/test_litellm/rust_bridge/test_tokenizer.py +++ b/tests/test_litellm/rust_bridge/test_tokenizer.py @@ -1,134 +1,49 @@ -from collections.abc import Generator from typing import Final import pytest import tiktoken from tokenizers import Tokenizer -import litellm from litellm.litellm_core_utils.tokenizer import HuggingFaceTokenizer, OpenAIEncoding -from litellm.rust_bridge import configuration, tokenizer -from litellm.utils import _select_tokenizer +from litellm.rust_bridge import tokenizer +from litellm.utils import claude_json_str from tests.test_litellm.litellm_core_utils.test_decode_special_tokens import TOKENIZER_JSON - -@pytest.fixture(autouse=True) -def isolated_configuration(monkeypatch: pytest.MonkeyPatch) -> Generator[None]: - monkeypatch.delenv("LITELLM_RUST", raising=False) - configuration.reset_rust_configuration() - yield - tokenizer.TOKENIZER.reset() - configuration.reset_rust_configuration() +TEXTS: Final = ("hello <|endoftext|> world", "café 漢字 🙂", " def f():\n return 1\n", "hello again") -@pytest.mark.parametrize("environment", (None, "0", "1")) -@pytest.mark.parametrize("process", (None, False, True)) -def test_tokenizer_factories_follow_rollout( - monkeypatch: pytest.MonkeyPatch, environment: str | None, process: bool | None -) -> None: - configuration.rust(process) - if environment is not None: - monkeypatch.setenv("LITELLM_RUST", environment) - enabled: Final = environment == "1" if environment is not None else process is True - encoding: Final = tokenizer.get_encoding("cl100k_base") - custom: Final = litellm.create_tokenizer(TOKENIZER_JSON) +@pytest.mark.parametrize("name", ("cl100k_base", "o200k_base")) +@pytest.mark.parametrize("text", TEXTS) +def test_native_encoding_matches_tiktoken(name: str, text: str) -> None: + native: Final = tokenizer.native_encoding(name) + if native is None: + pytest.skip("native extension is not built") + encoding: Final = OpenAIEncoding.wrap(native) + reference: Final = tiktoken.get_encoding(name) + + ids: Final = encoding.encode(text, disallowed_special=()) + assert ids == reference.encode(text, disallowed_special=()) + assert encoding.decode(ids) == reference.decode(ids) + + +@pytest.mark.parametrize("text", TEXTS) +def test_native_anthropic_tokenizer_matches_python(text: str) -> None: + native: Final = tokenizer.native_anthropic() + if native is None: + pytest.skip("native extension is not built") + reference: Final = Tokenizer.from_str(claude_json_str) + + ids: Final = HuggingFaceTokenizer(native).encode(text).ids + assert ids == reference.encode(text).ids + assert HuggingFaceTokenizer(native).decode(ids) == reference.decode(ids) + + +def test_native_custom_tokenizer_matches_python() -> None: + factory: Final = tokenizer.TOKENIZER.load() + if factory is None: + pytest.skip("native extension is not built") + native: Final = HuggingFaceTokenizer(factory.from_json(TOKENIZER_JSON)) reference: Final = Tokenizer.from_str(TOKENIZER_JSON) - assert isinstance(encoding, OpenAIEncoding if enabled else tiktoken.Encoding) - assert isinstance(custom["tokenizer"], HuggingFaceTokenizer if enabled else Tokenizer) - assert encoding.encode("café 漢字 🙂") == tiktoken.get_encoding(encoding.name).encode("café 漢字 🙂") - assert litellm.encode(text="Hello World", custom_tokenizer=custom) == reference.encode("Hello World").ids - assert litellm.token_counter(text="Hello World", custom_tokenizer=custom) == len(reference.encode("Hello World")) - - -def test_missing_native_binding_keeps_python_tokenizer_api() -> None: - configuration.rust(True) - tokenizer.TOKENIZER.override(None) - encoding: Final = tokenizer.get_encoding("cl100k_base") - custom: Final = litellm.create_tokenizer(TOKENIZER_JSON)["tokenizer"] - - assert isinstance(encoding, tiktoken.Encoding) - assert isinstance(custom, Tokenizer) - custom.enable_padding(pad_id=0, pad_token="[UNK]") - assert [item.ids for item in custom.encode_batch(["Hello", "Hello World"])] == [[3, 1, 0], [3, 1, 2]] - - -def test_cached_selection_follows_backend_changes(monkeypatch: pytest.MonkeyPatch) -> None: - monkeypatch.setattr(litellm, "disable_hf_tokenizer_download", True) - configuration.rust(True) - native: Final = _select_tokenizer("dispatch-fixture")["tokenizer"] - configuration.rust(False) - python: Final = _select_tokenizer("dispatch-fixture")["tokenizer"] - - assert isinstance(native, OpenAIEncoding) - assert isinstance(python, tiktoken.Encoding) - assert native.encode("hello") == python.encode("hello") - - -def test_declined_native_factory_falls_back_before_tokenizing() -> None: - from litellm.rust_bridge._native import RustBridgeDeclined - - class UnavailableTokenizer: - @staticmethod - def from_json(json: str) -> None: - raise RustBridgeDeclined("huggingface feature is disabled") - - configuration.rust(True) - binding: Final = tokenizer._as_factory(UnavailableTokenizer) - tokenizer.TOKENIZER.override(binding) - custom: Final = litellm.create_tokenizer(TOKENIZER_JSON) - - assert isinstance(custom["tokenizer"], Tokenizer) - assert ( - litellm.decode(tokens=litellm.encode(text="Hello World", custom_tokenizer=custom), custom_tokenizer=custom) - == "Hello World" - ) - - -@pytest.mark.parametrize( - ("model", "text"), - ( - ("gpt-4o", "hello <|endoftext|> world"), - ("gpt-3.5-turbo", "café 漢字 🙂"), - ("text-davinci-003", " def f():\n return 1\n"), - ("tokenizer-parity-fixture", "hello again"), - ), -) -def test_public_token_api_is_identical_across_backends(monkeypatch: pytest.MonkeyPatch, model: str, text: str) -> None: - """`litellm.token_counter`, `encode` and `decode` return the same values whichever backend - the catalog picks; only the object types differ.""" - monkeypatch.setattr(litellm, "anthropic_models", {*litellm.anthropic_models, "tokenizer-parity-fixture"}) - messages: Final = [{"role": "user", "content": text}, {"role": "assistant", "content": "ok"}] - - def observe() -> tuple[int, int, list[int], str]: - ids: Final = litellm.encode(model=model, text=text) - return ( - litellm.token_counter(model=model, text=text), - litellm.token_counter(model=model, messages=messages), - ids, - litellm.decode(model=model, tokens=ids), - ) - - configuration.rust(False) - python: Final = observe() - configuration.rust(True) - rust: Final = observe() - - assert rust == python - - -def test_cached_huggingface_tokenizers_follow_backend_changes(monkeypatch: pytest.MonkeyPatch) -> None: - from litellm.litellm_core_utils.tokenizer import HuggingFaceTokenizer as RustHuggingFaceTokenizer - from litellm.utils import _load_huggingface_tokenizer - - monkeypatch.setattr(litellm, "anthropic_models", {*litellm.anthropic_models, "tokenizer-cache-fixture"}) - _load_huggingface_tokenizer.cache_clear() - configuration.rust(True) - native: Final = _select_tokenizer("tokenizer-cache-fixture")["tokenizer"] - configuration.rust(False) - python: Final = _select_tokenizer("tokenizer-cache-fixture")["tokenizer"] - configuration.rust(True) - - assert isinstance(native, RustHuggingFaceTokenizer) - assert isinstance(python, Tokenizer) - assert _select_tokenizer("tokenizer-cache-fixture")["tokenizer"] is native + assert native.encode("Hello World").ids == reference.encode("Hello World").ids + assert native.decode(reference.encode("Hello World").ids) == reference.decode(reference.encode("Hello World").ids) diff --git a/tests/test_litellm/secret_managers/test_aws_secret_manager_rotation.py b/tests/test_litellm/secret_managers/test_aws_secret_manager_rotation.py index 4a4cec6bf77..af1380f6fd1 100644 --- a/tests/test_litellm/secret_managers/test_aws_secret_manager_rotation.py +++ b/tests/test_litellm/secret_managers/test_aws_secret_manager_rotation.py @@ -1,11 +1,17 @@ -from collections.abc import Mapping +import json +from collections.abc import Iterator, Mapping +from contextlib import contextmanager from dataclasses import dataclass, replace from types import MappingProxyType from typing import Final, TypeAlias +import httpx import pytest +import litellm +from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler from litellm.secret_managers.aws_secret_manager_v2 import AWSSecretsManagerV2 +from litellm.types.llms.custom_http import httpxSpecialProvider OptionalParams: TypeAlias = Mapping[str, object] | None @@ -204,3 +210,173 @@ async def test_rotate_secret_different_names_persists_requested_value_and_delete assert manager.storage.values[new_name] == new_value assert current_name not in manager.storage.values assert manager.storage.values[unrelated_secret_name] == unrelated_value + + +@dataclass(frozen=True, slots=True) +class FakeSecretsManagerState: + live: Mapping[str, str] + scheduled_for_deletion: frozenset[str] = frozenset() + actions: tuple[str, ...] = () + descriptions: Mapping[str, str] = MappingProxyType({}) + failing_actions: frozenset[str] = frozenset() + + +class FakeSecretsManagerService: + def __init__(self, state: FakeSecretsManagerState) -> None: + self.state = state + + def handle(self, request: httpx.Request) -> httpx.Response: + action: Final = request.headers["X-Amz-Target"].removeprefix("secretsmanager.") + body: Final = json.loads(request.content) + name: Final = str(body.get("Name") or body.get("SecretId")) + self.state = replace(self.state, actions=(*self.state.actions, f"{action}:{name}")) + if action in self.state.failing_actions: + return self._error("InternalServiceError", f"injected failure for {action}") + match action: + case "CreateSecret": + if name in self.state.live: + return self._error("ResourceExistsException", f"The secret {name} already exists") + self.state = replace( + self.state, + live=MappingProxyType({**self.state.live, name: str(body["SecretString"])}), + descriptions=MappingProxyType({**self.state.descriptions, name: str(body.get("Description", ""))}), + ) + return httpx.Response(200, json={"ARN": f"arn:fake:{name}", "Name": name}) + case "UpdateSecret": + if name in self.state.scheduled_for_deletion: + return self._error( + "InvalidRequestException", + "You can't perform this operation on the secret because it was marked for deletion.", + ) + self.state = replace( + self.state, + live=MappingProxyType({**self.state.live, name: str(body["SecretString"])}), + descriptions=MappingProxyType({**self.state.descriptions, name: str(body.get("Description", ""))}), + ) + return httpx.Response(200, json={"ARN": f"arn:fake:{name}", "Name": name}) + case "DescribeSecret": + if name not in self.state.live: + return self._error("ResourceNotFoundException", "Secrets Manager can't find the specified secret.") + deleted: Final = "2026-01-01T00:00:00Z" if name in self.state.scheduled_for_deletion else None + return httpx.Response(200, json={"ARN": f"arn:fake:{name}", "Name": name, "DeletedDate": deleted}) + case "RestoreSecret": + self.state = replace(self.state, scheduled_for_deletion=self.state.scheduled_for_deletion - {name}) + return httpx.Response(200, json={"ARN": f"arn:fake:{name}", "Name": name}) + case "PutSecretValue": + if name in self.state.scheduled_for_deletion: + return self._error( + "InvalidRequestException", + "You can't perform this operation on the secret because it was marked for deletion.", + ) + self.state = replace( + self.state, live=MappingProxyType({**self.state.live, name: str(body["SecretString"])}) + ) + return httpx.Response(200, json={"ARN": f"arn:fake:{name}", "Name": name}) + case "GetSecretValue": + if name not in self.state.live or name in self.state.scheduled_for_deletion: + return self._error("ResourceNotFoundException", "Secrets Manager can't find the specified secret.") + return httpx.Response(200, json={"SecretString": self.state.live[name]}) + case "DeleteSecret": + self.state = replace(self.state, scheduled_for_deletion=self.state.scheduled_for_deletion | {name}) + return httpx.Response(200, json={"ARN": f"arn:fake:{name}", "Name": name}) + return self._error("UnsupportedAction", action) + + @staticmethod + def _error(error_type: str, message: str) -> httpx.Response: + return httpx.Response(400, json={"__type": error_type, "message": message}) + + +@contextmanager +def fake_secrets_manager(monkeypatch: pytest.MonkeyPatch) -> Iterator[FakeSecretsManagerService]: + monkeypatch.setenv("AWS_ACCESS_KEY_ID", "synthetic-access-key") + monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "synthetic-secret-key") + monkeypatch.setenv("AWS_REGION_NAME", "us-east-1") + service: Final = FakeSecretsManagerService(FakeSecretsManagerState(live=MappingProxyType({}))) + cache_key: Final = "async_httpx_clienttimeout_None" + httpxSpecialProvider.SecretManager + litellm.in_memory_llm_clients_cache.set_cache( + key=cache_key, + value=AsyncHTTPHandler(transport=httpx.MockTransport(service.handle)), + ) + try: + yield service + finally: + litellm.in_memory_llm_clients_cache.delete_cache( + litellm.in_memory_llm_clients_cache.update_cache_key_with_event_loop(cache_key) + ) + + +@pytest.mark.asyncio +async def test_rotate_secret_back_to_name_inside_recovery_window_restores_and_stores_new_value( + monkeypatch: pytest.MonkeyPatch, +) -> None: + alias_a: Final = "synthetic/alias-a" + alias_b: Final = "synthetic/alias-b" + with fake_secrets_manager(monkeypatch) as fake: + manager: Final = AWSSecretsManagerV2(aws_region_name="us-east-1") + await manager.async_write_secret(secret_name=alias_a, secret_value="value-1") + await manager.async_rotate_secret( + current_secret_name=alias_a, new_secret_name=alias_b, new_secret_value="value-2" + ) + assert alias_a in fake.state.scheduled_for_deletion + + await manager.async_rotate_secret( + current_secret_name=alias_b, new_secret_name=alias_a, new_secret_value="value-3" + ) + + assert await manager.async_read_secret(secret_name=alias_a) == "value-3" + assert await manager.async_read_secret(secret_name=alias_b) is None + assert fake.state.scheduled_for_deletion == frozenset({alias_b}) + assert fake.state.descriptions[alias_a] == f"Rotated from {alias_b}" + + +@pytest.mark.asyncio +async def test_write_secret_to_name_inside_recovery_window_reschedules_deletion_when_update_fails( + monkeypatch: pytest.MonkeyPatch, +) -> None: + alias: Final = "synthetic/deleted-alias" + with fake_secrets_manager(monkeypatch) as fake: + manager: Final = AWSSecretsManagerV2(aws_region_name="us-east-1") + await manager.async_write_secret(secret_name=alias, secret_value="value-1") + await manager.async_delete_secret(secret_name=alias, recovery_window_in_days=7) + fake.state = replace(fake.state, failing_actions=frozenset({"UpdateSecret"})) + + with pytest.raises(ValueError, match="injected failure for UpdateSecret"): + await manager.async_write_secret(secret_name=alias, secret_value="value-2") + + assert fake.state.scheduled_for_deletion == frozenset({alias}) + assert fake.state.live[alias] == "value-1" + + +@pytest.mark.asyncio +async def test_write_secret_to_name_inside_recovery_window_restores_and_stores_new_value( + monkeypatch: pytest.MonkeyPatch, +) -> None: + alias: Final = "synthetic/deleted-alias" + with fake_secrets_manager(monkeypatch) as fake: + manager: Final = AWSSecretsManagerV2(aws_region_name="us-east-1") + await manager.async_write_secret(secret_name=alias, secret_value="value-1") + await manager.async_delete_secret(secret_name=alias, recovery_window_in_days=7) + + assert await manager.async_write_secret(secret_name=alias, secret_value="value-2") == { + "ARN": f"arn:fake:{alias}", + "Name": alias, + } + + assert await manager.async_read_secret(secret_name=alias) == "value-2" + assert fake.state.scheduled_for_deletion == frozenset() + + +@pytest.mark.asyncio +async def test_write_secret_to_live_existing_name_still_fails_without_overwriting( + monkeypatch: pytest.MonkeyPatch, +) -> None: + alias: Final = "synthetic/live-alias" + with fake_secrets_manager(monkeypatch) as fake: + manager: Final = AWSSecretsManagerV2(aws_region_name="us-east-1") + await manager.async_write_secret(secret_name=alias, secret_value="value-1") + + with pytest.raises(ValueError, match="ResourceExistsException"): + await manager.async_write_secret(secret_name=alias, secret_value="value-2") + + assert await manager.async_read_secret(secret_name=alias) == "value-1" + assert f"RestoreSecret:{alias}" not in fake.state.actions diff --git a/tests/test_litellm/test_claude_opus_5_config.py b/tests/test_litellm/test_claude_opus_5_config.py index 2e0a359b79b..b5efe016a60 100644 --- a/tests/test_litellm/test_claude_opus_5_config.py +++ b/tests/test_litellm/test_claude_opus_5_config.py @@ -41,7 +41,10 @@ ALL_OPUS_5_VARIANTS = ( "jp.anthropic.claude-opus-5", "vertex_ai/claude-opus-5", "vertex_ai/claude-opus-5@default", + "vertex_ai/claude-opus-5-5", + "vertex_ai/claude-opus-5-5@default", "azure_ai/claude-opus-5", + "azure_ai/claude-opus-5-5", ) BEDROCK_OPUS_5_VARIANTS = ( @@ -69,20 +72,37 @@ def test_opus_5_registered_for_bedrock_converse(): assert "anthropic.claude-opus-5" in BEDROCK_CONVERSE_MODELS -def test_opus_5_5_present_in_bundled_backup(): +OPUS_5_5_VARIANTS = ( + "claude-opus-5-5", + "vertex_ai/claude-opus-5-5", + "vertex_ai/claude-opus-5-5@default", + "azure_ai/claude-opus-5-5", +) + + +@pytest.mark.parametrize("model_name", OPUS_5_5_VARIANTS) +def test_opus_5_5_present_in_bundled_backup(model_name): backup = GetModelCostMap.load_local_model_cost_map() root = _load_root_cost_map() - assert "claude-opus-5-5" in backup - assert "claude-opus-5-5" in root - assert backup["claude-opus-5-5"] == root["claude-opus-5-5"] + assert model_name in backup + assert model_name in root + assert backup[model_name] == root[model_name] -@pytest.mark.parametrize("model", ["claude-opus-5-5", "anthropic/claude-opus-5-5"]) -def test_opus_5_5_thinking_profile(local_model_cost_map, model): +@pytest.mark.parametrize( + ("model", "provider"), + [ + ("claude-opus-5-5", "anthropic"), + ("anthropic/claude-opus-5-5", "anthropic"), + ("vertex_ai/claude-opus-5-5", "vertex_ai"), + ("azure_ai/claude-opus-5-5", "azure_ai"), + ], +) +def test_opus_5_5_thinking_profile(local_model_cost_map, model, provider): """Opus 5.5 has thinking always on with the adaptive thinking surface, and no forced tool use, same as Fable 5.1.""" from litellm.llms.anthropic.common_utils import AnthropicModelInfo - assert AnthropicModelInfo._is_adaptive_thinking_model(model, "anthropic") is True - assert AnthropicModelInfo._is_always_on_thinking_model(model, "anthropic") is True + assert AnthropicModelInfo._is_adaptive_thinking_model(model, provider) is True + assert AnthropicModelInfo._is_always_on_thinking_model(model, provider) is True assert AnthropicModelInfo.forced_tool_use_unsupported(model.removeprefix("anthropic/")) is True diff --git a/tests/test_litellm/test_cost_calculator.py b/tests/test_litellm/test_cost_calculator.py index a33701cd1bf..ddcdeb61e02 100644 --- a/tests/test_litellm/test_cost_calculator.py +++ b/tests/test_litellm/test_cost_calculator.py @@ -1,6 +1,7 @@ import datetime import time -from types import MappingProxyType +from pathlib import Path +from types import MappingProxyType, SimpleNamespace from typing import Final, cast import pytest @@ -22,8 +23,13 @@ from litellm.types.llms.base import CachedTokensDetails from litellm.types.llms.openai import OpenAIRealtimeStreamList, ResponseAPIUsage, ResponsesAPIResponse from litellm.types.rerank import RerankResponse from litellm.types.utils import ( + CacheCreationTokenDetails, CallTypes, Choices, + ImageObject, + ImageResponse, + ImageUsage, + ImageUsageInputTokensDetails, LiteLLMRealtimeStreamLoggingObject, Message, ModelInfo, @@ -32,6 +38,7 @@ from litellm.types.utils import ( Usage, ) from litellm.types.videos.main import VideoObject +from litellm.utils import supports_prompt_caching @pytest.fixture @@ -153,131 +160,8 @@ def test_cost_calculator_with_response_cost_in_additional_headers(): assert result == 1000 -def test_cost_calculator_with_usage(_local_model_cost_map, monkeypatch): - - usage = Usage( - prompt_tokens=120, - completion_tokens=100, - prompt_tokens_details=PromptTokensDetailsWrapper( - text_tokens=10, - audio_tokens=90, - image_tokens=20, - ), - ) - mr = ModelResponse(usage=usage, model="gemini-2.0-flash-001") - - result = response_cost_calculator( - response_object=mr, - model="", - custom_llm_provider="vertex_ai", - call_type="acompletion", - optional_params={}, - cache_hit=None, - base_model=None, - ) - - model_info = litellm.model_cost["gemini-2.0-flash-001"] - - # Step 1: Test a model where input_cost_per_image_token is not set. - # In this case the calculation should use input_cost_per_token as fallback. - assert model_info.get("input_cost_per_image_token") is None, ( - "Test case expects that input_cost_per_image_token is not set" - ) - - expected_cost = ( - usage.prompt_tokens_details.audio_tokens * model_info["input_cost_per_audio_token"] - + usage.prompt_tokens_details.text_tokens * model_info["input_cost_per_token"] - + usage.prompt_tokens_details.image_tokens * model_info["input_cost_per_token"] - + usage.completion_tokens * model_info["output_cost_per_token"] - ) - - assert result == expected_cost, f"Got {result}, Expected {expected_cost}" - - # Step 2: Set input_cost_per_image_token. - # In this case the explicit cost information should be used. - temp_model_info_object = dict(model_info) - temp_model_info_object["input_cost_per_image_token"] = 0.5 - - monkeypatch.setattr( - litellm, - "model_cost", - {"gemini-2.0-flash-001": temp_model_info_object}, - ) - - # Invalidate caches after modifying litellm.model_cost - from litellm.utils import _invalidate_model_cost_lowercase_map - - _invalidate_model_cost_lowercase_map() - - result = response_cost_calculator( - response_object=mr, - model="", - custom_llm_provider="vertex_ai", - call_type="acompletion", - optional_params={}, - cache_hit=None, - base_model=None, - ) - - expected_cost = ( - usage.prompt_tokens_details.audio_tokens * temp_model_info_object["input_cost_per_audio_token"] - + usage.prompt_tokens_details.text_tokens * temp_model_info_object["input_cost_per_token"] - + usage.prompt_tokens_details.image_tokens * temp_model_info_object["input_cost_per_image_token"] - + usage.completion_tokens * temp_model_info_object["output_cost_per_token"] - ) - - assert result == expected_cost, f"Got {result}, Expected {expected_cost}" -def test_handle_realtime_stream_cost_calculation_stores_cost_breakdown(): - """Regression: realtime cost must populate logging_obj.cost_breakdown so the - spend logs / UI show input vs output cost (issue: cost_breakdown was None for - /v1/realtime even though a total spend was computed).""" - from datetime import datetime - - from litellm.litellm_core_utils.litellm_logging import Logging - - results: OpenAIRealtimeStreamList = [ - {"type": "session.created", "session": {"model": "gpt-4o-realtime-preview"}}, - { - "type": "response.done", - "response": { - "usage": { - "input_tokens": 100, - "output_tokens": 50, - "total_tokens": 150, - } - }, - }, - ] - combined_usage_object = RealtimeAPITokenUsageProcessor.collect_and_combine_usage_from_realtime_stream_results( - results=results, - ) - - logging_obj = Logging( - model="gpt-4o-realtime-preview", - messages=[], - stream=False, - call_type="_arealtime", - start_time=datetime.now(), - litellm_call_id="realtime-cost-breakdown-test", - function_id="realtime-cost-breakdown-test", - ) - - total_cost = handle_realtime_stream_cost_calculation( - results=results, - combined_usage_object=combined_usage_object, - custom_llm_provider="openai", - litellm_model_name="gpt-4o-realtime-preview", - litellm_logging_obj=logging_obj, - ) - - assert total_cost > 0 - assert logging_obj.cost_breakdown is not None - assert logging_obj.cost_breakdown["input_cost"] > 0 - assert logging_obj.cost_breakdown["output_cost"] > 0 - assert abs(logging_obj.cost_breakdown["input_cost"] + logging_obj.cost_breakdown["output_cost"] - total_cost) < 1e-9 - assert abs(logging_obj.cost_breakdown["total_cost"] - total_cost) < 1e-9 def test_realtime_stream_combines_text_and_audio_token_details(): @@ -686,6 +570,95 @@ def test_tiered_pricing_only_deployment_selects_router_model_id(): assert router_model_id in selected +@pytest.mark.parametrize("metadata_key", ["metadata", "litellm_metadata"]) +def test_completion_cost_image_generation_reads_deployment_model_info_price_from_logging_metadata( + _local_model_cost_map: None, metadata_key: str +) -> None: + cost = completion_cost( + completion_response=ImageResponse(data=[ImageObject(url="https://example.com/img.png")]), + model="fal_ai/fal-ai/unlisted-image-model", + call_type="image_generation", + custom_pricing=True, + litellm_logging_obj=SimpleNamespace( + litellm_params={metadata_key: {"model_info": {"output_cost_per_image": 0.08}}} + ), + ) + + assert cost == pytest.approx(0.08) + + +def test_completion_cost_image_generation_registered_deployment_price_keeps_map_token_rates( + _local_model_cost_map: None, monkeypatch: pytest.MonkeyPatch +) -> None: + deployment_id: Final = "gemini-image-deployment-priced-per-image" + monkeypatch.setitem( + litellm.model_cost, + deployment_id, + {"mode": "image_generation", "litellm_provider": "gemini", "output_cost_per_image": 0.1}, + ) + map_model: Final = "gemini/gemini-3.1-flash-image" + row: Final = litellm.model_cost[map_model] + usage: Final = ImageUsage( + input_tokens=10, + input_tokens_details=ImageUsageInputTokensDetails(image_tokens=0, text_tokens=10), + output_tokens=1290, + total_tokens=1300, + ) + + cost = completion_cost( + completion_response=ImageResponse(data=[ImageObject(url="https://example.com/img.png")], usage=usage), + model=map_model, + custom_llm_provider="gemini", + call_type="image_generation", + custom_pricing=True, + router_model_id=deployment_id, + litellm_logging_obj=SimpleNamespace(litellm_params={"metadata": {"model_info": {"id": deployment_id}}}), + ) + + expected: Final = ( + usage.input_tokens * row["input_cost_per_token"] + usage.output_tokens * row["output_cost_per_image_token"] + ) + assert cost == pytest.approx(expected) + + +def test_completion_cost_image_generation_ignores_deployment_model_info_without_custom_pricing( + _local_model_cost_map: None, +) -> None: + cost = completion_cost( + completion_response=ImageResponse(data=[ImageObject(url="https://example.com/img.png")]), + model="fal_ai/openai/gpt-image-2", + call_type="image_generation", + custom_pricing=False, + optional_params={"quality": "high", "image_size": {"width": 1024, "height": 1024}}, + litellm_logging_obj=SimpleNamespace( + litellm_params={"litellm_metadata": {"model_info": {"output_cost_per_image": 0.5}}} + ), + ) + + assert cost == pytest.approx(0.211) + + +async def test_router_image_generation_bills_litellm_params_output_cost_per_image() -> None: + from litellm import Router + + router = Router( + model_list=[ + { + "model_name": "img", + "litellm_params": { + "model": "fal_ai/fal-ai/unlisted-image-model", + "api_key": "sk-fake", + "output_cost_per_image": 0.08, + }, + } + ] + ) + + response = await router.aimage_generation(model="img", prompt="x", mock_response="https://example.com/img.png") + + assert response._hidden_params["response_cost"] == pytest.approx(0.08) + + def test_tiered_pricing_only_deployment_completion_cost_is_nonzero(): """End-to-end: a tier-only deployment must produce the tiered cost, not $0. Mirrors the reported dashscope/qwen3.7-plus trace (12 prompt + 377 @@ -900,6 +873,40 @@ def test_default_image_cost_calculator(monkeypatch): assert cost == 10485760 +@pytest.mark.parametrize( + ("model", "quality", "size", "priced_key", "pixels"), + [ + ("azure/dall-e-3", "standard", "1024x1024", "azure/standard/1024-x-1024/dall-e-3", 1024 * 1024), + ("azure/dall-e-3", "hd", "1024x1792", "azure/hd/1024-x-1792/dall-e-3", 1024 * 1792), + ("dall-e-3", "hd", "1024x1792", "azure/hd/1024-x-1792/dall-e-3", 1024 * 1792), + ], +) +def test_default_image_cost_calculator_matches_provider_first_quality_key( + monkeypatch, model: str, quality: str, size: str, priced_key: str, pixels: int +): + from litellm.cost_calculator import default_image_cost_calculator + + monkeypatch.setattr( + litellm, + "model_cost", + { + "azure/standard/1024-x-1024/dall-e-3": {"litellm_provider": "azure", "input_cost_per_pixel": 1e-08}, + "azure/hd/1024-x-1792/dall-e-3": {"litellm_provider": "azure", "input_cost_per_pixel": 3e-08}, + }, + ) + + cost = default_image_cost_calculator( + model=model, + custom_llm_provider="azure", + quality=quality, + n=1, + size=size, + optional_params={}, + ) + + assert cost == litellm.model_cost[priced_key]["input_cost_per_pixel"] * pixels + + def test_cost_calculator_with_cache_creation(): from litellm import completion_cost from litellm.types.utils import Choices, Message, Usage @@ -1034,126 +1041,6 @@ def test_bedrock_cost_calculator_comparison_with_without_cache(): print(f"Cost with cache: {cost_with_cache}") -def test_log_context_cost_calculation(): - """ - Test that log context cost calculation works correctly with tiered pricing. - - This test verifies that when using extended context (above 200k tokens), - the log context costs are calculated using the appropriate tiered rates. - """ - from litellm import completion_cost - from litellm.types.utils import ( - Choices, - Message, - ModelResponse, - PromptTokensDetailsWrapper, - Usage, - ) - - # Create a mock response with extended context usage - extended_context_response = ModelResponse( - id="test-extended-context-response", - created=1750733889, - model="claude-4-sonnet-20250514", - object="chat.completion", - system_fingerprint=None, - choices=[ - Choices( - finish_reason="stop", - index=0, - message=Message( - content="This is a test response for extended context cost calculation.", - role="assistant", - tool_calls=None, - function_call=None, - ), - ) - ], - usage=Usage( - total_tokens=350000, # Above 200k threshold - prompt_tokens=301000, # Above 200k threshold - completion_tokens=50000, - prompt_tokens_details=PromptTokensDetailsWrapper( - text_tokens=300000, - cached_tokens=0, # No cache hits - audio_tokens=None, - image_tokens=None, - character_count=None, - video_length_seconds=None, - cache_creation_tokens=1000, - ), - completion_tokens_details=None, - _cache_creation_input_tokens=1000, # Some tokens added to cache - ), - ) - - # Calculate the cost using the extended context model - result = completion_cost( - completion_response=extended_context_response, - model="claude-4-sonnet-20250514", - custom_llm_provider="anthropic", - ) - - # Debug: Print the actual result - print(f"DEBUG: Actual cost result: ${result:.6f}") - - # Get model info to understand the pricing - from litellm import get_model_info - - model_info = get_model_info(model="claude-4-sonnet-20250514", custom_llm_provider="anthropic") - - # Calculate expected cost based on actual model pricing - input_cost_per_token = model_info.get("input_cost_per_token", 0) - output_cost_per_token = model_info.get("output_cost_per_token", 0) - cache_creation_cost_per_token = model_info.get("cache_creation_input_token_cost", 0) - - # Check if tiered pricing is applied - input_cost_above_200k = model_info.get("input_cost_per_token_above_200k_tokens", input_cost_per_token) - output_cost_above_200k = model_info.get("output_cost_per_token_above_200k_tokens", output_cost_per_token) - cache_creation_above_200k = model_info.get( - "cache_creation_input_token_cost_above_200k_tokens", - cache_creation_cost_per_token, - ) - - print(f"DEBUG: Base input cost per token: ${input_cost_per_token:.2e}") - print(f"DEBUG: Base output cost per token: ${output_cost_per_token:.2e}") - print(f"DEBUG: Base cache creation cost per token: ${cache_creation_cost_per_token:.2e}") - - # Handle tiered pricing - if not available, use base pricing - if input_cost_above_200k is not None: - print(f"DEBUG: Tiered input cost per token (>200k): ${input_cost_above_200k:.2e}") - else: - print("DEBUG: No tiered input pricing available, using base pricing") - input_cost_above_200k = input_cost_per_token - - if output_cost_above_200k is not None: - print(f"DEBUG: Tiered output cost per token (>200k): ${output_cost_above_200k:.2e}") - else: - print("DEBUG: No tiered output pricing available, using base pricing") - output_cost_above_200k = output_cost_per_token - - if cache_creation_above_200k is not None: - print(f"DEBUG: Tiered cache creation cost per token (>200k): ${cache_creation_above_200k:.2e}") - else: - print("DEBUG: No tiered cache creation pricing available, using base pricing") - cache_creation_above_200k = cache_creation_cost_per_token - - # Since we're above 200k tokens, we should use tiered pricing if available - expected_input_cost = 300000 * input_cost_above_200k - expected_output_cost = 50000 * output_cost_above_200k - expected_cache_cost = 1000 * cache_creation_above_200k - expected_total = expected_input_cost + expected_output_cost + expected_cache_cost - - print(f"DEBUG: Expected total: ${expected_total:.6f}") - - # Allow for small floating point differences - assert abs(result - expected_total) < 1e-6, f"Expected cost ${expected_total:.6f}, but got ${result:.6f}" - - print(f"✓ Log context cost calculation with tiered pricing is correct: ${result:.6f}") - print(f" - Input tokens (300k): ${expected_input_cost:.6f}") - print(f" - Output tokens (50k): ${expected_output_cost:.6f}") - print(f" - Cache creation (1k): ${expected_cache_cost:.6f}") - print(f" - Total: ${result:.6f}") def test_gemini_25_explicit_caching_cost_direct_usage(): @@ -1724,56 +1611,6 @@ def test_cost_margin_with_discount(monkeypatch): print(f" - Expected: ${expected_cost:.6f}") -def test_azure_image_generation_cost_calculator(): - from unittest.mock import MagicMock - - from litellm.types.utils import ( - ImageObject, - ImageResponse, - ImageUsage, - ImageUsageInputTokensDetails, - ) - - response_cost_calculator_kwargs = { - "response_object": ImageResponse( - created=1761785270, - background=None, - data=[ - ImageObject( - b64_json=None, - revised_prompt="A futuristic, techno-inspired green duck wearing cool modern sunglasses. The duck has a sleek, metallic appearance with glowing neon green accents, standing on a high-tech urban background with holographic billboards and illuminated city lights in the distance. The duck's feathers have a glossy, high-tech sheen, resembling a robotic design but still maintaining its avian features. The scene has a vibrant, cyberpunk aesthetic with a neon color palette.", - url="test-azure-blob-url-with-sas-token", - ) - ], - output_format=None, - quality="hd", - size=None, - usage=ImageUsage( - input_tokens=0, - input_tokens_details=ImageUsageInputTokensDetails(image_tokens=0, text_tokens=0), - output_tokens=0, - total_tokens=0, - ), - ), - "model": "azure/dall-e-3", - "cache_hit": False, - "custom_llm_provider": "azure", - "base_model": "azure/dall-e-3", - "call_type": "aimage_generation", - "optional_params": {}, - "custom_pricing": False, - "prompt": "", - "standard_built_in_tools_params": { - "web_search_options": None, - "file_search": None, - }, - "router_model_id": "6738c432ffc9b733597c6b86613ca20dc5f49bde591fd3d03e7cd6aa25bb241e", - "litellm_logging_obj": MagicMock(), - "service_tier": None, - } - - cost = response_cost_calculator(**response_cost_calculator_kwargs) - assert cost > 0.079 def test_completion_cost_extracts_service_tier_from_response(_local_model_cost_map): @@ -2526,87 +2363,6 @@ def test_gemini_without_cache_tokens_details(): print("✅ Gemini without cacheTokensDetails works correctly") -def test_gemini_implicit_caching_cost_calculation(): - """ - Test for Issue #16341: Gemini implicit cached tokens not counted in spend log - - When Gemini uses implicit caching, it returns cachedContentTokenCount but NOT - cacheTokensDetails. In this case, we should subtract cachedContentTokenCount - from text_tokens to correctly calculate costs. - - See: https://github.com/BerriAI/litellm/issues/16341 - """ - from litellm import completion_cost - from litellm.llms.vertex_ai.gemini.vertex_and_google_ai_studio_gemini import ( - VertexGeminiConfig, - ) - from litellm.types.utils import Choices, Message, ModelResponse - - # Simulate Gemini response with implicit caching (cachedContentTokenCount only) - completion_response = { - "usageMetadata": { - "promptTokenCount": 10000, - "candidatesTokenCount": 5, - "totalTokenCount": 10005, - "cachedContentTokenCount": 8000, # Implicit caching - no cacheTokensDetails - "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 10000}], - "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 5}], - } - } - - usage = VertexGeminiConfig._calculate_usage(completion_response) - - # Verify parsing - assert usage.cache_read_input_tokens == 8000, ( - f"cache_read_input_tokens should be 8000, got {usage.cache_read_input_tokens}" - ) - assert usage.prompt_tokens_details.cached_tokens == 8000, ( - f"cached_tokens should be 8000, got {usage.prompt_tokens_details.cached_tokens}" - ) - - # CRITICAL: text_tokens should be (10000 - 8000) = 2000, NOT 10000 - # This is the fix for issue #16341 - assert usage.prompt_tokens_details.text_tokens == 2000, ( - f"text_tokens should be 2000 (10000 - 8000), got {usage.prompt_tokens_details.text_tokens}" - ) - - # Verify cost calculation uses cached token pricing - response = ModelResponse( - id="mock-id", - model="gemini-2.0-flash", - choices=[ - Choices( - index=0, - message=Message(role="assistant", content="Hello!"), - finish_reason="stop", - ) - ], - usage=usage, - ) - - cost = completion_cost( - completion_response=response, - model="gemini-2.0-flash", - custom_llm_provider="gemini", - ) - - # Get model pricing for verification - import litellm - - model_info = litellm.get_model_info("gemini/gemini-2.0-flash") - input_cost = model_info.get("input_cost_per_token", 0) - cache_read_cost = model_info.get("cache_read_input_token_cost", input_cost) - output_cost = model_info.get("output_cost_per_token", 0) - - # Expected cost: (2000 * input) + (8000 * cache_read) + (5 * output) - expected_cost = (2000 * input_cost) + (8000 * cache_read_cost) + (5 * output_cost) - - assert abs(cost - expected_cost) < 1e-9, ( - f"Cost calculation is wrong. Got ${cost:.6f}, expected ${expected_cost:.6f}. " - f"Cached tokens may not be using reduced pricing." - ) - - print("✅ Issue #16341 fix verified: Gemini implicit caching cost calculated correctly") def test_additional_costs_only_for_azure_ai(_local_model_cost_map): @@ -4757,3 +4513,123 @@ def test_cost_per_token_bedrock_qwen3_next_uses_regional_entry_not_us_rate( assert prompt_usd == pytest.approx(prompt_tokens * regional["input_cost_per_token"]) assert completion_usd == pytest.approx(completion_tokens * regional["output_cost_per_token"]) + + +def test_cost_per_token_bedrock_nemotron_super_3_uses_eu_west_2_entry_not_us_rate( + monkeypatch: pytest.MonkeyPatch, +) -> None: + monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True") + monkeypatch.setattr(litellm, "model_cost", litellm.get_model_cost_map(url="")) + + regional_key: Final = "bedrock/eu-west-2/nvidia.nemotron-super-3-120b" + regional: Final = litellm.model_cost[regional_key] + us: Final = litellm.model_cost["nvidia.nemotron-super-3-120b"] + assert regional["input_cost_per_token"] != us["input_cost_per_token"] + assert regional["output_cost_per_token"] != us["output_cost_per_token"] + + prompt_tokens, completion_tokens = 1000, 500 + prompt_usd, completion_usd = cost_per_token( + model=regional_key, + prompt_tokens=prompt_tokens, + completion_tokens=completion_tokens, + custom_llm_provider="bedrock", + ) + + assert prompt_usd == pytest.approx(prompt_tokens * regional["input_cost_per_token"]) + assert completion_usd == pytest.approx(completion_tokens * regional["output_cost_per_token"]) + + +GPT_REALTIME_2_FAMILY: Final = ( + "azure/gpt-realtime-2.1", + "azure/gpt-realtime-2.1-mini", + "gpt-realtime-2", + "gpt-realtime-2.1", + "gpt-realtime-2.1-mini", +) + + +def test_gpt_realtime_2_family_prices_audio_cache_writes_and_reads_alike(_local_model_cost_map: None) -> None: + audio_cache_rates: Final = { + model: ( + litellm.model_cost[model].get("cache_read_input_audio_token_cost"), + litellm.model_cost[model].get("cache_creation_input_audio_token_cost"), + ) + for model in GPT_REALTIME_2_FAMILY + } + + # Azure publishes one cached-audio meter per gpt-realtime-2 deployment, + # https://azure.microsoft.com/en-us/pricing/details/cognitive-services/openai-service/, checked 2026-09-23 + assert all(read is not None and write == read for read, write in audio_cache_rates.values()), audio_cache_rates + assert len(audio_cache_rates) == len(GPT_REALTIME_2_FAMILY) + + +GEMINI_LIVE_NATIVE_AUDIO_CASES: Final = ( + ("gemini-live-2.5-flash-native-audio", "vertex_ai"), + ("gemini-live-2.5-flash-preview-native-audio-09-2025", "vertex_ai"), + ("gemini/gemini-live-2.5-flash-preview-native-audio-09-2025", "gemini"), +) + + +@pytest.mark.parametrize(("model", "provider"), GEMINI_LIVE_NATIVE_AUDIO_CASES) +def test_gemini_live_native_audio_carries_no_cached_input_rate( + _local_model_cost_map: None, model: str, provider: str +) -> None: + # the Vertex pricing table prints N/A for cached input on every Live row, + # https://cloud.google.com/vertex-ai/generative-ai/pricing, checked 2026-09-23 + assert litellm.get_model_info(model, custom_llm_provider=provider)["cache_read_input_token_cost"] is None + + prompt_usd, _ = cost_per_token( + model=model, + prompt_tokens=101_000, + completion_tokens=0, + custom_llm_provider=provider, + usage_object=Usage( + prompt_tokens=101_000, + completion_tokens=0, + prompt_tokens_details=PromptTokensDetailsWrapper(cached_tokens=100_000), + ), + ) + fresh_usd, _ = cost_per_token( + model=model, + prompt_tokens=101_000, + completion_tokens=0, + custom_llm_provider=provider, + usage_object=Usage(prompt_tokens=101_000, completion_tokens=0), + ) + + assert prompt_usd == pytest.approx(fresh_usd), ( + "with no cached rate the cached tokens bill at the input rate, so a phantom discount cannot appear" + ) + assert prompt_usd > 0 + + +@pytest.mark.parametrize(("model", "provider"), GEMINI_LIVE_NATIVE_AUDIO_CASES) +def test_gemini_live_native_audio_declares_prompt_caching_unsupported( + _local_model_cost_map: None, model: str, provider: str +) -> None: + # the Vertex context-caching supported-model lists contain no Live model while 2.5 Flash is listed, + # https://cloud.google.com/vertex-ai/generative-ai/docs/context-cache/context-cache-overview, checked 2026-09-23 + assert litellm.get_model_info(model, custom_llm_provider=provider)["supports_prompt_caching"] is False + assert supports_prompt_caching(model=model, custom_llm_provider=provider) is False + assert supports_prompt_caching(model="gemini-2.5-flash", custom_llm_provider="vertex_ai") is True, ( + "control: the helper swallows a lookup error into False, so without this a broken lookup reads as a pass" + ) + + +@pytest.mark.parametrize( + "model", + ["gemini-live-2.5-flash-native-audio", "vertex_ai/gemini-live-2.5-flash-native-audio"], +) +def test_gemini_live_native_audio_limits_and_capabilities_match_vendor_model_card( + _local_model_cost_map: None, model: str +) -> None: + info = litellm.get_model_info(model) + + # the Vertex model card for gemini-live-2.5-flash-native-audio publishes these limits and flags, + # https://cloud.google.com/vertex-ai/generative-ai/docs/models, checked 2026-09-23 + assert info["max_input_tokens"] == 131072 + assert info["max_output_tokens"] == 65536 + assert info["max_tokens"] == 65536 + assert info["supports_response_schema"] is False + assert info["supports_url_context"] is False + assert info["supports_pdf_input"] is False diff --git a/tests/test_litellm/test_count_tokens_public_api.py b/tests/test_litellm/test_count_tokens_public_api.py index 2918d0aa522..84121dd63e4 100644 --- a/tests/test_litellm/test_count_tokens_public_api.py +++ b/tests/test_litellm/test_count_tokens_public_api.py @@ -157,21 +157,3 @@ def test_acount_tokens_no_api_key_falls_back(monkeypatch): assert result.tokenizer_type == "local_tokenizer" -async def test_acount_tokens_local_fallback_counts_off_the_event_loop(): - from tests.large_text import text - from tests.test_litellm.litellm_core_utils.event_loop_lag import ( - assert_loop_stayed_free, - timed_with_loop_lags, - warm_tokenizer, - ) - - model = "together_ai/meta-llama/Llama-3-8b-chat-hf" - warm_tokenizer(model) - - result, took, lags = await timed_with_loop_lags( - lambda: litellm.acount_tokens(model=model, messages=[{"role": "user", "content": text * 100}]) - ) - - assert result.tokenizer_type == "local_tokenizer" - assert result.total_tokens > 100_000 - assert_loop_stayed_free(took, lags) diff --git a/tests/test_litellm/test_gpt_image_cost_calculator.py b/tests/test_litellm/test_gpt_image_cost_calculator.py index 42d4c699200..d026285f9ae 100644 --- a/tests/test_litellm/test_gpt_image_cost_calculator.py +++ b/tests/test_litellm/test_gpt_image_cost_calculator.py @@ -16,6 +16,8 @@ import litellm from litellm.types.utils import ( ImageObject, ImageResponse, + ImageUsage, + ImageUsageInputTokensDetails, ) @@ -52,31 +54,42 @@ class TestGPTImageCostCalculator: assert cost == 0.0 + @pytest.mark.parametrize( + "usage", + [ + None, + ImageUsage( + input_tokens=0, + input_tokens_details=ImageUsageInputTokensDetails(image_tokens=0, text_tokens=0), + output_tokens=0, + total_tokens=0, + ), + ], + ) + def test_gpt_image_1_bills_deployment_output_cost_per_image_without_usage_tokens( + self, usage: ImageUsage | None + ) -> None: + from litellm.llms.openai.image_generation.cost_calculator import cost_calculator + + image_response = ImageResponse( + created=1234567890, + data=[ImageObject(url="http://example.com/one.jpg"), ImageObject(url="http://example.com/two.jpg")], + usage=usage, + ) + + cost = cost_calculator( + model="gpt-image-1", + image_response=image_response, + custom_llm_provider="openai", + model_info={"output_cost_per_image": 0.05}, + ) + + assert cost == pytest.approx(0.10) + class TestGPTImageCostRouting: """Test that gpt-image models are properly routed to the token-based calculator""" - def test_openai_dalle_routes_to_pixel_calculator(self): - """Test that OpenAI DALL-E still routes to pixel-based calculator""" - from litellm.litellm_core_utils.llm_cost_calc.utils import CostCalculatorUtils - - image_response = ImageResponse( - created=1234567890, - data=[ImageObject(url="http://example.com/image.jpg")], - ) - image_response.size = "1024x1024" - image_response.quality = "standard" - - cost = CostCalculatorUtils.route_image_generation_cost_calculator( - model="dall-e-3", - completion_response=image_response, - custom_llm_provider="openai", - size="1024x1024", - quality="standard", - n=1, - ) - - assert cost >= 0 class TestGPTImage15OutputImageTokens: diff --git a/tests/test_litellm/test_logging.py b/tests/test_litellm/test_logging.py index 7cecdaec25d..d9cfe88d52f 100644 --- a/tests/test_litellm/test_logging.py +++ b/tests/test_litellm/test_logging.py @@ -19,6 +19,16 @@ 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, @@ -33,15 +43,6 @@ from litellm._logging import ( verbose_logger, verbose_proxy_logger, verbose_router_logger, - ALL_LOGGERS, - AccessLogPathFilter, - AccessLogRedactionFilter, - CorrelationContextFilter, - CorrelationPlainFormatter, - JsonFormatter, - LevelRoutingStreamHandler, - SecretRedactionFilter, - StdoutLogTruncationFilter, ) from litellm.constants import LITELLM_TRUNCATED_PAYLOAD_FIELD from litellm.integrations.custom_logger import CustomLogger @@ -824,6 +825,75 @@ def test_secret_filter_keeps_truncated_traceback(monkeypatch): 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() @@ -983,10 +1053,10 @@ _REQUEST_DUMP = "{'model': 'gpt-4', 'messages': [{'role': 'user', 'content': 'he (CorrelationPlainFormatter(_PLAIN_LOG_FORMAT), JsonFormatter()), ids=("plain", "json"), ) -def test_scrubbed_record_is_scanned_for_secrets_once(monkeypatch, formatter): - """Every pass of the secret regex over a multi-megabyte debug line costs seconds of - event-loop time, so a formatter must not rescan what SecretRedactionFilter scrubbed.""" +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,)) @@ -997,14 +1067,15 @@ def test_scrubbed_record_is_scanned_for_secrets_once(monkeypatch, formatter): assert _REQUEST_DUMP in rendered assert "litellm_redacted" not in rendered - assert counting.calls == 1 - assert counting.scanned_chars == len(f"receiving data: {_REQUEST_DUMP}") + 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,)) @@ -1012,13 +1083,14 @@ def test_stamped_record_is_not_scanned_again(monkeypatch): assert SecretRedactionFilter().filter(record) is True assert SecretRedactionFilter().filter(record) is True - assert counting.calls == 1 + 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") @@ -1619,3 +1691,75 @@ def test_access_log_path_filter_keeps_a_record_without_a_string_path_arg(monkeyp 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() diff --git a/tests/test_litellm/test_openai_service_tier_long_context_pricing.py b/tests/test_litellm/test_openai_service_tier_long_context_pricing.py index c766370230c..9b3a1e57169 100644 --- a/tests/test_litellm/test_openai_service_tier_long_context_pricing.py +++ b/tests/test_litellm/test_openai_service_tier_long_context_pricing.py @@ -58,6 +58,18 @@ PRIORITY_LONG_CONTEXT = { "cache_read_input_token_cost_above_272k_tokens_priority": 4e-06, "cache_creation_input_token_cost_above_272k_tokens_priority": 5e-05, }, + "gpt-6-sol": { + "input_cost_per_token_above_272k_tokens_priority": 8e-06, + "output_cost_per_token_above_272k_tokens_priority": 3e-05, + "cache_read_input_token_cost_above_272k_tokens_priority": 8e-07, + "cache_creation_input_token_cost_above_272k_tokens_priority": 1e-05, + }, + "gpt-6-luna": { + "input_cost_per_token_above_272k_tokens_priority": 4e-07, + "output_cost_per_token_above_272k_tokens_priority": 1.5e-06, + "cache_read_input_token_cost_above_272k_tokens_priority": 4e-08, + "cache_creation_input_token_cost_above_272k_tokens_priority": 5e-07, + }, } EXPECTED = {**FLEX_LONG_CONTEXT, **PRIORITY_LONG_CONTEXT} @@ -90,4 +102,6 @@ TIERED_COST_CASES = [ ("gpt-5.6-terra", "priority", 8e-06, 3.6e-05), ("gpt-5.6-luna", "priority", 8e-07, 3.6e-06), ("gpt-6-astra", "priority", 4e-05, 0.00015), + ("gpt-6-sol", "priority", 8e-06, 3e-05), + ("gpt-6-luna", "priority", 4e-07, 1.5e-06), ] diff --git a/tests/test_litellm/test_pre_commit_lint.py b/tests/test_litellm/test_pre_commit_lint.py index e12da0833dc..2d7fa897536 100644 --- a/tests/test_litellm/test_pre_commit_lint.py +++ b/tests/test_litellm/test_pre_commit_lint.py @@ -9,6 +9,8 @@ from pathlib import Path import pytest +from tests._process_helpers import process_is_gone + ROOT = Path(__file__).resolve().parents[2] SCRIPT = ROOT / "scripts" / "pre_commit_lint.sh" WHOLE_TREE_RUFF = "run --no-sync ruff check --config ruff-tests.toml tests" @@ -343,14 +345,6 @@ def _wait_until(predicate: Callable[[], bool], timeout_seconds: float) -> bool: return predicate() -def _pid_gone(pid: int) -> bool: - try: - os.kill(pid, 0) - except ProcessLookupError: - return True - return False - - def test_interrupt_kills_background_jobs_and_removes_logs(tmp_path: Path) -> None: repo, bin_dir = _sandbox(tmp_path) hang_dir = tmp_path / "hang" @@ -372,7 +366,7 @@ def test_interrupt_kills_background_jobs_and_removes_logs(tmp_path: Path) -> Non os.killpg(proc.pid, signal.SIGINT) assert proc.wait(timeout=10) != 0 make_pid = int((hang_dir / "make.pid").read_text()) - assert _wait_until(lambda: _pid_gone(make_pid), 5) + assert process_is_gone(make_pid, within_seconds=5) assert _wait_until(lambda: not any(tmp_dir.iterdir()), 5), list(tmp_dir.iterdir()) finally: with suppress(ProcessLookupError, PermissionError): diff --git a/tests/test_litellm/test_process_helpers.py b/tests/test_litellm/test_process_helpers.py new file mode 100644 index 00000000000..00d4d07d71f --- /dev/null +++ b/tests/test_litellm/test_process_helpers.py @@ -0,0 +1,65 @@ +"""``process_is_gone`` has to say gone for every shape a killed process can take, and never for a live one.""" + +import os +import signal +import subprocess +import sys +from pathlib import Path +from typing import Final + +import pytest + +from tests._process_helpers import process_is_gone + +SLEEP_FOREVER: Final = (sys.executable, "-I", "-c", "import time; time.sleep(600)") + +LEAVE_A_ZOMBIE_BEHIND: Final = """ +import os, signal, subprocess, sys, time +grandchild = subprocess.Popen([sys.executable, "-c", "import time; time.sleep(600)"]) +os.kill(grandchild.pid, signal.SIGKILL) +while open(f"/proc/{grandchild.pid}/stat").read().rpartition(")")[2].split()[0] != "Z": + time.sleep(0.01) +print(grandchild.pid, flush=True) +time.sleep(600) +""" + + +def test_a_live_process_is_not_gone() -> None: + child: Final = subprocess.Popen(SLEEP_FOREVER) + try: + assert not process_is_gone(child.pid, within_seconds=0.3) + finally: + child.kill() + child.wait() + + +def test_a_reaped_child_is_gone() -> None: + child: Final = subprocess.Popen(SLEEP_FOREVER) + child.kill() + child.wait() + assert process_is_gone(child.pid, within_seconds=1) + + +@pytest.mark.skipif(os.name == "nt", reason="zombies are a POSIX thing") +def test_an_unreaped_child_is_reaped_and_gone() -> None: + child: Final = subprocess.Popen(SLEEP_FOREVER) + os.kill(child.pid, signal.SIGKILL) + assert process_is_gone(child.pid, within_seconds=1) + with pytest.raises(ChildProcessError): + os.waitpid(child.pid, os.WNOHANG) + + +@pytest.mark.skipif(not Path("/proc").is_dir(), reason="needs procfs to see a zombie that is not our child") +def test_a_zombie_left_by_another_process_is_gone() -> None: + zombie_factory: Final = subprocess.Popen( + [sys.executable, "-I", "-c", LEAVE_A_ZOMBIE_BEHIND], stdout=subprocess.PIPE, text=True + ) + try: + assert zombie_factory.stdout is not None + zombie_pid: Final = int(zombie_factory.stdout.readline()) + with pytest.raises(ChildProcessError): + os.waitpid(zombie_pid, os.WNOHANG) + assert process_is_gone(zombie_pid, within_seconds=1) + finally: + zombie_factory.kill() + zombie_factory.wait() diff --git a/tests/test_litellm/test_redact_string_in_error_paths.py b/tests/test_litellm/test_redact_string_in_error_paths.py index 07d1ec5f523..a5128a87b0d 100644 --- a/tests/test_litellm/test_redact_string_in_error_paths.py +++ b/tests/test_litellm/test_redact_string_in_error_paths.py @@ -2,7 +2,7 @@ Tests for _redact_string usage in error/logging paths. Covers actual execution of redaction in: -- WebSocket close reasons in realtime handlers (openai, azure, bedrock) +- WebSocket close reasons in realtime handlers (openai, bedrock) - Gemini RAG ingestion x-goog-api-key header usage - Traceback redaction pattern used in proxy streaming - Router fallback-failure traceback redaction @@ -72,25 +72,6 @@ class TestOpenAIRealtimeRedaction: api_key="test-key", ) - @pytest.mark.asyncio - async def test_invalid_status_code_redacts_reason(self): - import websockets.exceptions - - from litellm.llms.openai.realtime.handler import OpenAIRealtime - - handler = OpenAIRealtime() - exc = websockets.exceptions.InvalidStatusCode(403, None) - exc.status_code = 403 - - kwargs = self._call_kwargs() - mock_ws = kwargs["websocket"] - p1, p2, p3 = self._make_patches(handler) - with p1, p2, p3, patch("websockets.connect", side_effect=exc): - await handler.async_realtime(**kwargs) - - mock_ws.close.assert_called_once() - assert mock_ws.close.call_args[1]["code"] == 403 - @pytest.mark.asyncio async def test_generic_exception_redacts_reason(self): from litellm.llms.openai.realtime.handler import OpenAIRealtime @@ -111,41 +92,6 @@ class TestOpenAIRealtimeRedaction: assert "sk-1234567890abcdefghij" not in mock_ws.close.call_args[1]["reason"] -class TestAzureRealtimeRedaction: - """Test that Azure realtime handler redacts secrets in websocket close reasons.""" - - @pytest.mark.asyncio - async def test_invalid_status_code_redacts_reason(self): - import websockets.exceptions - - from litellm.llms.azure.realtime.handler import AzureOpenAIRealtime - - handler = AzureOpenAIRealtime() - mock_ws = AsyncMock() - exc = websockets.exceptions.InvalidStatusCode(403, None) - exc.status_code = 403 - - with ( - patch.object( - handler, - "_construct_url", - return_value="wss://test.openai.azure.com/openai/realtime", - ), - patch("websockets.connect", side_effect=exc), - ): - await handler.async_realtime( - model="gpt-4", - websocket=mock_ws, - logging_obj=MagicMock(), - api_base="https://test.openai.azure.com/", - api_key="test-key", - api_version="2024-10-01-preview", - ) - - mock_ws.close.assert_called_once() - assert mock_ws.close.call_args[1]["code"] == 403 - - class TestBedrockRealtimeRedaction: """Test that _redact_string produces safe close reasons for Bedrock-style errors.""" diff --git a/tests/test_litellm/test_router.py b/tests/test_litellm/test_router.py index 0df6a181957..411377f29cf 100644 --- a/tests/test_litellm/test_router.py +++ b/tests/test_litellm/test_router.py @@ -9,7 +9,7 @@ import sys import threading import warnings from collections.abc import Awaitable, Callable, Mapping -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone from types import SimpleNamespace from typing import Final, Literal from unittest.mock import AsyncMock, MagicMock, patch @@ -850,36 +850,6 @@ async def test_arouter_async_get_healthy_deployments(): assert result[0]["litellm_params"]["model"] == "gpt-3.5-turbo" -@pytest.mark.asyncio -@patch("litellm.amoderation") -async def test_arouter_amoderation_with_credential_name(mock_amoderation): - """ - Test that router.amoderation passes litellm_credential_name to the underlying litellm.amoderation call - """ - mock_amoderation.return_value = AsyncMock() - - router = litellm.Router( - model_list=[ - { - "model_name": "text-moderation-stable", - "litellm_params": { - "model": "text-moderation-stable", - "litellm_credential_name": "my-custom-auth", - }, - }, - ], - ) - - await router.amoderation(input="I love everyone!", model="text-moderation-stable") - - mock_amoderation.assert_called_once() - call_kwargs = mock_amoderation.call_args[1] # Get the kwargs of the call - print( - "call kwargs for router.amoderation=", - json.dumps(call_kwargs, indent=4, default=str), - ) - assert call_kwargs["litellm_credential_name"] == "my-custom-auth" - assert call_kwargs["model"] == "text-moderation-stable" def test_arouter_test_team_model(): @@ -17620,3 +17590,242 @@ class TestMemberAutoRouterInference: monkeypatch.setitem(sys.modules, "fastapi", None) monkeypatch.delitem(sys.modules, "litellm.proxy.auth.auto_router_checks", raising=False) assert (await self._route(router, {"metadata": {"user_api_key_team_id": "router-team"}})).model == "restricted-model" + + +def _access_window_offsets(start_hours: float, end_hours: float, team_ids: list) -> dict: + now_utc = datetime.now(timezone.utc) + return { + "start": (now_utc + timedelta(hours=start_hours)).strftime("%H:%M"), + "end": (now_utc + timedelta(hours=end_hours)).strftime("%H:%M"), + "timezone": "UTC", + "team_ids": team_ids, + } + + +def _reserved_model_list(windows_for_reserved=None, windows_for_open=None) -> list: + reserved: dict = { + "model_name": "gpt-4o-ptu", + "litellm_params": {"model": "gpt-4o", "mock_response": "reserved"}, + "model_info": {"id": "reserved-deployment"}, + } + if windows_for_reserved is not None: + reserved["model_info"]["access_windows"] = windows_for_reserved + unreserved: dict = { + "model_name": "gpt-4o-ptu", + "litellm_params": {"model": "gpt-4o", "mock_response": "open"}, + "model_info": {"id": "open-deployment"}, + } + if windows_for_open is not None: + unreserved["model_info"]["access_windows"] = windows_for_open + return [reserved, unreserved] + + +def test_access_windows_hide_reserved_deployment_from_other_teams(): + router = Router( + model_list=_reserved_model_list( + windows_for_reserved=[_access_window_offsets(-1, 1, ["team-a"])], + ), + ) + _, deployments = router._common_checks_available_deployment( + model="gpt-4o-ptu", + request_kwargs={"metadata": {"user_api_key_team_id": "team-b"}}, + ) + assert [d["model_info"]["id"] for d in deployments] == ["open-deployment"] + + +def test_access_windows_raise_when_only_reserved_deployments_remain(): + router = Router(model_list=_reserved_model_list( + windows_for_reserved=[_access_window_offsets(-1, 1, ["team-a"])], + windows_for_open=[_access_window_offsets(-1, 1, ["team-a"])], + )[:1]) + for request_kwargs in ({"metadata": {"user_api_key_team_id": "team-b"}}, {}): + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._common_checks_available_deployment(model="gpt-4o-ptu", request_kwargs=request_kwargs) + _, deployments = router._common_checks_available_deployment( + model="gpt-4o-ptu", + request_kwargs={"metadata": {"user_api_key_team_id": "team-a"}}, + ) + assert [d["model_info"]["id"] for d in deployments] == ["reserved-deployment"] + + +def test_reserved_deployments_drop_strategy_markers_before_filtering(): + router = Router(model_list=_reserved_model_list()[:1]) + marker = {"model_name": "gpt-4o-ptu", "litellm_params": {"model": "auto_router/semantic"}} + reserved = { + "model_name": "gpt-4o-ptu", + "litellm_params": {"model": "gpt-4o"}, + "model_info": {"access_windows": [_access_window_offsets(-1, 1, ["team-a"])]}, + } + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._filter_reserved_deployments( + model="gpt-4o-ptu", + healthy_deployments=[marker, reserved], + request_team_id="team-b", + ) + + +def test_access_windows_invalid_timezone_fails_router_construction(): + with pytest.raises(ValueError, match=r"gpt-4o-ptu.*access_windows"): + Router( + model_list=[ + { + "model_name": "gpt-4o-ptu", + "litellm_params": {"model": "gpt-4o", "mock_response": "x"}, + "model_info": { + "access_windows": [ + { + "start": "22:00", + "end": "06:00", + "timezone": "Mars/Olympus", + "team_ids": ["team-a"], + } + ] + }, + } + ], + ) + + +def test_access_windows_inactive_window_leaves_deployments_available(): + router = Router( + model_list=_reserved_model_list( + windows_for_reserved=[_access_window_offsets(2, 3, ["team-a"])], + ), + ) + _, deployments = router._common_checks_available_deployment( + model="gpt-4o-ptu", + request_kwargs={"metadata": {"user_api_key_team_id": "team-b"}}, + ) + assert {d["model_info"]["id"] for d in deployments} == {"reserved-deployment", "open-deployment"} + + +def test_access_windows_apply_when_calling_by_model_id(): + router = Router(model_list=_reserved_model_list( + windows_for_reserved=[_access_window_offsets(-1, 1, ["team-a"])], + )) + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._common_checks_available_deployment( + model="reserved-deployment", + request_kwargs={"metadata": {"user_api_key_team_id": "team-b"}}, + ) + _, deployment = router._common_checks_available_deployment( + model="reserved-deployment", + request_kwargs={"metadata": {"user_api_key_team_id": "team-a"}}, + ) + assert deployment["model_info"]["id"] == "reserved-deployment" + + +def test_access_windows_apply_when_calling_by_litellm_model_name(): + router = Router( + model_list=[ + { + "model_name": "gpt-4o-ptu", + "litellm_params": { + "model": "openai/gpt-5.6-bypass-probe", + "mock_response": "reserved", + }, + "model_info": { + "id": "reserved-litellm-model", + "access_windows": [_access_window_offsets(-1, 1, ["team-a"])], + }, + } + ], + ) + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._common_checks_available_deployment( + model="openai/gpt-5.6-bypass-probe", + request_kwargs={"metadata": {"user_api_key_team_id": "team-b"}}, + ) + _, deployments = router._common_checks_available_deployment( + model="openai/gpt-5.6-bypass-probe", + request_kwargs={"metadata": {"user_api_key_team_id": "team-a"}}, + ) + assert [d["model_info"]["id"] for d in deployments] == ["reserved-litellm-model"] + + +def test_access_windows_apply_to_specific_deployment_calls(): + router = Router( + model_list=[ + { + "model_name": "gpt-4o-ptu", + "litellm_params": { + "model": "openai/gpt-5.6-specific-probe", + "mock_response": "reserved", + }, + "model_info": { + "id": "reserved-specific", + "access_windows": [_access_window_offsets(-1, 1, ["team-a"])], + }, + } + ], + ) + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._common_checks_available_deployment( + model="openai/gpt-5.6-specific-probe", + specific_deployment=True, + request_kwargs={"metadata": {"user_api_key_team_id": "team-b"}}, + ) + _, deployments = router._common_checks_available_deployment( + model="openai/gpt-5.6-specific-probe", + specific_deployment=True, + request_kwargs={"metadata": {"user_api_key_team_id": "team-a"}}, + ) + assert [d["model_info"]["id"] for d in deployments] == ["reserved-specific"] + + +def test_access_windows_apply_to_wildcard_early_resolve(): + router = Router( + model_list=[ + { + "model_name": "openai/*", + "litellm_params": {"model": "openai/*", "mock_response": "reserved"}, + "model_info": { + "id": "reserved-wildcard", + "access_windows": [_access_window_offsets(-1, 1, ["team-a"])], + }, + } + ], + ) + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._common_checks_available_deployment( + model="openai/gpt-probe-wildcard", + request_kwargs={"metadata": {"user_api_key_team_id": "team-b"}}, + ) + _, deployments = router._common_checks_available_deployment( + model="openai/gpt-probe-wildcard", + request_kwargs={"metadata": {"user_api_key_team_id": "team-a"}}, + ) + assert [d["model_info"]["id"] for d in deployments] == ["reserved-wildcard"] + + +def test_access_windows_filter_reserved_deployments_method(): + router = Router(model_list=_reserved_model_list()) + reserved: dict = { + "model_info": { + "id": "reserved-deployment", + "access_windows": [_access_window_offsets(-1, 1, ["team-a"])], + } + } + open_deployment: dict = {"model_info": {"id": "open-deployment"}} + assert [ + d["model_info"]["id"] + for d in router._filter_reserved_deployments( + model="gpt-4o-ptu", + healthy_deployments=[reserved, open_deployment], + request_team_id="team-b", + ) + ] == ["open-deployment"] + with pytest.raises(litellm.BadRequestError, match="reserved for another team"): + router._filter_reserved_deployments( + model="gpt-4o-ptu", + healthy_deployments=[reserved], + request_team_id="team-b", + ) + assert [ + d["model_info"]["id"] + for d in router._filter_reserved_deployments( + model="gpt-4o-ptu", + healthy_deployments=[reserved, open_deployment], + request_team_id="team-a", + ) + ] == ["reserved-deployment", "open-deployment"] diff --git a/tests/test_litellm/test_router_exception_redaction.py b/tests/test_litellm/test_router_exception_redaction.py index 6754775db22..5b52496fc1c 100644 --- a/tests/test_litellm/test_router_exception_redaction.py +++ b/tests/test_litellm/test_router_exception_redaction.py @@ -26,8 +26,8 @@ Five leak sites are gated in `litellm/router.py`: 1. Deployment timeout debug after `litellm.Timeout` 2. ContextWindowExceededError fallback hint 3. ContentPolicyViolationError fallback hint -4. "No fallback model group found for..." when fallbacks dict misses -5. "Received Model Group=...\\nAvailable Model Group Fallbacks=..." +4. "no fallback model group was found" when fallbacks dict misses +5. "model group '...' failed with the error above" plus the fallback outcome (always fires on terminal raise from the fallback orchestrator) Site 5 is the broadest — it fires for every failing call that goes @@ -42,8 +42,9 @@ import pytest import litellm from litellm import Router -_RECEIVED_MODEL_GROUP_PHRASE = "Received Model Group=" -_AVAILABLE_FALLBACKS_PHRASE = "Available Model Group Fallbacks=" +_RECEIVED_MODEL_GROUP_PHRASE = "failed with the error above" +_AVAILABLE_FALLBACKS_PHRASE = "No fallback was attempted" +_NO_FALLBACK_GROUP_PHRASE = "no fallback model group was found" _CONTEXT_WINDOW_HINT_PHRASE = "context_window_fallbacks=" _INTERNAL_MODEL_GROUP_NAME = "all-anthropic/claude-secret-internal" _FALLBACK_CREDENTIAL = "sk-INLINEFALLBACKSECRET1234567890" @@ -124,7 +125,7 @@ def test_flag_defaults_on(): assert litellm.expose_router_debug_in_errors is True -# --- Site 5: "Received Model Group=..." on terminal raise -------------------- +# --- Site 5: fallback outcome on terminal raise -------------------- @pytest.mark.asyncio @@ -192,7 +193,7 @@ async def test_flag_on_shows_context_window_fallback_hint(monkeypatch: pytest.Mo assert _INTERNAL_MODEL_GROUP_NAME in msg, msg -# --- Site 4: "No fallback model group found..." when fallbacks miss --------- +# --- Site 4: "no fallback model group was found" when fallbacks miss --------- @pytest.mark.asyncio @@ -221,7 +222,7 @@ async def test_flag_off_does_not_leak_when_no_fallback_group_found(monkeypatch: messages=[{"role": "user", "content": "hi"}], ) msg = excinfo.value.message - assert "No fallback model group found" not in msg, msg + assert _NO_FALLBACK_GROUP_PHRASE not in msg, msg assert "some-other-group" not in msg, msg assert _INTERNAL_MODEL_GROUP_NAME not in msg, msg @@ -250,8 +251,12 @@ async def test_flag_on_shows_when_no_fallback_group_found(monkeypatch: pytest.Mo messages=[{"role": "user", "content": "hi"}], ) msg = excinfo.value.message - assert "No fallback model group found" in msg, msg - assert _INTERNAL_MODEL_GROUP_NAME in msg, msg + assert _NO_FALLBACK_GROUP_PHRASE in msg, msg + assert f"model group '{_INTERNAL_MODEL_GROUP_NAME}' failed with the error above" in msg, msg + assert "Fallbacks are configured for: some-other-group" in msg, msg + assert "not retried on another model" in msg, msg + assert _AVAILABLE_FALLBACKS_PHRASE not in msg, msg + assert msg.count("failed with the error above") == 1, msg # --- Site 1: Deployment timeout debug on litellm.Timeout -------------------- @@ -349,6 +354,30 @@ async def test_flag_on_shows_content_policy_fallback_hint(monkeypatch: pytest.Mo assert _INTERNAL_MODEL_GROUP_NAME in msg, msg +@pytest.mark.asyncio +async def test_flag_on_explains_failed_content_policy_fallback(monkeypatch: pytest.MonkeyPatch): + monkeypatch.setattr(litellm, "expose_router_debug_in_errors", True) + router = Router( + model_list=[ + {"model_name": _INTERNAL_MODEL_GROUP_NAME, "litellm_params": {"model": "gpt-4o", "api_key": "key"}}, + {"model_name": "policy-safe-group", "litellm_params": {"model": "gpt-4o", "api_key": "key"}}, + ], + content_policy_fallbacks=[{_INTERNAL_MODEL_GROUP_NAME: ["policy-safe-group"]}], + num_retries=0, + ) + with pytest.raises(litellm.ContentPolicyViolationError) as excinfo: + await router.acompletion( + model=_INTERNAL_MODEL_GROUP_NAME, + messages=[{"role": "user", "content": "hi"}], + mock_response=_content_policy_error(), + ) + msg = excinfo.value.message + assert f"model group '{_INTERNAL_MODEL_GROUP_NAME}' failed with the error above" in msg, msg + assert "Fallback to policy-safe-group also failed: " in msg, msg + assert _AVAILABLE_FALLBACKS_PHRASE not in msg, msg + assert msg.count("failed with the error above") == 1, msg + + # --- Credential masking: raw provider keys never leak, either flag state ---- @@ -387,7 +416,7 @@ async def test_flag_on_masks_fallback_credentials(monkeypatch: pytest.MonkeyPatc async def test_flag_on_scrubs_credential_from_inner_fallback_exception_string(monkeypatch: pytest.MonkeyPatch): """If the fallback attempt itself raises an exception whose message embeds a raw provider credential (e.g. a provider SDK echoing back the api_key it was - called with), that string is re-embedded via `Error doing the fallback: ...` + called with), that string is re-embedded via `Fallback to ... also failed: ...` on the terminal raise. The router must scrub known secret patterns from it. The primary fails with a benign rate-limit; the fallback deployment fails with an exception whose text contains the secret.""" @@ -423,6 +452,9 @@ async def test_flag_on_scrubs_credential_from_inner_fallback_exception_string(mo messages=[{"role": "user", "content": "hi"}], ) msg = excinfo.value.message - assert "Error doing the fallback:" in msg, msg + assert f"model group '{_INTERNAL_MODEL_GROUP_NAME}' failed with the error above" in msg, msg + assert "Fallback to fallback-group also failed: " in msg, msg + assert "content_filter_policy" in msg, msg + assert msg.count("failed with the error above") == 1, msg assert inner_secret not in msg, msg assert "REDACTED" in msg, msg diff --git a/tests/test_litellm/test_secret_redaction.py b/tests/test_litellm/test_secret_redaction.py index f58ade11d1c..71369c33a6b 100644 --- a/tests/test_litellm/test_secret_redaction.py +++ b/tests/test_litellm/test_secret_redaction.py @@ -19,7 +19,11 @@ from litellm._logging import ( verbose_proxy_logger, verbose_router_logger, ) -from litellm.litellm_core_utils.secret_redaction import redact_internal_details, redact_string +from litellm.litellm_core_utils.secret_redaction import ( + redact_internal_details, + redact_string, + redact_structured_value, +) SECRET = "sk-proj-abc123def456ghi789jklmnopqrst" @@ -71,6 +75,17 @@ def test_redact_string_catches_secret_patterns(): assert redact_string(normal) == normal +@pytest.mark.parametrize("native", (False, True), ids=("python", "rust")) +def test_diagnostic_redaction_policy_matches_across_backends(monkeypatch: pytest.MonkeyPatch, native: bool) -> None: + if native: + pytest.importorskip("litellm.rust_bridge._native") + monkeypatch.setenv("LITELLM_RUST", "1" if native else "0") + + assert redact_string("GET /v1?api_key=abcdefgh12345&page=2") == "GET /v1?REDACTED&page=2" + assert redact_structured_value("db_url", "postgresql://reader@example.org/database") == "REDACTED" + assert redact_internal_details("failed at /etc/service/keys on db.internal") == "failed at REDACTED on REDACTED" + + @pytest.mark.parametrize( "connection_string", [ diff --git a/tests/test_litellm/test_together_ai_model_metadata.py b/tests/test_litellm/test_together_ai_model_metadata.py index 7176ba4f219..dccba3d66f9 100644 --- a/tests/test_litellm/test_together_ai_model_metadata.py +++ b/tests/test_litellm/test_together_ai_model_metadata.py @@ -95,15 +95,6 @@ def _successor(info: dict[str, object]) -> str | None: return successor if isinstance(successor, str) else None -def test_together_successor_metadata_points_at_known_models(cost_map: CostMap): - successors = { - model: successor - for model, info in cost_map.items() - if model.startswith("together_ai/") and (successor := _successor(info)) is not None - } - assert len(successors) >= 10 - for model, successor in successors.items(): - assert successor in cost_map, f"{model} names successor {successor} that is not in the map" def test_together_backup_cost_map_in_sync(cost_map: CostMap): diff --git a/tests/test_litellm/test_unit_shard_missing_paths.py b/tests/test_litellm/test_unit_shard_missing_paths.py new file mode 100644 index 00000000000..b91c2cff764 --- /dev/null +++ b/tests/test_litellm/test_unit_shard_missing_paths.py @@ -0,0 +1,74 @@ +import os +import subprocess +import sys +from pathlib import Path +from types import MappingProxyType +from typing import Final + +import pytest +import yaml + +_REPO_ROOT: Final = Path(__file__).resolve().parents[2] +_BASE_WORKFLOW: Final = _REPO_ROOT / ".github" / "workflows" / "_test-unit-base.yml" +_SHARD_ENV: Final = MappingProxyType( + {"MAX_FAILURES": "10", "RERUNS": "0", "DIST": "loadscope", "TEST_TIMEOUT_SECONDS": "60", "COVERAGE_CORE": "sysmon"} +) +_UV_SHIM: Final = f'#!/usr/bin/env bash\nshift 2\nexec "{sys.executable}" -m "$@"\n' +_PASSING_TEST: Final = "def test_passes():\n assert True\n" +_FAILING_TEST: Final = "def test_fails():\n assert False\n" + + +def _run_tests_script() -> str: + workflow: Final = yaml.safe_load(_BASE_WORKFLOW.read_text()) + return next(step["run"] for step in workflow["jobs"]["run"]["steps"] if step.get("name") == "Run tests") + + +def _run_shard(tmp_path: Path, test_path: str, workers: str) -> subprocess.CompletedProcess[str]: + shim_dir: Final = tmp_path / "bin" + shim_dir.mkdir() + (shim_dir / "uv").write_text(_UV_SHIM) + (shim_dir / "uv").chmod(0o755) + (tmp_path / "pyproject.toml").write_text("[tool.pytest.ini_options]\naddopts = '-p no:cacheprovider'\n") + return subprocess.run( + ("bash", "--noprofile", "--norc", "-eo", "pipefail", "-c", _run_tests_script()), + cwd=tmp_path, + env={ + **os.environ, + **_SHARD_ENV, + "PATH": f"{shim_dir}{os.pathsep}{os.environ['PATH']}", + "TEST_PATH": test_path, + "WORKERS": workers, + }, + capture_output=True, + text=True, + timeout=120, + check=False, + ) + + +def _write_passing_test(tmp_path: Path) -> Path: + present: Final = tmp_path / "tests" / "present" + present.mkdir(parents=True) + (present / "test_present.py").write_text(_PASSING_TEST) + return present + + +@pytest.mark.parametrize("workers", ("0", "2"), ids=("serial", "xdist")) +def test_a_missing_path_is_dropped_and_the_existing_paths_still_run(tmp_path: Path, workers: str) -> None: + _write_passing_test(tmp_path) + + result: Final = _run_shard(tmp_path, "tests/gone tests/present", workers) + + assert result.returncode == 0, result.stdout + result.stderr + assert "1 passed" in result.stdout, result.stdout + assert "::warning::tests/gone does not exist" in result.stdout + + +def test_ignore_flags_survive_the_path_filter(tmp_path: Path) -> None: + present: Final = _write_passing_test(tmp_path) + (present / "test_ignored.py").write_text(_FAILING_TEST) + + result: Final = _run_shard(tmp_path, "tests/present --ignore=tests/present/test_ignored.py", "0") + + assert result.returncode == 0, result.stdout + result.stderr + assert "1 passed" in result.stdout, result.stdout diff --git a/tests/test_litellm/test_utils.py b/tests/test_litellm/test_utils.py index 62aae7aed34..ce280cc3513 100644 --- a/tests/test_litellm/test_utils.py +++ b/tests/test_litellm/test_utils.py @@ -8,7 +8,7 @@ import logging import os import queue import threading -from collections.abc import Callable, Iterator +from collections.abc import Callable, Iterator, Mapping from concurrent.futures import Future, ThreadPoolExecutor from datetime import datetime, timedelta, timezone from pathlib import PurePath @@ -32,27 +32,35 @@ from litellm._logging import ( from litellm.caching.caching import Cache from litellm.caching.caching_handler import _PENDING_CACHE_WRITES from litellm.constants import DEFAULT_MOCK_RESPONSE_COMPLETION_TOKEN_COUNT +from litellm.integrations.custom_guardrail import CustomGuardrail from litellm.integrations.custom_logger import CustomLogger from litellm.litellm_core_utils.get_litellm_params import get_litellm_params from litellm.litellm_core_utils.thread_pool_executor import executor as logging_executor from litellm.llms.base_llm.base_model_iterator import MockResponseIterator from litellm.proxy.utils import is_valid_api_key from litellm.types.integrations.custom_logger import HEADROOM_CONVERTED_STREAM_KEY +from litellm.types.llms.openai import ResponsesAPIResponse from litellm.types.router import CredentialLiteLLMParams, GenericLiteLLMParams from litellm.types.utils import ( ADDRESSED_RESPONSE_ID_FIELD, CallTypes, Choices, Delta, + EmbeddingResponse, + ImageResponse, LlmProviders, + LLMResponseTypes, ModelResponse, ModelResponseStream, PromptTokensDetailsWrapper, + RerankResponse, StreamingChoices, + TranscriptionResponse, Usage, all_litellm_params, bedrock_batch_litellm_params, ) +from litellm.types.videos.main import VideoObject from litellm.utils import ( CustomStreamWrapper, ProviderConfigManager, @@ -230,6 +238,13 @@ def test_get_model_info_prefers_exact_dated_key_over_stripped( assert info["key"] == expected_key +def test_get_model_info_internal_failure_is_not_reported_as_unmapped() -> None: + with patch("litellm.utils._get_potential_model_names", side_effect=RuntimeError("malformed metadata")): + with pytest.raises(Exception, match="This model isn't mapped yet") as exc_info: + litellm.utils._get_model_info_helper(model="gpt-4o", custom_llm_provider="openai") + assert not isinstance(exc_info.value, litellm.ModelNotMappedError) + + def test_check_provider_match_azure_ai_allows_openai_and_azure(): """ Test that azure_ai provider can match openai and azure models. @@ -624,6 +639,9 @@ def validate_model_cost_values(model_data, exceptions=None): "output_cost_per_character", "input_cost_per_image", "output_cost_per_image", + "output_cost_per_image_512", + "output_cost_per_image_1024", + "output_cost_per_image_1536", "input_cost_per_pixel", "output_cost_per_pixel", "input_cost_per_second", @@ -851,6 +869,9 @@ def test_aaamodel_prices_and_context_window_json_is_valid(): "output_cost_per_character": {"type": "number"}, "output_cost_per_character_above_128k_tokens": {"type": "number"}, "output_cost_per_image": {"type": "number"}, + "output_cost_per_image_512": {"type": "number"}, + "output_cost_per_image_1024": {"type": "number"}, + "output_cost_per_image_1536": {"type": "number"}, "output_cost_per_image_token": {"type": "number"}, "output_cost_per_video_token": {"type": "number"}, "output_cost_per_pixel": {"type": "number"}, @@ -1465,12 +1486,6 @@ class TestProxyFunctionCalling: ("gemini/gemini-2.5-pro", "litellm_proxy/gemini/gemini-2.5-pro", True), ("gemini/gemini-2.5-flash", "litellm_proxy/gemini/gemini-2.5-flash", True), # Groq models (mixed support) - ("groq/gemma-7b-it", "litellm_proxy/groq/gemma-7b-it", True), - ( - "groq/llama-3.3-70b-versatile", - "litellm_proxy/groq/llama-3.3-70b-versatile", - True, - ), # Cohere models (generally don't support function calling) ("command-nightly", "litellm_proxy/command-nightly", False), ], @@ -3042,6 +3057,45 @@ class TestExtraBodyCannotOverrideModel: assert result["extra_body"] == {"top_k": 5}, result + def test_nested_drop_paths_do_not_break_extra_body_filtering(self) -> None: + from litellm.utils import add_provider_specific_params_to_optional_params + + result = add_provider_specific_params_to_optional_params( + optional_params={}, + passed_params={ + "model": "hosted_vllm/my-vllm-model", + "extra_body": {"model": "hosted_vllm/other", "top_k": 5, "kept": True}, + }, + custom_llm_provider="hosted_vllm", + openai_params=["model", "temperature"], + additional_drop_params=[["tools", "function", "strict"], "top_k"], + ) + + assert result == {"extra_body": {"kept": True}}, result + + def test_a_list_entry_does_not_break_a_supported_nested_drop_path(self) -> None: + def tools() -> list[dict]: + return [ + { + "type": "function", + "function": {"name": "f", "custom_marker": "LEAK", "parameters": {"type": "object"}}, + } + ] + + untouched = litellm.get_optional_params( + model="my-vllm-model", custom_llm_provider="hosted_vllm", tools=tools() + ) + assert untouched["tools"][0]["function"]["custom_marker"] == "LEAK", untouched + + result = litellm.get_optional_params( + model="my-vllm-model", + custom_llm_provider="hosted_vllm", + tools=tools(), + additional_drop_params=["tools[*].function.custom_marker", ["tools", "function", "custom_marker"]], + ) + + assert "custom_marker" not in result["tools"][0]["function"], result + class TestDropParamsWithPromptCacheKey: """ @@ -4366,6 +4420,111 @@ async def test_converted_chat_stream_hook_skips_unhandled_wrappers( assert wrapper.completion_stream is completion_stream +class _ChatShapedSuccessDeploymentHook(CustomLogger): + async def async_post_call_success_deployment_hook( + self, request_data: dict[str, object], response: object, call_type: CallTypes | None + ) -> None: + raise AttributeError(f"{type(response).__name__!r} object has no attribute 'choices'") + + +class _RecordingSuccessDeploymentHook(CustomLogger): + def __init__(self) -> None: + super().__init__() + self.seen_responses: tuple[object, ...] = () + + async def async_post_call_success_deployment_hook( + self, request_data: dict[str, object], response: object, call_type: CallTypes | None + ) -> None: + self.seen_responses = (*self.seen_responses, response) + + +_SUCCESS_RESPONSES_BY_CALL_TYPE: Final = ( + pytest.param( + VideoObject(id="video_abc", object="video", status="queued", model="sora-2", seconds="4", size="720x1280"), + CallTypes.avideo_generation, + id="video", + ), + pytest.param(EmbeddingResponse(model="text-embedding-3-small"), CallTypes.aembedding, id="embedding"), + pytest.param( + ResponsesAPIResponse( + id="resp_abc", created_at=1, output=[], parallel_tool_calls=False, tool_choice="auto", tools=[], model="gpt-5.6" + ), + CallTypes.aresponses, + id="responses", + ), + pytest.param(ImageResponse(), CallTypes.aimage_generation, id="image"), + pytest.param(RerankResponse(id="rerank_abc"), CallTypes.arerank, id="rerank"), + pytest.param(TranscriptionResponse(text="hi"), CallTypes.atranscription, id="transcription"), + pytest.param(ModelResponse(model="gpt-5.6"), CallTypes.acompletion, id="chat"), + pytest.param(ModelResponse(model="claude-sonnet-4-5"), CallTypes.aanthropic_messages, id="anthropic_messages"), +) + + +@pytest.mark.asyncio +@pytest.mark.parametrize(("response", "call_type"), _SUCCESS_RESPONSES_BY_CALL_TYPE) +async def test_success_deployment_hook_raising_keeps_response_and_runs_later_hooks( + monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture, response: object, call_type: CallTypes +) -> None: + second_hook: Final = _RecordingSuccessDeploymentHook() + monkeypatch.setattr(litellm, "callbacks", [_ChatShapedSuccessDeploymentHook(), second_hook]) + + with caplog.at_level(logging.ERROR, logger=verbose_logger.name): + result: Final = await async_post_call_success_deployment_hook( + request_data={"model": "m"}, response=response, call_type=call_type + ) + + assert result is response + assert second_hook.seen_responses == (response,) + failure_logs: Final = tuple(r for r in caplog.records if "async_post_call_success_deployment_hook error" in r.message) + assert len(failure_logs) == 1 + assert "_ChatShapedSuccessDeploymentHook" in failure_logs[0].message + assert str(call_type) in failure_logs[0].message + assert failure_logs[0].exc_info is not None + + +@pytest.mark.asyncio +async def test_success_deployment_hook_raising_keeps_earlier_hook_rewrite(monkeypatch: pytest.MonkeyPatch) -> None: + rewriter: Final = _RewritingSuccessDeploymentHook() + trailing_hook: Final = _RecordingSuccessDeploymentHook() + monkeypatch.setattr(litellm, "callbacks", [rewriter, _ChatShapedSuccessDeploymentHook(), trailing_hook]) + original: Final = ModelResponse(model="gpt-5.6") + + result: Final = await async_post_call_success_deployment_hook( + request_data={"model": "gpt-5.6"}, response=original, call_type=CallTypes.acompletion + ) + + assert isinstance(result, ModelResponse) + assert result is not original + assert result.choices[0].message.content == "rewritten by deployment hook" + assert trailing_hook.seen_responses == (result,) + + +class _GuardrailBlocked(Exception): + pass + + +class _BlockingSuccessDeploymentGuardrail(CustomGuardrail): + async def async_post_call_success_deployment_hook( + self, request_data: dict, response: LLMResponseTypes, call_type: CallTypes | None + ) -> LLMResponseTypes | None: + raise _GuardrailBlocked("Violated moderation policy") + + +@pytest.mark.asyncio +async def test_success_deployment_hook_still_propagates_guardrail_block(monkeypatch: pytest.MonkeyPatch) -> None: + later_hook: Final = _RewritingSuccessDeploymentHook() + monkeypatch.setattr( + litellm, "callbacks", [_BlockingSuccessDeploymentGuardrail(guardrail_name="blocking"), later_hook] + ) + + with pytest.raises(_GuardrailBlocked): + await async_post_call_success_deployment_hook( + request_data={"model": "gpt-5.6"}, response=ModelResponse(model="gpt-5.6"), call_type=CallTypes.acompletion + ) + + assert later_hook.seen_responses == () + + @pytest.mark.asyncio @respx.mock async def test_wrapper_async_leaves_success_deployment_hook_off_requested_fake_stream( @@ -5124,23 +5283,31 @@ async def test_wrapper_async_does_not_fire_failure_hook_for_post_success_error( ) -> None: """Regression: an error raised after the deployment call already succeeded (e.g. inside async_post_call_success_deployment_hook or post_call_processing) is not a deployment - attempt failure and must not reach async_post_call_failure_deployment_hook.""" + attempt failure and must not reach async_post_call_failure_deployment_hook. The raising + callback is a guardrail because a plain logger's success hook error is isolated and + logged instead of propagating out of the call.""" - class ExplodingSuccessLogger(CustomLogger): + class ExplodingSuccessGuardrail(CustomGuardrail): def __init__(self) -> None: - super().__init__() - self.failure_calls: list[Exception] = [] + super().__init__(guardrail_name="exploding") + self.failure_calls: tuple[Exception, ...] = () - async def async_post_call_success_deployment_hook(self, request_data, response, call_type): + async def async_post_call_success_deployment_hook( + self, request_data: Mapping[str, object], response: LLMResponseTypes, call_type: CallTypes | None + ) -> LLMResponseTypes | None: raise RuntimeError("boom in success hook, model call itself succeeded") async def async_post_call_failure_deployment_hook( - self, request_data, exception, call_type, fallback_depth=None - ): - self.failure_calls.append(exception) + self, + request_data: Mapping[str, object], + exception: Exception, + call_type: CallTypes | None, + fallback_depth: int | None = None, + ) -> None: + self.failure_calls = (*self.failure_calls, exception) - exploding_logger = ExplodingSuccessLogger() - monkeypatch.setattr(litellm, "callbacks", [exploding_logger]) + exploding_guardrail: Final = ExplodingSuccessGuardrail() + monkeypatch.setattr(litellm, "callbacks", [exploding_guardrail]) with pytest.raises(RuntimeError, match="boom in success hook"): await litellm.acompletion( @@ -5149,7 +5316,7 @@ async def test_wrapper_async_does_not_fire_failure_hook_for_post_success_error( mock_response="this call succeeds", ) - assert exploding_logger.failure_calls == [] + assert exploding_guardrail.failure_calls == () @pytest.mark.asyncio diff --git a/tests/test_litellm/test_xai_responses_auto_routing.py b/tests/test_litellm/test_xai_responses_auto_routing.py index d405ea1e6c6..c31f599dd79 100644 --- a/tests/test_litellm/test_xai_responses_auto_routing.py +++ b/tests/test_litellm/test_xai_responses_auto_routing.py @@ -46,34 +46,6 @@ class TestXAIResponsesAutoRouting: assert model_info.get("mode") != "responses" assert updated_model == model - def test_responses_api_bridge_check_with_tools(self): - """Test that with tools, xAI automatically routes to Responses API""" - model = "grok-3" - custom_llm_provider = "xai" - tools = [ - { - "type": "function", - "function": { - "name": "get_weather", - "description": "Get the weather", - "parameters": { - "type": "object", - "properties": {"location": {"type": "string"}}, - }, - }, - } - ] - web_search_options = None - - model_info, updated_model = responses_api_bridge_check( - model=model, - custom_llm_provider=custom_llm_provider, - web_search_options=web_search_options, - ) - - # Should auto-route to responses mode when tools are present - assert model_info.get("mode") == "chat" - assert updated_model == model def test_responses_api_bridge_check_with_empty_tools(self): """Test that with empty tools list, xAI does not route to Responses API""" @@ -134,57 +106,8 @@ class TestXAIResponsesAutoRouting: assert model_info.get("mode") == "responses" assert updated_model == "grok-3" # prefix removed - def test_responses_api_bridge_check_with_code_interpreter_tool(self): - """Test auto-routing with code_interpreter tool""" - model = "grok-3" - custom_llm_provider = "xai" - tools = [{"type": "code_interpreter"}] - web_search_options = None - model_info, updated_model = responses_api_bridge_check( - model=model, - custom_llm_provider=custom_llm_provider, - web_search_options=web_search_options, - ) - # Should auto-route with code_interpreter tool - assert model_info.get("mode") == "chat" - assert updated_model == model - def test_responses_api_bridge_check_with_web_search_tool(self): - """Test auto-routing with web_search tool""" - model = "grok-4" - custom_llm_provider = "xai" - tools = [ - {"type": "web_search", "filters": {"allowed_domains": ["wikipedia.org"]}} - ] - web_search_options = None - - model_info, updated_model = responses_api_bridge_check( - model=model, - custom_llm_provider=custom_llm_provider, - web_search_options=web_search_options, - ) - - # Should auto-route with web_search tool - assert model_info.get("mode") == "chat" - assert updated_model == model - - def test_responses_api_bridge_check_with_x_search_tool(self): - """Test auto-routing with x_search tool""" - model = "grok-4" - custom_llm_provider = "xai" - tools = [{"type": "x_search", "allowed_x_handles": ["@elonmusk"]}] - web_search_options = None - - model_info, updated_model = responses_api_bridge_check( - model=model, - custom_llm_provider=custom_llm_provider, - web_search_options=web_search_options, - ) - - # Should auto-route with x_search tool - assert model_info.get("mode") == "chat" - assert updated_model == model def test_responses_api_bridge_check_with_web_search_options(self): """Test auto-routing with web_search_options""" diff --git a/tests/test_litellm/types/test_router.py b/tests/test_litellm/types/test_router.py index 7fcb76b638f..4d4c326d1ca 100644 --- a/tests/test_litellm/types/test_router.py +++ b/tests/test_litellm/types/test_router.py @@ -91,7 +91,7 @@ def test_pricing_strings_are_coerced_to_float(): def test_invalid_pricing_is_rejected(): - with pytest.raises(ValueError, match='validation error for ModelInfo'): + with pytest.raises(ValueError, match="validation error for ModelInfo"): ModelInfo(id="x", input_cost_per_token="free") @@ -118,7 +118,9 @@ def test_drop_params_ignores_non_flag_non_string_values_with_a_warning(value, ca assert f"drop_params={value!r} is not a flag value" in caplog.text -@pytest.mark.parametrize("value", [True, "true", None, "os.environ/DROP_PARAMS", "v2:gcm:ciphertext-from-a-pre-fix-row"]) +@pytest.mark.parametrize( + "value", [True, "true", None, "os.environ/DROP_PARAMS", "v2:gcm:ciphertext-from-a-pre-fix-row"] +) def test_drop_params_flags_and_strings_log_nothing(value, caplog): with caplog.at_level(logging.WARNING, logger="LiteLLM"): GenericLiteLLMParams(drop_params=value) @@ -146,3 +148,88 @@ def test_aws_session_tags_round_trip_as_sts_shaped_pairs(): def test_aws_session_tags_reject_shapes_sts_would_refuse(aws_session_tags): with pytest.raises(ValidationError, match="aws_session_tags"): LiteLLM_Params(model="bedrock/anthropic.claude-opus-5", aws_session_tags=aws_session_tags) + + +def test_provider_affinity_header_is_normalized(): + params = LiteLLM_Params( + model="openai/gpt-4o-mini", + provider_affinity_header="X-Conversation-Id", + ) + + assert params.provider_affinity_header == "X-Conversation-Id" + assert params.model_dump(exclude_none=True)["provider_affinity_header"] == "X-Conversation-Id" + + +@pytest.mark.parametrize( + "header", + [ + "Authorization", + "Proxy-Authorization", + "Cookie", + "Set-Cookie", + "Host", + "Content-Length", + "Content-Type", + "X-API-Key", + ], +) +def test_provider_affinity_header_rejects_sensitive_or_transport_headers(header: str): + with pytest.raises(ValueError, match="provider_affinity_header"): + LiteLLM_Params( + model="openai/gpt-4o-mini", + provider_affinity_header=header, + ) + + +@pytest.mark.parametrize("header", ["", "X Conversation Id", "X-Conversation-Id\r\nInjected: true"]) +def test_provider_affinity_header_rejects_invalid_header_names(header: str): + with pytest.raises(ValueError, match="provider_affinity_header"): + LiteLLM_Params( + model="openai/gpt-4o-mini", + provider_affinity_header=header, + ) + + +def test_model_info_parses_access_windows_time_strings(): + import datetime + + info = ModelInfo( + id="x", + access_windows=[ + { + "start": "22:00", + "end": "06:00", + "timezone": "America/New_York", + "team_ids": ["team-nightly"], + } + ], + ) + window = info.access_windows[0] + assert window.start == datetime.time(22, 0) + assert window.end == datetime.time(6, 0) + assert window.timezone == "America/New_York" + assert window.team_ids == ("team-nightly",) + + +@pytest.mark.parametrize( + "access_windows", + [ + [{"start": "25:00", "end": "06:00", "timezone": "UTC", "team_ids": ["t"]}], + [{"start": "22:00", "end": "06:00", "timezone": "Mars/Olympus", "team_ids": ["t"]}], + [{"start": "22:00", "end": "06:00", "timezone": "UTC", "team_ids": []}], + ], + ids=["invalid-time", "unknown-timezone", "empty-team-ids"], +) +def test_model_info_rejects_invalid_access_windows(access_windows): + with pytest.raises(ValidationError): + ModelInfo(id="x", access_windows=access_windows) + + +def test_model_info_rejects_offset_aware_access_window_times(): + with pytest.raises(ValidationError): + ModelInfo( + id="x", + access_windows=[ + {"start": "22:00+05:00", "end": "06:00", "timezone": "UTC", "team_ids": ["t"]} + ], + ) diff --git a/tests/test_litellm/vector_stores/test_vector_store_registry.py b/tests/test_litellm/vector_stores/test_vector_store_registry.py index f19c3706845..762176d6a81 100644 --- a/tests/test_litellm/vector_stores/test_vector_store_registry.py +++ b/tests/test_litellm/vector_stores/test_vector_store_registry.py @@ -8,7 +8,7 @@ from fastapi.testclient import TestClient from datetime import datetime, timezone -from unittest.mock import MagicMock +from unittest.mock import AsyncMock, MagicMock import litellm from litellm.types.vector_stores import LiteLLM_ManagedVectorStore @@ -182,3 +182,70 @@ def test_search_uses_registry_credentials(): assert getattr(called_params, "aws_region_name") == "us-east-1" finally: litellm.vector_store_registry = original_registry + + +def _config_registry(vector_store_id: str = "vs_from_config") -> VectorStoreRegistry: + registry = VectorStoreRegistry(vector_stores=[]) + registry.load_vector_stores_from_config( + [ + { + "vector_store_name": "config-store", + "litellm_params": {"vector_store_id": vector_store_id, "custom_llm_provider": "openai"}, + } + ] + ) + return registry + + +def _db_store(vector_store_id: str, vector_store_name: str) -> LiteLLM_ManagedVectorStore: + return LiteLLM_ManagedVectorStore( + vector_store_id=vector_store_id, + custom_llm_provider="openai", + vector_store_name=vector_store_name, + created_at=datetime.now(timezone.utc), + updated_at=datetime.now(timezone.utc), + ) + + +def test_config_loaded_store_is_marked_config_owned_and_db_store_is_not(): + registry = _config_registry() + registry.add_vector_store_to_registry(_db_store("vs_from_db", "db-store")) + + assert registry.get_litellm_managed_vector_store_from_registry("vs_from_config")["is_config"] is True + assert registry.is_config_vector_store("vs_from_config") is True + assert registry.is_config_vector_store("vs_from_db") is False + assert registry.is_config_vector_store("vs_unknown") is False + + +def test_db_row_does_not_overwrite_config_owned_store_in_registry(): + registry = _config_registry() + registry.add_vector_store_to_registry(_db_store("vs_from_db", "db-store")) + + registry.update_vector_store_in_registry("vs_from_config", _db_store("vs_from_config", "renamed-in-db")) + registry.update_vector_store_in_registry("vs_from_db", _db_store("vs_from_db", "renamed-in-db")) + + assert registry.get_litellm_managed_vector_store_from_registry("vs_from_config") == { + **registry.get_litellm_managed_vector_store_from_registry("vs_from_config"), + "vector_store_name": "config-store", + "is_config": True, + } + assert registry.get_litellm_managed_vector_store_from_registry("vs_from_db")["vector_store_name"] == "renamed-in-db" + + +@pytest.mark.asyncio +async def test_config_owned_store_survives_db_liveness_check_while_missing_db_store_is_evicted(): + registry = _config_registry() + registry.add_vector_store_to_registry(_db_store("vs_from_db", "db-store")) + prisma_client = MagicMock() + prisma_client.db.litellm_managedvectorstorestable.find_unique = AsyncMock(return_value=None) + + to_run = await registry.pop_vector_stores_to_run_with_db_fallback( + non_default_params={"vector_store_ids": ["vs_from_config", "vs_from_db"]}, + prisma_client=prisma_client, + ) + + assert [vs["vector_store_id"] for vs in to_run] == ["vs_from_config"] + assert [vs["vector_store_id"] for vs in registry.vector_stores] == ["vs_from_config"] + prisma_client.db.litellm_managedvectorstorestable.find_unique.assert_awaited_once_with( + where={"vector_store_id": "vs_from_db"} + ) diff --git a/tests/test_litellm_rust/messages/test_callbacks.py b/tests/test_litellm_rust/messages/test_callbacks.py index b55bc47d640..d5dc5437398 100644 --- a/tests/test_litellm_rust/messages/test_callbacks.py +++ b/tests/test_litellm_rust/messages/test_callbacks.py @@ -5,7 +5,11 @@ import pytest import litellm from litellm.integrations.custom_logger import CustomLogger +from litellm.rust_bridge import catalog +from litellm.rust_bridge.catalog import Route, RouteRule +from litellm.rust_bridge.configuration import Rollout from tests.test_litellm_rust.support.callback_recorder import RecordingLogger, drain_logging +from tests.test_litellm_rust.support.isolation import rebound from tests.test_litellm_rust.support.recording_server import RecordingServer, ResponseSpec from tests.test_litellm_rust.support.requests import ( MESSAGES, @@ -20,6 +24,12 @@ pytestmark = pytest.mark.requires_rust_extension STREAM: Final = ResponseSpec(body=None, events=MESSAGES_EVENTS) +@pytest.fixture(autouse=True) +def opt_messages_into_rust() -> Iterator[None]: + with rebound(catalog, "RULES", (RouteRule(Route.MESSAGES, Rollout.RUST_OPT_IN), *catalog.RULES)): + yield + + @pytest.fixture def messages_server(recording_server: RecordingServer) -> RecordingServer: recording_server.default_response = ResponseSpec(body=MESSAGES_RESPONSE) diff --git a/tests/test_litellm_rust/test_cache.py b/tests/test_litellm_rust/test_cache.py index 0f389edaa27..e2e2f9f1819 100644 --- a/tests/test_litellm_rust/test_cache.py +++ b/tests/test_litellm_rust/test_cache.py @@ -15,7 +15,7 @@ from contextlib import ExitStack from datetime import datetime from pathlib import Path from types import SimpleNamespace -from typing import Final, Protocol, cast +from typing import Final, Protocol, TypeAlias, cast from unittest.mock import Mock from urllib.parse import urlparse from uuid import uuid4 @@ -37,10 +37,10 @@ from litellm.caching.in_memory_cache import InMemoryCache from litellm.caching.redis_cluster_cache import RedisClusterCache from litellm.caching.redis_semantic_cache import RedisSemanticCache from litellm.caching.s3_cache import S3Cache -from litellm.rust_bridge import _native +from litellm.rust_bridge import _native, catalog from litellm.rust_bridge.catalog import CacheRule, Route, RouteRule, SecretManagerRule from litellm.rust_bridge.configuration import Rollout -from litellm.rust_bridge.response_cache import ResponseCacheRuntime, resolve_response_cache +from litellm.rust_bridge.response_cache import NativeResponseCacheRuntime, ResponseCacheRuntime, resolve_response_cache from litellm.types.caching import LiteLLMCacheType from litellm.types.llms.custom_llm import CustomLLMItem from litellm.types.utils import EmbeddingResponse @@ -1843,9 +1843,7 @@ async def test_qdrant_semantic_async_parity(qdrant_url: str, fake_embedding_endp assert python_value["response"] == {"id": "native"} -async def test_qdrant_semantic_async_store_batch_shares_entries( - qdrant_url: str, fake_embedding_endpoint: str -) -> None: +async def test_qdrant_semantic_async_store_batch_shares_entries(qdrant_url: str, fake_embedding_endpoint: str) -> None: del fake_embedding_endpoint collection: Final = f"cache_{uuid4().hex}" facade: Final = qdrant_facade(qdrant_url, collection) @@ -1865,14 +1863,12 @@ async def test_qdrant_semantic_async_store_batch_shares_entries( assert binding.lookup(entries[0]) == {"id": "one"} assert binding.lookup(entries[1]) == {"id": "two"} - assert ( - (await facade.cache.async_get_cache("batch-one", messages=entries[0]["messages"]))["response"] - == {"id": "one"} - ) - assert ( - (await facade.cache.async_get_cache("batch-two", messages=entries[1]["messages"]))["response"] - == {"id": "two"} - ) + assert (await facade.cache.async_get_cache("batch-one", messages=entries[0]["messages"]))["response"] == { + "id": "one" + } + assert (await facade.cache.async_get_cache("batch-two", messages=entries[1]["messages"]))["response"] == { + "id": "two" + } async def test_qdrant_semantic_malformed_entries_and_unsupported_operations( @@ -1962,3 +1958,389 @@ def test_qdrant_semantic_mutation_and_projection_fallback(qdrant_url: str, fake_ unsupported.cache.qdrant_api_base = "http://127.0.0.1:7777" with pytest.raises(TypeError, match="gRPC"): handle._bind_facade(unsupported) + + +CacheFactory: TypeAlias = Callable[[], Cache] + + +def require_rust(monkeypatch: pytest.MonkeyPatch, backend: LiteLLMCacheType) -> None: + monkeypatch.setattr(catalog, "RULES", (CacheRule(Rollout.RUST_REQUIRED, backends=frozenset({backend})),)) + + +def native_runtime(facade: Cache) -> ResponseCacheRuntime: + runtime: Final = facade._native_cache # pyright: ignore[reportPrivateUsage] # the activation under test has no public accessor + assert isinstance(runtime, ResponseCacheRuntime) + assert runtime.kind == "native" + return runtime + + +@pytest.fixture +def cache_factory(request: pytest.FixtureRequest, tmp_path: Path) -> CacheFactory: + backend: Final = cast(LiteLLMCacheType, request.param) + match backend: + case LiteLLMCacheType.LOCAL: + return lambda: Cache(type=backend) + case LiteLLMCacheType.DISK: + return lambda: Cache(type=backend, disk_cache_dir=str(tmp_path)) + case LiteLLMCacheType.REDIS: + parsed: Final = urlparse(cast(str, request.getfixturevalue("redis_url"))) + return lambda: Cache(type=backend, host=parsed.hostname, port=str(parsed.port)) + case LiteLLMCacheType.S3: + stub: Final = cast(S3Stub, request.getfixturevalue("s3_stub")) + return lambda: Cache( + type=backend, + s3_bucket_name="cache-bucket", + s3_region_name="us-east-1", + s3_endpoint_url=stub.url, + s3_aws_access_key_id="key", + s3_aws_secret_access_key="secret", + s3_path="team", + ) + case LiteLLMCacheType.GCS: + return lambda: Cache(type=backend, gcs_bucket_name="bucket", gcs_path="cache/") + case LiteLLMCacheType.REDIS_SEMANTIC: + return lambda: Cache( + type=backend, + redis_url="redis://127.0.0.1:6379", + similarity_threshold=0.8, + redis_semantic_cache_embedding_model="text-embedding-3-small", + ) + case LiteLLMCacheType.VALKEY_SEMANTIC: + return lambda: Cache(type=backend, redis_url="redis://127.0.0.1:6390/0", similarity_threshold=0.8) + case _: + raise AssertionError(f"no local factory for {backend}") + + +ROUND_TRIP_BACKENDS: Final = ( + LiteLLMCacheType.LOCAL, + LiteLLMCacheType.DISK, + LiteLLMCacheType.REDIS, + LiteLLMCacheType.S3, +) +SHARED_STORE_BACKENDS: Final = (LiteLLMCacheType.DISK, LiteLLMCacheType.REDIS, LiteLLMCacheType.S3) + + +def completion_kwargs(label: str) -> dict[str, object]: + return {"model": "gpt-4o", "messages": [{"role": "user", "content": f"{label} {uuid4().hex}"}]} + + +@pytest.mark.parametrize("backend", list(LiteLLMCacheType)) +def test_shipped_rules_keep_every_backend_on_python(backend: LiteLLMCacheType) -> None: + assert resolve_response_cache(cast(Cache, SimpleNamespace(type=backend))) is None + + +@pytest.mark.parametrize( + "cache_factory", + [ + LiteLLMCacheType.LOCAL, + LiteLLMCacheType.DISK, + LiteLLMCacheType.REDIS, + LiteLLMCacheType.S3, + LiteLLMCacheType.GCS, + LiteLLMCacheType.REDIS_SEMANTIC, + LiteLLMCacheType.VALKEY_SEMANTIC, + ], + indirect=True, +) +def test_shipped_rules_construct_python_backed_facades(cache_factory: CacheFactory) -> None: + assert cache_factory()._native_cache is None # pyright: ignore[reportPrivateUsage] # the activation under test has no public accessor + + +@pytest.mark.parametrize( + "cache_factory", + [ + LiteLLMCacheType.LOCAL, + LiteLLMCacheType.DISK, + LiteLLMCacheType.REDIS, + LiteLLMCacheType.S3, + LiteLLMCacheType.GCS, + LiteLLMCacheType.REDIS_SEMANTIC, + LiteLLMCacheType.VALKEY_SEMANTIC, + ], + indirect=True, +) +def test_rust_required_rule_activates_the_native_backend( + cache_factory: CacheFactory, monkeypatch: pytest.MonkeyPatch, request: pytest.FixtureRequest +) -> None: + require_rust(monkeypatch, cast(LiteLLMCacheType, request.node.callspec.params["cache_factory"])) + native_runtime(cache_factory()) + + +@pytest.mark.parametrize("cache_factory", ROUND_TRIP_BACKENDS, indirect=True) +async def test_facade_storage_calls_round_trip_through_the_native_backend( + cache_factory: CacheFactory, monkeypatch: pytest.MonkeyPatch, request: pytest.FixtureRequest +) -> None: + require_rust(monkeypatch, cast(LiteLLMCacheType, request.node.callspec.params["cache_factory"])) + facade: Final = cache_factory() + native_runtime(facade) + + sync_kwargs: Final = completion_kwargs("sync") + facade.add_cache({"answer": 1}, **sync_kwargs) + assert facade.get_cache(**sync_kwargs) == {"answer": 1} + + async_kwargs: Final = completion_kwargs("async") + await facade.async_add_cache({"answer": 2}, **async_kwargs) + assert await facade.async_get_cache(**async_kwargs) == {"answer": 2} + assert facade.get_cache(**completion_kwargs("absent")) is None + + +async def test_memory_facade_writes_bypass_the_python_backend(monkeypatch: pytest.MonkeyPatch) -> None: + require_rust(monkeypatch, LiteLLMCacheType.LOCAL) + facade: Final = Cache(type=LiteLLMCacheType.LOCAL) + native_runtime(facade) + kwargs: Final = completion_kwargs("memory") + facade.add_cache({"answer": 1}, **kwargs) + assert facade.cache.get_cache(facade.get_cache_key(**kwargs)) is None + assert facade.get_cache(**kwargs) == {"answer": 1} + + +@pytest.mark.parametrize("cache_factory", SHARED_STORE_BACKENDS, indirect=True) +async def test_native_and_python_facades_share_one_wire_format( + cache_factory: CacheFactory, monkeypatch: pytest.MonkeyPatch, request: pytest.FixtureRequest +) -> None: + python_facade: Final = cache_factory() + assert python_facade._native_cache is None # pyright: ignore[reportPrivateUsage] # the activation under test has no public accessor + require_rust(monkeypatch, cast(LiteLLMCacheType, request.node.callspec.params["cache_factory"])) + native_facade: Final = cache_factory() + native_runtime(native_facade) + + native_written: Final = completion_kwargs("native") + native_facade.add_cache({"writer": "native"}, **native_written) + assert python_facade.get_cache(**native_written) == {"writer": "native"} + + python_written: Final = completion_kwargs("python") + python_facade.add_cache({"writer": "python"}, **python_written) + assert native_facade.get_cache(**python_written) == {"writer": "python"} + + async_native: Final = completion_kwargs("async-native") + await native_facade.async_add_cache({"writer": "async-native"}, **async_native) + assert await python_facade.async_get_cache(**async_native) == {"writer": "async-native"} + + async_python: Final = completion_kwargs("async-python") + await python_facade.async_add_cache({"writer": "async-python"}, **async_python) + assert await native_facade.async_get_cache(**async_python) == {"writer": "async-python"} + + +@pytest.mark.parametrize("cache_factory", ROUND_TRIP_BACKENDS, indirect=True) +async def test_embedding_pipeline_stores_one_native_entry_per_input( + cache_factory: CacheFactory, monkeypatch: pytest.MonkeyPatch, request: pytest.FixtureRequest +) -> None: + require_rust(monkeypatch, cast(LiteLLMCacheType, request.node.callspec.params["cache_factory"])) + facade: Final = cache_factory() + native_runtime(facade) + inputs: Final = [f"alpha {uuid4().hex}", f"beta {uuid4().hex}"] + result: Final = EmbeddingResponse( + model="text-embedding-3-small", + data=[ + {"object": "embedding", "index": 0, "embedding": [0.1, 0.2]}, + {"object": "embedding", "index": 1, "embedding": [0.3, 0.4]}, + ], + ) + await facade.async_add_cache_pipeline(result, model="text-embedding-3-small", input=inputs) + + keys: Final = [facade.get_cache_key(model="text-embedding-3-small", input=text) for text in inputs] + assert len(set(keys)) == len(inputs) + for text, expected in zip(inputs, ([0.1, 0.2], [0.3, 0.4]), strict=True): + cached = await facade.async_get_cache(model="text-embedding-3-small", input=text) + assert isinstance(cached, dict) + assert cached["embedding"] == expected + assert await facade.async_get_cache(model="text-embedding-3-small", input=inputs) is None + + +def redis_facade(redis_url: str, **settings: object) -> Cache: + parsed: Final = urlparse(redis_url) + return Cache(type=LiteLLMCacheType.REDIS, host=parsed.hostname, port=str(parsed.port), **settings) + + +@pytest.mark.parametrize( + ("settings", "message"), + [ + pytest.param({"max_connections": 10}, "max_connections requires Python", id="pool-size"), + pytest.param({"socket_timeout": 1.0}, "socket_timeout and socket_connect_timeout", id="socket-timeout"), + pytest.param( + {"socket_connect_timeout": 1.0}, "socket_timeout and socket_connect_timeout", id="connect-timeout" + ), + pytest.param({"socket_keepalive": True}, "does not support socket_keepalive", id="keepalive"), + pytest.param({"health_check_interval": 5}, "does not support health_check_interval", id="health-check"), + pytest.param({"client_name": "litellm"}, "does not support client_name", id="client-name"), + pytest.param({"ssl": True}, "ssl_check_hostname=false require Python", id="tls-default-hostname-check"), + pytest.param({"ssl": True, "ssl_cert_reqs": "none"}, "ssl_cert_reqs=none", id="tls-without-verification"), + pytest.param( + {"ssl": True, "ssl_check_hostname": True, "ssl_ca_certs": "/ca.pem"}, + "does not support ssl_ca_certs", + id="tls-custom-ca", + ), + pytest.param( + {"ssl": True, "ssl_check_hostname": True, "ssl_certfile": "/client.pem", "ssl_keyfile": "/client.key"}, + "does not support ssl_ca_certs, ssl_ca_data, ssl_certfile or ssl_keyfile", + id="tls-client-certificate", + ), + ], +) +def test_redis_settings_the_native_client_cannot_honor_decline( + redis_url: str, monkeypatch: pytest.MonkeyPatch, settings: dict[str, object], message: str +) -> None: + require_rust(monkeypatch, LiteLLMCacheType.REDIS) + with pytest.raises(RuntimeError, match=f"declined the cache: native Redis.*{message}"): + redis_facade(redis_url, **settings) + + +def test_redis_verified_tls_activates_natively(redis_url: str, monkeypatch: pytest.MonkeyPatch) -> None: + require_rust(monkeypatch, LiteLLMCacheType.REDIS) + native_runtime(redis_facade(redis_url, ssl=True, ssl_check_hostname=True)) + + +async def test_redis_flush_size_buffers_native_facade_writes(redis_url: str, monkeypatch: pytest.MonkeyPatch) -> None: + require_rust(monkeypatch, LiteLLMCacheType.REDIS) + facade: Final = redis_facade(redis_url, redis_flush_size=2, namespace="team") + native_runtime(facade) + client: Final = redis.Redis.from_url(redis_url) + first: Final = completion_kwargs("first") + await facade.async_add_cache({"value": 1}, **first) + first_key: Final = facade.get_cache_key(**first) + assert first_key.startswith("team:") + assert client.get(first_key) is None + second: Final = completion_kwargs("second") + await facade.async_add_cache({"value": 2}, **second) + assert client.get(first_key) is not None + assert client.get(facade.get_cache_key(**second)) is not None + client.close() + + +@pytest.mark.parametrize( + ("backend", "settings", "message"), + [ + pytest.param( + LiteLLMCacheType.VALKEY_SEMANTIC, + {"redis_url": "rediss://127.0.0.1:6390/0", "similarity_threshold": 0.8}, + "native Valkey semantic cache does not support TLS connections", + id="valkey-tls", + ), + pytest.param( + LiteLLMCacheType.VALKEY_SEMANTIC, + {"redis_url": "redis://127.0.0.1:6390/0?socket_timeout=1", "similarity_threshold": 0.8}, + "native Redis uses fixed socket timeouts; socket_timeout and socket_connect_timeout require Python", + id="valkey-socket-timeout", + ), + pytest.param( + LiteLLMCacheType.REDIS_SEMANTIC, + {"redis_url": "rediss://127.0.0.1:6380", "similarity_threshold": 0.8}, + "native Redis semantic cache does not support TLS or query options in redis_url", + id="redis-semantic-tls", + ), + pytest.param( + LiteLLMCacheType.REDIS_SEMANTIC, + {"redis_url": "redis://127.0.0.1:6379?socket_timeout=1", "similarity_threshold": 0.8}, + "native Redis semantic cache does not support TLS or query options in redis_url", + id="redis-semantic-query", + ), + ], +) +def test_semantic_settings_the_native_client_cannot_honor_decline( + monkeypatch: pytest.MonkeyPatch, backend: LiteLLMCacheType, settings: dict[str, object], message: str +) -> None: + require_rust(monkeypatch, backend) + with pytest.raises(RuntimeError, match=f"declined the cache: {message}"): + Cache(type=backend, **settings) + + +def test_rust_with_fallback_keeps_python_when_the_native_client_declines( + redis_url: str, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setattr( + catalog, + "RULES", + (CacheRule(Rollout.RUST_OPT_OUT, backends=frozenset({LiteLLMCacheType.REDIS})),), + ) + assert redis_facade(redis_url, socket_timeout=1.0)._native_cache is None # pyright: ignore[reportPrivateUsage] # the activation under test has no public accessor + + +def test_qdrant_semantic_rust_required_rule_activates_natively( + qdrant_url: str, fake_embedding_endpoint: str, monkeypatch: pytest.MonkeyPatch +) -> None: + del fake_embedding_endpoint + require_rust(monkeypatch, LiteLLMCacheType.QDRANT_SEMANTIC) + facade: Final = qdrant_facade(qdrant_url, f"cache_{uuid4().hex}") + native_runtime(facade) + kwargs: Final = {"model": "gpt-4o", "messages": [{"role": "user", "content": "qdrant activation"}]} + facade.add_cache({"answer": "qdrant"}, **kwargs) + assert facade.get_cache(**kwargs) == {"answer": "qdrant"} + + +async def test_redis_semantic_rust_required_rule_activates_natively( + redis_stack: tuple[str, str], semantic_embedding: DeterministicEmbedding, monkeypatch: pytest.MonkeyPatch +) -> None: + del semantic_embedding + url, index = redis_stack + require_rust(monkeypatch, LiteLLMCacheType.REDIS_SEMANTIC) + facade: Final = Cache( + type=LiteLLMCacheType.REDIS_SEMANTIC, + redis_url=url, + similarity_threshold=0.8, + redis_semantic_cache_embedding_model=SEMANTIC_EMBEDDING_MODEL, + redis_semantic_cache_index_name=index, + ) + native_runtime(facade) + kwargs: Final = {"model": "gpt-4o", "messages": semantic_messages("name a primary color")} + await facade.async_add_cache({"answer": "blue"}, **kwargs) + assert await facade.async_get_cache(**kwargs) == {"answer": "blue"} + + +async def test_azure_blob_rust_required_rule_activates_natively(monkeypatch: pytest.MonkeyPatch) -> None: + account_url: Final = os.environ.get("AZURE_BLOB_CACHE_ACCOUNT_URL") + if account_url is None: + pytest.skip( + "live Azure Blob parity needs AZURE_BLOB_CACHE_ACCOUNT_URL plus DefaultAzureCredential inputs in the environment" + ) + require_rust(monkeypatch, LiteLLMCacheType.AZURE_BLOB) + facade: Final = Cache( + type=LiteLLMCacheType.AZURE_BLOB, + azure_account_url=account_url, + azure_blob_container=f"litellm-parity-{uuid.uuid4().hex[:12]}", + ) + backend: Final = facade.cache + assert isinstance(backend, AzureBlobCache) + try: + native_runtime(facade) + kwargs: Final = completion_kwargs("azure") + await facade.async_add_cache({"answer": "azure"}, **kwargs) + assert await facade.async_get_cache(**kwargs) == {"answer": "azure"} + assert backend.get_cache(facade.get_cache_key(**kwargs))["response"] == {"answer": "azure"} + finally: + backend.container_client.delete_container() + await backend.disconnect() + + +class _SemanticHit: + """A native semantic runtime that answers every lookup with one cached response.""" + + kind: Final = "native" + + def lookup_semantic(self, request: object) -> tuple[object, float | None]: + return {"answer": 42}, 0.97 + + async def async_lookup_semantic(self, request: object) -> tuple[object, float | None]: + return {"answer": 42}, 0.97 + + +@pytest.mark.parametrize("semantic_type", [LiteLLMCacheType.QDRANT_SEMANTIC, LiteLLMCacheType.REDIS_SEMANTIC]) +@pytest.mark.parametrize("use_async", [False, True], ids=["sync", "async"]) +def test_native_semantic_hit_stamps_similarity_on_request_metadata( + semantic_type: LiteLLMCacheType, use_async: bool +) -> None: + """Python semantic backends write `metadata["semantic-similarity"]` on every lookup, and the + facade copies it to the caller's metadata; the native path must report it the same way.""" + facade: Final = Cache() + facade.type = semantic_type + facade._native_cache = ResponseCacheRuntime(cast(NativeResponseCacheRuntime, _SemanticHit())) # pyright: ignore[reportPrivateUsage] # the native path under test has no public setter + metadata: Final[dict[str, object]] = {} + kwargs: Final = { + "cache_key": "semantic-key", + "messages": [{"role": "user", "content": "hello"}], + "metadata": metadata, + } + + result: Final = asyncio.run(facade.async_get_cache(**kwargs)) if use_async else facade.get_cache(**kwargs) + + assert result == {"answer": 42} + assert metadata["semantic-similarity"] == 0.97 diff --git a/tests/test_litellm_rust/test_fork_guard.py b/tests/test_litellm_rust/test_fork_guard.py index 2a8fb6f9fca..02c454e0460 100644 --- a/tests/test_litellm_rust/test_fork_guard.py +++ b/tests/test_litellm_rust/test_fork_guard.py @@ -155,10 +155,17 @@ import asyncio import os import litellm from litellm.proxy.spend_tracking.input_tokens import count_input_tokens -from litellm.rust_bridge import _native +from litellm.rust_bridge import _native, catalog +from litellm.rust_bridge.catalog import Route, RouteRule +from litellm.rust_bridge.configuration import Rollout from litellm.litellm_core_utils.tokenizer import HuggingFaceTokenizer from litellm.utils import claude_json_str +catalog.RULES = ( + RouteRule(Route.TOKENIZER, Rollout.RUST_OPT_IN), + RouteRule(Route.TOKEN_COUNTER, Rollout.RUST_OPT_IN), + *catalog.RULES, +) litellm.anthropic_models = {*litellm.anthropic_models, "tokenizer-fork-fixture"} _native.reserve_process_for_forking() for create in ( diff --git a/tests/test_litellm_rust/test_valkey_semantic_cache_native.py b/tests/test_litellm_rust/test_valkey_semantic_cache_native.py index c87a9f86a80..046f3a70ae8 100644 --- a/tests/test_litellm_rust/test_valkey_semantic_cache_native.py +++ b/tests/test_litellm_rust/test_valkey_semantic_cache_native.py @@ -15,7 +15,10 @@ import redis from litellm.caching.caching import Cache from litellm.caching.valkey_semantic_cache import ValkeySemanticCache -from litellm.rust_bridge import _native +from litellm.rust_bridge import _native, catalog +from litellm.rust_bridge.catalog import CacheRule +from litellm.rust_bridge.configuration import Rollout +from litellm.rust_bridge.response_cache import ResponseCacheRuntime from litellm.types.caching import LiteLLMCacheType pytestmark: Final = pytest.mark.requires_rust_extension @@ -597,3 +600,22 @@ async def test_ping_maps_unsupported_native_operation_to_not_implemented( binding: Final = _native._CacheTestResolver(SimpleNamespace(cache=handle)).resolve() with pytest.raises(NotImplementedError): await binding.ping() + + +async def test_rust_required_rule_activates_the_facade_natively( + valkey_url: str, + index_name: str, + monkeypatch: pytest.MonkeyPatch, +) -> None: + monkeypatch.setattr( + catalog, + "RULES", + (CacheRule(Rollout.RUST_REQUIRED, backends=frozenset({LiteLLMCacheType.VALKEY_SEMANTIC})),), + ) + facade: Final = _facade(valkey_url, index_name, {"semantic cache prompt": [1.0, 0.0]}) + runtime: Final = facade._native_cache # pyright: ignore[reportPrivateUsage] # the activation under test has no public accessor + assert isinstance(runtime, ResponseCacheRuntime) + assert runtime.kind == "native" + kwargs: Final = {"model": "gpt-4o", "messages": _request()["messages"]} + await facade.async_add_cache({"answer": "valkey"}, **kwargs) + assert await facade.async_get_cache(**kwargs) == {"answer": "valkey"} diff --git a/tests/unified_google_tests/conftest.py b/tests/unified_google_tests/conftest.py index cd05c856faf..9eac5f49651 100644 --- a/tests/unified_google_tests/conftest.py +++ b/tests/unified_google_tests/conftest.py @@ -102,7 +102,7 @@ def google_genai_proxy_url() -> Iterator[str]: credentials_file = os.environ.get("GOOGLE_APPLICATION_CREDENTIALS", "") if not (credentials_file and os.path.isfile(credentials_file)): vertex_credentials_path = load_vertex_ai_credentials( - model="vertex_ai/gemini-2.5-flash-lite" + model="vertex_ai/gemini-3.5-flash-lite" ) if vertex_credentials_path: temp_credentials_path = vertex_credentials_path diff --git a/tests/unified_google_tests/google_genai_proxy_test_config.yaml b/tests/unified_google_tests/google_genai_proxy_test_config.yaml index 0a1779aa3ec..99f24e62916 100644 --- a/tests/unified_google_tests/google_genai_proxy_test_config.yaml +++ b/tests/unified_google_tests/google_genai_proxy_test_config.yaml @@ -1,12 +1,12 @@ model_list: - - model_name: gemini-2.5-flash-lite + - model_name: gemini-3.5-flash-lite litellm_params: - model: gemini/gemini-2.5-flash-lite + model: gemini/gemini-3.5-flash-lite api_key: os.environ/GEMINI_API_KEY - - model_name: vertex-gemini-2.5-flash-lite + - model_name: vertex-gemini-3.5-flash-lite litellm_params: - model: vertex_ai/gemini-2.5-flash-lite + model: vertex_ai/gemini-3.5-flash-lite vertex_location: global router_settings: diff --git a/tests/unified_google_tests/test_google_ai_studio.py b/tests/unified_google_tests/test_google_ai_studio.py index 6d4c3725080..2364a01cedb 100644 --- a/tests/unified_google_tests/test_google_ai_studio.py +++ b/tests/unified_google_tests/test_google_ai_studio.py @@ -13,12 +13,12 @@ class TestGoogleGenAIStudio(BaseGoogleGenAITest, BaseGoogleGenAIProxySDKTest): @property def model_config(self): return { - "model": "gemini/gemini-2.5-flash-lite", + "model": "gemini/gemini-3.5-flash-lite", } @property def proxy_model_name(self) -> str: - return "gemini-2.5-flash-lite" + return "gemini-3.5-flash-lite" @pytest.mark.asyncio @@ -94,7 +94,7 @@ async def test_mock_stream_generate_content_with_tools(): "\n--- Testing async agenerate_content_stream with function call parsing ---" ) response = await litellm.google_genai.agenerate_content_stream( - model="gemini/gemini-2.5-flash-lite", + model="gemini/gemini-3.5-flash-lite", contents=contents, tools=[ { @@ -343,7 +343,7 @@ async def test_validate_post_request_parameters(): # Make the API call response = await litellm.google_genai.agenerate_content_stream( - model="gemini/gemini-2.5-flash-lite", contents=contents, tools=tools + model="gemini/gemini-3.5-flash-lite", contents=contents, tools=tools ) # Consume the response to ensure the request is made @@ -387,11 +387,11 @@ async def test_validate_post_request_parameters(): # Validate model field assert "model" in request_data, "Expected 'model' field in request data" - # Model might be transformed, but should contain gemini-2.5-flash-lite + # Model might be transformed, but should contain gemini-3.5-flash-lite model_value = request_data["model"] assert ( - "gemini-2.5-flash-lite" in model_value - ), f"Expected model to contain 'gemini-2.5-flash-lite', got: {model_value}" + "gemini-3.5-flash-lite" in model_value + ), f"Expected model to contain 'gemini-3.5-flash-lite', got: {model_value}" print(f"✅ Model validation passed: {model_value}") # Validate contents field diff --git a/tests/unified_google_tests/test_google_genai_proxy_test_config.py b/tests/unified_google_tests/test_google_genai_proxy_test_config.py index 694ec336bac..272e589e94a 100644 --- a/tests/unified_google_tests/test_google_genai_proxy_test_config.py +++ b/tests/unified_google_tests/test_google_genai_proxy_test_config.py @@ -12,14 +12,13 @@ from typing_extensions import ReadOnly, TypedDict import litellm from litellm import Router from litellm.constants import INITIAL_RETRY_DELAY, MAX_RETRY_DELAY -from litellm.llms.vertex_ai.common_utils import get_vertex_base_url +from litellm.llms.vertex_ai.common_utils import _get_gemini_url, get_vertex_base_url from litellm.llms.vertex_ai.vertex_llm_base import VertexBase CONFIG_PATH: Final = Path(__file__).parent / "google_genai_proxy_test_config.yaml" -GEMINI_DEPLOYMENT: Final = "gemini-2.5-flash-lite" -VERTEX_DEPLOYMENT: Final = "vertex-gemini-2.5-flash-lite" -GEMINI_HOST: Final = "generativelanguage.googleapis.com" -GEMINI_GENERATE_CONTENT_PATH: Final = "/v1beta/models/gemini-2.5-flash-lite:generateContent" +GEMINI_DEPLOYMENT: Final = "gemini-3.5-flash-lite" +VERTEX_DEPLOYMENT: Final = "vertex-gemini-3.5-flash-lite" +GEMINI_GENERATE_CONTENT_URL: Final = _get_gemini_url(mode="chat", model=GEMINI_DEPLOYMENT, stream=False)[0] VERTEX_GLOBAL_BASE_URL: Final = "https://aiplatform.googleapis.com" RESOURCE_EXHAUSTED: Final = { "error": {"code": 429, "message": "Resource exhausted. Please try again later.", "status": "RESOURCE_EXHAUSTED"} @@ -81,7 +80,7 @@ async def test_ci_proxy_config_rides_out_consecutive_429s_with_backoff( ) -> None: monkeypatch.setattr(litellm, "disable_aiohttp_transport", True) litellm.in_memory_llm_clients_cache.flush_cache() - route: Final = respx_mock.post(host=GEMINI_HOST, path=GEMINI_GENERATE_CONTENT_PATH).mock( + route: Final = respx_mock.post(GEMINI_GENERATE_CONTENT_URL).mock( side_effect=[httpx.Response(429, json=RESOURCE_EXHAUSTED)] * CONSECUTIVE_RATE_LIMITS + [httpx.Response(200, json=PONG)] ) diff --git a/tests/unified_google_tests/test_vertex_ai_native.py b/tests/unified_google_tests/test_vertex_ai_native.py index 640157bc33e..4bdc1a55283 100644 --- a/tests/unified_google_tests/test_vertex_ai_native.py +++ b/tests/unified_google_tests/test_vertex_ai_native.py @@ -8,9 +8,10 @@ class TestVertexAIGenerateContent(BaseGoogleGenAITest, BaseGoogleGenAIProxySDKTe @property def model_config(self): return { - "model": "vertex_ai/gemini-2.5-flash-lite", + "model": "vertex_ai/gemini-3.5-flash-lite", + "vertex_location": "global", } @property def proxy_model_name(self) -> str: - return "vertex-gemini-2.5-flash-lite" + return "vertex-gemini-3.5-flash-lite" diff --git a/tests/unit/litellm_core_utils/llm_response_utils/test_response_metadata.py b/tests/unit/litellm_core_utils/llm_response_utils/test_response_metadata.py index 37201e8155b..6f297e6e06a 100644 --- a/tests/unit/litellm_core_utils/llm_response_utils/test_response_metadata.py +++ b/tests/unit/litellm_core_utils/llm_response_utils/test_response_metadata.py @@ -7,6 +7,8 @@ through _hidden_params to the x-litellm-callback-duration-ms response header. import asyncio import datetime +import time +from collections.abc import Iterator from typing import Final from unittest.mock import MagicMock @@ -427,6 +429,15 @@ class TestCallbackDurationInCustomHeaders: assert "x-litellm-callback-duration-ms" not in headers +@pytest.fixture(params=["UTC", "Asia/Kolkata", "America/Los_Angeles"]) +def process_timezone(request: pytest.FixtureRequest, monkeypatch: pytest.MonkeyPatch) -> Iterator[str]: + monkeypatch.setenv("TZ", request.param) + time.tzset() + yield request.param + monkeypatch.undo() + time.tzset() + + class TestDetailedTiming: """Tests for detailed per-phase timing headers behind LITELLM_DETAILED_TIMING.""" @@ -472,13 +483,14 @@ class TestDetailedTiming: assert hidden.get("timing_pre_processing_ms") == 20.0 assert hidden.get("timing_post_processing_ms") == 10.0 # 530 - 20 - 500 - def test_detailed_timing_pre_processing_uses_receive_anchor(self, monkeypatch): + @pytest.mark.skipif(not hasattr(time, "tzset"), reason="switching the process timezone needs time.tzset()") + def test_detailed_timing_pre_processing_uses_receive_anchor(self, monkeypatch, process_timezone: str): monkeypatch.setattr(response_metadata_mod, "LITELLM_DETAILED_TIMING", True) result = ModelResponse() received_at = datetime.datetime(2025, 1, 1, tzinfo=datetime.timezone.utc) start = received_at + datetime.timedelta(milliseconds=200) - api_call_start = start.replace(tzinfo=None) + api_call_start = start.astimezone().replace(tzinfo=None) end = start + datetime.timedelta(milliseconds=530) logging_obj = self._make_logging_obj( llm_api_duration_ms=500.0, diff --git a/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py b/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py index e4a33d5772c..47609261a25 100644 --- a/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py +++ b/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py @@ -157,27 +157,6 @@ def test_foundry_gpt_6_astra_keeps_sampling_params_when_reasoning_effort_is_none assert optional_params == {"reasoning_effort": "none", "temperature": 0.2, "top_p": 0.9} -def test_a_gpt_5_name_without_a_foundry_row_keeps_reading_its_own_entry( - monkeypatch: pytest.MonkeyPatch, _local_model_cost_map -): - """Most gpt-5-family names have no azure_ai/ row. Reading an azure_ai/ key for those finds - nothing, and an openai.azure.com base sends the name down the azure provider, which has no key - for it either, so every effort answer would silently fall back to false and take temperature, - top_p and logprobs down with it.""" - monkeypatch.setenv("AZURE_AI_API_BASE", "https://example-resource.openai.azure.com") - monkeypatch.setenv("AZURE_AI_API_KEY", "placeholder") - - optional_params = litellm.utils.get_optional_params( - model="gpt-5.1-chat-latest", - custom_llm_provider="azure_ai", - temperature=0.2, - top_p=0.9, - logprobs=True, - ) - - assert optional_params["temperature"] == 0.2 - assert optional_params["top_p"] == 0.9 - assert optional_params["logprobs"] is True def test_azure_ai_grok_stop_parameter_handling(): diff --git a/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py b/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py index cf2fd78a896..3846a94c9fe 100644 --- a/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py +++ b/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py @@ -541,26 +541,48 @@ def test_output_config_format_converted_for_bedrock_chat_invoke_request(): assert json.loads(last_content[-1]["text"]) == schema -def test_output_config_format_forwarded_for_bedrock_chat_invoke_request(): +@pytest.mark.parametrize("model", ["anthropic.claude-opus-4-7", "us.anthropic.claude-opus-4-8"]) +def test_output_config_format_inlined_for_bedrock_chat_invoke_opus_4_7_and_4_8(local_model_cost_map, model): + """Bedrock rejects ``output_config.format`` on Claude Opus 4.7 and 4.8, so the + Invoke chat path inlines the schema into the last user message and keeps effort, + driven by the cost map alone (no capability stub).""" + schema = {"type": "object", "properties": {"answer": {"type": "string"}}} + + result = AmazonAnthropicClaudeConfig().transform_request( + model=model, + messages=[{"role": "user", "content": "test"}], + optional_params={ + "max_tokens": 100, + "output_config": {"effort": "xhigh", "format": {"type": "json_schema", "schema": schema}}, + }, + litellm_params={}, + headers={}, + ) + + assert result.get("output_config") == {"effort": "xhigh"} + assert json.loads(result["messages"][-1]["content"][-1]["text"]) == schema + + +def test_output_config_format_forwarded_for_bedrock_chat_invoke_request(local_model_cost_map): """Bedrock Invoke chat path forwards ``output_config.format`` alongside effort - for models with native structured-output support (Claude Opus 4.7).""" + for models with native structured-output support (Claude Sonnet 4.6).""" schema_format = { "type": "json_schema", "schema": {"type": "object", "properties": {"answer": {"type": "string"}}}, } result = AmazonAnthropicClaudeConfig().transform_request( - model="anthropic.claude-opus-4-7", + model="us.anthropic.claude-sonnet-4-6", messages=[{"role": "user", "content": "test"}], optional_params={ "max_tokens": 100, - "output_config": {"effort": "xhigh", "format": schema_format}, + "output_config": {"effort": "max", "format": schema_format}, }, litellm_params={}, headers={}, ) - assert result.get("output_config") == {"effort": "xhigh", "format": schema_format} + assert result.get("output_config") == {"effort": "max", "format": schema_format} assert "answer" not in json.dumps(result["messages"]) diff --git a/tests/unit/llms/fireworks_ai/chat/test_fireworks_ai_chat_transformation.py b/tests/unit/llms/fireworks_ai/chat/test_fireworks_ai_chat_transformation.py index 6815f00267c..3f740edf834 100644 --- a/tests/unit/llms/fireworks_ai/chat/test_fireworks_ai_chat_transformation.py +++ b/tests/unit/llms/fireworks_ai/chat/test_fireworks_ai_chat_transformation.py @@ -1695,21 +1695,6 @@ def test_nim_vllm_extras_translated_end_to_end_in_request_body(): assert request_body["top_k"] == 40 -def test_in_schema_unsupported_params_still_raise(): - with pytest.raises(litellm.UnsupportedParamsError): - litellm.get_optional_params( - model="accounts/fireworks/models/llama-v3-70b-instruct", - custom_llm_provider="fireworks_ai", - drop_params=False, - store=True, - ) - optional_params = litellm.get_optional_params( - model="accounts/fireworks/models/llama-v3-70b-instruct", - custom_llm_provider="fireworks_ai", - drop_params=True, - store=True, - ) - assert "store" not in optional_params def test_streaming_preserves_selected_model_for_private_accounting(): diff --git a/tests/unit/llms/moonshot/test_moonshot_chat_transformation.py b/tests/unit/llms/moonshot/test_moonshot_chat_transformation.py index c39affc18a8..4e7a2931cda 100644 --- a/tests/unit/llms/moonshot/test_moonshot_chat_transformation.py +++ b/tests/unit/llms/moonshot/test_moonshot_chat_transformation.py @@ -715,7 +715,7 @@ class TestMoonshotReasoningEffort: def force_local_model_cost(self, monkeypatch): monkeypatch.setattr(litellm, "model_cost", GetModelCostMap.load_local_model_cost_map()) - @pytest.mark.parametrize("model", ["kimi-k3", "kimi-k2.5", "kimi-k2.6", "kimi-k2-thinking"]) + @pytest.mark.parametrize("model", ["kimi-k3", "kimi-k2.5", "kimi-k2.6"]) def test_reasoning_model_supports_reasoning_effort(self, model): assert "reasoning_effort" in MoonshotChatConfig().get_supported_openai_params(model) diff --git a/tests/unit/repositories/test_repositories.py b/tests/unit/repositories/test_repositories.py index 87cf2fc4268..e185d95ffb8 100644 --- a/tests/unit/repositories/test_repositories.py +++ b/tests/unit/repositories/test_repositories.py @@ -2120,6 +2120,7 @@ class TestPrismaTableRepository: "litellm_prompttable", "litellm_searchtoolstable", "litellm_ssoconfig", + "litellm_uisettings", } ) diff --git a/ui/litellm-dashboard/package-lock.json b/ui/litellm-dashboard/package-lock.json index 1f459bc50ea..0b71b51dc3f 100644 --- a/ui/litellm-dashboard/package-lock.json +++ b/ui/litellm-dashboard/package-lock.json @@ -13,6 +13,7 @@ "@headlessui/tailwindcss": "0.2.2", "@heroicons/react": "1.0.6", "@hookform/resolvers": "5.4.0", + "@shadcn/react": "0.3.1", "@tanstack/react-pacer": "0.22.1", "@tanstack/react-query": "5.100.7", "@tanstack/react-table": "8.21.3", @@ -2990,6 +2991,24 @@ "dev": true, "license": "MIT" }, + "node_modules/@shadcn/react": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@shadcn/react/-/react-0.3.1.tgz", + "integrity": "sha512-2gOR0HDMtWeRsCZfNDaU0YDFdgH3zsDQ6lz67Fv/y/qjY9y+R8kJqAn6q56phqv7/zHi0wqURjntrNO9zL7vnQ==", + "license": "MIT", + "peerDependencies": { + "@types/react": ">=19", + "react": ">=19" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "react": { + "optional": true + } + } + }, "node_modules/@standard-schema/spec": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", diff --git a/ui/litellm-dashboard/package.json b/ui/litellm-dashboard/package.json index 9786d5c1d6e..233a0e63881 100644 --- a/ui/litellm-dashboard/package.json +++ b/ui/litellm-dashboard/package.json @@ -29,6 +29,7 @@ "@headlessui/tailwindcss": "0.2.2", "@heroicons/react": "1.0.6", "@hookform/resolvers": "5.4.0", + "@shadcn/react": "0.3.1", "@tanstack/react-pacer": "0.22.1", "@tanstack/react-query": "5.100.7", "@tanstack/react-table": "8.21.3", diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.test.ts new file mode 100644 index 00000000000..96e9cff6ac7 --- /dev/null +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.test.ts @@ -0,0 +1,101 @@ +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { renderHook, waitFor } from "@testing-library/react"; +import React, { ReactNode } from "react"; +import { beforeEach, describe, expect, it, vi } from "vitest"; + +import { keyInfoV1Call, userGetInfoV2 } from "@/components/networking"; + +import { useKeyInfo } from "./useKeyInfo"; + +vi.mock("@/components/networking", () => ({ + keyInfoV1Call: vi.fn(), + userGetInfoV2: vi.fn(), +})); + +const mockUseAuthorized = vi.fn(); +vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({ + default: () => mockUseAuthorized(), +})); + +const mockKeyInfoV1Call = vi.mocked(keyInfoV1Call); +const mockUserGetInfoV2 = vi.mocked(userGetInfoV2); + +const createWrapper = () => { + const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } }); + const wrapper = ({ children }: { children: ReactNode }) => + React.createElement(QueryClientProvider, { client: queryClient }, children); + return { queryClient, wrapper }; +}; + +const KEY_ID = "sk-key-1"; +const ACCESS_TOKEN = "sk-access"; + +const OWNER = { + user_id: "user-1", + user_email: "owner@example.com", + user_alias: "Budget Owner", + user_role: "user", + spend: 0, + max_budget: 1500, + models: [], + budget_duration: "1mo", + budget_reset_at: null, + metadata: null, + created_at: null, + updated_at: null, + sso_user_id: null, + teams: [], +}; + +const keyInfoResponse = (info: Record) => ({ info }); + +describe("useKeyInfo", () => { + beforeEach(() => { + mockKeyInfoV1Call.mockReset(); + mockUserGetInfoV2.mockReset(); + mockUseAuthorized.mockReturnValue({ accessToken: ACCESS_TOKEN }); + }); + + it("attaches the owner's budget fields when the key has a user_id", async () => { + mockKeyInfoV1Call.mockResolvedValue(keyInfoResponse({ user_id: "user-1", key_alias: "team-key" })); + mockUserGetInfoV2.mockResolvedValue(OWNER); + const { wrapper } = createWrapper(); + + const { result } = renderHook(() => useKeyInfo(KEY_ID), { wrapper }); + + await waitFor(() => expect(result.current.isSuccess).toBe(true)); + expect(mockUserGetInfoV2).toHaveBeenCalledWith(ACCESS_TOKEN, "user-1"); + const expectedUser = { + user_id: "user-1", + user_email: "owner@example.com", + user_alias: "Budget Owner", + max_budget: 1500, + budget_duration: "1mo", + }; + expect(result.current.data?.user).toEqual(expectedUser); + }); + + it("does not fetch an owner when the key has no user_id", async () => { + mockKeyInfoV1Call.mockResolvedValue(keyInfoResponse({ user_id: null, key_alias: "service-key" })); + const { wrapper } = createWrapper(); + + const { result } = renderHook(() => useKeyInfo(KEY_ID), { wrapper }); + + await waitFor(() => expect(result.current.isSuccess).toBe(true)); + expect(mockUserGetInfoV2).not.toHaveBeenCalled(); + expect(result.current.data?.user).toBeUndefined(); + }); + + it("still resolves the key data when the owner lookup fails", async () => { + mockKeyInfoV1Call.mockResolvedValue(keyInfoResponse({ user_id: "user-1" })); + mockUserGetInfoV2.mockRejectedValue(new Error("403")); + const { wrapper } = createWrapper(); + + const { result } = renderHook(() => useKeyInfo(KEY_ID), { wrapper }); + + await waitFor(() => expect(result.current.isSuccess).toBe(true)); + expect(result.current.data?.token).toBe(KEY_ID); + expect(result.current.data?.api_key).toBe(KEY_ID); + expect(result.current.data?.user).toBeUndefined(); + }); +}); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.ts index 57950953d74..be248e9aafb 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.ts +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/keys/useKeyInfo.ts @@ -2,10 +2,25 @@ import { useQuery, UseQueryResult } from "@tanstack/react-query"; import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized"; import { KeyResponse } from "@/components/key_team_helpers/key_list"; -import { keyInfoV1Call } from "@/components/networking"; +import { keyInfoV1Call, userGetInfoV2 } from "@/components/networking"; import { keyKeys } from "./useKeys"; +const fetchOwner = async (accessToken: string, userId: string): Promise => { + try { + const owner = await userGetInfoV2(accessToken, userId); + return { + user_id: owner.user_id, + user_email: owner.user_email, + user_alias: owner.user_alias, + max_budget: owner.max_budget, + budget_duration: owner.budget_duration, + }; + } catch { + return undefined; + } +}; + export function useKeyInfo(keyId: string | null, options?: { enabled?: boolean }): UseQueryResult { const { accessToken } = useAuthorized(); @@ -14,10 +29,16 @@ export function useKeyInfo(keyId: string | null, options?: { enabled?: boolean } queryFn: async () => { if (!accessToken || !keyId) throw new Error("Missing access token or key id"); const keyData = await keyInfoV1Call(accessToken, keyId); + const info = keyData["info"]; + const owner = + typeof info.user_id === "string" && info.user_id !== "" + ? await fetchOwner(accessToken, info.user_id) + : undefined; return { - ...keyData["info"], + ...info, token: keyId, api_key: keyId, + ...(owner ? { user: owner } : {}), }; }, enabled: Boolean(accessToken && keyId) && (options?.enabled ?? true), diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/proxySettings/useProxySettings.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/proxySettings/useProxySettings.ts index 7925af223ae..b7b28c47f9c 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/hooks/proxySettings/useProxySettings.ts +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/proxySettings/useProxySettings.ts @@ -1,4 +1,4 @@ -import { fetchProxySettings } from "@/utils/proxyUtils"; +import { getProxyBaseUrl, getProxyUISettings } from "@/components/networking"; import { useQuery } from "@tanstack/react-query"; import { createQueryKeys } from "../common/queryKeysFactory"; @@ -18,11 +18,19 @@ const EMPTY_PROXY_SETTINGS: ProxySettings = { LITELLM_UI_API_DOC_BASE_URL: null, }; -export default function useProxySettings(accessToken: string | null): ProxySettings { - const { data } = useQuery({ - queryKey: [...proxySettingsKeys.all, accessToken], - queryFn: () => fetchProxySettings(accessToken), +export function useProxySettingsQuery(accessToken: string | null) { + const managementBaseUrl = getProxyBaseUrl(); + return useQuery({ + queryKey: [...proxySettingsKeys.all, managementBaseUrl, accessToken], + queryFn: () => { + if (getProxyBaseUrl() !== managementBaseUrl) throw new Error("Gateway changed while loading settings."); + return accessToken ? getProxyUISettings(accessToken) : null; + }, enabled: Boolean(accessToken), }); +} + +export default function useProxySettings(accessToken: string | null): ProxySettings { + const { data } = useProxySettingsQuery(accessToken); return data ?? EMPTY_PROXY_SETTINGS; } diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/router/useRouterFields.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/router/useRouterFields.ts index b5adb0994e6..bb37b559cb6 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/hooks/router/useRouterFields.ts +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/router/useRouterFields.ts @@ -16,6 +16,7 @@ export interface RouterSettingsField { export interface RouterFieldsResponse { fields: RouterSettingsField[]; routing_strategy_descriptions: Record; + routing_group_strategies?: string[]; } const routerFieldsKeys = createQueryKeys("routerFields"); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.test.ts new file mode 100644 index 00000000000..e5f7814c7c8 --- /dev/null +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.test.ts @@ -0,0 +1,65 @@ +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { act, renderHook, waitFor } from "@testing-library/react"; +import { createElement, type ReactNode } from "react"; +import { beforeEach, describe, expect, it, vi } from "vitest"; + +import { getRouterSettingsCall, setCallbacksCall } from "@/components/networking"; +import type { RoutingGroup } from "@/components/routing_groups/types"; +import { useRoutingGroups, useSaveRoutingGroups } from "./useRoutingGroups"; + +vi.mock("@/components/networking", () => ({ + getRouterSettingsCall: vi.fn(), + setCallbacksCall: vi.fn(), +})); + +vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({ + default: () => ({ accessToken: "test-token", userId: "admin", userRole: "Admin" }), +})); + +const createWrapper = () => { + const client = new QueryClient({ defaultOptions: { queries: { retry: false } } }); + return function QueryWrapper({ children }: { children: ReactNode }) { + return createElement(QueryClientProvider, { client }, children); + }; +}; + +describe("routing group settings", () => { + beforeEach(() => vi.clearAllMocks()); + + it.each([ + { metadata: ["simple-shuffle", "priority"], expected: ["simple-shuffle", "priority"] }, + { metadata: undefined, expected: ["simple-shuffle"] }, + ])("uses the advertised group strategies and supports older gateways", async ({ metadata, expected }) => { + vi.mocked(getRouterSettingsCall).mockResolvedValue({ + fields: [{ field_name: "routing_strategy", options: ["simple-shuffle"] }], + routing_group_strategies: metadata, + current_values: {}, + }); + const { result } = renderHook(() => useRoutingGroups(), { wrapper: createWrapper() }); + + await waitFor(() => expect(result.current.data?.availableStrategies).toEqual(expected)); + }); + + it("loads and saves membership priorities through the existing router settings endpoint", async () => { + const groups: RoutingGroup[] = [ + { + group_name: "preferred-chat", + models: ["preferred", "backup"], + routing_strategy: "priority", + model_priorities: { preferred: 1, backup: 4 }, + }, + ]; + vi.mocked(getRouterSettingsCall).mockResolvedValue({ current_values: { routing_groups: groups } }); + vi.mocked(setCallbacksCall).mockResolvedValue({}); + const { result } = renderHook(() => ({ query: useRoutingGroups(), save: useSaveRoutingGroups() }), { + wrapper: createWrapper(), + }); + + await waitFor(() => expect(result.current.query.data?.routingGroups).toEqual(groups)); + await act(async () => { + await result.current.save.mutateAsync(groups); + }); + + expect(setCallbacksCall).toHaveBeenCalledWith("test-token", { router_settings: { routing_groups: groups } }); + }); +}); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.ts index 71d27d2017c..5ed6fa6a594 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.ts +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/routingGroups/useRoutingGroups.ts @@ -19,11 +19,12 @@ const fetchRoutingGroups = async (accessToken: string): Promise f?.field_name === "routing_strategy"); + const groupStrategies: unknown = data?.routing_group_strategies ?? routingStrategyField?.options; return { routingGroups: Array.isArray(currentValues.routing_groups) ? currentValues.routing_groups : [], routingStrategy: currentValues.routing_strategy ?? null, - availableStrategies: Array.isArray(routingStrategyField?.options) ? routingStrategyField.options : [], + availableStrategies: Array.isArray(groupStrategies) ? groupStrategies : [], }; }; diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/uiSettings/useApplyUserBudgetToTeamKeys.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/uiSettings/useApplyUserBudgetToTeamKeys.ts new file mode 100644 index 00000000000..3aeed5e4338 --- /dev/null +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/uiSettings/useApplyUserBudgetToTeamKeys.ts @@ -0,0 +1,6 @@ +import { useUISettings } from "./useUISettings"; + +export const APPLY_USER_BUDGET_TO_TEAM_KEYS_SETTING_KEY = "apply_user_budget_to_team_keys"; + +export const useApplyUserBudgetToTeamKeys = (): boolean => + useUISettings().data?.values?.[APPLY_USER_BUDGET_TO_TEAM_KEYS_SETTING_KEY] === true; diff --git a/ui/litellm-dashboard/src/app/(dashboard)/layout.tsx b/ui/litellm-dashboard/src/app/(dashboard)/layout.tsx index 2e903c7b150..03612cee3c6 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/layout.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/layout.tsx @@ -13,6 +13,7 @@ import { NoRedisWarningBanner } from "@/components/NoRedisWarningBanner"; import { EnvCredentialLoginWarningBanner } from "@/components/EnvCredentialLoginWarningBanner"; import { LicenseExpiryBanner } from "@/components/LicenseExpiryBanner"; import { UserBanner } from "@/components/UserBanner"; +import LiteAdmin from "@/components/liteadmin/LiteAdmin"; import { UpgradeBanner } from "@/components/UpgradeBanner"; import { uiHref } from "@/utils/uiHref"; import { PluginModeProvider, usePluginMode } from "@/contexts/PluginModeContext"; @@ -141,6 +142,7 @@ function DashboardShell({ children }: { children: React.ReactNode }) {
{children}
+ ); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatComposer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatComposer.tsx index 4925e775ac7..5d2edbdfc94 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatComposer.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatComposer.tsx @@ -56,14 +56,16 @@ export function ChatComposer({ {showSuggestions && suggestions.length > 0 && (
{suggestions.map((suggestion) => ( - + {suggestion} + ))}
)} diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.test.tsx index 7aae01254da..33e982e2735 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.test.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.test.tsx @@ -59,7 +59,16 @@ describe("VectorStoreTable", () => { it("should render every column header", () => { render(); - for (const header of ["Vector Store ID", "Name", "Description", "Files", "Provider", "Created At", "Updated At"]) { + for (const header of [ + "Vector Store ID", + "Name", + "Description", + "Source", + "Files", + "Provider", + "Created At", + "Updated At", + ]) { expect(screen.getByText(header)).toBeInTheDocument(); } }); @@ -112,6 +121,36 @@ describe("VectorStoreTable", () => { expect(mockOnDelete).toHaveBeenCalledWith("vs-newer"); }); + it("should label each row's source as Config or DB", () => { + const configStore: VectorStore = { ...mockVectorStores[1], vector_store_id: "vs-config", is_config: true }; + render(); + const rows = screen.getAllByRole("row").slice(1); + const dbRow = rows.find((row) => within(row).queryByText("vs-newer")); + const configRow = rows.find((row) => within(row).queryByText("vs-config")); + expect(within(dbRow!).getByText("DB")).toBeInTheDocument(); + expect(within(dbRow!).queryByText("Config")).not.toBeInTheDocument(); + expect(within(configRow!).getByText("Config")).toBeInTheDocument(); + expect(within(configRow!).queryByText("DB")).not.toBeInTheDocument(); + }); + + it("should keep edit and delete disabled for a config-defined store while copy still works", async () => { + const user = userEvent.setup(); + const configStore: VectorStore = { ...mockVectorStores[1], vector_store_id: "vs-config", is_config: true }; + render(); + await user.click(screen.getByTestId("vector-store-actions-vs-config")); + const editItem = await screen.findByTestId("vector-store-action-edit"); + const deleteItem = screen.getByTestId("vector-store-action-delete"); + expect(editItem).toHaveAttribute("aria-disabled", "true"); + expect(deleteItem).toHaveAttribute("aria-disabled", "true"); + expect(screen.getByText(/Read only: this vector store is defined in the config file/)).toBeVisible(); + await user.click(editItem); + await user.click(deleteItem); + expect(mockOnEdit).not.toHaveBeenCalled(); + expect(mockOnDelete).not.toHaveBeenCalled(); + await user.click(screen.getByTestId("vector-store-action-copy")); + expect(await window.navigator.clipboard.readText()).toBe("vs-config"); + }); + it("should copy the vector store ID through the actions menu", async () => { const user = userEvent.setup(); render(); @@ -119,4 +158,12 @@ describe("VectorStoreTable", () => { await user.click(await screen.findByTestId("vector-store-action-copy")); expect(await window.navigator.clipboard.readText()).toBe("vs-newer"); }); + + it("should not show the read-only hint for a database-backed store", async () => { + const user = userEvent.setup(); + render(); + await user.click(screen.getByTestId("vector-store-actions-vs-newer")); + await screen.findByTestId("vector-store-action-edit"); + expect(screen.queryByText(/Read only: this vector store is defined in the config file/)).not.toBeInTheDocument(); + }); }); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx index a4c18e48e1a..d0ed333d3d7 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx @@ -4,7 +4,7 @@ import { ColumnDef } from "@tanstack/react-table"; import { Copy, MoreHorizontal, Pencil, Trash2 } from "lucide-react"; import { DataTableSortHeader } from "@/components/shared/DataTable"; -import { CellTooltip, DateCell, IdentityCell } from "@/components/shared/table_cells"; +import { CellTooltip, DateCell, IdentityCell, StatusBadge } from "@/components/shared/table_cells"; import { getVectorStoreProviderLogoAndName } from "@/components/vector_store_providers"; import { buttonVariants } from "@/components/ui/button"; import { @@ -18,6 +18,9 @@ import { VectorStore } from "@/components/vector_store_management/types"; import { cn } from "@/lib/cva.config"; import { copyToClipboard } from "@/utils/dataUtils"; +const CONFIG_STORE_HINT = + "Read only: this vector store is defined in the config file and cannot be edited or deleted on the dashboard."; + function VectorStoreProviderCell({ provider }: { provider: string }) { const { displayName, logo } = getVectorStoreProviderLogoAndName(provider); return ( @@ -64,6 +67,7 @@ interface VectorStoreRowActionsProps { } function VectorStoreRowActions({ vectorStore, onEdit, onDelete }: VectorStoreRowActionsProps) { + const isFromConfig = vectorStore.is_config ?? false; return ( - onEdit(vectorStore.vector_store_id)}> + onEdit(vectorStore.vector_store_id)} + > Edit @@ -89,11 +97,17 @@ function VectorStoreRowActions({ vectorStore, onEdit, onDelete }: VectorStoreRow onDelete(vectorStore.vector_store_id)} > Delete + {isFromConfig && ( +
+ {CONFIG_STORE_HINT} +
+ )} ); @@ -158,6 +172,18 @@ export const getVectorStoreTableColumns = ({ ); }, }, + { + id: "source", + accessorFn: (row) => row.is_config ?? false, + meta: { title: "Source", skeleton: "badge" }, + header: ({ column }) => , + size: 110, + enableSorting: true, + cell: ({ row }) => { + const isFromConfig = row.original.is_config ?? false; + return ; + }, + }, { id: "files", meta: { title: "Files" }, diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.test.tsx index 697d5f9692b..1600518ecdf 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.test.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.test.tsx @@ -59,6 +59,61 @@ describe("VectorStoreInfoView", () => { expect(await screen.findByText("Vector Store ID: vs-1")).toBeInTheDocument(); }); + it("should render a config-defined store read-only for an admin, even when opened in edit mode", async () => { + mockVectorStoreInfoCall.mockResolvedValue({ + vector_store: { + vector_store_id: "vs-config", + vector_store_name: "config-store", + custom_llm_provider: "openai", + created_at: "2024-01-01T00:00:00Z", + updated_at: "2024-01-01T00:00:00Z", + is_config: true, + }, + }); + render( + , + ); + expect(await screen.findByText("Vector Store ID: vs-config")).toBeInTheDocument(); + expect(screen.getByText("Read only: defined in the config file")).toBeInTheDocument(); + expect(screen.getByText("Config")).toBeInTheDocument(); + expect(screen.queryByText("DB")).not.toBeInTheDocument(); + expect(screen.getByText("Vector Store Details")).toBeInTheDocument(); + expect(screen.queryByRole("button", { name: "Edit Vector Store" })).not.toBeInTheDocument(); + expect(screen.queryByRole("button", { name: /Save/ })).not.toBeInTheDocument(); + }); + + it("should still offer editing for a database-backed store", async () => { + mockVectorStoreInfoCall.mockResolvedValue({ + vector_store: { + vector_store_id: "vs-db", + vector_store_name: "db-store", + custom_llm_provider: "openai", + created_at: "2024-01-01T00:00:00Z", + updated_at: "2024-01-01T00:00:00Z", + is_config: false, + }, + }); + render( + , + ); + expect(await screen.findByText("Vector Store ID: vs-db")).toBeInTheDocument(); + expect(screen.queryByText("Read only: defined in the config file")).not.toBeInTheDocument(); + expect(screen.getByText("DB")).toBeInTheDocument(); + expect(screen.getAllByRole("button", { name: "Edit Vector Store" }).length).toBeGreaterThan(0); + }); + it("should show a not-found state with a working back button when the fetch fails instead of loading forever", async () => { const user = userEvent.setup(); const onClose = vi.fn(); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx index 58fd2ce1143..92d4145b9f2 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { ArrowLeft, CircleHelp } from "lucide-react"; +import { ArrowLeft, CircleHelp, Lock } from "lucide-react"; import { z } from "zod/v4"; import { vectorStoreInfoCall, @@ -15,6 +15,8 @@ import VectorStoreTester from "./VectorStoreTester"; import { toast } from "@/lib/toast"; import { FieldGroup } from "@/components/ui/field"; import { FormField } from "@/components/shared/form/FormField"; +import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert"; +import { StatusBadge } from "@/components/shared/table_cells"; import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { Card, CardContent } from "@/components/ui/card"; @@ -200,6 +202,9 @@ const VectorStoreInfoView: React.FC = ({ return
Loading...
; } + const canEdit = is_admin && !vectorStoreDetails.is_config; + const showEditForm = isEditing && canEdit; + return (
@@ -208,14 +213,31 @@ const VectorStoreInfoView: React.FC = ({ Back to Vector Stores -

Vector Store ID: {vectorStoreDetails.vector_store_id}

+
+

Vector Store ID: {vectorStoreDetails.vector_store_id}

+ +

{vectorStoreDetails.vector_store_description || "No description"}

- {is_admin && !isEditing && } + {canEdit && !isEditing && }
+ {vectorStoreDetails.is_config && ( + + + Read only: defined in the config file + + This vector store comes from the proxy config YAML, so it cannot be edited or deleted on the dashboard. + Change or remove it in the config file and restart the proxy. + + + )} + @@ -227,7 +249,7 @@ const VectorStoreInfoView: React.FC = ({ - {isEditing ? ( + {showEditForm ? (

Edit Vector Store

@@ -373,7 +395,7 @@ const VectorStoreInfoView: React.FC = ({

Vector Store Details

- {is_admin && } + {canEdit && }
diff --git a/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.test.tsx b/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.test.tsx index 4d963a2f603..7ef7f1fcb09 100644 --- a/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.test.tsx +++ b/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.test.tsx @@ -58,6 +58,10 @@ vi.mock("@/app/(dashboard)/hooks/keys/useKeyInfo", () => ({ useKeyInfo: vi.fn(), })); +vi.mock("@/app/(dashboard)/hooks/uiSettings/useApplyUserBudgetToTeamKeys", () => ({ + useApplyUserBudgetToTeamKeys: vi.fn(() => false), +})); + vi.mock("@/app/(dashboard)/hooks/useTeams", () => ({ default: vi.fn(), })); diff --git a/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx b/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx index 39dd2cc5ab2..ec405ee9cad 100644 --- a/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx +++ b/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx @@ -3,6 +3,7 @@ import { useKeyInfo } from "@/app/(dashboard)/hooks/keys/useKeyInfo"; import { useKeys } from "@/app/(dashboard)/hooks/keys/useKeys"; import { useOrganizations } from "@/app/(dashboard)/hooks/organizations/useOrganizations"; +import { useApplyUserBudgetToTeamKeys } from "@/app/(dashboard)/hooks/uiSettings/useApplyUserBudgetToTeamKeys"; import { useAllTeams } from "@/app/(dashboard)/hooks/teams/useTeams"; import { DEBOUNCE_WAIT_MS } from "@/utils/debounceConstants"; import { @@ -139,10 +140,18 @@ export function VirtualKeysTable({ headerActions }: VirtualKeysTableProps) { const keyList = useMemo(() => keys?.keys ?? [], [keys]); const rowCount = keys?.total_count ?? 0; - const columns = useMemo( - () => getKeyTableColumns({ allTeams, organizations, onSelectKey: (key) => void setSelectedKeyId(key.token) }), - [allTeams, organizations, setSelectedKeyId], + const applyUserBudgetToTeamKeys = useApplyUserBudgetToTeamKeys(); + + const columnDeps = useMemo( + () => ({ + allTeams, + organizations, + onSelectKey: (key: KeyResponse) => void setSelectedKeyId(key.token), + applyUserBudgetToTeamKeys, + }), + [allTeams, organizations, setSelectedKeyId, applyUserBudgetToTeamKeys], ); + const columns = useMemo(() => getKeyTableColumns(columnDeps), [columnDeps]); const selectedKeyFromList = useMemo( () => keyList.find((key) => key.token === selectedKeyId), diff --git a/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx b/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx index c9ee0fa1126..33625c0e1eb 100644 --- a/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx +++ b/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx @@ -4,7 +4,7 @@ import { Info } from "lucide-react"; import { ColumnDef } from "@tanstack/react-table"; import { DataTableMultiSortHeader, DataTableSortHeader, type DataTableSortField } from "@/components/shared/DataTable"; -import { inheritedBudgetGates } from "@/components/shared/InheritedBudgetHint"; +import { inheritedBudgetGates, keyOwnerBudgetSource } from "@/components/shared/InheritedBudgetHint"; import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card"; import { Skeleton } from "@/components/ui/skeleton"; import { @@ -86,12 +86,14 @@ interface KeyTableColumnsDeps { allTeams: Team[]; organizations: Organization[]; onSelectKey: (key: KeyResponse) => void; + applyUserBudgetToTeamKeys: boolean; } export const getKeyTableColumns = ({ allTeams, organizations, onSelectKey, + applyUserBudgetToTeamKeys, }: KeyTableColumnsDeps): ColumnDef[] => [ { id: "key_alias", @@ -277,7 +279,11 @@ export const getKeyTableColumns = ({ ); }, diff --git a/ui/litellm-dashboard/src/components/add_model/AutoRouterAvailability.tsx b/ui/litellm-dashboard/src/components/add_model/AutoRouterAvailability.tsx new file mode 100644 index 00000000000..b1233ef03b8 --- /dev/null +++ b/ui/litellm-dashboard/src/components/add_model/AutoRouterAvailability.tsx @@ -0,0 +1,165 @@ +import { createContext, useContext, useEffect, useState } from "react"; +import { useQuery, type UseQueryOptions } from "@tanstack/react-query"; +import { apiClient } from "@/components/networking"; +import { Popover, PopoverContent, PopoverTitle, PopoverTrigger } from "@/components/ui/popover"; +import type { components } from "@/lib/http/schema"; + +type Availability = components["schemas"]["AutoRouterAvailabilityResponse"]; +type Request = components["schemas"]["AutoRouterAvailabilityRequest"]; +export type Allowance = components["schemas"]["AutoRouterAllowance"]; + +type AvailabilityState = { + data?: Availability; + isPending: boolean; + isError: boolean; + isChecking?: boolean; + refetch?: () => unknown; +}; + +export const AutoRouterAvailabilityContext = createContext({ isPending: true, isError: false }); + +export const useAutoRouterAvailability = (accessToken: string, body: Request, enabled = true) => { + const serialized = JSON.stringify(body.complexity_router_config ?? null); + const [debounced, setDebounced] = useState(serialized); + useEffect(() => { + const timeout = setTimeout(() => setDebounced(serialized), 300); + return () => clearTimeout(timeout); + }, [serialized]); + const options: UseQueryOptions = { + queryKey: ["autoRouterAvailability", accessToken, body.team_id, body.saved_model_id, debounced], + queryFn: ({ signal }) => + apiClient.post("/auto_router/availability", { + accessToken, + body: { ...body, complexity_router_config: JSON.parse(debounced) }, + signal, + }), + enabled: enabled && Boolean(accessToken), + placeholderData: (previous, previousQuery) => { + const key = previousQuery?.queryKey; + return key?.[1] === accessToken && key[2] === body.team_id && key[3] === body.saved_model_id + ? previous + : undefined; + }, + refetchOnMount: "always", + staleTime: 0, + retry: false, + }; + const query = useQuery(options); + const isChecking = query.isFetching || query.isPlaceholderData || serialized !== debounced; + const saveBlockedReason = () => { + if (!enabled) return null; + if (query.isPending || isChecking) return "Checking availability"; + if (query.isError || !query.data) return "Could not check availability. Retry before saving."; + return query.data.error ?? null; + }; + return { + ...query, + isPending: query.isPending || (query.isFetching && !query.isFetchedAfterMount), + isChecking, + saveBlockedReason: saveBlockedReason(), + }; +}; + +export const allowanceLabel = (allowance?: Allowance): string | null => { + if (!allowance?.available) return "Availability unavailable"; + if (allowance.limit == null) return null; + if (allowance.used_by_this_router) return "Used by this router"; + return `${allowance.remaining} of ${allowance.limit} available`; +}; + +const availabilityLabel = (state: AvailabilityState, key: string) => { + if (state.isPending || state.isChecking) return "Checking availability"; + if (state.isError) return "Availability unavailable"; + return allowanceLabel(state.data?.allowances.find((entry) => entry.key === key)); +}; + +export const useAllowanceLabel = (key: string) => availabilityLabel(useContext(AutoRouterAvailabilityContext), key); + +export const isAllowanceExhausted = (allowance?: Allowance) => + Boolean(allowance?.available && allowance.limit != null && allowance.remaining === 0) && + !allowance?.used_by_this_router; + +export const AUTO_ROUTER_CONTACT_URL = "https://calendly.com/tin-berri/litellm-auto-router-pricing-discussion"; + +export const AutoRouterContactLink = ({ features, message }: { features?: string[]; message?: string }) => { + const state = useContext(AutoRouterAvailabilityContext); + if (state.isPending || state.isError || state.isChecking) return null; + const exhausted = state.data?.allowances.some( + (entry) => (!features || features.includes(entry.key)) && isAllowanceExhausted(entry), + ); + if (!exhausted) return null; + return ( + + {message} + + Talk to our team + + + ); +}; + +export const AutoRouterAllowanceLabel = ({ feature }: { feature: string }) => { + const label = useAllowanceLabel(feature); + return label ? ( + {label} + ) : null; +}; + +export const AutoRouterAllowanceNote = ({ feature, label }: { feature: string; label: string }) => { + const availability = useAllowanceLabel(feature); + return availability ? ( +

+ {label}: {availability} +

+ ) : null; +}; + +export const AutoRouterLimits = () => { + const state = useContext(AutoRouterAvailabilityContext); + const limits = [ + ["heuristic_v2", "Heuristic v2 routers"], + ["capability", "Capability routers"], + ["llm_v2", "Fuse v2 routers"], + ["tier_or_classifier_prompt", "Custom tiers or prompts"], + ["heuristic_tuning", "Rule-based tuning"], + ]; + return ( + + + View limits + + + Routing and customization limits +

+ Rule-based, Complexity, and Jev are unlimited with built-in settings. Choose or change tier models freely. + Customization allowances are shared across this proxy. +

+
+ {limits.map(([key, label]) => ( +
+
{label}
+
+ {availabilityLabel(state, key) ?? "Unlimited"} +
+
+ ))} +
+

+ Custom tier definitions and written classifier instructions share one allowance. Built-in prompts and + display-name changes do not use it. +

+

+ Changing scoring rules, such as weights, thresholds, keywords, or custom dimensions, uses the Rule-based + tuning allowance. It also applies to Heuristic first and Hybrid. Recorded settings on existing routers are + preserved; new routers start from built-in rules. +

+ + + + ); +}; diff --git a/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.integration.test.tsx b/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.integration.test.tsx index ac6851349ea..f843a472d15 100644 --- a/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.integration.test.tsx +++ b/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.integration.test.tsx @@ -1,7 +1,9 @@ import React, { useState } from "react"; import { describe, expect, it, vi } from "vitest"; -import { fireEvent, renderWithProviders, screen } from "../../../tests/test-utils"; +import { fireEvent, renderWithProviders, screen, waitFor, within } from "../../../tests/test-utils"; +import { selectAutoRouterOption } from "../../../tests/autoRouterSetup"; import AutoRouterClassifierTabs from "./AutoRouterClassifierTabs"; +import { AutoRouterAllowanceNote, AutoRouterAvailabilityContext } from "./AutoRouterAvailability"; import type { ComplexityRouterConfigValue } from "./ComplexityRouterConfig"; const initial: ComplexityRouterConfigValue = { @@ -9,28 +11,67 @@ const initial: ComplexityRouterConfigValue = { tiers: { SIMPLE: ["efficient"], MEDIUM: [], COMPLEX: [], REASONING: ["capable"] }, }; -function Form({ initialValue = initial }: { initialValue?: ComplexityRouterConfigValue }) { +function Form({ + initialValue = initial, + remaining = 1, + limit = 1, + ownedFeature, + availabilityState, +}: { + initialValue?: ComplexityRouterConfigValue; + remaining?: number; + limit?: number | null; + ownedFeature?: string; + availabilityState?: Partial>; +}) { const [value, setValue] = useState(initialValue); return ( - - {value.classifier_type} - + ({ + key, + limit, + remaining, + available: true, + used_by_this_router: key === ownedFeature, + }), + ), + error: null, + }, + ...availabilityState, + }} + > + + {value.classifier_type} + + ); } -describe("AutoRouterClassifierTabs", () => { - it.each(["heuristic", "heuristic_v2", "llm", "heuristic_first", "hybrid"] as const)( - "groups %s under Complexity without resetting its configuration", - (classifier_type) => { +describe("Auto-router classifier selection", () => { + it.each(["heuristic", "heuristic_v2", "llm", "heuristic_first", "hybrid", "jev"] as const)( + "shows saved %s without changing its configuration", + async (classifier_type) => { const onChange = vi.fn(); renderWithProviders( - Existing classifier settings + Existing settings , ); - expect(screen.getByRole("tab", { name: "Complexity" })).toHaveAttribute("aria-selected", "true"); - expect(screen.getByRole("tabpanel", { name: "Complexity" })).toHaveTextContent("Existing classifier settings"); - fireEvent.click(screen.getByRole("tab", { name: "Complexity" })); + const family = { + heuristic: "Heuristics", + heuristic_v2: "Heuristics", + llm: "LLM", + heuristic_first: "LLM", + hybrid: "LLM", + jev: "Jev", + }[classifier_type]; + expect(screen.getByRole("radio", { name: new RegExp(`^${family}$`) })).toBeChecked(); + fireEvent.click(screen.getByRole("radio", { name: new RegExp(`^${family}$`) })); expect(onChange).not.toHaveBeenCalled(); }, ); @@ -38,38 +79,186 @@ describe("AutoRouterClassifierTabs", () => { it.each([ ["capability", "Capability"], ["llm_v2", "Fuse v2"], - ] as const)("opens saved %s settings and switches back to local Complexity", (classifier_type, label) => { - renderWithProviders(
); - expect(screen.getByRole("tab", { name: label })).toHaveAttribute("aria-selected", "true"); - fireEvent.click(screen.getByRole("tab", { name: "Complexity" })); - expect(screen.getByRole("tab", { name: "Complexity" })).toHaveAttribute("aria-selected", "true"); - expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent("heuristic"); + ] as const)( + "opens saved %s and retains the LLM family when switching to Complexity", + async (classifier_type, label) => { + renderWithProviders(); + expect(screen.getByRole("button", { name: "Routing approach" })).toHaveTextContent(label); + await selectAutoRouterOption("Routing approach", "Complexity"); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent("llm"); + }, + ); + + it.each([ + [1, "heuristic"], + [0, "heuristic"], + ])("defaults to Rule-based when %s v2 slots remain", async (remaining, classifier) => { + renderWithProviders(); + fireEvent.click(screen.getByRole("radio", { name: /^Heuristics$/ })); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent(String(classifier)); + fireEvent.click(screen.getByRole("button", { name: "Heuristic" })); + expect(screen.getByRole("menuitemradio", { name: /^Heuristic v2/ })).toHaveTextContent( + `${remaining} of 1 available`, + ); }); - it("keeps custom tiers editable under Complexity and explains why forecast tabs are disabled", () => { + it.each([ + { data: undefined }, + { isPending: true }, + { isError: true }, + { isChecking: true }, + { data: { allowances: [], error: null } }, + { data: { allowances: [{ key: "heuristic_v2", limit: 1, remaining: null, available: false }], error: null } }, + ])("uses Rule-based when v2 availability is unverified: %j", async (availabilityState) => { + renderWithProviders(); + fireEvent.click(screen.getByRole("radio", { name: "Heuristics" })); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent(/^heuristic$/); + }); + + it("does not present Rule-based as having a classifier quota", () => { + renderWithProviders(); + expect(screen.getByRole("button", { name: "Heuristic" })).toHaveTextContent(/^Rule-based/); + fireEvent.click(screen.getByRole("button", { name: "Heuristic" })); + expect(screen.getAllByRole("menuitemradio")[0]).toHaveTextContent(/^Rule-based/); + expect(screen.getByRole("menuitemradio", { name: /^Rule-based/ })).not.toHaveTextContent("of 1 available"); + expect(screen.getByRole("menuitemradio", { name: /^Heuristic v2/ })).toHaveTextContent("0 of 1 available"); + }); + + it("omits allowance labels with an unlimited entitlement", async () => { + renderWithProviders(); + fireEvent.click(screen.getByRole("button", { name: "Heuristic" })); + expect(screen.getByRole("menuitemradio", { name: /^Heuristic v2/ })).not.toHaveTextContent("available"); + }); + + it.each([ + ["heuristic", "Heuristic", "Heuristic v2"], + ["llm", "Routing approach", "Capability"], + ["llm", "Routing approach", "Fuse v2"], + ] as const)("blocks exhausted %s options: %s / %s", (classifier_type, field, option) => { + renderWithProviders(); + fireEvent.click(screen.getByRole("button", { name: field })); + const unavailable = screen.getByRole("menuitemradio", { name: new RegExp(`^${option}`) }); + expect(unavailable).toHaveAttribute("aria-disabled", "true"); + fireEvent.click(unavailable); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent(classifier_type); + }); + + it.each([ + ["heuristic_v2", "heuristic", "Heuristic", "Heuristic v2"], + ["capability", "llm", "Routing approach", "Capability"], + ["llm_v2", "llm", "Routing approach", "Fuse v2"], + ] as const)("lets a saved router reselect its own %s allowance", async (feature, classifier_type, field, option) => { + renderWithProviders(); + await selectAutoRouterOption(field, option); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent(feature); + expect(screen.getByRole("button", { name: field })).toHaveTextContent("Used by this router"); + }); + + it("shows Jev's single Complexity approach without changing saved configuration", () => { const onChange = vi.fn(); renderWithProviders( - + Existing settings + , + ); + expect(screen.getByRole("button", { name: "Routing approach" })).toHaveTextContent("ComplexityUnlimited"); + fireEvent.click(screen.getByRole("button", { name: "Routing approach" })); + expect(screen.getAllByRole("menuitemradio")).toHaveLength(1); + fireEvent.click(screen.getByRole("menuitemradio", { name: /^Complexity/ })); + expect(onChange).not.toHaveBeenCalled(); + }); + + it("keeps custom tiers editable and disables incompatible choices", async () => { + renderWithProviders( + - Custom tiers - , + />, ); - expect(screen.getByRole("tabpanel", { name: "Complexity" })).toHaveTextContent("Custom tiers"); + expect(screen.getByRole("radio", { name: /^Heuristics$/ })).toHaveAttribute("aria-disabled", "true"); + fireEvent.click(screen.getByRole("button", { name: "Routing approach" })); for (const name of ["Capability", "Fuse v2"]) { - const tab = screen.getByRole("tab", { name }); - expect(tab).toHaveAttribute("aria-disabled", "true"); - expect(tab).toHaveAccessibleDescription("Restore standard tiers to use Capability or Fuse v2."); - fireEvent.click(tab); + expect(screen.getByRole("menuitemradio", { name: new RegExp(`^${name}`) })).toHaveAttribute( + "aria-disabled", + "true", + ); } - expect(onChange).not.toHaveBeenCalled(); - expect(screen.getByText("Restore standard tiers to use Capability or Fuse v2.")).toBeVisible(); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent("llm"); + }); +}); + +describe("Gated routing contact action", () => { + it("offers a pricing discussion in View limits", async () => { + renderWithProviders(); + expect(screen.queryByRole("link", { name: "Talk to our team" })).not.toBeInTheDocument(); + fireEvent.click(screen.getByRole("button", { name: "View limits" })); + const link = within(screen.getByRole("dialog")).getByRole("link", { name: "Talk to our team" }); + await waitFor(() => expect(link).toBeVisible()); + expect(link).toHaveAttribute("href", "https://calendly.com/tin-berri/litellm-auto-router-pricing-discussion"); + expect(link).toHaveAttribute("target", "_blank"); + expect(link).toHaveAttribute("rel", "noopener noreferrer"); + }); + + it.each([ + ["heuristic", "Heuristic", "Heuristic v2"], + ["llm", "Routing approach", "Capability"], + ] as const)( + "keeps the contact action available beside the disabled %s choice", + async (classifier_type, field, option) => { + renderWithProviders(); + expect(screen.queryByText(/Need more/)).not.toBeInTheDocument(); + fireEvent.click(screen.getByRole("button", { name: field })); + const disabled = screen.getByRole("menuitemradio", { name: new RegExp(`^${option}`) }); + expect(disabled).toHaveAttribute("aria-disabled", "true"); + const link = screen.getByRole("menuitem", { name: `Talk to our team about ${option}` }); + await waitFor(() => expect(link).toBeVisible()); + expect(link).toHaveAttribute("href", "https://calendly.com/tin-berri/litellm-auto-router-pricing-discussion"); + expect(link).toHaveAttribute("target", "_blank"); + fireEvent.click(link); + expect(screen.getByRole("status", { name: "Classifier type" })).toHaveTextContent(classifier_type); + }, + ); + + it.each([ + { remaining: 1 }, + { remaining: 0, limit: null }, + { remaining: 0, availabilityState: { isPending: true } }, + { remaining: 0, availabilityState: { isError: true } }, + { remaining: 0, availabilityState: { isChecking: true } }, + ])("does not pitch an upgrade for a free or unverified option: %j", (props) => { + renderWithProviders(); + fireEvent.click(screen.getByRole("button", { name: "Routing approach" })); + expect(screen.queryByRole("menuitem", { name: /Talk to our team/ })).not.toBeInTheDocument(); + }); + + it("does not pitch an upgrade for the saved heuristic's own slot", () => { + renderWithProviders( + , + ); + fireEvent.click(screen.getByRole("button", { name: "Heuristic" })); + expect(screen.queryByRole("menuitem", { name: /Talk to our team/ })).not.toBeInTheDocument(); + }); + + it("includes the sales action beside customization limits and blocked changes", () => { + const allowance = { key: "tier_or_classifier_prompt", limit: 1, remaining: 0, available: true }; + const state = { + isPending: false, + isError: false, + data: { allowances: [allowance], error: "Custom tiers have no available allowance" }, + }; + renderWithProviders( + + + + + , + ); + expect(screen.getByText(/Custom tiers: 0 of 1 available/)).toHaveTextContent("Talk to our team"); + expect(within(screen.getByRole("alert")).getByRole("link", { name: "Talk to our team" })).toBeVisible(); }); }); diff --git a/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.tsx b/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.tsx index 98c0d4aab2f..92fc8d2a335 100644 --- a/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.tsx +++ b/ui/litellm-dashboard/src/components/add_model/AutoRouterClassifierTabs.tsx @@ -1,8 +1,119 @@ -import React, { useId } from "react"; -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; -import { effectiveClassifierType, type ComplexityRouterConfigValue } from "./ComplexityRouterConfig"; +import React, { useContext, useId } from "react"; +import { Label } from "@/components/ui/label"; +import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"; +import { ChevronDownIcon } from "lucide-react"; +import { Button } from "@/components/ui/button"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; +import { + effectiveClassifierType, + type ClassifierType, + type ComplexityRouterConfigValue, +} from "./ComplexityRouterConfig"; import { transitionClassifierType } from "./classifier_type_transition"; import { isForecastClassifier } from "./forecast_classifier_config"; +import { + AutoRouterAllowanceLabel, + AutoRouterAvailabilityContext, + AutoRouterLimits, + AutoRouterContactLink, + isAllowanceExhausted, + AUTO_ROUTER_CONTACT_URL, +} from "./AutoRouterAvailability"; + +function ClassifierOption({ + value, + label, + description, + feature, + disabled, + unlimited = true, +}: { + value: string; + label: string; + description: string; + feature?: string; + disabled?: boolean; + unlimited?: boolean; +}) { + const state = useContext(AutoRouterAvailabilityContext); + const allowance = state.data?.allowances.find((entry) => entry.key === feature); + const fresh = !state.isPending && !state.isError && !state.isChecking; + const exhausted = isAllowanceExhausted(allowance); + return ( +
+ + + + {label} + {feature ? ( + + ) : ( + unlimited && Unlimited + )} + + {description} + + + {fresh && exhausted && ( + } + aria-label={`Talk to our team about ${label}`} + className="absolute top-9 right-8 cursor-pointer px-0 py-0 text-xs leading-5 font-medium text-blue-600 focus:text-blue-600 hover:underline dark:text-blue-400 dark:focus:text-blue-400" + > + Talk to our team + + )} +
+ ); +} + +function ClassifierMenu({ + id, + label, + value, + selectedLabel, + feature, + onValueChange, + children, +}: { + id: string; + label: string; + value: string; + selectedLabel: string; + feature?: string; + onValueChange: (value: string) => void; + children: React.ReactNode; +}) { + return ( + + } + > + {selectedLabel} + {feature ? ( + + ) : ( + Unlimited + )} + + + + + {children} + + + + ); +} interface AutoRouterClassifierTabsProps { value: ComplexityRouterConfigValue; @@ -11,47 +122,174 @@ interface AutoRouterClassifierTabsProps { } const AutoRouterClassifierTabs: React.FC = ({ value, onChange, children }) => { - const restrictionId = useId(); + const id = useId(); + const availability = useContext(AutoRouterAvailabilityContext); const classifierType = effectiveClassifierType(value); - const selected = isForecastClassifier(classifierType) ? classifierType : "complexity"; + const familyByType: Record = { + heuristic: "heuristics", + heuristic_v2: "heuristics", + llm: "llm", + heuristic_first: "llm", + hybrid: "llm", + capability: "llm", + llm_v2: "llm", + jev: "jev", + custom: "custom", + }; + const family = familyByType[classifierType]; const hasCustomTiers = Boolean(value.custom_tier_set); - - const handleChange = (tab: unknown) => { - if (tab === selected) return; - if (tab === "complexity") { - onChange(transitionClassifierType(value, isForecastClassifier(classifierType) ? "heuristic" : classifierType)); - } else if (!hasCustomTiers && (tab === "capability" || tab === "llm_v2")) { - onChange(transitionClassifierType(value, tab)); - } + const changeType = (next: ClassifierType) => { + if (next !== classifierType) onChange(transitionClassifierType(value, next)); }; + const changeFamily = (next: unknown) => { + if (next === family) return; + if (next === "heuristics") changeType("heuristic"); + if (next === "llm") changeType("llm"); + if (next === "jev") changeType("jev"); + }; + const approachLabels: Partial> = { capability: "Capability", llm_v2: "Fuse v2" }; + const approachDescription: Partial> = { + capability: "Use the efficient model when it is likely to succeed", + llm_v2: "Use the efficient model when its predicted quality is close enough to the capable model", + }; return ( - -

Classifier type

- - Complexity - - Capability - - - Fuse v2 - - +
+
+ + What classifies your requests? + + + + {[ + { value: "heuristics", label: "Heuristics", description: "Classify locally, with no API call" }, + { value: "llm", label: "LLM", description: "Use a judge model to choose a solver" }, + { value: "jev", label: "Jev", description: "Use TypeSafe System One Choice to choose a tier" }, + ].map((option) => ( + + ))} + +
+ {family === "custom" && ( +

This router uses a custom classifier plugin

+ )} + {family === "heuristics" && ( +
+ + { + if (next === "heuristic" || next === "heuristic_v2") changeType(next); + }} + > + + + +

+ {classifierType === "heuristic_v2" + ? "Use calibrated probabilities to match requests to a tier" + : "Match requests using scoring rules. Choose or change tier models freely"} +

+
+ )} + {(family === "llm" || family === "jev") && ( +
+ + { + if (next === "llm" || next === "capability" || next === "llm_v2") { + if (next === "llm" && !isForecastClassifier(classifierType)) return; + changeType(next); + } + }} + > + + {family === "llm" && ( + <> + + + + )} + +

+ {approachDescription[classifierType] ?? "Match task difficulty to a tier"} +

+
+ )} {hasCustomTiers && ( -

- Restore standard tiers to use Capability or Fuse v2. +

+ Restore standard tiers to use Heuristics, Capability, or Fuse v2

)} - {children} - + {availability.data?.error && !availability.isChecking && ( +
+

{availability.data.error}

+ +
+ )} + {availability.isError && ( +

+ Could not check availability.{" "} + +

+ )} + {children} +
); }; diff --git a/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx b/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx index b7a0fd67443..ccd204aa521 100644 --- a/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx @@ -1,9 +1,10 @@ +import ClassifierPrimarySettings from "./ClassifierPrimarySettings"; +import { AutoRouterAllowanceNote } from "./AutoRouterAvailability"; import { transitionClassifierType } from "./classifier_type_transition"; import JevClassifierConfig from "./JevClassifierConfig"; import { Info } from "lucide-react"; import { SimpleTooltip } from "@/components/ui/tooltip"; import { MultiSelect } from "@/components/shared/MultiSelect"; -import { SearchSelect } from "@/components/shared/SearchSelect"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { Card, CardContent } from "@/components/ui/card"; import { Button } from "@/components/ui/button"; @@ -25,13 +26,10 @@ import ClassifierTypeRadios from "./ClassifierTypeRadios"; import type { ReasoningEffort } from "./complexity_router_tiers"; import { useComplexityScorerDefaults } from "@/app/(dashboard)/hooks/autoRouter/useComplexityScorerDefaults"; import { - ClassificationFrequency, ClassifierFallback, ClassifierLLMConfig, ClassifierType, ComplexityRouterConfigValue, - classificationFrequency, - withClassificationFrequency, DEFAULT_CLASSIFIER_CONTEXT_BUDGET_CHARS, MIN_QUOTED_CONTEXT_TURN_CHARS, DEFAULT_CLASSIFIER_CONTEXT_WINDOW_SIZE, @@ -171,6 +169,7 @@ interface ClassificationMethodConfigProps { showValidationErrors?: boolean; /** The resolved default model - see resolveComplexityDefaultModel. Names and gates the radio. */ defaultModel?: string; + advancedOnly?: boolean; } export const InactiveHeuristicV2Threshold: React.FC> = ({ @@ -215,13 +214,11 @@ const ClassificationMethodConfig: React.FC = ({ onCustomTechnicalKeywordsChange, showValidationErrors = false, defaultModel, + advancedOnly = false, }) => { const [draft, setDraft] = React.useState<{ id: string; raw: string } | null>(null); const hasDefaultModel = Boolean(defaultModel); const classifierType = effectiveClassifierType(value); - const sessionFrequencyRestriction = restrictedBy(value, "sessionAffinity"); - const classifierModelMissing = - showValidationErrors && usesLlmClassifier(classifierType) && !value.classifier_llm_config?.model; const usesCustomPrompt = Boolean(value.classifier_llm_config?.system_prompt?.trim()); const contextBudget = value.classifier_context_budget_chars ?? DEFAULT_CLASSIFIER_CONTEXT_BUDGET_CHARS; const contextBudgetQuotesNothing = contextBudget > 0 && contextBudget < MIN_QUOTED_CONTEXT_TURN_CHARS; @@ -282,23 +279,6 @@ const ClassificationMethodConfig: React.FC = ({ onChange(nextValue); }; - const handleClassifierModelChange = (model: string | null) => { - if (model === null) return; - if (model === value.classifier_llm_config?.model) return; - const { reasoning_effort: _reasoningEffort, ...classifierLlmConfig } = value.classifier_llm_config ?? { - model: "", - timeout_ms: DEFAULT_CLASSIFIER_TIMEOUT_MS, - }; - onChange({ - ...value, - classifier_llm_config: { - ...classifierLlmConfig, - model, - timeout_ms: classifierLlmConfig.timeout_ms, - }, - }); - }; - const handleClassifierReasoningEffortChange = (reasoningEffort: ReasoningEffort | undefined) => { if (!value.classifier_llm_config) return; const { reasoning_effort: _reasoningEffort, ...classifierLlmConfig } = value.classifier_llm_config; @@ -350,10 +330,6 @@ const ClassificationMethodConfig: React.FC = ({ onChange({ ...value, classifier_fallback: fallback }); }; - const handleClassificationFrequencyChange = (frequency: ClassificationFrequency) => { - onChange(withClassificationFrequency(value, frequency)); - }; - const handleClassifierContextWindowSizeChange = (windowSize: number) => { onChange({ ...value, @@ -389,7 +365,50 @@ const ClassificationMethodConfig: React.FC = ({ return ( <> - + {!advancedOnly && ( + <> + + + + )} + {advancedOnly && ["llm", "heuristic_first", "hybrid"].includes(classifierType) && ( +
+ + +
+ )} {classifierType === "custom" && ( @@ -474,66 +493,9 @@ const ClassificationMethodConfig: React.FC = ({
)} -
- How often to classify - - handleClassificationFrequencyChange(frequency as ClassificationFrequency) - } - > -
- - - -
- -

- Holding the tier keeps an agent on one model for a whole tool loop and cuts scoring cost. A turn the router - cannot match to a held decision, such as one with no session id or an expired one, is scored again -

-
- {classifierType === "jev" && } {usesLlmClassifier(classifierType) && (
-
- Classifier Model - - {classifierModelMissing && A classifier model is required} -
= ({
+ {!value.custom_tier_set && usesCustomPrompt ? ( = ({ /> Number of prior user turns sent to the classifier provider, excluding tool output and harness reminders. - LLM and JEV default to 3 turns; JEV sends them to the configured TypeSafe endpoint. Set to 0 to omit + LLM and Jev default to 3 turns; Jev sends them to the configured TypeSafe endpoint. Set to 0 to omit conversation history. The current message and selected system text are still sent.
@@ -769,6 +735,9 @@ const ClassificationMethodConfig: React.FC = ({
)} + {["heuristic", "heuristic_first", "hybrid"].includes(classifierType) && ( + + )} diff --git a/ui/litellm-dashboard/src/components/add_model/ClassifierPrimarySettings.tsx b/ui/litellm-dashboard/src/components/add_model/ClassifierPrimarySettings.tsx new file mode 100644 index 00000000000..32cb4851580 --- /dev/null +++ b/ui/litellm-dashboard/src/components/add_model/ClassifierPrimarySettings.tsx @@ -0,0 +1,98 @@ +import React from "react"; +import { Label } from "@/components/ui/label"; +import { SearchSelect } from "@/components/shared/SearchSelect"; +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; +import { + classificationFrequency, + withClassificationFrequency, + effectiveClassifierType, + usesLlmClassifier, + DEFAULT_CLASSIFIER_TIMEOUT_MS, + type ComplexityRouterConfigValue, + type ClassificationFrequency, +} from "./ComplexityRouterConfig"; +import { restrictedBy } from "./TierRestrictions"; + +export default function ClassifierPrimarySettings({ + value, + onChange, + modelOptions, + showValidationErrors = false, +}: { + value: ComplexityRouterConfigValue; + onChange: (value: ComplexityRouterConfigValue) => void; + modelOptions: { value: string; label: string }[]; + showValidationErrors?: boolean; +}) { + const id = React.useId(); + const restriction = restrictedBy(value, "sessionAffinity"); + const frequency = classificationFrequency(value); + const frequencyDescription = { + every_request: "Choose a model again for every request", + user_turn: "Reclassify when the user sends a new message", + session: "Keep the same tier for the session. Requires a client session ID", + }[frequency]; + const usesJudge = usesLlmClassifier(effectiveClassifierType(value)); + const missingJudge = showValidationErrors && usesJudge && !value.classifier_llm_config?.model; + return ( +
+
+ + +

{restriction?.reason ?? frequencyDescription}

+
+ {usesJudge && ( +
+ + { + if (!model || model === value.classifier_llm_config?.model) return; + onChange({ + ...value, + classifier_llm_config: { + ...value.classifier_llm_config, + model, + timeout_ms: value.classifier_llm_config?.timeout_ms ?? DEFAULT_CLASSIFIER_TIMEOUT_MS, + reasoning_effort: undefined, + }, + }); + }} + /> + {missingJudge && ( +

+ A judge model is required +

+ )} +
+ )} +
+ ); +} diff --git a/ui/litellm-dashboard/src/components/add_model/ClassifierTypeRadios.tsx b/ui/litellm-dashboard/src/components/add_model/ClassifierTypeRadios.tsx index 1602e19069a..1fd6dfa6a20 100644 --- a/ui/litellm-dashboard/src/components/add_model/ClassifierTypeRadios.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ClassifierTypeRadios.tsx @@ -54,7 +54,7 @@ const ClassifierTypeRadios: React.FC = ({ value, clas diff --git a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterAdvancedSections.tsx b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterAdvancedSections.tsx index 71f8bce76b5..a4e833152a9 100644 --- a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterAdvancedSections.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterAdvancedSections.tsx @@ -6,6 +6,7 @@ import type { ModelGroup } from "@/components/llm_calls/fetch_models"; import type { ComplexityRouterConfigValue } from "./ComplexityRouterConfig"; import AdaptiveRoutingConfig from "./AdaptiveRoutingConfig"; import ClassificationMethodConfig from "./ClassificationMethodConfig"; +import ForecastClassifierConfig from "./ForecastClassifierConfig"; import ContextWindowEscalationConfig from "./ContextWindowEscalationConfig"; import ResponseFormatControls from "./ResponseFormatControls"; import StallEscalationConfig from "./StallEscalationConfig"; @@ -79,13 +80,31 @@ const ComplexityRouterAdvancedSections: React.FC { const sections = [ + ...(forecast + ? [ + { + key: "classifier", + label: Classifier tuning, + children: ( + + ), + }, + ] + : []), ...(!forecast ? [ { key: "classifier", - label: Advanced: Classification Method, + label: Classification Method, children: ( Advanced: Heuristic Keyword Overrides, + label: Heuristic Keyword Overrides, children: , }, ] : []), { key: "adaptive", - label: Advanced: Adaptive Routing, + label: Adaptive Routing, children: ( @@ -119,39 +138,39 @@ const ComplexityRouterAdvancedSections: React.FCAdvanced: Affinity, + label: Affinity, children: , }, { key: "modality", - label: Advanced: Modality Routing, + label: Modality Routing, children: , }, { key: "plan-mode", - label: Advanced: Plan-Mode Override, + label: Plan-Mode Override, children: ( ), }, { key: "housekeeping", - label: Advanced: Housekeeping Routing, + label: Housekeeping Routing, children: , }, { key: "reminder-markers", - label: Advanced: Reminder Markers, + label: Ignore Custom Tags, children: , }, { key: "context-window", - label: Advanced: Context Window Escalation, + label: Context Window Escalation, children: , }, { key: "stall-escalation", - label: Advanced: Stalled Task Escalation, + label: Stalled Task Escalation, children: ( @@ -160,14 +179,14 @@ const ComplexityRouterAdvancedSections: React.FCAdvanced: Response Format, + label: Response Format, children: , }, ...(onEscalationKeywordsChange ? [ { key: "escalation", - label: Advanced: Escalation Keywords, + label: Escalation Keywords, children: ( @@ -180,7 +199,7 @@ const ComplexityRouterAdvancedSections: React.FCAdvanced: Compression, + label: Compression, children: , }, ] @@ -189,7 +208,7 @@ const ComplexityRouterAdvancedSections: React.FCAdvanced: Keyword/Semantic Matching, + label: Keyword/Semantic Matching, children: ( <> {onKeywordTierRulesChange && ( @@ -220,20 +239,65 @@ const ComplexityRouterAdvancedSections: React.FC(() => + showValidationErrors ? groups.map((group) => group.label) : [], + ); + const [previousValidation, setPreviousValidation] = React.useState(showValidationErrors); + if (previousValidation !== showValidationErrors) { + setPreviousValidation(showValidationErrors); + if (showValidationErrors) setOpenGroups(groups.map((group) => group.label)); + } return ( - <> - {sections - .filter(({ key }) => !forecast || !["adaptive", "context-window", "escalation"].includes(key)) - .map(({ key, label, children }) => ( - - - - {label} - - {children} - - ))} - +
+ {groups.map((group) => ( + + setOpenGroups((current) => + open ? [...current, group.label] : current.filter((label) => label !== group.label), + ) + } + className="border-b border-border last:border-b-0" + > + + + {group.label} + + + {sections + .filter( + ({ key }) => + group.keys.includes(key) && + (!forecast || !["adaptive", "context-window", "escalation"].includes(key)), + ) + .map(({ key, label, children }) => ( +
+ {key !== "classifier" &&

{label}

} + {children} +
+ ))} + + + ))} +
); }; diff --git a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.integration.test.tsx similarity index 85% rename from ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx rename to ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.integration.test.tsx index 56b37b92af3..4a00a469f97 100644 --- a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.integration.test.tsx @@ -1,8 +1,15 @@ +import { openAutoRouterAdvanced, selectAutoRouterOption } from "../../../tests/autoRouterSetup"; import { fireEvent, renderWithProviders, screen, within } from "../../../tests/test-utils"; import userEvent from "@testing-library/user-event"; import React from "react"; -import { vi, type Mock } from "vitest"; -import ComplexityRouterConfig, { ComplexityRouterConfigValue } from "./ComplexityRouterConfig"; +import { describe, it, expect, vi, type Mock } from "vitest"; +import ComplexityRouterConfigView, { ComplexityRouterConfigValue } from "./ComplexityRouterConfig"; +import AutoRouterClassifierTabs from "./AutoRouterClassifierTabs"; +const ComplexityRouterConfig = (props: React.ComponentProps) => ( + + + +); vi.mock( "@/app/(dashboard)/hooks/autoRouter/useComplexityScorerDefaults", async () => await import("../../../tests/mocks/complexityScorerDefaults"), @@ -45,12 +52,12 @@ const baseProps = { }; describe("ComplexityRouterConfig", () => { - it("should render", () => { + it("should render", async () => { renderWithProviders(); - expect(screen.getByText("Complexity Tier Configuration")).toBeInTheDocument(); + expect(screen.getByText("Models by tier")).toBeInTheDocument(); }); - it("should display all four tier labels", () => { + it("should display all four tier labels", async () => { renderWithProviders(); expect(screen.getByText("Simple Tier")).toBeInTheDocument(); expect(screen.getByText("Medium Tier")).toBeInTheDocument(); @@ -58,7 +65,7 @@ describe("ComplexityRouterConfig", () => { expect(screen.getByText("Reasoning Tier")).toBeInTheDocument(); }); - it("should show example queries for each tier", () => { + it("should show example queries for each tier", async () => { renderWithProviders(); expect(screen.getByText(/Hello!/)).toBeInTheDocument(); expect(screen.getByText(/Explain how REST APIs work/)).toBeInTheDocument(); @@ -66,46 +73,51 @@ describe("ComplexityRouterConfig", () => { expect(screen.getByText(/Think step by step/)).toBeInTheDocument(); }); - it("should display the how classification works section", () => { + it("should display the how classification works section", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("How Classification Works")).toBeInTheDocument(); }); - it("should show score thresholds in the classification section", () => { + it("should show score thresholds in the classification section", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText(/Score < 0.15/)).toBeInTheDocument(); expect(screen.getByText(/Score 0.15 - 0.35/)).toBeInTheDocument(); expect(screen.getByText(/Score 0.35 - 0.60/)).toBeInTheDocument(); expect(screen.getByText(/Score > 0.60/)).toBeInTheDocument(); }); - it("leaves the score threshold list color to the theme instead of an inline style", () => { + it("leaves the score threshold list color to the theme instead of an inline style", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); const list = screen.getByText(/Score < 0.15/).closest("ul"); expect(list).toBeInTheDocument(); expect(list).toHaveClass("text-muted-foreground"); expect(list?.style.color).toBe(""); }); - it("should default to heuristic and hide classifier model/timeout fields", () => { + it("should default to heuristic and hide classifier model/timeout fields", async () => { renderWithProviders(); - expect(screen.getByText("Advanced: Classification Method")).toBeInTheDocument(); - expect(screen.queryByText("Classifier Model")).not.toBeInTheDocument(); + openAutoRouterAdvanced("Classification Method"); + expect(screen.getByText("Classifier tuning")).toBeInTheDocument(); + expect(screen.queryByText("Judge model")).not.toBeInTheDocument(); }); - it("shows heuristic advanced sections and hides keyword overrides for capability classifiers", () => { + it("shows heuristic advanced sections and hides keyword overrides for capability classifiers", async () => { const { rerender } = renderWithProviders(); - expect(screen.getByText("Advanced: Heuristic Keyword Overrides")).toBeInTheDocument(); - expect(screen.getByText("Advanced: Housekeeping Routing")).toBeInTheDocument(); - expect(screen.getByText("Advanced: Reminder Markers")).toBeInTheDocument(); + openAutoRouterAdvanced("Heuristic Keyword Overrides"); + + expect(screen.getByText("Heuristic Keyword Overrides")).toBeInTheDocument(); + openAutoRouterAdvanced("Housekeeping Routing"); + expect(screen.getByText("Housekeeping Routing")).toBeInTheDocument(); + openAutoRouterAdvanced("Ignore Custom Tags"); + expect(screen.getByText("Ignore Custom Tags")).toBeInTheDocument(); const capabilityValue = { ...defaultValue, classifier_type: "capability" as const }; rerender(); - expect(screen.queryByText("Advanced: Heuristic Keyword Overrides")).not.toBeInTheDocument(); + expect(screen.queryByText("Heuristic Keyword Overrides")).not.toBeInTheDocument(); }); it.each([ @@ -115,7 +127,7 @@ describe("ComplexityRouterConfig", () => { renderWithProviders( , ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); if (visible) { expect(screen.getByLabelText("Classifier plugin timeout (ms)")).toBeInTheDocument(); } else { @@ -128,7 +140,7 @@ describe("ComplexityRouterConfig", () => { renderWithProviders( , ); - fireEvent.click(screen.getByText("Advanced: Reminder Markers")); + openAutoRouterAdvanced("Ignore Custom Tags"); const validation = screen.queryByText(/needs both/i); if (showValidationErrors) { expect(validation).toBeInTheDocument(); @@ -137,11 +149,11 @@ describe("ComplexityRouterConfig", () => { } }); - it("disables housekeeping sentinels when cheapest-tier routing is off", () => { + it("disables housekeeping sentinels when cheapest-tier routing is off", async () => { renderWithProviders( , ); - fireEvent.click(screen.getByText("Advanced: Housekeeping Routing")); + openAutoRouterAdvanced("Housekeeping Routing"); const sentinelInput = screen.getByRole("combobox", { name: "e.g., conversation title" }); expect(sentinelInput).toBeDisabled(); }); @@ -151,7 +163,7 @@ describe("ComplexityRouterConfig", () => { const onChange = vi.fn(); renderWithProviders(); - await user.click(screen.getByText("Advanced: Response Format")); + openAutoRouterAdvanced("Response Format"); await user.click(screen.getByRole("switch", { name: "Return raw model name" })); expect(onChange).toHaveBeenCalledWith({ @@ -160,13 +172,13 @@ describe("ComplexityRouterConfig", () => { }); }); - it("should reveal classifier model and timeout fields when llm is selected", () => { + it("should reveal classifier model and timeout fields when llm is selected", async () => { const onChange = vi.fn(); renderWithProviders(); // Collapse panel content isn't rendered until first expanded. - fireEvent.click(screen.getByText("Advanced: Classification Method")); - fireEvent.click(screen.getByText("LLM Classifier")); + openAutoRouterAdvanced("Classification Method"); + fireEvent.click(screen.getByRole("radio", { name: /^LLM$/ })); const expectedValue: ComplexityRouterConfigValue = { ...defaultValue, @@ -178,14 +190,14 @@ describe("ComplexityRouterConfig", () => { expect(onChange).toHaveBeenCalledWith(expectedValue); }); - it("selects heuristic v2 without requiring a classifier model or showing weighted scoring", () => { + it("selects heuristic v2 without requiring a classifier model or showing weighted scoring", async () => { const onChange = vi.fn(); const { rerender } = renderWithProviders( , ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - fireEvent.click(screen.getByText("Heuristic v2")); + openAutoRouterAdvanced("Classification Method"); + await selectAutoRouterOption("Heuristic", "Heuristic v2"); expect(onChange).toHaveBeenCalledWith( expect.objectContaining({ @@ -197,7 +209,7 @@ describe("ComplexityRouterConfig", () => { const heuristicV2Value: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "heuristic_v2" }; rerender(); - expect(screen.queryByText("Classifier Model")).not.toBeInTheDocument(); + expect(screen.queryByText("Judge model")).not.toBeInTheDocument(); expect(screen.queryByText("Advanced scoring")).not.toBeInTheDocument(); expect(screen.getByText(/estimates success probability for all four tiers/)).toBeInTheDocument(); expect(screen.queryByText(/Score < 0.15/)).not.toBeInTheDocument(); @@ -233,7 +245,7 @@ describe("ComplexityRouterConfig", () => { expect(onChange).toHaveBeenCalledWith({ ...value, heuristic_v2_success_threshold: undefined }); }); - it("shows an inactive zero threshold until explicitly cleared and hides the summary for active or absent values", () => { + it("shows an inactive zero threshold until explicitly cleared and hides the summary for active or absent values", async () => { const onChange = vi.fn(); const value = { ...defaultValue, heuristic_v2_success_threshold: 0 }; const { rerender } = renderWithProviders( @@ -248,7 +260,7 @@ describe("ComplexityRouterConfig", () => { expect(screen.queryByRole("region", { name: "Inactive Heuristic v2 threshold" })).not.toBeInTheDocument(); }); - it("should show classifier fields and use the configured values when classifier_type is llm", () => { + it("should show classifier fields and use the configured values when classifier_type is llm", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -258,9 +270,9 @@ describe("ComplexityRouterConfig", () => { }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); - expect(screen.getByText("Classifier Model")).toBeInTheDocument(); + expect(screen.getByText("Judge model")).toBeInTheDocument(); expect(screen.getByLabelText("Timeout (ms)")).toHaveValue("750"); expect(screen.getByRole("switch", { name: "Classifier circuit breaker" })).toBeChecked(); expect(screen.getByLabelText("Circuit breaker cooldown (seconds)")).toHaveValue("30"); @@ -268,7 +280,7 @@ describe("ComplexityRouterConfig", () => { expect(screen.queryByText("Context Per-Turn Character Limit")).not.toBeInTheDocument(); }); - it("should allow the default-on classifier circuit breaker to be disabled", () => { + it("should allow the default-on classifier circuit breaker to be disabled", async () => { const onChange = vi.fn(); const llmValue: ComplexityRouterConfigValue = { ...defaultValue, @@ -276,7 +288,7 @@ describe("ComplexityRouterConfig", () => { classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000 }, }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); fireEvent.click(screen.getByRole("switch", { name: "Classifier circuit breaker" })); @@ -287,7 +299,7 @@ describe("ComplexityRouterConfig", () => { ); }); - it("should default the context window and budget when llm is selected", () => { + it("should default the context window and budget when llm is selected", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -295,13 +307,13 @@ describe("ComplexityRouterConfig", () => { }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByLabelText("Context Window Size")).toHaveValue("3"); expect(screen.getByLabelText("Context Character Budget")).toHaveValue("8000"); }); - it("should warn when the budget is too small to quote any turn that does not already fit", () => { + it("should warn when the budget is too small to quote any turn that does not already fit", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -310,12 +322,12 @@ describe("ComplexityRouterConfig", () => { }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText(/no room to quote a turn/i)).toBeInTheDocument(); }); - it("should not warn on a budget large enough to quote a turn, nor on a deliberate zero", () => { + it("should not warn on a budget large enough to quote a turn, nor on a deliberate zero", async () => { for (const budget of [120, 8000, 0]) { const { unmount } = renderWithProviders( { onChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.queryByText(/no room to quote a turn/i)).not.toBeInTheDocument(); unmount(); } }); - it("should show the assistant-turns switch with its configured value when classifier_type is llm", () => { + it("should show the assistant-turns switch with its configured value when classifier_type is llm", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -344,13 +356,13 @@ describe("ComplexityRouterConfig", () => { }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("Include Assistant Turns")).toBeInTheDocument(); expect(screen.getByRole("switch", { name: "Include Assistant Turns" })).toBeChecked(); }); - it("should render the assistant-turns switch off when it is not set", () => { + it("should render the assistant-turns switch off when it is not set", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -358,18 +370,18 @@ describe("ComplexityRouterConfig", () => { }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByRole("switch", { name: "Include Assistant Turns" })).not.toBeChecked(); }); - it("should hide the assistant-turns switch when classifier_type is heuristic", () => { + it("should hide the assistant-turns switch when classifier_type is heuristic", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.queryByText("Include Assistant Turns")).not.toBeInTheDocument(); }); - it("should call onChange when the assistant-turns switch is toggled", () => { + it("should call onChange when the assistant-turns switch is toggled", async () => { const onChange = vi.fn(); const llmValue: ComplexityRouterConfigValue = { ...defaultValue, @@ -378,7 +390,7 @@ describe("ComplexityRouterConfig", () => { }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); fireEvent.click(screen.getByRole("switch", { name: "Include Assistant Turns" })); expect(onChange).toHaveBeenCalledWith( @@ -386,9 +398,9 @@ describe("ComplexityRouterConfig", () => { ); }); - it("should hide classifier context fields when classifier_type is heuristic", () => { + it("should hide classifier context fields when classifier_type is heuristic", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.queryByText("Context Window Size")).not.toBeInTheDocument(); expect(screen.queryByText("Context Per-Turn Character Limit")).not.toBeInTheDocument(); }); @@ -416,7 +428,7 @@ describe("ComplexityRouterConfig", () => { classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000 }, }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); const input = screen.getByLabelText(label); fireEvent.change(input, { target: { value: "" } }); @@ -429,14 +441,14 @@ describe("ComplexityRouterConfig", () => { expect(onChange).toHaveBeenLastCalledWith({ ...llmValue, ...expected }); }); - it("restores the committed context window size after an empty field loses focus", () => { + it("restores the committed context window size after an empty field loses focus", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000 }, }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); const input = screen.getByLabelText("Context Window Size"); fireEvent.change(input, { target: { value: "" } }); @@ -445,13 +457,13 @@ describe("ComplexityRouterConfig", () => { expect(input).toHaveValue("3"); }); - it("should render the custom technical keywords field", () => { + it("should render the custom technical keywords field", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("Custom Technical Keywords")).toBeInTheDocument(); }); - it("should display existing custom technical keywords as tags", () => { + it("should display existing custom technical keywords as tags", async () => { renderWithProviders( { onCustomTechnicalKeywordsChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("udp")).toBeInTheDocument(); expect(screen.getByText("kafka")).toBeInTheDocument(); }); @@ -474,7 +486,7 @@ describe("ComplexityRouterConfig", () => { onCustomTechnicalKeywordsChange={onCustomTechnicalKeywordsChange} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); const keywordsSection = screen.getByText("Custom Technical Keywords").closest("div")?.parentElement as HTMLElement; await user.type(within(keywordsSection).getByRole("combobox"), "udp"); await user.click(await screen.findByText('Create "udp"')); @@ -491,35 +503,35 @@ describe("ComplexityRouterConfig", () => { onCustomTechnicalKeywordsChange={onCustomTechnicalKeywordsChange} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); const keywordsSection = screen.getByText("Custom Technical Keywords").closest("div")?.parentElement as HTMLElement; await user.type(within(keywordsSection).getByRole("combobox"), "udp, kafka ,terraform"); await user.click(await screen.findByText('Create "udp, kafka ,terraform"')); expect(onCustomTechnicalKeywordsChange).toHaveBeenCalledWith(["udp", "kafka", "terraform"]); }); - it("should render an empty state when no keyword tier rules exist", () => { + it("should render an empty state when no keyword tier rules exist", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); expect(screen.getByText("Keyword Tier Overrides")).toBeInTheDocument(); expect(screen.getByText("No keyword tier overrides configured")).toBeInTheDocument(); }); - it("hides the keyword-tier and semantic sections when their change handlers are absent (edit modal)", () => { + it("hides the keyword-tier and semantic sections when their change handlers are absent (edit modal)", async () => { // The edit-auto-router modal renders ComplexityRouterConfig without these handlers; // the sections must stay hidden rather than render interactive-but-dead controls. renderWithProviders(); expect(screen.queryByText("Keyword Tier Overrides")).not.toBeInTheDocument(); expect(screen.queryByText("Semantic keyword matching")).not.toBeInTheDocument(); // Core tier config still renders. - expect(screen.getByText("Complexity Tier Configuration")).toBeInTheDocument(); + expect(screen.getByText("Models by tier")).toBeInTheDocument(); }); it("should call onKeywordTierRulesChange with a new rule when 'Add keyword rule' is clicked", async () => { const user = userEvent.setup(); const onKeywordTierRulesChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); await user.click(screen.getByRole("button", { name: /add keyword rule/i })); expect(onKeywordTierRulesChange).toHaveBeenCalledTimes(1); const newRules = onKeywordTierRulesChange.mock.calls[0][0]; @@ -537,7 +549,7 @@ describe("ComplexityRouterConfig", () => { onKeywordTierRulesChange={onKeywordTierRulesChange} />, ); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); const field = screen.getByText("Keywords 1").closest("div") as HTMLElement; await user.type(within(field).getByRole("combobox"), "invoice"); @@ -556,7 +568,7 @@ describe("ComplexityRouterConfig", () => { onKeywordTierRulesChange={onKeywordTierRulesChange} />, ); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); expect(screen.getByText("invoice")).toBeInTheDocument(); expect(screen.getByText("refund")).toBeInTheDocument(); @@ -564,17 +576,17 @@ describe("ComplexityRouterConfig", () => { expect(onKeywordTierRulesChange).toHaveBeenCalledWith([]); }); - it("should not show embedding model or match score fields when semantic matching is disabled", () => { + it("should not show embedding model or match score fields when semantic matching is disabled", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); expect(screen.getByText("Semantic keyword matching")).toBeInTheDocument(); expect(screen.queryByText("Embedding model")).not.toBeInTheDocument(); expect(screen.queryByText("Minimum match score")).not.toBeInTheDocument(); }); - it("should show embedding model and match score fields when semantic matching is enabled", () => { + it("should show embedding model and match score fields when semantic matching is enabled", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); expect(screen.getByText("Embedding model")).toBeInTheDocument(); expect(screen.getByText("Minimum match score")).toBeInTheDocument(); }); @@ -589,7 +601,7 @@ describe("ComplexityRouterConfig", () => { onSemanticMatchingEnabledChange={onSemanticMatchingEnabledChange} />, ); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); await user.click(screen.getByRole("switch", { name: "Semantic keyword matching" })); expect(onSemanticMatchingEnabledChange).toHaveBeenCalledWith(true, expect.anything()); }); @@ -606,34 +618,34 @@ describe("ComplexityRouterConfig", () => { expect(screen.queryAllByText("text-embedding-3-small")).toHaveLength(0); }); - it("does not show tier validation errors by default", () => { + it("does not show tier validation errors by default", async () => { renderWithProviders(); expect(screen.queryByText("This tier is required")).not.toBeInTheDocument(); }); - it("shows an inline error on the classifier model select when llm is selected without a model", () => { + it("shows an inline error on the classifier model select when llm is selected without a model", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", classifier_llm_config: { model: "", timeout_ms: 3000 }, }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - expect(screen.getByText("A classifier model is required")).toBeInTheDocument(); + openAutoRouterAdvanced("Classification Method"); + expect(screen.getByText("A judge model is required")).toBeInTheDocument(); }); - it("does not show the classifier model error once a classifier model is set", () => { + it("does not show the classifier model error once a classifier model is set", async () => { const llmValue: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000 }, }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - expect(screen.queryByText("A classifier model is required")).not.toBeInTheDocument(); + openAutoRouterAdvanced("Classification Method"); + expect(screen.queryByText("A judge model is required")).not.toBeInTheDocument(); }); - it("shows a validation error only under unfilled tiers when showValidationErrors is true", () => { + it("shows a validation error only under unfilled tiers when showValidationErrors is true", async () => { renderWithProviders( { expect(screen.getAllByText(/tier is required/)).toHaveLength(1); }); - it("renders the escalation keywords section with current keywords when the handler is provided", () => { + it("renders the escalation keywords section with current keywords when the handler is provided", async () => { renderWithProviders( { onEscalationKeywordsChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Escalation Keywords")); - expect(screen.getByText("Escalation Keywords")).toBeInTheDocument(); + openAutoRouterAdvanced("Escalation Keywords"); + expect(screen.getAllByText("Escalation Keywords")).not.toHaveLength(0); expect(screen.getByText("LITELLM ESCALATE")).toBeInTheDocument(); }); - it("hides the escalation keywords section when no handler is provided", () => { + it("hides the escalation keywords section when no handler is provided", async () => { renderWithProviders(); - expect(screen.queryByText("Advanced: Escalation Keywords")).not.toBeInTheDocument(); + expect(screen.queryByText("Escalation Keywords")).not.toBeInTheDocument(); }); }); @@ -671,21 +683,21 @@ describe("ComplexityRouterConfig classifier fallback", () => { classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000 }, }; - it("defaults the fallback to the heuristic, matching the backend field default", () => { + it("defaults the fallback to the heuristic, matching the backend field default", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByRole("radio", { name: /Score with the heuristic/ })).toBeChecked(); }); - it("records a switch to the default model fallback", () => { + it("records a switch to the default model fallback", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); fireEvent.click(screen.getByRole("radio", { name: /Route to the default model/ })); expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ classifier_fallback: "default_model" })); }); - it("disables the default model fallback when no tier would produce one", () => { + it("disables the default model fallback when no tier would produce one", async () => { // The deployment's default model is derived from the tiers on submit, so offering the option // with no tiers picked would save a config the backend rejects at startup. const noTiers: ComplexityRouterConfigValue = { @@ -693,17 +705,17 @@ describe("ComplexityRouterConfig classifier fallback", () => { tiers: { SIMPLE: [], MEDIUM: [], COMPLEX: [], REASONING: [] }, }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByRole("radio", { name: /Route to the default model/ })).toHaveAttribute("aria-disabled", "true"); }); - it("hides the fallback choice for the heuristic classifier, which has nothing to fall back from", () => { + it("hides the fallback choice for the heuristic classifier, which has nothing to fall back from", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.queryByText("If the classifier fails")).not.toBeInTheDocument(); }); - it("stops describing the heuristic as the fallback once a custom prompt routes failures to the default model", () => { + it("stops describing the heuristic as the fallback once a custom prompt routes failures to the default model", async () => { // With both set, the heuristic scorer never runs, so the panel must not keep implying a // score decides anything on this router. renderWithProviders( @@ -717,11 +729,11 @@ describe("ComplexityRouterConfig classifier fallback", () => { onChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText(/no longer runs at all/)).toBeInTheDocument(); }); - it("still describes the heuristic as the fallback when a custom prompt keeps heuristic fallback", () => { + it("still describes the heuristic as the fallback when a custom prompt keeps heuristic fallback", async () => { renderWithProviders( { onChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText(/only when the classifier call fails/)).toBeInTheDocument(); }); - it("clears a stored fallback when switching back to the heuristic classifier", () => { + it("clears a stored fallback when switching back to the heuristic classifier", async () => { const onChange = vi.fn(); renderWithProviders( { onChange={onChange} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - fireEvent.click(screen.getByRole("radio", { name: /rule-based scoring/ })); + openAutoRouterAdvanced("Classification Method"); + fireEvent.click(screen.getByRole("radio", { name: /^Heuristics$/ })); expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ classifier_fallback: undefined })); }); }); @@ -758,19 +770,21 @@ describe("ComplexityRouterConfig classification frequency", () => { classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000 }, }; - it("defaults to every request, matching both backend field defaults", () => { + it("defaults to every request, matching both backend field defaults", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - expect(screen.getByRole("radio", { name: /Every request/ })).toBeChecked(); - expect(screen.getByRole("radio", { name: /Every new user message/ })).not.toBeChecked(); - expect(screen.getByRole("radio", { name: /Once per session/ })).not.toBeChecked(); + openAutoRouterAdvanced("Classification Method"); + expect(screen.getByRole("combobox", { name: "How often to classify" })).toHaveTextContent("Every request"); + expect(screen.getByRole("combobox", { name: "How often to classify" })).not.toHaveTextContent( + "Every new user message", + ); + expect(screen.getByRole("combobox", { name: "How often to classify" })).not.toHaveTextContent("Once per session"); }); - it("writes both wire fields when the frequency moves to every new user message", () => { + it("writes both wire fields when the frequency moves to every new user message", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - fireEvent.click(screen.getByRole("radio", { name: /Every new user message/ })); + openAutoRouterAdvanced("Classification Method"); + await selectAutoRouterOption("How often to classify", "Every new user message"); expect(onChange).toHaveBeenCalledWith({ ...llmValue, classification_mode: "user_turn", @@ -778,11 +792,11 @@ describe("ComplexityRouterConfig classification frequency", () => { }); }); - it("writes session affinity, not a classification mode, when the frequency moves to once per session", () => { + it("writes session affinity, not a classification mode, when the frequency moves to once per session", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - fireEvent.click(screen.getByRole("radio", { name: /Once per session/ })); + openAutoRouterAdvanced("Classification Method"); + await selectAutoRouterOption("How often to classify", "Once per session"); expect(onChange).toHaveBeenCalledWith({ ...llmValue, classification_mode: "every_request", @@ -790,7 +804,7 @@ describe("ComplexityRouterConfig classification frequency", () => { }); }); - it("shows a hand-authored config that sets both fields as once per session, matching the backend", () => { + it("shows a hand-authored config that sets both fields as once per session, matching the backend", async () => { renderWithProviders( { onChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - expect(screen.getByRole("radio", { name: /Once per session/ })).toBeChecked(); - expect(screen.getByRole("radio", { name: /Every new user message/ })).not.toBeChecked(); + openAutoRouterAdvanced("Classification Method"); + expect(screen.getByRole("combobox", { name: "How often to classify" })).toHaveTextContent("Once per session"); + expect(screen.getByRole("combobox", { name: "How often to classify" })).not.toHaveTextContent( + "Every new user message", + ); }); - it("records a switch back to every request", () => { + it("records a switch back to every request", async () => { const onChange = vi.fn(); renderWithProviders( { onChange={onChange} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - expect(screen.getByRole("radio", { name: /Every new user message/ })).toBeChecked(); - fireEvent.click(screen.getByRole("radio", { name: /Every request/ })); + openAutoRouterAdvanced("Classification Method"); + expect(screen.getByRole("combobox", { name: "How often to classify" })).toHaveTextContent("Every new user message"); + await selectAutoRouterOption("How often to classify", "Every request"); expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ classification_mode: "every_request" })); }); - it("offers the frequency on a heuristic router, where holding the tier still pins the model", () => { + it("offers the frequency on a heuristic router, where holding the tier still pins the model", async () => { // The backend pin is gated on the two fields alone, so a heuristic router that switches models // mid tool loop is fixed by this control too. renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - expect(screen.getByRole("radio", { name: /Every new user message/ })).toBeInTheDocument(); + openAutoRouterAdvanced("Classification Method"); + expect(screen.getByRole("combobox", { name: "How often to classify" })).toBeVisible(); }); }); @@ -836,11 +852,11 @@ describe("ComplexityRouterConfig classifier rubric", () => { const openClassificationPanel = (value: ComplexityRouterConfigValue, onChange = vi.fn()) => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); return onChange; }; - it("shows an existing router with no stored preset as legacy in the prompt control", () => { + it("shows an existing router with no stored preset as legacy in the prompt control", async () => { // This router predates the setting. Displaying a calibrated preset it does not have would tell the // operator their traffic is graded by examples the classifier never receives, and saving the form // unchanged would then move its tier decisions. @@ -849,19 +865,19 @@ describe("ComplexityRouterConfig classifier rubric", () => { expect(screen.getByRole("button", { name: "Customize prompt" })).toBeInTheDocument(); }); - it("stamps the calibrated preset on a classifier being switched on for the first time", () => { + it("stamps the calibrated preset on a classifier being switched on for the first time", async () => { // A heuristic router turning on the LLM classifier has no prior tier behaviour to preserve, so a // newly configured classifier starts on the calibrated rubric rather than the legacy one. const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - fireEvent.click(screen.getByText("LLM Classifier")); + openAutoRouterAdvanced("Classification Method"); + fireEvent.click(screen.getByRole("radio", { name: /^LLM$/ })); expect(onChange).toHaveBeenCalledWith( expect.objectContaining({ classifier_llm_config: expect.objectContaining({ classification_rubric: "agentic" }) }), ); }); - it("shows the calibrated preset when a router stores one", () => { + it("shows the calibrated preset when a router stores one", async () => { openClassificationPanel({ ...llmValue, classifier_llm_config: { model: "gpt-3.5-turbo", timeout_ms: 3000, classification_rubric: "agentic" }, @@ -906,7 +922,7 @@ describe("ComplexityRouterConfig classifier rubric", () => { ); }); - it("keeps the rubric out of the legacy whole-prompt editor, which replaces it entirely", () => { + it("keeps the rubric out of the legacy whole-prompt editor, which replaces it entirely", async () => { // The backend rejects both together, so the legacy editor must not offer a rubric to pick. openClassificationPanel({ ...llmValue, @@ -916,7 +932,7 @@ describe("ComplexityRouterConfig classifier rubric", () => { expect(screen.queryByRole("button", { name: "Customize prompt" })).not.toBeInTheDocument(); }); - it("hides the prompt control for the heuristic classifier, which sends no prompt at all", () => { + it("hides the prompt control for the heuristic classifier, which sends no prompt at all", async () => { openClassificationPanel(defaultValue); expect(screen.queryByRole("button", { name: "Customize prompt" })).not.toBeInTheDocument(); }); @@ -928,7 +944,7 @@ describe("ComplexityRouterConfig tier labels", () => { tier_labels: { SIMPLE: "Cheap", MEDIUM: "Standard", COMPLEX: "Premium", REASONING: "Deep" }, }; - it("shows the operator's names in the tier headers instead of the defaults", () => { + it("shows the operator's names in the tier headers instead of the defaults", async () => { renderWithProviders(); expect(screen.getByText("Cheap Tier")).toBeInTheDocument(); expect(screen.getByText("Deep Tier")).toBeInTheDocument(); @@ -936,13 +952,13 @@ describe("ComplexityRouterConfig tier labels", () => { expect(screen.queryByText("Reasoning Tier")).not.toBeInTheDocument(); }); - it("keeps the rung ordinal and canonical name visible under a rename", () => { + it("keeps the rung ordinal and canonical name visible under a rename", async () => { renderWithProviders(); expect(screen.getByText(/Tier 1 of 4/)).toHaveTextContent("Tier 1 of 4 · SIMPLE"); expect(screen.getByText(/Tier 4 of 4/)).toHaveTextContent("Tier 4 of 4 · REASONING"); }); - it("names the renamed tier in the required-field error", () => { + it("names the renamed tier in the required-field error", async () => { renderWithProviders( { expect(screen.getByText("The Deep tier is required")).toBeInTheDocument(); }); - it("reports a typed label back to the caller under its canonical tier key", () => { + it("reports a typed label back to the caller under its canonical tier key", async () => { const onChange = vi.fn(); renderWithProviders(); fireEvent.change(screen.getByLabelText("Display name for the Simple tier"), { target: { value: "Cheap" } }); expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ tier_labels: { SIMPLE: "Cheap" } })); }); - it("shows a stored label in its input so an edit round-trips", () => { + it("shows a stored label in its input so an edit round-trips", async () => { renderWithProviders(); expect(screen.getByLabelText("Display name for the Reasoning tier")).toHaveValue("Deep"); }); - it("leaves the label inputs empty when nothing was renamed", () => { + it("leaves the label inputs empty when nothing was renamed", async () => { renderWithProviders(); expect(screen.getByLabelText("Display name for the Simple tier")).toHaveValue(""); }); - it("uses the operator's names in the classification score table", () => { + it("uses the operator's names in the classification score table", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("Cheap")).toBeInTheDocument(); expect(screen.getByText("Deep")).toBeInTheDocument(); }); - it("uses the operator's names in the keyword rule tier picker", () => { + it("uses the operator's names in the keyword rule tier picker", async () => { renderWithProviders( { keywordTierRules={[{ id: "r1", keywords: ["invoice"], tier: "REASONING" }]} />, ); - fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); expect(screen.getByRole("combobox", { name: "Route keyword rule 1 to tier" })).toHaveTextContent("Deep"); }); }); describe("ComplexityRouterConfig modality panel", () => { - it("defaults the image-routing switch off and writes modality_routing through onChange", () => { + it("defaults the image-routing switch off and writes modality_routing through onChange", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Modality Routing")); + openAutoRouterAdvanced("Modality Routing"); const toggle = screen.getByRole("switch", { name: "Route image requests to vision-capable models" }); expect(toggle).not.toBeChecked(); @@ -1003,19 +1019,19 @@ describe("ComplexityRouterConfig modality panel", () => { expect(onChange).toHaveBeenCalledWith({ ...defaultValue, modality_routing: true }); }); - it("renders a stored modality_routing=true as on", () => { + it("renders a stored modality_routing=true as on", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Modality Routing")); + openAutoRouterAdvanced("Modality Routing"); expect(screen.getByRole("switch", { name: "Route image requests to vision-capable models" })).toBeChecked(); }); // The backend ignores modality_pin_override unless modality_routing is on, so offering it while // image routing is off would let an operator save a flag that does nothing. - it("disables the pin-override switch while image routing is off", () => { + it("disables the pin-override switch while image routing is off", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Modality Routing")); + openAutoRouterAdvanced("Modality Routing"); const override = screen.getByRole("switch", { name: "Override session pin for image requests" }); expect(override).toHaveAttribute("aria-disabled", "true"); @@ -1023,11 +1039,11 @@ describe("ComplexityRouterConfig modality panel", () => { expect(onChange).not.toHaveBeenCalled(); }); - it("writes modality_pin_override through onChange once image routing is on", () => { + it("writes modality_pin_override through onChange once image routing is on", async () => { const onChange = vi.fn(); const value = { ...defaultValue, modality_routing: true }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Modality Routing")); + openAutoRouterAdvanced("Modality Routing"); const override = screen.getByRole("switch", { name: "Override session pin for image requests" }); expect(override).not.toBeChecked(); @@ -1036,51 +1052,51 @@ describe("ComplexityRouterConfig modality panel", () => { expect(onChange).toHaveBeenCalledWith({ ...value, modality_pin_override: true }); }); - it("renders a stored modality_pin_override=true as on", () => { + it("renders a stored modality_pin_override=true as on", async () => { renderWithProviders( , ); - fireEvent.click(screen.getByText("Advanced: Modality Routing")); + openAutoRouterAdvanced("Modality Routing"); expect(screen.getByRole("switch", { name: "Override session pin for image requests" })).toBeChecked(); }); }); describe("ComplexityRouterConfig affinity panel", () => { - it("holds the deployment switch at its backend default, session pinning having moved to the frequency choice", () => { + it("holds the deployment switch at its backend default, session pinning having moved to the frequency choice", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Affinity")); + openAutoRouterAdvanced("Affinity"); expect(screen.getByRole("switch", { name: "Pin one model deployment per tier" })).toBeChecked(); expect(screen.queryByRole("switch", { name: "Pin a session to its first model" })).not.toBeInTheDocument(); }); - it("writes deployment_affinity through onChange without touching other keys", () => { + it("writes deployment_affinity through onChange without touching other keys", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Affinity")); + openAutoRouterAdvanced("Affinity"); fireEvent.click(screen.getByRole("switch", { name: "Pin one model deployment per tier" })); expect(onChange).toHaveBeenCalledWith({ ...defaultValue, deployment_affinity: false }); }); - it("renders a stored deployment_affinity=false as off", () => { + it("renders a stored deployment_affinity=false as off", async () => { renderWithProviders( , ); - fireEvent.click(screen.getByText("Advanced: Affinity")); + openAutoRouterAdvanced("Affinity"); expect(screen.getByRole("switch", { name: "Pin one model deployment per tier" })).not.toBeChecked(); }); - it("writes an idle TTL on blur and keeps the partial input as a draft while typing", () => { + it("writes an idle TTL on blur and keeps the partial input as a draft while typing", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Affinity")); + openAutoRouterAdvanced("Affinity"); const ttl = screen.getByLabelText("How long a pin survives idle (seconds)"); expect(ttl).toHaveAttribute("placeholder", "3600"); @@ -1091,11 +1107,11 @@ describe("ComplexityRouterConfig affinity panel", () => { expect(onChange).toHaveBeenCalledWith({ ...defaultValue, session_affinity_ttl_seconds: 300 }); }); - it("clearing the idle TTL returns the router to its backend default", () => { + it("clearing the idle TTL returns the router to its backend default", async () => { const onChange = vi.fn(); const value = { ...defaultValue, session_affinity_ttl_seconds: 300 }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Affinity")); + openAutoRouterAdvanced("Affinity"); const ttl = screen.getByLabelText("How long a pin survives idle (seconds)"); expect(ttl).toHaveValue("300"); @@ -1105,10 +1121,10 @@ describe("ComplexityRouterConfig affinity panel", () => { expect(onChange).toHaveBeenCalledWith({ ...value, session_affinity_ttl_seconds: undefined }); }); - it("clamps a non-positive idle TTL to the backend's minimum", () => { + it("clamps a non-positive idle TTL to the backend's minimum", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Affinity")); + openAutoRouterAdvanced("Affinity"); const ttl = screen.getByLabelText("How long a pin survives idle (seconds)"); fireEvent.change(ttl, { target: { value: "0" } }); @@ -1121,12 +1137,12 @@ describe("ComplexityRouterConfig affinity panel", () => { describe("ComplexityRouterConfig default model", () => { const getDefaultModelSelect = () => screen.getByRole("combobox", { name: "Default model" }); - it("shows what the tiers currently imply, so an untouched router still names its default", () => { + it("shows what the tiers currently imply, so an untouched router still names its default", async () => { renderWithProviders(); expect(getDefaultModelSelect()).toHaveAttribute("placeholder", "Derived from tiers: gpt-3.5-turbo"); }); - it("asks for a model rather than naming a derived one when no tier holds one", () => { + it("asks for a model rather than naming a derived one when no tier holds one", async () => { const noTiers: ComplexityRouterConfigValue = { ...defaultValue, tiers: { SIMPLE: [], MEDIUM: [], COMPLEX: [], REASONING: [] }, @@ -1157,13 +1173,13 @@ describe("ComplexityRouterConfig default model", () => { expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ default_model: undefined })); }); - it("shows a pinned model as the selection instead of the tier-derived one", () => { + it("shows a pinned model as the selection instead of the tier-derived one", async () => { const pinned: ComplexityRouterConfigValue = { ...defaultValue, default_model: "claude-3-opus" }; renderWithProviders(); expect(getDefaultModelSelect()).toHaveValue("claude-3-opus"); }); - it("unlocks the default model fallback on a pin alone, with no tier to derive from", () => { + it("unlocks the default model fallback on a pin alone, with no tier to derive from", async () => { const pinnedNoTiers: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -1172,11 +1188,11 @@ describe("ComplexityRouterConfig default model", () => { default_model: "claude-3-opus", }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByRole("radio", { name: /Route to the default model/ })).not.toHaveAttribute("aria-disabled"); }); - it("names the resolved default on the fallback option, so the destination is not a guess", () => { + it("names the resolved default on the fallback option, so the destination is not a guess", async () => { const pinned: ComplexityRouterConfigValue = { ...defaultValue, classifier_type: "llm", @@ -1184,13 +1200,13 @@ describe("ComplexityRouterConfig default model", () => { default_model: "claude-3-opus", }; renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByRole("radio", { name: /Route to the default model \(claude-3-opus\)/ })).toBeInTheDocument(); }); }); describe("plan-mode override", () => { - const openPanel = () => fireEvent.click(screen.getByText("Advanced: Plan-Mode Override")); + const openPanel = () => openAutoRouterAdvanced("Plan-Mode Override"); const switchName = "Route plan-mode requests to a minimum tier"; it("toggling on floors at the highest tier that has models", async () => { @@ -1248,13 +1264,13 @@ describe("plan-mode override", () => { }); describe("ComplexityRouterConfig per-model reasoning effort", () => { - it("renders one effort select per selected model, defaulting to Default", () => { + it("renders one effort select per selected model, defaulting to Default", async () => { renderWithProviders(); const select = screen.getByRole("combobox", { name: "Reasoning effort for gpt-4 in the Complex tier" }); expect(select).toHaveTextContent("Default"); }); - it("shows the hydrated effort for a model that has one stored", () => { + it("shows the hydrated effort for a model that has one stored", async () => { renderWithProviders( { const renderClassifier = (value: ComplexityRouterConfigValue = llmValue, onChange = vi.fn()) => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); return onChange; }; @@ -1348,7 +1364,7 @@ describe("ComplexityRouterConfig classifier reasoning effort", () => { classifier_llm_config: { model: "gpt-4", timeout_ms: 3000, reasoning_effort: "high" }, }); const user = userEvent.setup(); - await user.click(screen.getByRole("combobox", { name: "Classifier Model" })); + await user.click(screen.getByRole("combobox", { name: "Judge model" })); await user.click(await screen.findByRole("option", { name: "gpt-3.5-turbo" })); expect(onChange).toHaveBeenCalledWith({ ...llmValue, @@ -1364,7 +1380,7 @@ describe("ComplexityRouterConfig classifier reasoning effort", () => { classifier_llm_config: { model: "gpt-4", timeout_ms: 3000, reasoning_effort: "high" }, }); const user = userEvent.setup(); - await user.click(screen.getByRole("combobox", { name: "Classifier Model" })); + await user.click(screen.getByRole("combobox", { name: "Judge model" })); if (action === "click") await user.click(await screen.findByRole("option", { name: "gpt-4" })); else await user.keyboard("{Enter}"); expect(onChange).not.toHaveBeenCalled(); @@ -1397,7 +1413,7 @@ describe("ComplexityRouterConfig classifier reasoning effort", () => { }); describe("ComplexityRouterConfig reasoning effort gating", () => { - it("offers no effort select for a model group without reasoning support", () => { + it("offers no effort select for a model group without reasoning support", async () => { renderWithProviders(); expect( screen.queryByRole("combobox", { name: "Reasoning effort for gpt-3.5-turbo in the Simple tier" }), @@ -1406,7 +1422,7 @@ describe("ComplexityRouterConfig reasoning effort gating", () => { // A stored effort on a model the group info calls non-reasoning must stay visible, or the // operator has no way to clear it. - it("keeps the select for a non-reasoning model that already has a stored effort", () => { + it("keeps the select for a non-reasoning model that already has a stored effort", async () => { renderWithProviders( { // An empty list is the group's own answer that its deployments share no level, which is different // from the field being absent, so the control is dropped rather than falling back to every level. - it("offers no effort at all when the group intersects to nothing", () => { + it("offers no effort at all when the group intersects to nothing", async () => { renderWithProviders( { // Hand-authored configs can carry a level outside the supported set (e.g. max); it must render // and stay clearable rather than being masked as Default. - it("keeps showing a stored effort outside the supported set", () => { + it("keeps showing a stored effort outside the supported set", async () => { renderWithProviders( { describe("ComplexityRouterConfig custom technical keywords", () => { const openClassificationPanel = (value: ComplexityRouterConfigValue) => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); }; const llmConfig = { model: "gpt-3.5-turbo", timeout_ms: 3000 }; @@ -1503,7 +1519,7 @@ describe("ComplexityRouterConfig custom technical keywords", () => { expect(screen.getByText("Custom Technical Keywords")).toBeInTheDocument(); }); - it("hides the keywords when the scorer never runs, so they cannot imply an effect they have none", () => { + it("hides the keywords when the scorer never runs, so they cannot imply an effect they have none", async () => { const llmWithDefaultFallback = { ...defaultValue, classifier_type: "llm" as const, @@ -1547,19 +1563,19 @@ describe("ComplexityRouterConfig tier editing", () => { }, }; - it("offers Edit tiers only when the parent owns the editor flag", () => { + it("offers Edit tiers only when the parent owns the editor flag", async () => { renderWithProviders(); expect(screen.queryByRole("button", { name: "Edit tiers" })).not.toBeInTheDocument(); }); - it("surfaces the caller's orphaned-rule verdict while editing, so Done is not a silent exit", () => { + it("surfaces the caller's orphaned-rule verdict while editing, so Done is not a silent exit", async () => { renderEditor(customValue, { keywordRulesError: "Keyword rule(s) 1 route to a tier this router no longer has" }); expect( screen.getByText("Keyword rule(s) 1 route to a tier this router no longer has", { exact: false }), ).toBeInTheDocument(); }); - it("keeps the orphaned-rule verdict out of the collapsed view, where the submit tooltip owns it", () => { + it("keeps the orphaned-rule verdict out of the collapsed view, where the submit tooltip owns it", async () => { renderWithProviders( { expect(screen.queryByText("route to a tier this router no longer has", { exact: false })).not.toBeInTheDocument(); }); - it("renders the four built-in tiers before any edit, unchanged", () => { + it("renders the four built-in tiers before any edit, unchanged", async () => { renderWithProviders(); expect(screen.getByRole("button", { name: "Edit tiers" })).toBeInTheDocument(); expect(screen.getByText("Tier 1 of 4", { exact: false })).toHaveTextContent("SIMPLE"); }); - it("adds a row and moves the form into an edited tier set, which the built-in record never leaves", () => { + it("adds a row and moves the form into an edited tier set, which the built-in record never leaves", async () => { const { committed } = renderEditor(); fireEvent.click(screen.getByRole("button", { name: "Add tier" })); const next = committed(); @@ -1585,7 +1601,7 @@ describe("ComplexityRouterConfig tier editing", () => { expect(next.tiers).toEqual(defaultValue.tiers); }); - it("renames a built-in tier straight from the editor, which is what makes the set custom", () => { + it("renames a built-in tier straight from the editor, which is what makes the set custom", async () => { const { committed } = renderEditor(); fireEvent.change(screen.getByLabelText("Name for tier 3"), { target: { value: "SECURITY_REVIEW" } }); const next = committed(); @@ -1598,13 +1614,13 @@ describe("ComplexityRouterConfig tier editing", () => { expect(next.tiers).toEqual(defaultValue.tiers); }); - it("opening the editor and changing nothing leaves the router on the built-in tiers", () => { + it("opening the editor and changing nothing leaves the router on the built-in tiers", async () => { const { onChange } = renderEditor(); expect(screen.getByRole("button", { name: "Done" })).toBeEnabled(); expect(onChange).not.toHaveBeenCalled(); }); - it("swaps the display-name field for the tier-name field while the editor is open", () => { + it("swaps the display-name field for the tier-name field while the editor is open", async () => { const { rerender } = renderWithProviders(); expect(screen.getByLabelText("Display name for the Simple tier")).toBeInTheDocument(); rerender(); @@ -1612,23 +1628,23 @@ describe("ComplexityRouterConfig tier editing", () => { expect(screen.getByLabelText("Name for tier 1")).toBeInTheDocument(); }); - it("drops the scorer card entirely once an edited tier set replaces the heuristic", () => { + it("drops the scorer card entirely once an edited tier set replaces the heuristic", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.queryByText("How Classification Works")).not.toBeInTheDocument(); expect( screen.queryByText("scores each request across 7 built-in dimensions", { exact: false }), ).not.toBeInTheDocument(); }); - it("keeps the scorer card on a built-in router, whose tiers the score still decides", () => { + it("keeps the scorer card on a built-in router, whose tiers the score still decides", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("How Classification Works")).toBeInTheDocument(); expect(screen.getByText("scores each request across 7 built-in dimensions", { exact: false })).toBeInTheDocument(); }); - it("says why a custom row is blocked instead of only reddening its border", () => { + it("says why a custom row is blocked instead of only reddening its border", async () => { const missingDefinition: ComplexityRouterConfigValue = { ...customValue, custom_tier_set: { @@ -1652,24 +1668,24 @@ describe("ComplexityRouterConfig tier editing", () => { expect(screen.getByRole("button", { name: "Done" })).toBeDisabled(); }); - it("enables Done once every row carries a name, a definition and a model", () => { + it("enables Done once every row carries a name, a definition and a model", async () => { renderEditor(customValue); expect(screen.getByRole("button", { name: "Done" })).toBeEnabled(); }); - it("refuses to remove a row that would take the set below the backend's minimum", () => { + it("refuses to remove a row that would take the set below the backend's minimum", async () => { renderEditor(customValue); expect(screen.getByRole("button", { name: "Remove the CASUAL tier" })).toBeDisabled(); }); - it("keeps a definition on one line, because the backend rejects a newline in it", () => { + it("keeps a definition on one line, because the backend rejects a newline in it", async () => { const { committed } = renderEditor(customValue); fireEvent.change(screen.getByLabelText("Definition for tier 2"), { target: { value: "audits\nand reviews" } }); const next = committed(); expect(next.custom_tier_set?.tiers[1].definition).toBe("audits and reviews"); }); - it("moves a keyword rule with the tier it points at when that tier is renamed", () => { + it("moves a keyword rule with the tier it points at when that tier is renamed", async () => { const onKeywordTierRulesChange = vi.fn(); renderWithProviders( { expect(onKeywordTierRulesChange).toHaveBeenCalledWith([{ id: "r1", keywords: ["audit"], tier: "AUDIT" }]); }); - it("re-points the fallback tier when the row it named is removed, never leaving it dangling", () => { + it("re-points the fallback tier when the row it named is removed, never leaving it dangling", async () => { const threeRows: ComplexityRouterConfigValue = { ...customValue, custom_tier_set: { @@ -1702,7 +1718,7 @@ describe("ComplexityRouterConfig tier editing", () => { expect(next.custom_tier_set?.tiers.some((row) => row.id === next.custom_tier_set?.fallback_tier_id)).toBe(true); }); - it("turns off a plan-mode floor whose row was removed, rather than leaving it pointing at nothing", () => { + it("turns off a plan-mode floor whose row was removed, rather than leaving it pointing at nothing", async () => { const withFloor: ComplexityRouterConfigValue = { ...customValue, plan_mode_min_tier: "sec", @@ -1719,14 +1735,14 @@ describe("ComplexityRouterConfig tier editing", () => { expect(committed().plan_mode_min_tier).toBeUndefined(); }); - it("replaces the display-name inputs with the reason an edited tier set forbids them", () => { + it("replaces the display-name inputs with the reason an edited tier set forbids them", async () => { renderWithProviders(); expect(screen.queryByLabelText("Display name for the Simple tier")).not.toBeInTheDocument(); expect(screen.getByText("Display names rename the built-in tiers", { exact: false })).toBeInTheDocument(); expect(screen.getByLabelText("Fallback tier")).toBeInTheDocument(); }); - it("disables the once-per-session frequency and says why, rather than letting a stripped value look saved", () => { + it("disables the once-per-session frequency and says why, rather than letting a stripped value look saved", async () => { renderWithProviders( { onEditingTiersChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); - const sessionOption = screen.getByRole("radio", { name: /Once per session/ }); + openAutoRouterAdvanced("Classification Method"); + fireEvent.click(screen.getByRole("combobox", { name: "How often to classify" })); + const sessionOption = screen.getByRole("option", { name: "Once per session" }); expect(sessionOption).toHaveAttribute("aria-disabled", "true"); expect(sessionOption).not.toBeChecked(); expect( @@ -1743,15 +1760,15 @@ describe("ComplexityRouterConfig tier editing", () => { ).toBeInTheDocument(); }); - it("lets an edited tier set write its own opening instructions instead of refusing a prompt outright", () => { + it("lets an edited tier set write its own opening instructions instead of refusing a prompt outright", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("your own calibration examples", { exact: false })).toBeInTheDocument(); expect(screen.getByRole("button", { name: "Customize prompt" })).toBeInTheDocument(); expect(screen.queryByText("A replacement prompt drops the tier bullets", { exact: false })).not.toBeInTheDocument(); }); - it("gives built-in routers the opening-only editor, keeping the tier definitions derived", () => { + it("gives built-in routers the opening-only editor, keeping the tier definitions derived", async () => { renderWithProviders( { onEditingTiersChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByText("The base rubric supplies", { exact: false })).toBeInTheDocument(); expect(screen.getByRole("button", { name: "Customize prompt" })).toBeInTheDocument(); expect(screen.queryByText("Replace the built-in complexity rubric", { exact: false })).not.toBeInTheDocument(); }); - it("keeps the legacy whole-prompt editor only on a router that already stored a replacement prompt", () => { + it("keeps the legacy whole-prompt editor only on a router that already stored a replacement prompt", async () => { renderWithProviders( { onEditingTiersChange={vi.fn()} />, ); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.getByRole("button", { name: "Edit custom prompt" })).toBeInTheDocument(); expect(screen.queryByRole("button", { name: "Customize prompt" })).not.toBeInTheDocument(); }); - it("leaves built-in routers with their display-name inputs and no restriction copy", () => { + it("leaves built-in routers with their display-name inputs and no restriction copy", async () => { renderWithProviders(); expect(screen.getByLabelText("Display name for the Simple tier")).toBeInTheDocument(); expect(screen.queryByText("Display names rename the built-in tiers", { exact: false })).not.toBeInTheDocument(); @@ -1810,9 +1827,9 @@ describe("classifier vision settings", () => { ); }; - it("starts off and reveals the default cap when enabled", () => { + it("starts off and reveals the default cap when enabled", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); const vision = screen.getByRole("switch", { name: "Use images for classification" }); expect(vision).not.toBeChecked(); @@ -1823,10 +1840,10 @@ describe("classifier vision settings", () => { expect(screen.getByLabelText("Maximum images per request")).toHaveValue("1"); }); - it("writes the switch and a clamped image cap into the classifier config", () => { + it("writes the switch and a clamped image cap into the classifier config", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); fireEvent.click(screen.getByRole("switch", { name: "Use images for classification" })); expect(onChange).toHaveBeenLastCalledWith({ @@ -1841,10 +1858,10 @@ describe("classifier vision settings", () => { }); }); - it("keeps the image cap draft empty until a valid value is entered", () => { + it("keeps the image cap draft empty until a valid value is entered", async () => { const onChange = vi.fn(); renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); fireEvent.click(screen.getByRole("switch", { name: "Use images for classification" })); onChange.mockClear(); @@ -1861,9 +1878,9 @@ describe("classifier vision settings", () => { }); }); - it("is absent when the classifier is heuristic", () => { + it("is absent when the classifier is heuristic", async () => { renderWithProviders(); - fireEvent.click(screen.getByText("Advanced: Classification Method")); + openAutoRouterAdvanced("Classification Method"); expect(screen.queryByText("Use images for classification")).not.toBeInTheDocument(); }); diff --git a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx index acf6b62a95a..32f9ebf97ad 100644 --- a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx @@ -1,4 +1,6 @@ import RoutingOptions from "./RoutingOptions"; +import ClassifierPrimarySettings from "./ClassifierPrimarySettings"; +import { AutoRouterAllowanceNote } from "./AutoRouterAvailability"; import type { JevClassifierConfig } from "./jev_classifier_config"; import { type ClassifierType } from "./classifier_types"; export { type ClassifierType, usesLlmClassifier, usesClassifierContext } from "./classifier_types"; @@ -6,11 +8,11 @@ import ForecastClassifierConfig, { ForecastSolverModels } from "./ForecastClassi import { isForecastClassifier, type CapabilitySettings, type FuseSettings } from "./forecast_classifier_config"; import { SimpleTooltip } from "@/components/ui/tooltip"; import { MultiSelect } from "@/components/shared/MultiSelect"; +import TierConfigIntro from "./TierConfigIntro"; import DefaultModelField from "./DefaultModelField"; import { Info, Plus, Trash2, X } from "lucide-react"; import NonReasoningTierToggle from "./NonReasoningTierToggle"; -import TierConfigIntro from "./TierConfigIntro"; import TierRowSelect from "./TierRowSelect"; import { Card, CardContent } from "@/components/ui/card"; import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group"; @@ -226,10 +228,16 @@ const TierSetToolbar: React.FC<{ ) )} + {editing && ( + + )} {editing && ( Add or remove tiers to define your own set. Every custom tier needs a definition the classifier routes on, and - an edited set requires the LLM or JEV classification method + an edited set requires the LLM or Jev classification method )} {editing && keywordRulesError && ( @@ -596,10 +604,14 @@ const ComplexityRouterConfig: React.FC = ({ return (
+
-

- {forecast ? "Solver models" : "Complexity Tier Configuration"} -

+

{forecast ? "Solver models" : "Models by tier"}

{!forecast && ( @@ -619,6 +631,7 @@ const ComplexityRouterConfig: React.FC = ({ fastModeByModel={fastModeByModel} /> = ({ ) : ( <> - {!customTierSet && ( @@ -750,13 +762,19 @@ const ComplexityRouterConfig: React.FC = ({ )} - {!forecast && } + - + {forecast && ( <> - void>(); renderWithProviders(); - await user.click(screen.getByRole("button", { name: "Advanced routing options" })); + openAutoRouterAdvanced("Keyword/Semantic Matching"); expect(screen.getByRole("switch", { name: "Fast mode for secondary in the Medium routing pool tier" })).toBeChecked(); expect(onChange).not.toHaveBeenCalled(); await user.click(screen.getByRole("combobox", { name: "Select medium routing pool models" })); @@ -245,7 +246,7 @@ it.each(["capability", "llm_v2"] as const)( ); const view = renderWithProviders(editor(hydrateComplexityRouterConfig(stored, undefined))); - await user.click(screen.getByRole("button", { name: "Advanced routing options" })); + openAutoRouterAdvanced("Keyword/Semantic Matching"); const select = () => screen.getByRole("combobox", { name: "Default model" }); expect(select()).toHaveValue("legacy-default"); expect(onChange).not.toHaveBeenCalled(); @@ -284,8 +285,8 @@ it.each(["capability", "llm_v2"] as const)("offers only populated keyword target /> ); const view = renderWithProviders(editor([])); - await user.click(screen.getByRole("button", { name: "Advanced routing options" })); - await user.click(screen.getByText("Advanced: Keyword/Semantic Matching")); + openAutoRouterAdvanced("Keyword/Semantic Matching"); + openAutoRouterAdvanced("Keyword/Semantic Matching"); await user.click(screen.getByRole("button", { name: "Add keyword rule" })); const rules = onRulesChange.mock.lastCall![0]; expect(rules[0].tier).toBe("SIMPLE"); diff --git a/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.integration.test.tsx b/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.integration.test.tsx index a03ccb11456..f243e63d387 100644 --- a/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.integration.test.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.integration.test.tsx @@ -1,3 +1,4 @@ +import { selectAutoRouterApproach } from "../../../tests/autoRouterSetup"; import React, { useState } from "react"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import userEvent from "@testing-library/user-event"; @@ -306,7 +307,7 @@ describe("forecast classifier form", () => { ); }); - it("switches a populated standard router to Capability without saving hidden pools or their overrides", () => { + it("switches a populated standard router to Capability without saving hidden pools or their overrides", async () => { renderWithProviders( { }} />, ); - fireEvent.click(screen.getByRole("tab", { name: "Capability" })); + await selectAutoRouterApproach("Capability"); fireEvent.change(screen.getByLabelText("Solve probability threshold"), { target: { value: "0.7" } }); expect(screen.getByRole("button", { name: "Save configuration" })).toBeEnabled(); fireEvent.click(screen.getByRole("button", { name: "Save configuration" })); @@ -347,7 +348,7 @@ describe("forecast classifier form", () => { it.each(["capability", "llm_v2"] as const)( "carries non-default solver assignments when switching away from %s", - (source) => { + async (source) => { const pair = { efficient_tier: "MEDIUM", capable_tier: "COMPLEX" }; const previous: ComplexityRouterConfigValue = { ...(source === "capability" ? initial : fuseInitial), @@ -359,7 +360,7 @@ describe("forecast classifier form", () => { tier_model_params: { MEDIUM: { efficient: { max_tokens: 128 } }, COMPLEX: { capable: { speed: "fast" } } }, }; renderWithProviders(); - fireEvent.click(screen.getByRole("tab", { name: source === "capability" ? "Fuse v2" : "Capability" })); + await selectAutoRouterApproach(source === "capability" ? "Fuse v2" : "Capability"); if (source === "capability") { fireEvent.change(screen.getByLabelText("Efficient solver profile"), { target: { value: "Small solver" } }); fireEvent.change(screen.getByLabelText("Capable solver profile"), { target: { value: "Large solver" } }); @@ -402,20 +403,22 @@ describe("forecast classifier form", () => { ] as const)("restores the current rubric when switching %s through Complexity to %s", async (source, target) => { const user = userEvent.setup(); renderWithProviders(); - fireEvent.click(screen.getByRole("tab", { name: "Complexity" })); + await selectAutoRouterApproach("Complexity"); fireEvent.click(screen.getByRole("radio", { name: new RegExp(`^${target}`) })); - await user.click(screen.getByRole("combobox", { name: "Classifier Model" })); + await user.click(screen.getByRole("combobox", { name: "Judge model" })); await user.click(screen.getByRole("option", { name: "judge" })); fireEvent.click(screen.getByRole("button", { name: "Save configuration" })); const output = screen.getByRole("status", { name: "Saved configuration" }); expect(output).toHaveTextContent('"classification_rubric":"agentic"'); expect(output).toHaveTextContent('"model":"judge"'); - expect(output).toHaveTextContent('"timeout_ms":3000'); + expect(output).toHaveTextContent( + `"timeout_ms":${(source === "capability" ? initial : fuseInitial).classifier_llm_config?.timeout_ms}`, + ); expect(output).not.toHaveTextContent('"capability_classifier_config"'); expect(output).not.toHaveTextContent('"llm_v2_config"'); }); - it("saves capability threshold edits together with fitted calibration", () => { + it("saves capability threshold edits together with fitted calibration", async () => { renderWithProviders(); fireEvent.change(screen.getByLabelText("Solve probability threshold"), { target: { value: "0.6" } }); fireEvent.click(screen.getByRole("button", { name: "Classifier options" })); @@ -432,9 +435,9 @@ describe("forecast classifier form", () => { expect(screen.getByRole("button", { name: "Save configuration" })).toBeDisabled(); }); - it("switches to Fuse, requires solver context, and saves the filled fields", () => { + it("switches to Fuse, requires solver context, and saves the filled fields", async () => { renderWithProviders(); - fireEvent.click(screen.getByRole("tab", { name: "Fuse v2" })); + await selectAutoRouterApproach("Fuse v2"); expect(screen.queryByLabelText("Solve probability threshold")).not.toBeInTheDocument(); expect(screen.getByRole("button", { name: "Save configuration" })).toBeDisabled(); fireEvent.change(screen.getByLabelText("Efficient solver profile"), { diff --git a/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.tsx b/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.tsx index c336423fe39..d759b870209 100644 --- a/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.tsx +++ b/ui/litellm-dashboard/src/components/add_model/ForecastClassifierConfig.tsx @@ -36,6 +36,7 @@ interface Props { onChange: (value: ComplexityRouterConfigValue) => void; modelOptions: { value: string; label: string }[]; effortOptionsByModel: Record; + section?: "all" | "required" | "advanced"; } const NumberField = ({ @@ -188,7 +189,7 @@ const CalibrationFields = ({ const emptyCoefficients = () => ({ slope: Number.NaN, intercept: Number.NaN }); -const ForecastClassifierConfig = ({ value, onChange, modelOptions, effortOptionsByModel }: Props) => { +const ForecastClassifierConfig = ({ value, onChange, modelOptions, effortOptionsByModel, section = "all" }: Props) => { const id = React.useId(); const isCapability = value.classifier_type === "capability"; const capability = value.capability_classifier_config ?? newCapabilitySettings(); @@ -212,72 +213,195 @@ const ForecastClassifierConfig = ({ value, onChange, modelOptions, effortOptions ? "Forecasts whether the efficient solver can complete the task using the bundled capability card" : "Forecasts success for both solvers and selects efficient when the estimated quality gap is within your allowance"}

-
- - { - if (model === llm.model) return; - onChange({ ...value, classifier_llm_config: { ...llm, model: model ?? "", reasoning_effort: undefined } }); - }} - /> -
- {isCapability ? ( + {section === "all" && ( <> - updateCapability({ ...capability, base_threshold })} - /> - - ) : ( - <> - - updateFuse({ ...fuse, max_quality_gap })} - /> +
+ + { + if (model === llm.model) return; + onChange({ + ...value, + classifier_llm_config: { ...llm, model: model ?? "", reasoning_effort: undefined }, + }); + }} + /> +
)} - - - - Classifier options - - - onChange({ ...value, classifier_llm_config: { ...llm, reasoning_effort } })} - /> - onChange({ ...value, classifier_llm_config: { ...llm, timeout_ms } })} - /> - onChange({ ...value, classifier_llm_config })} - /> - onChange({ ...value, classifier_llm_config })} - /> + {section !== "advanced" && ( + <> + {isCapability ? ( + <> + updateCapability({ ...capability, base_threshold })} + /> + + ) : ( + <> + + updateFuse({ ...fuse, max_quality_gap })} + /> + + )} + + )} + {section !== "required" && ( + + {section === "all" && ( + + + Classifier options + + )} + + + onChange({ ...value, classifier_llm_config: { ...llm, reasoning_effort } }) + } + /> + onChange({ ...value, classifier_llm_config: { ...llm, timeout_ms } })} + /> + onChange({ ...value, classifier_llm_config })} + /> + onChange({ ...value, classifier_llm_config })} + /> + {isCapability && ( + updateCapability({ ...capability, threshold_step })} + /> + )} + updateTransport({ max_output_tokens })} + /> +
+ + { + if (response_format === "json_schema" || response_format === "json_object") + updateTransport({ response_format }); + }} + /> +
+
+ +

+ Optional coefficients fitted for your judge, solvers, and harness. Leave off to use raw forecasts +

+ {config.calibration && ( +
+ + setCalibrationVersion(event.target.value)} + /> +
+ )} + {isCapability && capability.calibration && ( + + updateCapability({ + ...capability, + calibration: { version: capability.calibration?.version ?? "", ...next }, + }) + } + /> + )} + {!isCapability && + fuse.calibration && + (["efficient", "capable"] as const).map((role) => ( + { + if (fuse.calibration) updateFuse({ ...fuse, calibration: { ...fuse.calibration, [role]: next } }); + }} + /> + ))} +
+ + + )} + {section === "all" && ( + <>
- {isCapability && ( - updateCapability({ ...capability, threshold_step })} - /> - )} - updateTransport({ max_output_tokens })} - /> -
- - { - if (response_format === "json_schema" || response_format === "json_object") - updateTransport({ response_format }); - }} - /> -
-
- -

- Optional coefficients fitted for your judge, solvers, and harness. Leave off to use raw forecasts -

- {config.calibration && ( -
- - setCalibrationVersion(event.target.value)} - /> -
- )} - {isCapability && capability.calibration && ( - - updateCapability({ - ...capability, - calibration: { version: capability.calibration?.version ?? "", ...next }, - }) - } - /> - )} - {!isCapability && - fuse.calibration && - (["efficient", "capable"] as const).map((role) => ( - { - if (fuse.calibration) updateFuse({ ...fuse, calibration: { ...fuse.calibration, [role]: next } }); - }} - /> - ))} -
- - + + )}

The classifier uses its bundled prompt and always falls back to the capable solver

- {error && ( + {section !== "advanced" && error && (

{error}

diff --git a/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.integration.test.tsx b/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.integration.test.tsx index 896fde3a446..7da8b12c2d7 100644 --- a/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.integration.test.tsx +++ b/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.integration.test.tsx @@ -98,28 +98,28 @@ describe("JEV classifier editor", () => { afterEach(() => vi.mocked(useAuthorized).mockReset()); it("uses built-in JEV without a license and preserves custom tiers and context through reload", () => { renderWithProviders(); - expect(screen.getByLabelText("Classifier Model")).toBeInTheDocument(); + expect(screen.getByLabelText("Judge model")).toBeInTheDocument(); expect(screen.getByText("Reasoning Effort")).toBeInTheDocument(); expect(screen.getByText("Classifier Prompt")).toBeInTheDocument(); expect(screen.getByRole("switch", { name: "Use images for classification" })).toBeInTheDocument(); - fireEvent.click(screen.getByRole("radio", { name: /JEV Classifier/ })); - expect(screen.getByRole("tab", { name: "Complexity" })).toHaveAttribute("aria-selected", "true"); - expect(screen.getByLabelText("JEV Model")).toHaveValue("jev-latest"); - expect(screen.getByLabelText("JEV Instructions")).toBeDisabled(); - expect(screen.queryByLabelText("Classifier Model")).not.toBeInTheDocument(); + fireEvent.click(screen.getByRole("radio", { name: /Jev Classifier/ })); + expect(screen.getByRole("radio", { name: /^Jev Classifier/ })).toBeChecked(); + expect(screen.getByLabelText("Jev Model")).toHaveValue("jev-latest"); + expect(screen.getByLabelText("Jev Instructions")).toBeEnabled(); + expect(screen.queryByLabelText("Judge model")).not.toBeInTheDocument(); expect(screen.queryByText("Reasoning Effort")).not.toBeInTheDocument(); expect(screen.queryByText("Classifier Prompt")).not.toBeInTheDocument(); expect(screen.queryByRole("switch", { name: "Use images for classification" })).not.toBeInTheDocument(); - fireEvent.change(screen.getByLabelText("JEV Model"), { target: { value: "jev-test" } }); - fireEvent.change(screen.getByLabelText("JEV Timeout (ms)"), { target: { value: "4200" } }); + fireEvent.change(screen.getByLabelText("Jev Model"), { target: { value: "jev-test" } }); + fireEvent.change(screen.getByLabelText("Jev Timeout (ms)"), { target: { value: "4200" } }); fireEvent.change(screen.getByLabelText("Context Window Size"), { target: { value: "6" } }); fireEvent.change(screen.getByLabelText("Circuit breaker cooldown (seconds)"), { target: { value: "50" } }); fireEvent.click(screen.getByRole("switch", { name: "Classifier circuit breaker" })); fireEvent.click(screen.getByRole("button", { name: "Customize tiers" })); fireEvent.click(screen.getByRole("button", { name: "Save and reload" })); - expect(screen.getByRole("radio", { name: /JEV Classifier/ })).toBeChecked(); - expect(screen.getByLabelText("JEV Model")).toHaveValue("jev-test"); - expect(screen.getByLabelText("JEV Timeout (ms)")).toHaveValue(4200); + expect(screen.getByRole("radio", { name: /Jev Classifier/ })).toBeChecked(); + expect(screen.getByLabelText("Jev Model")).toHaveValue("jev-test"); + expect(screen.getByLabelText("Jev Timeout (ms)")).toHaveValue(4200); expect(screen.getByLabelText("Context Window Size")).toHaveValue("6"); expect(screen.getByRole("switch", { name: "Classifier circuit breaker" })).not.toBeChecked(); fireEvent.click(screen.getByRole("button", { name: "Probe current config" })); @@ -152,10 +152,10 @@ describe("JEV classifier editor", () => { return ; }; renderWithProviders(); - expect(screen.getByLabelText("JEV Instructions")).toBeEnabled(); - fireEvent.change(screen.getByLabelText("JEV Instructions"), { target: { value: "New instructions" } }); - expect(screen.getByLabelText("JEV Instructions")).toHaveValue("New instructions"); - fireEvent.click(screen.getByRole("button", { name: "Restore built-in JEV instructions" })); - expect(screen.getByLabelText("JEV Instructions")).toHaveValue(""); + expect(screen.getByLabelText("Jev Instructions")).toBeEnabled(); + fireEvent.change(screen.getByLabelText("Jev Instructions"), { target: { value: "New instructions" } }); + expect(screen.getByLabelText("Jev Instructions")).toHaveValue("New instructions"); + fireEvent.click(screen.getByRole("button", { name: "Restore built-in Jev instructions" })); + expect(screen.getByLabelText("Jev Instructions")).toHaveValue(""); }); }); diff --git a/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.tsx b/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.tsx index 25286eaef07..97609bcd8c3 100644 --- a/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.tsx +++ b/ui/litellm-dashboard/src/components/add_model/JevClassifierConfig.tsx @@ -1,10 +1,9 @@ import React, { useId } from "react"; -import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized"; +import { AutoRouterAllowanceNote } from "./AutoRouterAvailability"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { Textarea } from "@/components/ui/textarea"; -import { SimpleTooltip } from "@/components/ui/tooltip"; import ClassifierCircuitBreakerConfig from "./ClassifierCircuitBreakerConfig"; import type { ComplexityRouterConfigValue } from "./ComplexityRouterConfig"; import { defaultJevClassifierConfig } from "./jev_classifier_config"; @@ -17,7 +16,6 @@ export default function JevClassifierConfig({ onChange: (value: ComplexityRouterConfigValue) => void; }) { const id = useId(); - const { premiumUser } = useAuthorized(); const config = value.jev_classifier_config ?? defaultJevClassifierConfig(); const update = (patch: Partial) => onChange({ ...value, jev_classifier_config: { ...config, ...patch } }); @@ -28,11 +26,11 @@ export default function JevClassifierConfig({ Uses TypeSafe System One Choice evaluation with your configured tiers

- + update({ model: event.target.value })} />
- +
- - -
-