🔄 Upstream Sync: LiteLLM v1.92.0

.cargo/config.toml

@@ -0,0 +1,19 @@
+[http]
+# CI has seen transient crates.io failures from libcurl's HTTP/2 multiplexing
+# during `maturin` metadata resolution. Disable multiplexing and retry more
+# aggressively so editable `uv sync` builds are not failed by one flaky frame.
+multiplexing = false
+
+[net]
+retry = 5
+
+# PyO3 cdylib (`litellm-python-bridge`) links against the host interpreter's
+# symbols, which are not present at link time when building an extension module.
+# On macOS, tell the linker to resolve undefined `_Py*` symbols dynamically at
+# load time (the standard pyo3 extension-module flag) so the cdylib links without
+# a libpython on the link line.
+[target.x86_64-apple-darwin]
+rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]
+
+[target.aarch64-apple-darwin]
+rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]

.dockerignore

@@ -49,6 +49,10 @@ build/
 *.egg-info/
 .DS_Store
 **/node_modules
+ui/litellm-dashboard/.next
+ui/litellm-dashboard/out
+litellm-rust/target/
+litellm/rust_bridge/_native*.so
 *.log
 .env
 .env.local

.git-blame-ignore-revs

@@ -8,3 +8,12 @@
 
 # Update pydantic code to fix warnings (GH-3600)
 876840e9957bc7e9f7d6a2b58c4d7c53dad16481
+
+# style(ui): run prettier --write across the dashboard (#29622)
+7edf3a9cb55548b143df1692f4ed7c4681d7fcf7
+
+# style: reformat litellm/ with ruff format (#31317)
+17bfd415aeb5a57fb646b5cc67da1c730aa7c50b
+
+# style: unify ruff format width on 120 (#31518)
+48b5a5a0cc5a694a11219416ee0b6eb6e620e74e

.gitattributes

@@ -1 +1,2 @@
-*.ipynb linguist-vendored
+*.ipynb linguist-vendored
+ui/litellm-dashboard/src/lib/http/schema.d.ts linguist-generated

.githooks/commit-msg

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+#
+# commit-msg — enforce Conventional Commits 1.0.0
+#   https://www.conventionalcommits.org/en/v1.0.0/
+#
+# Subject format:  <type>(<scope>)!: <description>
+#   - <type> must be one of the angular types (feat, fix, ...)
+#   - (<scope>) is optional
+#   - !       is optional and marks a breaking change
+#   - <description> is mandatory and must be non-empty
+#
+# Bypass: commit with --no-verify.
+# Merge, revert, fixup!, squash!, and amend! messages are passed through.
+
+set -eu
+
+COMMIT_MSG_FILE="${1:-}"
+if [ -z "$COMMIT_MSG_FILE" ] || [ ! -f "$COMMIT_MSG_FILE" ]; then
+    echo "commit-msg: missing commit message file" >&2
+    exit 1
+fi
+
+# First non-comment, non-empty line is the subject.
+subject=""
+while IFS= read -r line || [ -n "$line" ]; do
+    case "$line" in
+        ''|'#'*) continue ;;
+    esac
+    subject="$line"
+    break
+done < "$COMMIT_MSG_FILE"
+
+if [ -z "$subject" ]; then
+    echo "commit-msg: empty commit message" >&2
+    exit 1
+fi
+
+# Pass-through commits generated by git itself.
+case "$subject" in
+    "Merge "*|"Revert \""*|"fixup! "*|"squash! "*|"amend! "*)
+        exit 0
+        ;;
+esac
+
+ALLOWED_TYPES="feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert"
+# Description must not start with an uppercase letter — kept in sync with the
+# subjectPattern in .github/workflows/conventional-commits.yml so the local
+# hook is the strictly tighter of the two gates. (Without this guard, a commit
+# like "feat: Add thing" passes locally but fails the PR-title CI check.)
+PATTERN="^(${ALLOWED_TYPES})(\([^)]+\))?!?: [^A-Z].*"
+
+if printf '%s' "$subject" | grep -Eq "$PATTERN"; then
+    exit 0
+fi
+
+cat >&2 <<EOF
+✗ Commit message does not follow Conventional Commits.
+
+  Got:      $subject
+
+  Expected: <type>(<scope>)!: <description>
+            (description must start with a lowercase letter)
+
+  Allowed types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
+  Examples:
+    feat(router): add weighted round-robin strategy
+    fix(bedrock): decouple STS region from aws_region_name
+    chore(deps): bump black to 26.3.1
+    refactor!: drop Python 3.8 support
+
+See https://www.conventionalcommits.org/en/v1.0.0/
+
+To bypass (use sparingly): git commit --no-verify
+EOF
+exit 1

