chore(registry): load_catalog/load_signals dal registry fusion (registry.json)

pages/00_Vista_Insieme.py

@@ -196,7 +196,7 @@
             st.dataframe(col_df, hide_index=True, width="stretch")
 
 # -- Alert run falliti --
-run_failed = [s for s in sigs if s.get("sample_run", {}).get("status") == "failed"]
+run_failed = [s for s in sigs if s.get("run", {}).get("status") == "failed"]
 if run_failed:
     st.warning(
         f"⚠️ **{len(run_failed)} candidate con run CI fallito** "

pages/02_Pipeline_Health.py

@@ -45,7 +45,7 @@
 for sig in sigs:
     slug = sig["id"].replace("-", "_")
     if slug not in catalog_slugs:
-        sr = sig.get("sample_run", {}) or {}
+        sr = sig.get("run", {}) or {}
         candidati.append(
             {
                 "slug": slug,
@@ -67,7 +67,7 @@
     stage = ds.get("stage", "")
     slug = ds["slug"]
     sig_data = signals_by_slug.get(slug, {})
-    sr = sig_data.get("sample_run", {}) or {}
+    sr = sig_data.get("run", {}) or {}
     item = {
         "slug": slug,
         "name": ds.get("name", ""),
@@ -87,7 +87,7 @@
 # Elenco completo di tutti i segnali con run falliti (candidate + catalogo)
 all_failed = []
 for sig in sigs:
-    sr = sig.get("sample_run", {}) or {}
+    sr = sig.get("run", {}) or {}
     if sr.get("status") == "failed":
         slug = sig["id"].replace("-", "_")
         all_failed.append(
@@ -117,8 +117,8 @@
 ok_count = sum(1 for s in sigs if s.get("status") == "ok")
 warn_count = sum(1 for s in sigs if s.get("status") == "warn")
 err_count = sum(1 for s in sigs if s.get("status") == "error")
-run_passed = sum(1 for s in sigs if s.get("sample_run", {}).get("status") == "passed")
-run_failed = sum(1 for s in sigs if s.get("sample_run", {}).get("status") == "failed")
+run_passed = sum(1 for s in sigs if s.get("run", {}).get("status") == "passed")
+run_failed = sum(1 for s in sigs if s.get("run", {}).get("status") == "failed")
 run_none = len(sigs) - run_passed - run_failed
 
 max_n = max(n_intake, n_validation, n_published, 1)

sources.py

@@ -67,20 +67,46 @@ def _fetch_yaml(url: str) -> dict:
 # ── Caricatori con cache — errori mostrati nella UI ──────────────────────────────
 @st.cache_data(ttl=300, show_spinner=False)
 def load_catalog():
+    """Catalogo dataset dal registry fusion (registry.json)."""
     try:
-        return _fetch_json(f"{REGISTRY_BASE}/clean_catalog.json")
+        reg = _fetch_json(f"{REGISTRY_BASE}/registry.json")
+        return reg
     except Exception as e:
         st.error(f"❌ Catalogo non disponibile: {e}")
         return {}
 
 
 @st.cache_data(ttl=300, show_spinner=False)
 def load_signals():
+    """Segnali pipeline dal registry fusion (registry.json).
+
+    Il blocco ``run`` del registry viene esposto direttamente (chiave ``run``):
+    i campi ``checked_at``/``run_url`` non esistono nel registry, si derivano
+    da ``started_at`` e ``run_id``.
+    """
     try:
-        return _fetch_json(f"{REGISTRY_BASE}/pipeline_signals.json")
+        reg = _fetch_json(f"{REGISTRY_BASE}/registry.json")
+        signals = []
+        for s in reg.get("signals", []):
+            sig = dict(s)
+            run = s.get("run") or {}
+            if run:
+                sig["run"] = {
+                    "status": "passed"
+                    if run.get("status") == "SUCCESS"
+                    else run.get("status", "").lower(),
+                    "run_id": run.get("run_id", ""),
+                    "checked_at": (run.get("started_at") or "")[:10],
+                    "run_url": f"https://github.com/dataciviclab/dataset-incubator/actions/runs/{run.get('run_id', '')}"
+                    if run.get("run_id")
+                    else "",
+                    "year": run.get("year"),
+                }
+            signals.append(sig)
+        return {"schema_version": reg.get("schema_version", "1"), "signals": signals}
     except Exception as e:
         st.error(f"❌ Segnali pipeline non disponibili: {e}")
-        return {}
+        return {"signals": []}
 
 
 @st.cache_data(ttl=300, show_spinner=False)

tests/test_sources.py

@@ -121,7 +121,7 @@ def test_http_error(self):
     ("load_sources_dashboard", load_sources_dashboard, {"sources": []}),
     ("load_inventory_report", load_inventory_report, {}),
     ("load_catalog", load_catalog, {}),
-    ("load_signals", load_signals, {}),
+    ("load_signals", load_signals, {"signals": []}),
 ]
 
 
@@ -214,11 +214,25 @@ def test_loader_fallback_on_http_error(name, loader, expected_fallback):
     "sources": {"istat_sdmx": {"status": "ok", "rows": 4849, "method": "dataflow_count"}}
 }
 
-CATALOG_SAMPLE = {"datasets": [{"slug": "test", "stage": "published"}]}
-
-PIPELINE_SAMPLE = {"signals": [{"id": "test", "status": "ok"}]}
+# Registry fusion (registry.json) — fonte unica per load_catalog/load_signals
+REGISTRY_SAMPLE = {
+    "schema_version": 1,
+    "datasets": [{"slug": "test", "name": "Test", "stage": "published", "period": {}}],
+    "signals": [
+        {
+            "id": "test",
+            "status": "ok",
+            "run": {
+                "run_id": "20260101T000000Z_abc",
+                "year": 2025,
+                "status": "SUCCESS",
+                "started_at": "2026-01-01T00:00:00+00:00",
+            },
+        }
+    ],
+}
 
-REGISTRY_SAMPLE = """istat_sdmx:
+REGISTRY_SAMPLE_YAML = """istat_sdmx:
   protocol: sdmx
   verdict: go
   observation_mode: catalog-watch
@@ -263,17 +277,19 @@ def test_load_inventory_report(self, mock_get):
         result = load_inventory_report()
         assert result["sources"]["istat_sdmx"]["rows"] == 4849
 
-    @patch("sources._HTTP.get", return_value=_resp(CATALOG_SAMPLE))
+    @patch("sources._HTTP.get", return_value=_resp(REGISTRY_SAMPLE))
     def test_load_catalog(self, mock_get):
         result = load_catalog()
         assert len(result["datasets"]) == 1
 
-    @patch("sources._HTTP.get", return_value=_resp(PIPELINE_SAMPLE))
+    @patch("sources._HTTP.get", return_value=_resp(REGISTRY_SAMPLE))
     def test_load_signals(self, mock_get):
         result = load_signals()
         assert len(result["signals"]) == 1
+        # il blocco run del registry viene esposto come run (status normalizzato)
+        assert result["signals"][0]["run"]["status"] == "passed"
 
-    @patch("sources._HTTP.get", return_value=_yaml_resp(REGISTRY_SAMPLE))
+    @patch("sources._HTTP.get", return_value=_yaml_resp(REGISTRY_SAMPLE_YAML))
     def test_load_sources_registry(self, mock_get):
         result = load_sources_registry()
         assert result["istat_sdmx"]["verdict"] == "go"