cherry-pick: tag query fix + MCP metadata support

[ishaan-berri]

Cherry-picks two commits onto main:

• Tag query fix (Tag query fix #25094) by @harish876 — separate scheduler job for daily tag spend updates, fixes QPS issue with redis transaction buffer
• MCP metadata support (added support for metadata #24261) by @shivamrawat1 — adds metadata support to MCP server

Relevant issues

Pre-Submission checklist

Please complete all items before asking a LiteLLM maintainer to review your PR

• I have Added testing in the tests/test_litellm/ directory, Adding at least 1 test is a hard requirement - see details
• My PR passes all unit tests on make test-unit
• My PR's scope is as small as possible (no unrelated changes)
• My PR has no console errors (for UI changes)

Type

• New Feature
• Bug Fix
• Documentation
• Other

Changes

Cherry-pick of commits f4e69f4 and fca672f onto clean main.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
litellm	Ready	Preview, Comment	Apr 4, 2026 11:15pm

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 3 committers have signed the CLA.

✅ shivamrawat1
❌ ishaan-berri
❌ harish876
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[codspeed-hq]

Merging this PR will not alter performance

✅ 16 untouched benchmarks

---

_{Comparing litellm_cherry_pick_apr4 (217b356) with main (5187629)}

[greptile-apps]

Greptile Summary

This cherry-pick brings two independent fixes onto main:

• Tag query fix (Tag query fix #25094): Daily tag spend updates are moved into a dedicated APScheduler job running at batch_writing_interval × 2.3 (≈ 2.3× the main spend-update cadence). Because tag spend rows are more numerous than user/team rows, this smooths QPS on the LiteLLM_DailyTagSpend table without changing correctness. The implementation correctly removes tag spend from _commit_spend_updates_to_db_without_redis_buffer, adds a parallel Redis-buffered path via _commit_daily_tag_spend_to_db_with_redis, and registers the scheduler job in proxy_server.py.

• MCP metadata support (added support for metadata #24261): Adds _normalize_resource_contents() inside server.py to canonicalize TextResourceContents/BlobResourceContents into ReadResourceContents objects while preserving the meta field introduced in MCP 1.26.0. The function correctly uses is None checks (not truthiness) so an empty {} meta is preserved — confirmed by test_normalize_resource_contents_preserves_empty_metadata.

Minor findings (all P2):

• tests/proxy_unit_tests/test_update_daily_tag_spend.py is outside tests/test_litellm/, so it is not executed by make test-unit and misses CI coverage.
• _normalize_resource_contents silently drops content items of unrecognised types; a warning log would help future debuggability.
• test_redis_update_buffer.py does not cover the new store_in_memory_daily_tag_spend_updates_in_redis method.

All previously flagged items (inline import in proxy_server.py, missing space in the import, typo in constants.py) are tracked in existing review threads.

Confidence Score: 5/5

Safe to merge — no P0 or P1 defects found; all findings are minor coverage and style suggestions.

All three remaining findings are P2: a test file placed outside tests/test_litellm/, a missing warning for unknown MCP content types, and a gap in Redis buffer test coverage. None affect correctness or production reliability. The core logic — separate scheduler job, Redis lock pattern, metadata normalization — is sound and well-tested in the correct location.

No files require special attention. The tests/proxy_unit_tests/test_update_daily_tag_spend.py placement is worth fixing but is not a blocker.

Important Files Changed

Filename	Overview
litellm/constants.py	Adds DB_DAILY_TAG_SPEND_UPDATE_JOB_NAME lock key and DAILY_TAG_SPEND_BATCH_MULTIPLIER = 2.3 for the new scheduler; pattern consistent with existing constants.
litellm/proxy/_experimental/mcp_server/server.py	Adds _normalize_resource_contents() to propagate MCP 1.26.0 meta field; correctly uses is None guard so empty-dict meta is preserved.
litellm/proxy/db/db_spend_update_writer.py	Extracts tag spend into _commit_daily_tag_spend_to_db() / _commit_daily_tag_spend_to_db_with_redis(); cleanly removes it from the shared no-Redis path with an explanatory comment.
litellm/proxy/db/db_transaction_queue/redis_update_buffer.py	Adds store_in_memory_daily_tag_spend_updates_in_redis and get_all_daily_tag_spend_update_transactions_from_redis_buffer for the tag-only Redis path, correctly separate from the main 6-queue pipeline.
litellm/proxy/proxy_server.py	Registers the new update_daily_tag_spend APScheduler job at the correct multiplied interval.
litellm/proxy/utils.py	Adds update_daily_tag_spend() entry point that dispatches to Redis or non-Redis path; error is caught and logged without re-raising.
tests/proxy_unit_tests/test_update_daily_tag_spend.py	Good test coverage for update_daily_tag_spend branches, but placed in tests/proxy_unit_tests/ and will not be executed by make test-unit.
tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server.py	Adds well-structured tests for _normalize_resource_contents covering text, blob, empty-dict meta, and no-meta backward-compatibility; in the correct tests/test_litellm/ location.
tests/test_litellm/proxy/db/db_transaction_queue/test_redis_update_buffer.py	Tests the main pipeline path adequately but lacks coverage for the new store_in_memory_daily_tag_spend_updates_in_redis method.
docker/Dockerfile.dev	Minor, unrelated change; no issues.

Sequence Diagram

sequenceDiagram
    participant R as Request Handler
    participant Q as daily_tag_spend_update_queue
    participant S as APScheduler
    participant U as update_daily_tag_spend()
    participant W as DBSpendUpdateWriter
    participant Redis as Redis Buffer
    participant DB as LiteLLM_DailyTagSpend

    R->>Q: add_spend_log_transaction_to_daily_tag_transaction()
    Note over S: Every batch_interval x 2.3 seconds
    S->>U: trigger update_daily_tag_spend()
    alt Redis buffer enabled
        U->>W: _commit_daily_tag_spend_to_db_with_redis()
        W->>Redis: store_in_memory_daily_tag_spend_updates_in_redis()
        W->>W: acquire pod lock (DB_DAILY_TAG_SPEND_UPDATE_JOB_NAME)
        W->>Redis: get_all_daily_tag_spend_update_transactions_from_redis_buffer()
        W->>DB: update_daily_tag_spend() upsert
        W->>W: release pod lock
    else No Redis buffer
        U->>W: _commit_daily_tag_spend_to_db()
        W->>Q: flush_and_get_aggregated_daily_spend_update_transactions()
        W->>DB: update_daily_tag_spend() upsert
    end

Loading

_{Reviews (3): Last reviewed commit: "Merge branch 'main' into litellm_cherry_..." | Re-trigger Greptile}

[greptile-apps]

Inline import inside function body

Per the project style guide, imports should be at the top of the file (module-level), not inside functions/methods. The only accepted exception is to break circular imports. This import can be moved to the top of proxy_server.py alongside the other litellm.proxy.utils imports.

Move from litellm.proxy.utils import update_daily_tag_spend to the top-level imports section of proxy_server.py where the other utils symbols are imported.

Context Used: CLAUDE.md (source)

_{Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!}

[greptile-apps]

Typo in comment

"spcific" should be "specific".

Suggested change

	# The number of tag entries are higher than number of user, team entries. This leads to a higher QPS.
	# This will run tag spcific tasks at a later time to smooth QPS
	# The number of tag entries are higher than number of user, team entries. This leads to a higher QPS.
	# This will run tag specific tasks at a later time to smooth QPS

[greptile-apps]

Missing space after comma in import

Black and standard Python style require a space after commas in import lists.

Suggested change

	from litellm.constants import DB_SPEND_UPDATE_JOB_NAME,DB_DAILY_TAG_SPEND_UPDATE_JOB_NAME
	from litellm.constants import DB_SPEND_UPDATE_JOB_NAME, DB_DAILY_TAG_SPEND_UPDATE_JOB_NAME

_{Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!}