mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-13 23:11:40 +00:00
The any-discipline gate flagged values whose inferred type contains Any but let `object` slip through: a `dict[str, object]` hands back an unnarrowable value on every read, yet nothing caught it. This extends the same gate to a second discipline. A value whose inferred type is, or contains, `object` now trips LIT010, budgeted per file in its own `object-discipline-budget.json` so the existing tree is grandfathered (324 files, 2109 values, 50% headroom) and only new coarse `object` in an otherwise-clean file fails. A genuine boundary line is suppressed with `# object-ok: <reason>`, the same shape as `# any-ok` A bare `object` at an untyped boundary (a `def f(x: object)` you immediately narrow) is the disciplined alternative to `Any`, so it is grandfathered by the budget rather than carved out in code The leaf predicate, AST walk, suppression scan, and per-file budget are now shared across both disciplines, and `budget_ratchet_check.py` guards the new budget file with the same zero-floor semantics as the Any budget
188 lines
6.5 KiB
Python
188 lines
6.5 KiB
Python
#!/usr/bin/env python3
|
|
"""Non-gating ratchet guard: budget ceilings may only fall, never rise.
|
|
|
|
Every `*-budget.json` file (ruff-strict, type-discipline, mypy-code, basedpyright-code,
|
|
any-discipline) is a one-way ratchet: each rule's ceiling is `baseline + slack`, and the whole point is
|
|
to drive that number DOWN over time. This check compares every budget file against
|
|
its own content at the merge-base with the target branch and fails (exits 1, red) if:
|
|
|
|
* a rule's ceiling went up,
|
|
* a rule was dropped from a budget (its ceiling effectively became infinite), or
|
|
* an entire budget file was deleted.
|
|
|
|
New rules and lowered/equal ceilings are fine.
|
|
|
|
The any-discipline budget is keyed by file rather than rule: its gate treats an
|
|
absent file as ceiling 0 (the file must be Any-free), so an entry vanishing means
|
|
that file was cleaned to zero -- a tightening, and exactly the cleanup this
|
|
ratchet exists to encourage. Such a budget is therefore exempt from the
|
|
dropped-entry rule (a raised ceiling is still caught).
|
|
|
|
This is deliberately NOT a gating check. It should turn the run red so that a
|
|
loosening is impossible to miss in review, but it must stay OUT of the
|
|
branch-protection required-checks list: a justified bump (e.g. banning a new API,
|
|
which mechanically raises a baseline) can then still be merged by a human who has
|
|
seen the red and accepted it.
|
|
|
|
Usage:
|
|
python scripts/budget_ratchet_check.py [--base REF] [budget.json ...]
|
|
|
|
Stdlib only.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import json
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
from typing import NamedTuple
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent
|
|
DEFAULT_BASE = "origin/litellm_internal_staging"
|
|
DEFAULT_BUDGETS: tuple[str, ...] = (
|
|
"ruff-strict-budget.json",
|
|
"type-discipline-budget.json",
|
|
"mypy-code-budget.json",
|
|
"basedpyright-code-budget.json",
|
|
"any-discipline-budget.json",
|
|
"object-discipline-budget.json",
|
|
)
|
|
|
|
# File-keyed budgets whose gate treats an absent entry as ceiling 0 (the file
|
|
# must stay clean). Dropping an entry there is a tightening, not the "untracked,
|
|
# now unbounded" loosening a vanished rule is for the rule-keyed budgets, so a
|
|
# dropped entry must not read as a regression.
|
|
ZERO_FLOOR_BUDGETS: frozenset[str] = frozenset(
|
|
{"any-discipline-budget.json", "object-discipline-budget.json"}
|
|
)
|
|
|
|
|
|
class Regression(NamedTuple):
|
|
budget: str
|
|
rule: str
|
|
detail: str
|
|
|
|
|
|
def _run(cmd: list[str]) -> subprocess.CompletedProcess[str]:
|
|
return subprocess.run(cmd, cwd=REPO_ROOT, capture_output=True, text=True)
|
|
|
|
|
|
def _merge_base(base: str) -> str:
|
|
"""The common ancestor of `base` and HEAD, so unrelated base drift is ignored."""
|
|
proc = _run(["git", "merge-base", base, "HEAD"])
|
|
return proc.stdout.strip() or base
|
|
|
|
|
|
def _load_head(rel: str) -> dict | None:
|
|
path = REPO_ROOT / rel
|
|
if not path.exists():
|
|
return None
|
|
return json.loads(path.read_text())
|
|
|
|
|
|
def _ref_is_commit(ref: str) -> bool:
|
|
return (
|
|
_run(
|
|
["git", "rev-parse", "--verify", "--quiet", f"{ref}^{{commit}}"]
|
|
).returncode
|
|
== 0
|
|
)
|
|
|
|
|
|
def _load_base(rel: str, ref: str) -> dict | None:
|
|
"""Budget content at `ref`, or None when the file did not exist there.
|
|
|
|
`ref` is verified as a real commit by the caller, so a non-zero `git show` here means
|
|
the path was absent at that commit, not that the ref itself is unresolvable.
|
|
"""
|
|
proc = _run(["git", "show", f"{ref}:{rel}"])
|
|
if proc.returncode != 0:
|
|
return None
|
|
return json.loads(proc.stdout)
|
|
|
|
|
|
def _caps(budget: dict) -> dict[str, int]:
|
|
"""Map each rule to its ceiling (baseline + slack); skip malformed specs."""
|
|
caps: dict[str, int] = {}
|
|
for rule, spec in budget.items():
|
|
if isinstance(spec, dict):
|
|
caps[rule] = int(spec.get("baseline", 0)) + int(spec.get("slack", 0))
|
|
return caps
|
|
|
|
|
|
def regressions_for(rel: str, base: dict | None, head: dict | None) -> list[Regression]:
|
|
if base is None:
|
|
return [] # new budget file: nothing to ratchet against yet
|
|
if head is None:
|
|
return [Regression(rel, "*", "budget file was deleted (every ceiling removed)")]
|
|
|
|
base_caps = _caps(base)
|
|
head_caps = _caps(head)
|
|
drop_floors_to_zero = rel in ZERO_FLOOR_BUDGETS
|
|
out: list[Regression] = []
|
|
for rule, base_cap in sorted(base_caps.items()):
|
|
if rule not in head_caps:
|
|
if not drop_floors_to_zero:
|
|
out.append(
|
|
Regression(
|
|
rel, rule, f"rule dropped (ceiling {base_cap} -> removed)"
|
|
)
|
|
)
|
|
elif head_caps[rule] > base_cap:
|
|
out.append(
|
|
Regression(rel, rule, f"ceiling raised {base_cap} -> {head_caps[rule]}")
|
|
)
|
|
return out
|
|
|
|
|
|
def main() -> int:
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument("--base", default=DEFAULT_BASE)
|
|
parser.add_argument("budgets", nargs="*", help="budget files to check")
|
|
args = parser.parse_args()
|
|
budgets = args.budgets or list(DEFAULT_BUDGETS)
|
|
|
|
ref = _merge_base(args.base)
|
|
if not _ref_is_commit(ref):
|
|
print(
|
|
f"FAIL: base ref {ref!r} does not resolve to a commit, so the ratchet has nothing "
|
|
f"to compare against; refusing to pass vacuously (check the --base / BASE_SHA value)",
|
|
file=sys.stderr,
|
|
)
|
|
return 1
|
|
|
|
regressions: list[Regression] = []
|
|
checked: list[str] = []
|
|
for rel in budgets:
|
|
base = _load_base(rel, ref)
|
|
head = _load_head(rel)
|
|
if base is None and head is None:
|
|
continue
|
|
if base is None:
|
|
print(f"skip {rel}: new file (no base at {args.base} to ratchet against)")
|
|
continue
|
|
checked.append(rel)
|
|
regressions.extend(regressions_for(rel, base, head))
|
|
|
|
if regressions:
|
|
print(
|
|
f"FAIL: budget ceiling(s) loosened vs base {args.base} (merge-base {ref[:12]}):"
|
|
)
|
|
for reg in regressions:
|
|
print(f" {reg.budget} {reg.rule}: {reg.detail}")
|
|
print(
|
|
"Budgets are one-way ratchets and may only go down or stay flat. This "
|
|
"check is non-gating: if the increase is justified (e.g. a newly banned "
|
|
"API), a human can merge over the red after acknowledging it."
|
|
)
|
|
return 1
|
|
|
|
suffix = f" ({', '.join(checked)})" if checked else ""
|
|
print(f"OK: no budget ceiling increased vs base {args.base}{suffix}")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|