mirror of
https://github.com/allaunthefox/Research-Stack.git
synced 2026-07-31 03:05:21 +00:00
Squash the four overlapping feature branches into a single change set against main, eliminating cross-PR merge conflicts and the duplicated CI-fix scripts. What this brings in (merge order #79 -> #80 -> #81 -> #89): - #79 refactor(infra): shared utilities (4-Infrastructure/lib/*: q16, hashing, jsonl, fraction_utils) + the scripts/math-first/* validators that the math-check CI requires. - #80 feat(lean): Semantics.E8Sidon (1025 lines) -- Eisenstein coefficient identity E4^2 = E8 and the Sidon framework. E4_sq_eq_E8_coeff is fully proved (all Fourier-coefficient extraction machine-checked); the single residual gap is pinned to E4_sq_eq_E8_qExpansion (Mathlib lacks the valence formula / dim M8 = 1). 4 sorries + 1 axiom (e8_additive_completeness), all TODO(lean-port). - #81 refactor(lean): Float-free FixedPoint core (integer-only sqrt/log2/expNeg). E8Sidon.lean kept at #80's final 1025-line version (the #81 intermediate 438-line copy was overridden by merge order). - #89 feat(lean): Semantics.RRC.PolyFactorIdentity -- short-sleeve polynomial detection at the zerocopy limb boundary; now imports Semantics.E8Sidon for sigma3/sigma7/convolutionLHS (single source of truth) instead of inlining them. Conflict resolution: - flake.nix -> canonical rs-surface removal (Garnix shutdown). - scripts/math-first/* -> byte-identical across branches, clean. - .cursorrules / AGENTS.md -> unified; baselines + sorry inventory refreshed. Verification: - lake build (default aggregator): 3573 jobs, 0 errors. - lake build Semantics.RRC.PolyFactorIdentity (E8Sidon + FixedPoint + PolyFactor): 3655 jobs, 0 errors. Witnesses verified (sigma7 4 = 16513, convolutionLHS 6 = 2350). - Python tests: 68/68 pass. Note: the "Workers Builds: researchstack" check is a preexisting external Cloudflare build unrelated to this change (no branch touches 4-Infrastructure/cloudflare/). Build: 3573 jobs (default), 3655 jobs (narrow), 0 errors Co-Authored-By: Allaun Silverfox <bigdataiscoming+9i37y6j2@protonmail.com>
124 lines
3.8 KiB
Python
124 lines
3.8 KiB
Python
#!/usr/bin/env python3
|
|
"""Prepare a public-facing artifact with smoothing, receipts, and hashes."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import hashlib
|
|
import json
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parents[3] / "4-Infrastructure"))
|
|
from lib.hashing import sha256_file
|
|
|
|
def detect_mode(path: Path, explicit_mode: str) -> str:
|
|
if explicit_mode != "auto":
|
|
return explicit_mode
|
|
if path.suffix.lower() == ".json":
|
|
return "json"
|
|
return "text"
|
|
|
|
|
|
def parse_args() -> argparse.Namespace:
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument("--input", required=True, help="Source artifact to prepare.")
|
|
parser.add_argument(
|
|
"--out-dir",
|
|
required=True,
|
|
help="Directory for the prepared public artifact bundle.",
|
|
)
|
|
parser.add_argument(
|
|
"--label",
|
|
help="Optional label for the output filenames. Defaults to the input stem.",
|
|
)
|
|
parser.add_argument(
|
|
"--mode",
|
|
choices=("auto", "text", "json"),
|
|
default="auto",
|
|
help="Smoothing mode passed through to universal_smoother.py.",
|
|
)
|
|
return parser.parse_args()
|
|
|
|
|
|
def main() -> int:
|
|
args = parse_args()
|
|
input_path = Path(args.input).resolve()
|
|
out_dir = Path(args.out_dir).resolve()
|
|
out_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
if not input_path.is_file():
|
|
print(f"Input file not found: {input_path}", file=sys.stderr)
|
|
return 2
|
|
|
|
mode = detect_mode(input_path, args.mode)
|
|
label = args.label or input_path.stem
|
|
safe_label = "".join(ch if ch.isalnum() or ch in "-._" else "_" for ch in label)
|
|
|
|
suffix = input_path.suffix or (".json" if mode == "json" else ".txt")
|
|
smoothed_path = out_dir / f"{safe_label}.public{suffix}"
|
|
report_path = out_dir / f"{safe_label}.smoothing.json"
|
|
manifest_path = out_dir / f"{safe_label}.manifest.json"
|
|
|
|
smoother = Path(__file__).resolve().parent / "universal_smoother.py"
|
|
cmd = [
|
|
sys.executable,
|
|
str(smoother),
|
|
"--input",
|
|
str(input_path),
|
|
"--output",
|
|
str(smoothed_path),
|
|
"--report",
|
|
str(report_path),
|
|
"--mode",
|
|
mode,
|
|
]
|
|
completed = subprocess.run(
|
|
cmd,
|
|
check=True,
|
|
text=True,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
)
|
|
json.loads(completed.stdout)
|
|
|
|
smoothed_name = smoothed_path.name
|
|
receipt_name = report_path.name
|
|
bundle_fingerprint = hashlib.sha256(
|
|
json.dumps(
|
|
{
|
|
"label": safe_label,
|
|
"mode": mode,
|
|
"input_name": input_path.name,
|
|
"input_sha256": sha256_file(input_path),
|
|
"smoothed_artifact_name": smoothed_name,
|
|
"smoothed_artifact_sha256": sha256_file(smoothed_path),
|
|
"smoothing_receipt_name": receipt_name,
|
|
"smoothing_receipt_sha256": sha256_file(report_path),
|
|
},
|
|
sort_keys=True,
|
|
).encode("utf-8")
|
|
).hexdigest()
|
|
|
|
manifest = {
|
|
"schema": "hutter_public_artifact_manifest_v1",
|
|
"label": safe_label,
|
|
"input_name": input_path.name,
|
|
"input_sha256": sha256_file(input_path),
|
|
"mode": mode,
|
|
"smoothed_artifact_name": smoothed_name,
|
|
"smoothed_artifact_sha256": sha256_file(smoothed_path),
|
|
"smoothing_receipt_name": receipt_name,
|
|
"smoothing_receipt_sha256": sha256_file(report_path),
|
|
"bundle_fingerprint": bundle_fingerprint,
|
|
}
|
|
manifest_path.write_text(json.dumps(manifest, indent=2) + "\n", encoding="utf-8")
|
|
|
|
print(json.dumps(manifest, indent=2))
|
|
print(f"Wrote public artifact manifest: {manifest_path}", file=sys.stderr)
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|