Fix: handle both v2 (per_seed) and v3 (seeds) output formats

jobs/analyze_collapse.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 """
-OCC Collapse Mechanism — Post-Run Analysis Harness v2
+OCC Collapse Mechanism — Post-Run Analysis Harness v2.1
 =======================================================
-Handles both v2 (summary-only) and v3 (per-topic traces) output formats.
+Handles both v2 (summary-only, per_seed key) and v3 (per-topic traces, seeds key) output formats.
 
 Usage:
   python analyze_collapse.py <results.json>
@@ -10,6 +10,7 @@ Usage:
 
 import json, csv, sys
 from pathlib import Path
+from collections import defaultdict
 
 HYPOTHESIS_RULES = {
     "H1_volume_amplification": {
@@ -52,15 +53,32 @@ HYPOTHESIS_RULES = {
 def load(path):
     with open(path) as f: return json.load(f)
 
+def _get_seeds(data):
+    """Unify per_seed (v2) and seeds (v3) key."""
+    return data.get("seeds", data.get("per_seed", {}))
+
 def compute_summary(data):
+    # Try pre-computed aggregate first (v2 format)
+    agg_key = [k for k in data if k.startswith("aggregate_seeds_")]
+    if agg_key:
+        raw = data[agg_key[0]]
+        s = {}
+        for cn, ci in raw.items():
+            if isinstance(ci, dict) and "mean_accuracy" in ci:
+                s[cn] = {"mean": ci["mean_accuracy"], "min": ci["mean_accuracy"], "max": ci["mean_accuracy"]}
+        if s:
+            return s
+    # Try explicit summary (v3 format)
     s = data.get("summary", {})
-    if not s:
-        from collections import defaultdict
-        acc = defaultdict(list)
-        for sd in data.get("seeds",{}).values():
-            for cn, ci in sd.items():
-                if ci.get("accuracy") is not None: acc[cn].append(ci["accuracy"])
-        s = {k: {"mean": sum(v)/len(v), "min": min(v), "max": max(v)} for k,v in acc.items()}
+    if s:
+        return s
+    # Compute from seeds
+    acc = defaultdict(list)
+    for sd in _get_seeds(data).values():
+        for cn, ci in sd.items():
+            if isinstance(ci, dict) and ci.get("accuracy") is not None:
+                acc[cn].append(ci["accuracy"])
+    s = {k: {"mean": sum(v)/len(v), "min": min(v), "max": max(v)} for k,v in acc.items()}
     return s
 
 def make_summary_rows(summary):
@@ -70,8 +88,8 @@ def make_summary_rows(summary):
 
 def make_retention_rows(data):
     rows = []
-    for sid, sd in data.get("seeds",{}).items():
-        t = sd.get("equal_3round_traced", {})
+    for sid, sd in _get_seeds(data).items():
+        t = sd.get("equal_3round_traced", sd.get("equal_3round", {}))
         if not t or t.get("accuracy") is None: continue
         for rd, lbl in [(2,"round2"),(3,"round3")]:
             rows.append({"seed": int(sid), "round": rd,
@@ -83,7 +101,7 @@ def make_retention_rows(data):
 
 def make_per_topic_rows(data):
     rows = []
-    for sid, sd in data.get("seeds",{}).items():
+    for sid, sd in _get_seeds(data).items():
         pt = sd.get("equal_3round_traced",{}).get("per_topic_rounds", [])
         for p in pt:
             rounds = p.get("rounds",[])
@@ -98,7 +116,7 @@ def make_per_topic_rows(data):
 
 def make_flip_rows(data):
     flips, advs = [], []
-    for sid, sd in data.get("seeds",{}).items():
+    for sid, sd in _get_seeds(data).items():
         advs.append({"seed": int(sid),
             "total_adversary_flips": sd.get("equal_3round_traced",{}).get("adversary_flips",0)})
         for p in sd.get("equal_3round_traced",{}).get("per_topic_rounds",[]):
@@ -113,9 +131,9 @@ def make_flip_rows(data):
 
 def evaluate(summary_rows, data):
     sm = {r["condition"]: r for r in summary_rows}
-    # Get retention from first seed
-    fs = list(data.get("seeds",{}).values())[0] if data.get("seeds") else {}
-    t = fs.get("equal_3round_traced",{})
+    # Get retention from first seed (v3 only — v2 has no per-topic data)
+    fs = list(_get_seeds(data).values())[0] if _get_seeds(data) else {}
+    t = fs.get("equal_3round_traced", fs.get("equal_3round", {}))
     rr = t.get("honest_retention_round3",0)
     fr = t.get("flipped_away_round3",0)
     rate = rr/(rr+fr) if (rr+fr)>0 else 1.0