dashboard

Author: michielkallenberg

cybench/runs/analysis/index_map_lib.py

@@ -70,22 +70,35 @@ def country_display_name(cc: str) -> str:
     return _COUNTRY_NAMES.get(cc.lower(), cc.upper())
 
 
+def _version_from_slug(slug: str) -> int:
+    match = re.search(r"_v(\d+)$", slug, re.IGNORECASE)
+    return int(match.group(1)) if match else 0
+
+
 def _horizon_key_from_slug(slug: str) -> str | None:
     match = _SLUG_RE.match(slug)
     if not match:
         return None
     hz = match.group(2).lower()
     if hz in {"mid", "mid_season"}:
         return "mid"
+    if hz in {"qtr", "quarter_season"}:
+        return "qtr"
     return hz
 
 
 def group_walk_forward_entries(entries: list[IndexEntry]) -> list[dict[str, Any]]:
     """Group walk-forward index entries by ISO2 country code."""
+    walk_forward = [
+        e
+        for e in entries
+        if e.kind == "walk_forward" and e.country_code
+    ]
+    # Higher vN last so it wins when the same country×horizon appears twice.
+    walk_forward.sort(key=lambda e: _version_from_slug(e.slug))
+
     by_cc: dict[str, dict[str, Any]] = {}
-    for entry in entries:
-        if entry.kind != "walk_forward" or not entry.country_code:
-            continue
+    for entry in walk_forward:
         cc = entry.country_code.upper()
         hz = _horizon_key_from_slug(entry.slug)
         if hz is None:
@@ -98,6 +111,7 @@ def group_walk_forward_entries(entries: list[IndexEntry]) -> list[dict[str, Any]
                 "name": country_display_name(cc),
                 "eos": None,
                 "mid": None,
+                "qtr": None,
             },
         )
         row[hz] = entry.href

cybench/runs/viz/index_map_template.html

@@ -133,9 +133,10 @@ <h1>CY-Bench dashboards</h1>
       <div class="card">
         <div class="toolbar">
           <span class="muted">Horizon</span>
-          <button type="button" data-horizon="both" class="active">Both</button>
+          <button type="button" data-horizon="all" class="active">All</button>
+          <button type="button" data-horizon="mid">Mid-season (~50%)</button>
+          <button type="button" data-horizon="qtr">Late season (~75%)</button>
           <button type="button" data-horizon="eos">End of season</button>
-          <button type="button" data-horizon="mid">Mid-season</button>
         </div>
         <div id="map-wrap"><p class="muted">Loading map…</p></div>
         <div class="legend muted">
@@ -154,7 +155,7 @@ <h3>Select a country</h3>
     const DATA = __MAP_DATA_JSON__;
     const byCc = new Map(DATA.countries.map(c => [c.cc, c]));
     const byMapIso = new Map(DATA.countries.map(c => [c.map_cc || c.cc, c]));
-    let horizon = "both";
+    let horizon = "all";
     let selectedCc = null;
 
     const topLinks = document.getElementById("top-links");
@@ -170,7 +171,7 @@ <h3>Select a country</h3>
     topLinks.innerHTML += `<span class="pill muted">${DATA.n_countries} countries published</span>`;
 
     function hasHorizon(c, hz) {
-      if (hz === "both") return Boolean(c.eos || c.mid);
+      if (hz === "all" || hz === "both") return Boolean(c.eos || c.mid || c.qtr);
       return Boolean(c[hz]);
     }
 
@@ -190,11 +191,13 @@ <h3>Select a country</h3>
       const c = byCc.get(cc);
       const eosCls = c.eos ? "" : " disabled";
       const midCls = c.mid ? "" : " disabled";
+      const qtrCls = c.qtr ? "" : " disabled";
       el.innerHTML = `
         <h3>${c.name}</h3>
         <div class="cc">${c.cc}</div>
-        <a class="dash-link${eosCls}" href="${c.eos || "#"}">End-of-season walk-forward</a>
-        <a class="dash-link${midCls}" href="${c.mid || "#"}">Mid-season walk-forward</a>`;
+        <a class="dash-link${midCls}" href="${c.mid || "#"}">Mid-season walk-forward</a>
+        <a class="dash-link${qtrCls}" href="${c.qtr || "#"}">Late-season walk-forward (~75% observed)</a>
+        <a class="dash-link${eosCls}" href="${c.eos || "#"}">End-of-season walk-forward</a>`;
     }
 
     function selectCountry(cc) {

tests/runs/test_index_map.py

@@ -54,6 +54,30 @@ def test_group_walk_forward_entries():
     assert el["eos"]
 
 
+def test_group_walk_forward_entries_qtr_and_latest_version():
+    entries = [
+        IndexEntry(
+            href="de_walk_forward_qtr_v1/dashboard.html",
+            slug="de_walk_forward_qtr_v1",
+            title="Germany",
+            subtitle="qtr",
+            country_code="DE",
+            kind="walk_forward",
+        ),
+        IndexEntry(
+            href="de_walk_forward_qtr_v2/dashboard.html",
+            slug="de_walk_forward_qtr_v2",
+            title="Germany",
+            subtitle="qtr",
+            country_code="DE",
+            kind="walk_forward",
+        ),
+    ]
+    grouped = group_walk_forward_entries(entries)
+    de = next(r for r in grouped if r["cc"] == "DE")
+    assert de["qtr"] == "de_walk_forward_qtr_v2/dashboard.html"
+
+
 def test_export_world_geojson_includes_france(tmp_path: Path):
     try:
         world_shape_path("110")

tests/runs/test_publish_pipeline.py

@@ -55,7 +55,8 @@ def test_publish_target_names():
     )
     assert qtr.batch_name == "baselines_DE_qtr_v2"
     assert qtr.collect_dir == Path("/tmp/output/paper_walk_forward_de_qtr_v2")
-    assert "quarter-season" in qtr.default_title().lower()
+    assert "late season" in qtr.default_title().lower()
+    assert "75%" in qtr.default_title()
 
 
 def test_needs_collect_skips_when_state_matches(tmp_path: Path):