verify.py v0.1: run rebuild_cmds, mkdir reports, single-pass output parsing

scripts/verify.py

@@ -1,4 +1,4 @@
-"""PatchBench row verification + context expansion harness (v0).
+"""PatchBench row verification + context expansion harness (v0.1).
 
 For each candidate row:
   1. clone the repo at base_commit
@@ -16,8 +16,6 @@ import argparse, json, os, subprocess, sys, time, traceback
 
 REPO_ID = "rootxhacker/patchbench"
 CACHE = "/tmp/cache/repos"
-WORK = "/tmp/work"
-ROW_TIMEOUT_S = 2700          # hard cap per row so one slow repo can't eat the job
 CMD_TIMEOUT_S = 2100
 GIT_TIMEOUT_S = 900
 MAX_CONTEXT_LINES = 1500
@@ -74,27 +72,19 @@ def get_parser(row):
 
 
 def run_tests(row, repo_dir):
-    """Run test_cmds then print_cmds, parse with the row's parser. Returns (tests_dict, raw_tail, err)."""
+    """Run rebuild_cmds, then test_cmds, then print_cmds; parse combined output once.
+    Returns (tests_dict, combined_output_tail)."""
     parser = get_parser(row)
-    ok, err = sh(row.get("test_cmds"), repo_dir)
-    if not ok:
-        pass  # test cmd exit code is not authoritative; the parse decides
-    log = ""
-    if row.get("print_cmds"):
-        for c in row["print_cmds"]:
-            _, out, _ = run(c, repo_dir, 120)
-            log += out + "\n"
-    else:
-        _, log, _ = run(" && ".join(row.get("test_cmds") or ["true"]), repo_dir, 120)
-    tests = parser(log)
-    if not tests:
-        # last resort: parse the test_cmds output itself
-        allout = ""
-        for c in row.get("test_cmds") or []:
-            _, o, _ = run(c, repo_dir, 120)
-            allout += o + "\n"
-        tests = parser(allout) or {}
-    return tests, log[-3000:], err
+    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
+    out = ""
+    for c in (row.get("test_cmds") or []):
+        _, o, _ = run(c, repo_dir, CMD_TIMEOUT_S)
+        out += o + "\n"
+    for c in (row.get("print_cmds") or []):
+        _, o, _ = run(c, repo_dir, 120)
+        out += o + "\n"
+    return parser(out), out[-3000:]
 
 
 def grade(tests, want, expect):
@@ -106,7 +96,8 @@ def grade(tests, want, expect):
             missing.append(t)
         elif s != expect:
             wrong.append((t, s))
-    return (not missing and not wrong), {"missing": len(missing), "wrong": wrong[:10], "missing_ids": missing[:10]}
+    return (not missing and not wrong), {"missing": len(missing), "wrong": wrong[:10],
+                                         "missing_ids": missing[:5], "parsed_count": len(tests)}
 
 
 def touched_paths(patch):
@@ -186,13 +177,12 @@ def verify_row(row, lang):
     pre_runs = []
     for i in range(2):
         s = time.time()
-        tests, tail, _ = run_tests(row, repo_dir)
+        tests, tail = run_tests(row, repo_dir)
         pre_runs.append((tests, tail))
         rec["timing"][f"pre_test_{i}"] = round(time.time() - s, 1)
-    f2p_ok_pre = all(grade(t, row["fail_to_pass"], "fail")[0] for t, _ in pre_runs)
-    rec["f2p_pre_ok"] = f2p_ok_pre
-    rec["pre_missing"] = pre_runs[0][0].get and None  # placeholder, details below
     pre_detail = grade(pre_runs[0][0], row["fail_to_pass"], "fail")[1]
+    f2p_ok_pre = all(grade(t, row["fail_to_pass"], "fail")[0] for t, _ in pre_runs)
+    rec["f2p_pre_ok"], rec["pre_detail"] = f2p_ok_pre, pre_detail
 
     # ---- POST-FIX (twice) ----
     clean_state(repo_dir)
@@ -207,7 +197,7 @@ def verify_row(row, lang):
     post_runs = []
     for i in range(2):
         s = time.time()
-        tests, tail, _ = run_tests(row, repo_dir)
+        tests, tail = run_tests(row, repo_dir)
         post_runs.append((tests, tail))
         rec["timing"][f"post_test_{i}"] = round(time.time() - s, 1)
     f2p_ok_post = all(grade(t, row["fail_to_pass"], "pass")[0] for t, _ in post_runs)
@@ -218,7 +208,9 @@ def verify_row(row, lang):
     rec["timing"]["total"] = round(time.time() - t0, 1)
     rec["raw_tail"] = pre_runs[0][1][-1500:]
 
-    if not f2p_ok_pre:
+    if len(pre_runs[0][0]) == 0:
+        rec["status"] = "no_tests_parsed"
+    elif not f2p_ok_pre:
         rec["status"] = "f2p_not_failing_prefix"
     elif not f2p_ok_post:
         rec["status"] = "f2p_not_passing_postfix"
@@ -262,9 +254,6 @@ def main():
     done = 0
     with open(out_path, "w") as fo, open(verified_path, "w") as fv:
         for row in rows[:args.limit]:
-            if row["language"] != {"go": "go", "rust": "rust", "java": "java",
-                                   "js": "javascript", "ts": "typescript"}.get(args.lang):
-                continue
             try:
                 rec = verify_row(row, row["language"])
             except Exception as e:
@@ -278,8 +267,8 @@ def main():
                 fv.flush()
             print(f"[{row['id']}] {rec['status']} "
                   f"pre_ok={rec.get('f2p_pre_ok')} post_ok={rec.get('f2p_post_ok')} "
-                  f"p2p_ok={rec.get('p2p_post_ok')} err={(rec.get('error') or '')[:200]}",
-                  flush=True)
+                  f"p2p_ok={rec.get('p2p_post_ok')} parsed={rec.get('pre_detail', {}).get('parsed_count', '?')} "
+                  f"err={(rec.get('error') or '')[:200]}", flush=True)
             done += 1
 
     for path, dest in [(out_path, f"pilot/results/{args.lang}.jsonl"),