.githooks/pre-push

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+#
+# pre-push — enforce Conventional Branches
+#   https://conventional-branch.github.io/
+#
+# Branch format:  <type>/<description>
+#   <type> must be one of: feature, bugfix, hotfix, release, chore
+#
+# Protected branches (always allowed):
+#   - main
+#   - litellm_internal_staging
+#   - dependabot/*
+#   - gh-readonly-queue/*
+#
+# Tag pushes and branch deletions are skipped.
+# Bypass: git push --no-verify.
+
+set -eu
+
+ZERO_OID="0000000000000000000000000000000000000000"
+ZERO_OID_SHA256="0000000000000000000000000000000000000000000000000000000000000000"
+ALLOWED_TYPES="feature|bugfix|hotfix|release|chore"
+BRANCH_PATTERN="^(${ALLOWED_TYPES})/.+"
+
+PROTECTED_NAMES="main litellm_internal_staging"
+PROTECTED_PREFIXES="dependabot/ gh-readonly-queue/"
+
+is_protected() {
+    branch="$1"
+    for name in $PROTECTED_NAMES; do
+        if [ "$branch" = "$name" ]; then
+            return 0
+        fi
+    done
+    for prefix in $PROTECTED_PREFIXES; do
+        case "$branch" in "$prefix"*) return 0 ;; esac
+    done
+    return 1
+}
+
+invalid=""
+
+while read -r local_ref local_oid remote_ref remote_oid; do
+    # Branch deletion (no local commit being pushed).
+    if [ "$local_oid" = "$ZERO_OID" ] || [ "$local_oid" = "$ZERO_OID_SHA256" ]; then
+        continue
+    fi
+
+    # Only validate branch pushes; ignore tags and other ref namespaces.
+    case "$remote_ref" in
+        refs/heads/*) ;;
+        *) continue ;;
+    esac
+
+    branch="${remote_ref#refs/heads/}"
+
+    if is_protected "$branch"; then
+        continue
+    fi
+
+    if ! printf '%s' "$branch" | grep -Eq "$BRANCH_PATTERN"; then
+        invalid="$invalid $branch"
+    fi
+done
+
+if [ -n "$invalid" ]; then
+    cat >&2 <<EOF
+✗ Branch name does not follow Conventional Branches.
+
+  Invalid:$invalid
+
+  Expected: <type>/<description>
+
+  Allowed types: feature, bugfix, hotfix, release, chore
+  Examples:
+    feature/weighted-round-robin
+    bugfix/streaming-empty-chunks
+    chore/bump-deps
+    hotfix/auth-bypass
+
+  Protected (always allowed): main, litellm_internal_staging,
+  dependabot/*, gh-readonly-queue/*.
+
+See https://conventional-branch.github.io/
+
+Rename with: git branch -m <new-name>
+To bypass (use sparingly): git push --no-verify
+EOF
+    exit 1
+fi
+
+exit 0

.github/carto-features.yml

@@ -11,34 +11,45 @@
 features:
   - name: "OCI Gemini Tool Call UUIDs"
     source_prs: [68]
+    description: "Upstream refactored OCI to use modular helpers. Tool call ID generation now uses setdefault in generic.py; separate UUID generation not required."
     files:
-      - litellm/llms/oci/chat/transformation.py
+      - litellm/llms/oci/chat/generic.py
     verification:
-      - pattern: "uuid.uuid4().hex"
-        file: litellm/llms/oci/chat/transformation.py
-      - pattern: "_handle_tool_call_delta"
+      - pattern: "setdefault"
+        file: litellm/llms/oci/chat/generic.py
+      - pattern: "_queue_tool_call_delta_events"
         file: litellm/responses/litellm_completion_transformation/streaming_iterator.py
 
+  - name: "OCI Parallel Tool Result Reordering"
+    source_prs: [121]
+    description: "OCI GENERIC validates tool results positionally against the assistant's toolCalls order, rejecting out-of-order results with \"'toolCallId' of '<id>' not found in 'toolCalls' of previous message\". Parallel tool calls (e.g. xAI Grok) executed concurrently return results in completion order, so the adapter reorders each TOOL run to match the toolCalls order. Not present upstream; candidate for upstreaming."
+    files:
+      - litellm/llms/oci/chat/generic.py
+    verification:
+      - pattern: "_reorder_tool_results_to_match_tool_calls(new_messages)"
+        file: litellm/llms/oci/chat/generic.py
+
   - name: "OCI Inline PEM Key Normalization"
     source_prs: [17159]
     description: "Accepts the PEM private key as a string via oci_key, normalizes escaped newlines, and validates input type. Required for UI-based OCI credentials (textarea field)."
     files:
-      - litellm/llms/oci/chat/transformation.py
+      - litellm/llms/oci/common_utils.py
     verification:
       - pattern: "oci_key must be a string containing the PEM private key content"
-        file: litellm/llms/oci/chat/transformation.py
+        file: litellm/llms/oci/common_utils.py
       - pattern: "load_private_key_from_str(oci_key_content)"
-        file: litellm/llms/oci/chat/transformation.py
+        file: litellm/llms/oci/common_utils.py
 
   - name: "Snowflake Streaming + Tool Calling"
     source_prs: [38, 58]
+    description: "Upstream refactored Snowflake to use Anthropic Messages API for Claude. Message transformation is now in _extract_system_and_messages."
     files:
       - litellm/llms/snowflake/chat/transformation.py
       - litellm/responses/litellm_completion_transformation/transformation.py
     verification:
       - pattern: "SnowflakeStreamingHandler"
         file: litellm/llms/snowflake/chat/transformation.py
-      - pattern: "_transform_messages"
+      - pattern: "_extract_system_and_messages"
         file: litellm/llms/snowflake/chat/transformation.py
       - pattern: "tool_choice_value is None and tools"
         file: litellm/responses/litellm_completion_transformation/transformation.py
@@ -81,15 +92,11 @@ features:
 
   - name: "Snowflake Cortex Claude Function-Calling Follow-up Turns"
     source_prs: [111]
-    description: "Unblocks multi-turn Claude function-calling on Cortex: rebuilds assistant tool_use content_list, merges consecutive text+tool_call assistant turns, and strips OpenAI-only annotations that Cortex rejects (390142)."
+    description: "Strips OpenAI-only 'annotations' fields that the Agents SDK attaches when replaying a prior assistant turn; Cortex's Anthropic-compatible endpoint rejects them as unknown fields on every follow-up turn. Restored as a call site in _extract_system_and_messages after the v1.92.0 rewrite left the original helper defined but unused (CI stayed green because the old pattern only checked the definition existed, not that it was called). NOTE: this PR's original scope also claimed to merge consecutive text+tool_call assistant turns; that behavior is not currently implemented against the new Anthropic-format message builder and is not covered by this entry."
     files:
       - litellm/llms/snowflake/chat/transformation.py
     verification:
-      - pattern: "def _content_to_text_blocks"
-        file: litellm/llms/snowflake/chat/transformation.py
-      - pattern: "def _strip_openai_annotations"
-        file: litellm/llms/snowflake/chat/transformation.py
-      - pattern: "text_prelude_blocks"
+      - pattern: "_strip_openai_annotations(content)"
         file: litellm/llms/snowflake/chat/transformation.py
 
   - name: "Snowflake Cortex Array Content Flattening"