Upload app.py

app.py

@@ -31,6 +31,7 @@ from quread.metrics import (
     MetricWeights,
     MetricThresholds,
 )
+from quread.layout_mapper import parse_layout_csv_text
 
 # --- Qubit cap (configurable) ---
 DEFAULT_MAX_QUBITS = 16  # safe default for CPU Spaces; change if you want
@@ -76,6 +77,51 @@ def _write_tmp(filename: str, content: str) -> str:
         return f.name
 
 
+def _read_uploaded_text(uploaded_file) -> str:
+    if uploaded_file is None:
+        return ""
+
+    if isinstance(uploaded_file, bytes):
+        return uploaded_file.decode("utf-8", errors="replace")
+    if isinstance(uploaded_file, str):
+        path = pathlib.Path(uploaded_file)
+        if path.exists():
+            return path.read_text(encoding="utf-8", errors="replace")
+        return ""
+
+    if isinstance(uploaded_file, dict):
+        raw = uploaded_file.get("data")
+        if isinstance(raw, bytes):
+            return raw.decode("utf-8", errors="replace")
+        maybe_path = uploaded_file.get("name") or uploaded_file.get("path")
+        if maybe_path:
+            path = pathlib.Path(str(maybe_path))
+            if path.exists():
+                return path.read_text(encoding="utf-8", errors="replace")
+        return ""
+
+    maybe_path = getattr(uploaded_file, "name", None)
+    if maybe_path:
+        path = pathlib.Path(str(maybe_path))
+        if path.exists():
+            return path.read_text(encoding="utf-8", errors="replace")
+
+    raw = getattr(uploaded_file, "data", None)
+    if isinstance(raw, bytes):
+        return raw.decode("utf-8", errors="replace")
+    return ""
+
+
+def _resolve_layout_coords(layout_file, n_qubits, rows, cols):
+    layout_text = _read_uploaded_text(layout_file)
+    return parse_layout_csv_text(
+        layout_text,
+        int(n_qubits),
+        rows=int(rows),
+        cols=int(cols),
+    )
+
+
 def _circuit_hash(history):
     return hashlib.sha256(str(history).encode()).hexdigest()
 
@@ -238,13 +284,19 @@ def _metric_controls_to_models(
     return weights, thresholds
 
 
-def _hotspot_rows(metrics, n_qubits, top_k):
+def _hotspot_rows(metrics, n_qubits, top_k, qubit_coords=None):
     rows = []
     n = int(n_qubits)
     for q in range(n):
         risk = float(metrics["composite_risk"][q])
         level = int(metrics["hotspot_level"][q])
         status = "critical" if level == 2 else ("warning" if level == 1 else "ok")
+        layout_row = ""
+        layout_col = ""
+        if qubit_coords and q in qubit_coords:
+            rr, cc = qubit_coords[q]
+            layout_row = int(rr)
+            layout_col = int(cc)
         rows.append(
             [
                 q,
@@ -258,6 +310,8 @@ def _hotspot_rows(metrics, n_qubits, top_k):
                 round(float(metrics["coherence_health"][q]), 6),
                 round(float(metrics["decoherence_risk"][q]), 6),
                 round(float(metrics["fidelity"][q]), 6),
+                layout_row,
+                layout_col,
             ]
         )
     rows.sort(key=lambda x: x[2], reverse=True)
@@ -265,7 +319,7 @@ def _hotspot_rows(metrics, n_qubits, top_k):
     return rows[:k]
 
 
-def _hotspot_detail_markdown(metrics, meta, n_qubits, focus_qubit):
+def _hotspot_detail_markdown(metrics, meta, n_qubits, focus_qubit, qubit_coords=None):
     n = int(n_qubits)
     if n < 1:
         return "No qubits available."
@@ -279,6 +333,10 @@ def _hotspot_detail_markdown(metrics, meta, n_qubits, focus_qubit):
     thr_warning = float(getattr(thresholds, "warning", 0.45))
     thr_critical = float(getattr(thresholds, "critical", 0.70))
     fidelity_backend = str(meta.get("fidelity_backend", "unknown"))
+    coord_line = ""
+    if qubit_coords and q in qubit_coords:
+        rr, cc = qubit_coords[q]
+        coord_line = f"- Layout coordinate: row={int(rr)}, col={int(cc)}\n"
 
     return (
         f"### Hotspot Detail: q{q}\n"
@@ -286,6 +344,7 @@ def _hotspot_detail_markdown(metrics, meta, n_qubits, focus_qubit):
         f"- Composite risk: **{risk:.6f}**\n"
         f"- Thresholds: warning={thr_warning:.2f}, critical={thr_critical:.2f}\n"
         f"- Fidelity backend: `{fidelity_backend}`\n"
+        f"{coord_line}"
         f"- Activity count: {float(metrics['activity_count'][q]):.3f}\n"
         f"- Gate error: {float(metrics['gate_error'][q]):.6f}\n"
         f"- Readout error: {float(metrics['readout_error'][q]):.6f}\n"
@@ -573,6 +632,13 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
                                         label="Calibration JSON (optional)",
                                         placeholder='{"qubits":{"0":{"gate_error":0.012,"readout_error":0.02,"t1_us":82,"t2_us":61,"fidelity":0.991}}}',
                                     )
+                                with gr.Accordion("Physical Layout Mapper", open=False):
+                                    layout_csv_file = gr.File(
+                                        label="Layout CSV (optional): qubit,row,col",
+                                        file_types=[".csv"],
+                                        type="filepath",
+                                    )
+                                    gr.Markdown("<div class='small-note'>Accepted aliases: qubit_id/q/id and row(r/y), col(c/x).</div>")
                                 with gr.Accordion("Advanced Weights & Thresholds", open=False):
                                     gr.Markdown("<div class='small-note'>Composite risk weights are normalized automatically.</div>")
                                     with gr.Row():
@@ -610,6 +676,8 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
                                         "coherence_health",
                                         "decoherence_risk",
                                         "fidelity",
+                                        "layout_row",
+                                        "layout_col",
                                     ],
                                     interactive=False,
                                     label="Hotspot ranking (highest composite risk first)",
