mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-21 00:21:49 +00:00
88d3650d67
Resolves the merge conflicts blocking PR #32136. Conflicts resolved: 1. litellm/__init__.py — both branches add an independent module-level bool flag. Kept both: - `enforce_end_user_model_max_budget_on_master_key` (this PR) - `block_requests_for_models_without_pricing` (upstream) 2. litellm/proxy/auth/user_api_key_auth.py — four conflict regions in the master-key auth path, the virtual-key auth path, the DB lookup auth path, and the custom-auth post-checks path. The upstream rewrite inlined some end-user parameter population; this PR keeps its `_enforce_end_user_model_max_budget_checks()` / `_maybe_enforce_master_key_end_user_model_max_budget()` helper paths so the master-key enforcement behaviour introduced by #32136 is preserved. Verified with `python3 -c "import ast; ast.parse(...)"` on both files. |
||
|---|---|---|
| .. | ||
| actions | ||
| codeql | ||
| e2e-stack | ||
| ISSUE_TEMPLATE | ||
| observatory | ||
| screenshots | ||
| scripts | ||
| workflows | ||
| ci-coverage-allowlist.yml | ||
| CODEOWNERS | ||
| dependabot.yaml | ||
| deploy-on-aws.png | ||
| deploy-on-gcp.png | ||
| deploy-to-aws.png | ||
| FUNDING.yml | ||
| mutmut-coverage.rc | ||
| pull_request_template.md | ||
| template.yaml | ||
