fix: resolve conflicts for upstream sync PR #24

[Cartofante]

🔧 Automated Conflict Resolution

This PR resolves merge conflicts in #24 (main → carto/main upstream sync).

🎯 Resolution Strategy

Followed strict priority order:

1. 🏢 CARTO Customizations - Preserved all CARTO-specific infrastructure
2. 🔧 LiteLLM Core - Accepted upstream improvements to core functionality
3. ⚖️ Manual Merge - Combined both when needed

📋 Files Modified

CARTO versions kept (infrastructure):

• docker/Dockerfile.non_root - Preserved CARTO Prisma setup, litellm-proxy-extras wheel installation, and cache directory permissions
• litellm/responses/litellm_completion_transformation/*.py - Preserved CARTO Redis session storage patches (marked with # PATCH: comments)

Upstream versions accepted (core improvements):

• enterprise/litellm_enterprise/integrations/prometheus.py - Accepted memory leak fix (removed jitter parameter)
• litellm/constants.py - Accepted APScheduler configuration constants
• litellm/proxy/proxy_server.py - Accepted constant usage instead of hardcoded values
• litellm/llms/vertex_ai/gemini/transformation.py - Accepted null checks and type improvements
• requirements.txt - Accepted upstream dependency versions (litellm-proxy-extras==0.2.29)
• tests/** - Accepted upstream new test cases

Manually merged (combined both):

• litellm-proxy-extras/litellm_proxy_extras/migrations/*.sql - Resolved whitespace conflicts (trivial)
• litellm/responses/litellm_completion_transformation/streaming_iterator.py - Kept CARTO Redis patches + added upstream annotation event handling
• litellm/responses/litellm_completion_transformation/transformation.py - Kept CARTO Redis methods + added upstream cost field preservation

✅ Testing Results

• No conflict markers remain (<<<<<<<, =======, >>>>>>>)
• All conflicts resolved systematically
• ⚠️ make lint - Skipped (poetry not available in resolution environment)
• ⚠️ make lint-mypy - Skipped (poetry not available in resolution environment)
• ⚠️ make test-unit - Skipped (poetry not available in resolution environment)
• CI/CD pipeline must run tests after merge

🔍 Review Guidelines

Please verify:

1. ✅ CARTO Dockerfile customizations intact (# CARTO: sections)
2. ✅ CARTO Redis session storage patches preserved (# PATCH: comments)
3. ✅ Upstream memory leak fix applied (prometheus.py)
4. ✅ Upstream APScheduler constants used (constants.py, proxy_server.py)
5. ⚠️ CI/CD tests pass (linting, type checking, unit tests)

📝 Key Resolution Decisions

1. docker/Dockerfile.non_root: Kept CARTO's comprehensive Prisma setup with PATH configuration, tmp directories, and cache permissions. This is essential for CARTO's OpenShift deployment.

2. prometheus.py: Accepted upstream's removal of jitter parameter which was causing memory leaks. This is a critical bug fix that overrides CARTO's previous configuration.

3. responses transformation files: Carefully preserved CARTO's Redis session storage functionality while accepting upstream's cost tracking and annotation event handling improvements.

4. requirements.txt: Accepted upstream version of litellm-proxy-extras (0.2.29) which includes all necessary CARTO migrations.

🔄 What Happens After Merge

When this PR is merged into carto/main:

1. ✅ All upstream changes from main will be in carto/main (with conflicts resolved)
2. ✅ CARTO customizations preserved and working
3. ❌ Close PR 🔄 sync: upstream v1.78.5-stable #24 - it becomes redundant (changes already merged via this PR)
4. 🎉 Upstream sync complete!

Branch flow:

upstream/main → main (mirror) → carto/main (via this PR)

🤖 Automation Details

• Resolution Strategy: Prioritized CARTO infrastructure > Upstream core improvements > Manual merge
• Conflict Count: 13 files with conflicts, all resolved
• Manual Merge Files: 3 files required careful combination of both versions
• Generated by: Claude Code (automated conflict resolution)

---

📌 Action Required: Review CARTO customizations and run CI/CD tests before merging.

Resolves conflicts in #24