verify.py v0.2: per-language PATH fix, /testbed rewrite, record test cmds

scripts/verify.py

@@ -1,4 +1,4 @@
-"""PatchBench row verification + context expansion harness (v0.1).
+"""PatchBench row verification + context expansion harness (v0.2).
 
 For each candidate row:
   1. clone the repo at base_commit
@@ -9,8 +9,12 @@ For each candidate row:
   4. slice a 500-1500 line context window around the buggy files
   5. write a result record; verified rows additionally carry the full patchbench schema
 
+Native (non-Docker) reproduction of the upstream env: toolchain dirs are prepended
+to PATH per language, and the upstream /testbed convention is rewritten to the
+local checkout path.
+
 Usage (inside a job with the right language toolchain image):
-  python verify.py --lang go --file pilot/candidates/go.jsonl --limit 8
+  python verify.py --lang go --file pilot/candidates/go.jsonl --limit 6
 """
 import argparse, json, os, subprocess, sys, time, traceback
 
@@ -20,13 +24,22 @@ CMD_TIMEOUT_S = 2100
 GIT_TIMEOUT_S = 900
 MAX_CONTEXT_LINES = 1500
 
+# toolchain dirs that login-shell /etc/profile resets away, or that images install off-PATH
+LANG_PATH_PREPEND = {
+    "go": ["/usr/local/go/bin"],
+    "rust": ["/usr/local/cargo/bin", "/usr/local/rustup/bin"],
+    "java": [],
+    "javascript": [],
+    "typescript": [],
+}
 EXTS = {"go": [".go"], "rust": [".rs"], "java": [".java"],
         "javascript": [".js", ".mjs"], "typescript": [".ts", ".tsx"]}
 SKIP_DIRS = {".git", "node_modules", "vendor", "target", "dist", "build", "__pycache__", ".idea"}
 
+TESTBED = "/testbed"
+
 
 def run(cmd, cwd, timeout):
-    """cmd: string -> bash -c. Returns (returncode, combined_output, duration)."""
     t0 = time.time()
     try:
         p = subprocess.run(["bash", "-c", cmd], cwd=cwd, capture_output=True,
@@ -46,7 +59,6 @@ def sh(cmds, cwd, timeout=CMD_TIMEOUT_S):
 
 
 def apply_patch(text, cwd):
-    """Try git apply, then patch -p1. Returns error string or None."""
     pf = os.path.join(cwd, ".pb_patch")
     with open(pf, "w") as f:
         f.write(text)
@@ -75,8 +87,8 @@ def run_tests(row, repo_dir):
     """Run rebuild_cmds, then test_cmds, then print_cmds; parse combined output once.
     Returns (tests_dict, combined_output_tail)."""
     parser = get_parser(row)
-    sh(row.get("rebuild_cmds"), repo_dir)          # env/build; failure shows up as unparseable tests
-    run("mkdir -p reports", repo_dir, 30)          # test_cmds write reports/<lang>-test-results.json
+    sh(row.get("rebuild_cmds"), repo_dir)
+    run("mkdir -p reports", repo_dir, 30)
     out = ""
     for c in (row.get("test_cmds") or []):
         _, o, _ = run(c, repo_dir, CMD_TIMEOUT_S)
@@ -88,7 +100,6 @@ def run_tests(row, repo_dir):
 
 
 def grade(tests, want, expect):
-    """Return (ok, details). want: list of test ids, expect: 'pass'|'fail'."""
     missing, wrong = [], []
     for t in want:
         s = tests.get(t)
@@ -124,7 +135,7 @@ def collect_context(repo_dir, buggy_paths, test_paths, lang, cap=MAX_CONTEXT_LIN
                 n = sum(1 for _ in open(os.path.join(repo_dir, p), errors="replace"))
             except OSError:
                 continue
-            if n > 600:      # skip giant files entirely; they blow the window
+            if n > 600:
                 continue
             if p in buggy_paths:
                 prio["buggy"].append(p)
@@ -166,6 +177,14 @@ def verify_row(row, lang):
         if rc != 0:
             rec["error"] = f"checkout failed: {out[-500:]}"
             return rec
+
+    # native env fixes: toolchain PATH + /testbed convention
+    os.environ["PATH"] = ":".join(LANG_PATH_PREPEND.get(lang, [])) + ":" + os.environ["PATH"]
+    def tb(cmds):
+        return [c.replace(TESTBED, repo_dir) for c in (cmds or [])]
+    row = {**row, "test_cmds": tb(row["test_cmds"]), "rebuild_cmds": tb(row.get("rebuild_cmds")),
+           "print_cmds": tb(row.get("print_cmds"))}
+    rec["test_cmds"] = row["test_cmds"]
     rec["timing"]["setup"] = round(time.time() - t0, 1)
 
     # ---- PRE-FIX (twice) ----
@@ -219,7 +238,6 @@ def verify_row(row, lang):
     else:
         rec["status"] = "verified"
 
-    # context expansion only for rows worth publishing
     if rec["status"] == "verified":
         buggy = touched_paths(row["gold_patch"])
         tfiles = touched_paths(row["test_patch"])
@@ -239,7 +257,7 @@ def main():
     ap = argparse.ArgumentParser()
     ap.add_argument("--lang", required=True)
     ap.add_argument("--file", required=True)
-    ap.add_argument("--limit", type=int, default=8)
+    ap.add_argument("--limit", type=int, default=6)
     ap.add_argument("--out", default=None)
     args = ap.parse_args()