@@ -756,6 +824,9 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
     def _dl_synopsys_tcl(
         qc,
         n_qubits,
+        rows,
+        cols,
+        layout_file,
         calibration_text,
         activity_w,
         gate_error_w,
@@ -783,15 +854,25 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
             weights=weights,
             thresholds=thresholds,
         )
+        qubit_coords, _layout_meta = _resolve_layout_coords(
+            layout_file,
+            int(n_qubits),
+            int(rows),
+            int(cols),
+        )
         mapping = build_eda_mapping(
             metrics,
             cfg=None,
+            qubit_coords=qubit_coords,
         )
         return _write_tmp("quread_risk_synopsys.tcl", to_synopsys_tcl(mapping))
 
     def _dl_cadence_skill(
         qc,
         n_qubits,
+        rows,
+        cols,
+        layout_file,
         calibration_text,
         activity_w,
         gate_error_w,
@@ -819,9 +900,16 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
             weights=weights,
             thresholds=thresholds,
         )
+        qubit_coords, _layout_meta = _resolve_layout_coords(
+            layout_file,
+            int(n_qubits),
+            int(rows),
+            int(cols),
+        )
         mapping = build_eda_mapping(
             metrics,
             cfg=None,
+            qubit_coords=qubit_coords,
         )
         return _write_tmp("quread_risk_cadence.il", to_cadence_skill_reliability(mapping))
 
@@ -838,6 +926,7 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
         cols,
         metric,
         render_mode,
+        layout_file,
         calibration_text,
         activity_w,
         gate_error_w,
@@ -864,6 +953,12 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
         threshold_value = None if float(metric_thr) <= 0 else float(metric_thr)
         render_choice = str(render_mode or "interactive").strip().lower()
         notes = []
+        qubit_coords, layout_meta = _resolve_layout_coords(
+            layout_file,
+            int(n_qubits),
+            int(rows),
+            int(cols),
+        )
 
         if render_choice == "interactive":
             if plotly_available():
@@ -877,6 +972,7 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
                     weights=weights,
                     thresholds=thresholds,
                     highlight_threshold=threshold_value,
+                    qubit_coords=qubit_coords,
                 )
             else:
                 fig = make_metric_heatmap(
@@ -889,6 +985,7 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
                     weights=weights,
                     thresholds=thresholds,
                     highlight_threshold=threshold_value,
+                    qubit_coords=qubit_coords,
                 )
                 notes.append("Plotly unavailable in this runtime; using static heatmap.")
         else:
@@ -902,6 +999,7 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
                 weights=weights,
                 thresholds=thresholds,
                 highlight_threshold=threshold_value,
+                qubit_coords=qubit_coords,
             )
 
         metrics, meta = compute_metrics_from_csv(
@@ -912,8 +1010,23 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
             weights=weights,
             thresholds=thresholds,
         )
-        hotspot_rows = _hotspot_rows(metrics, int(n_qubits), int(top_k))
+        hotspot_rows = _hotspot_rows(
+            metrics,
+            int(n_qubits),
+            int(top_k),
+            qubit_coords=qubit_coords,
+        )
         note = notes
+        if layout_meta.get("source") == "uploaded":
+            note.append(
+                "Layout map uploaded: "
+                f"mapped={int(layout_meta.get('mapped', 0))}, "
+                f"fallback={int(layout_meta.get('fallback', 0))}, "
+                f"skipped={int(layout_meta.get('skipped', 0))}, "
+                f"duplicates={int(layout_meta.get('duplicates', 0))}"
+            )
+        else:
+            note.append("Layout map: using default row-major mapping.")
         skipped = int(meta.get("skipped_rows", 0))
         if skipped:
             note.append(f"Skipped malformed CSV rows: {skipped}")
@@ -924,7 +1037,13 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
         if fidelity_backend:
             note.append(f"Fidelity backend: {fidelity_backend}")
         summary = " | ".join(note) if note else "Hotspot ranking updated."
-        detail_md = _hotspot_detail_markdown(metrics, meta, int(n_qubits), int(focus_qubit))
+        detail_md = _hotspot_detail_markdown(
+            metrics,
+            meta,
+            int(n_qubits),
+            int(focus_qubit),
+            qubit_coords=qubit_coords,
+        )
         detail_fig = _hotspot_detail_plot(metrics, meta, int(n_qubits), int(focus_qubit))
         return fig, summary, hotspot_rows, detail_md, detail_fig
 
@@ -969,6 +1088,7 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
             chip_cols,
             heat_metric,
             heat_render_mode,
+            layout_csv_file,
             calibration_json,
             w_activity,
             w_gate,
@@ -1006,6 +1126,9 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
         inputs=[
             qc_state,
             n_qubits,
+            chip_rows,
+            chip_cols,
+            layout_csv_file,
             calibration_json,
             w_activity,
             w_gate,
@@ -1023,6 +1146,9 @@ with gr.Blocks(theme=theme, css=CSS, title="Quread.ai — State Vector Studio")
         inputs=[
             qc_state,
             n_qubits,
+            chip_rows,
+            chip_cols,
+            layout_csv_file,
             calibration_json,
             w_activity,
             w_gate,