Skip to content

test.sh: discard agent edits to the measurement setup before timing and tests #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArjunS07 wants to merge 1 commit into
base: survey/phase1-template-20261008
Choose a base branch
from
Open

test.sh: discard agent edits to the measurement setup before timing and tests #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions src/datasmith/harbor_adapter/template/tests/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,49 @@ pathlib.Path(log_dir, "patch_info.json").write_text(json.dumps(info))
PYEOF
echo "[$(ts)] [test] patch: files=${patch_files} +${patch_added}/-${patch_removed}"

# ── Restore the measurement setup ────────────────────────────────────────
# Agent edits to benchmarks, ASV config, conftest.py or .github/ are discarded; patch.diff above keeps them.
# PATTERNS is a copy of PROTECTED_PATCH_PATTERNS in fcrl/grading/gates.py (formulacode-verified-rl).
python - "${FC_BASE}" "${FC_INDEX:-}" "${LOG_DIR}/protected_restore.json" <<'PYEOF' || echo "[$(ts)] [test] WARNING: measurement setup restore failed" >&2
import json, os, re, subprocess, sys
base, index, out = sys.argv[1:4]
PATTERNS = (
r"(^|/)benchmarks?/",
r"(^|/)asv\.conf",
r"(^|/)\.snapshots/",
r"(^|/)conftest\.py$",
r"(^|/)\.github/",
)
def changed():
env = dict(os.environ, GIT_INDEX_FILE=index) if index else None
if index:
subprocess.run(["git", "add", "-A", "-N"], env=env, check=False, capture_output=True)
res = subprocess.run(["git", "diff", "-z", "--no-renames", "--name-status", base], env=env, check=True, capture_output=True, text=True)
parts = res.stdout.split("\0")
rows = zip(parts[0::2], parts[1::2])
return {path: status for status, path in rows if any(re.search(p, path) for p in PATTERNS)}
try:
# Against the upstream commit an untracked benchmark suite would count as added and be deleted.
if not os.path.exists("/opt/fc_baseline_sha"):
raise RuntimeError("no starting-tree commit (/opt/fc_baseline_sha); nothing restored")
found = changed()
for path, status in sorted(found.items()):
if status.startswith("A"):
subprocess.run(["git", "rm", "-q", "--cached", "--ignore-unmatch", "--", path], check=False, capture_output=True)
if os.path.lexists(path):
os.remove(path)
else:
subprocess.run(["git", "checkout", base, "--", path], check=True, capture_output=True)
if index:
subprocess.run(["cp", ".git/index", index], check=True)
record = {"ran": True, "base": base, "discarded": sorted(found), "remaining": sorted(changed())}
except Exception as e:
record = {"ran": False, "error": "%s: %s" % (type(e).__name__, e)}
with open(out, "w") as f:
json.dump(record, f)
print("[test] measurement setup restore: %s" % json.dumps(record))
PYEOF

# ── Rebuild compiled extensions the patch touched ────────────────────────
# The image holds the base-commit build; without this the patched sources are timed and tested as the old .so.
# pytest_runner.py reruns FC_REBUILD_CMD around its base-side run.
Expand Down
Loading