Restore hover tooltips with robust row-index mapping

app.py

@@ -72,6 +72,41 @@ def _choice_label_with_source_meta(tag: str, *, origin: str, preselected: bool)
     return _display_tag_text(tag)
 
 
+@lru_cache(maxsize=1)
+def _load_tag_wiki_defs() -> Dict[str, str]:
+    p = Path("data/tag_wiki_defs.json")
+    if not p.exists():
+        return {}
+    try:
+        with p.open("r", encoding="utf-8") as f:
+            data = json.load(f)
+        out: Dict[str, str] = {}
+        if isinstance(data, dict):
+            for k, v in data.items():
+                tag = _norm_tag_for_lookup(str(k))
+                text = " ".join(str(v or "").split())
+                if tag and text:
+                    out[tag] = text
+        return out
+    except Exception:
+        return {}
+
+
+def _tooltip_text_for_tag(tag: str) -> str:
+    t = _norm_tag_for_lookup(tag)
+    parts: List[str] = []
+    try:
+        count = get_tag_counts().get(t)
+    except Exception:
+        count = None
+    if isinstance(count, int):
+        parts.append(f"Count: {count:,}")
+    d = _load_tag_wiki_defs().get(t, "")
+    if d:
+        parts.append(d)
+    return "\n".join(parts).strip()
+
+
 def _selection_source_rank(origin: str) -> int:
     o = _normalize_selection_origin(origin)
     if o == "structural":
@@ -562,10 +597,23 @@ def _build_display_audit_line(
             }
             for tag, rec in sorted(info_by_tag.items())
         ],
-    }
+    }
     return "Display Tag Audit: " + json.dumps(payload, ensure_ascii=True)
 
 
+def _build_tooltip_payload(row_defs: List[Dict[str, Any]], max_rows: int) -> str:
+    row_defs_ui = (row_defs or [])[: max(0, int(max_rows))]
+    tips: Dict[str, str] = {}
+    rows: List[List[str]] = []
+    for row in row_defs_ui:
+        tags = _dedupe_norm_tags(row.get("tags", []) if isinstance(row, dict) else [])
+        rows.append(tags)
+        for t in tags:
+            if t not in tips:
+                tips[t] = _tooltip_text_for_tag(t)
+    return json.dumps({"rows": rows, "tips": tips}, ensure_ascii=True)
+
+
 def _build_row_component_updates(
     row_defs: List[Dict[str, Any]],
     selected_tags: List[str],
@@ -713,9 +761,11 @@ def _build_ui_payload(
                 continue
             selected_ui_seen.add(t)
             selected_ui.append(t)
+    tooltip_payload = _build_tooltip_payload(row_defs, display_max_rows_default)
     return [
         console_text,
         gr.update(visible=bool(row_defs)),
+        tooltip_payload,
         prompt_text,
         selected_ui,
         False,
@@ -736,6 +786,7 @@ def _prepare_run_ui() -> List[Any]:
     return [
         "Running...",
         gr.skip(),
+        "{}",
         "Running... usually completes in about 20 seconds.",
         [],
         False,
@@ -747,6 +798,18 @@ def _prepare_run_ui() -> List[Any]:
     ]
 
 
+def _update_run_button_visibility(prompt_text: str, last_run_prompt: str):
+    curr = (prompt_text or "").strip()
+    last = (last_run_prompt or "").strip()
+    can_run = bool(curr) and curr != last
+    return gr.update(visible=can_run, interactive=can_run)
+
+
+def _mark_run_triggered(prompt_text: str):
+    curr = (prompt_text or "").strip()
+    return gr.update(visible=False, interactive=False), curr
+
+
 def _rebuild_rows_from_selected(
     selected_tags_state: List[str],
     row_defs_state: List[Dict[str, Any]],
@@ -820,9 +883,11 @@ def _rebuild_rows_from_selected(
         selected_tags=selected_active,
         max_rows=display_max_rows_default,
     )
+    tooltip_payload = _build_tooltip_payload(toggle_rows, display_max_rows_default)
 
     return [
         gr.update(visible=bool(toggle_rows)),
+        tooltip_payload,
         prompt_text,
         sorted(selected_active),
         False,
@@ -1252,10 +1317,67 @@ css = """
 .suggested-prompt-card {
   margin-top: 10px !important;
 }
+
+.psq-hidden {
+  display: none !important;
+}
 """
 
 client_js = """
-() => {}
+() => {
+  const readTooltipMap = () => {
+    const el = document.querySelector("#psq-tooltip-map textarea, #psq-tooltip-map input");
+    if (!el) return { rows: [], tips: {} };
+    const raw = (el.value || "").trim();
+    if (!raw) return { rows: [], tips: {} };
+    try {
+      const obj = JSON.parse(raw);
+      if (!obj || typeof obj !== "object") return { rows: [], tips: {} };
+      const rows = Array.isArray(obj.rows) ? obj.rows : [];
+      const tips = (obj.tips && typeof obj.tips === "object") ? obj.tips : {};
+      return { rows, tips };
+    } catch (_) {
+      return { rows: [], tips: {} };
+    }
+  };
+
+  const applyTooltips = () => {
+    const payload = readTooltipMap();
+    const rowTags = Array.isArray(payload.rows) ? payload.rows : [];
+    const tipMap = (payload.tips && typeof payload.tips === "object") ? payload.tips : {};
+    const rowEls = document.querySelectorAll(".lego-tags");
+    rowEls.forEach((rowEl, rowIdx) => {
+      const tags = Array.isArray(rowTags[rowIdx]) ? rowTags[rowIdx] : [];
+      const labels = rowEl.querySelectorAll("label");
+      labels.forEach((label, tagIdx) => {
+        const span = label.querySelector("span");
+        const tag = (tagIdx < tags.length) ? tags[tagIdx] : "";
+        const tip = tag && Object.prototype.hasOwnProperty.call(tipMap, tag) ? (tipMap[tag] || "") : "";
+        if (tip) {
+          label.title = tip;
+          if (span) span.title = tip;
+        } else {
+          label.removeAttribute("title");
+          if (span) span.removeAttribute("title");
+        }
+      });
+    });
+  };
+
+  let scheduled = false;
+  const scheduleApply = () => {
+    if (scheduled) return;
+    scheduled = true;
+    requestAnimationFrame(() => {
+      scheduled = false;
+      applyTooltips();
+    });
+  };
+
+  scheduleApply();
+  const observer = new MutationObserver(() => scheduleApply());
+  observer.observe(document.body, { childList: true, subtree: true });
+}
 """
 
 
@@ -1791,9 +1913,10 @@ with gr.Blocks(css=css, js=client_js) as app:
                 )
             else:
                 mascot_img = gr.Markdown("`(mascot image unavailable)`")
-            submit_button = gr.Button("Run", variant="primary")
+            submit_button = gr.Button("Run", variant="primary", visible=False, interactive=False)
             gr.Markdown("Typical runtime: up to ~20 seconds.", elem_classes=["run-hint"])
-
+
+    last_run_prompt_state = gr.State("")
     selected_tags_state = gr.State([])
     rows_dirty_state = gr.State(False)
     row_defs_state = gr.State([])
@@ -1874,10 +1997,19 @@ with gr.Blocks(css=css, js=client_js) as app:
             interactive=False,
             placeholder="Progress logs will appear here."
         )
+    tooltip_map_payload = gr.Textbox(
+        value="{}",
+        visible=True,
+        interactive=False,
+        container=False,
+        elem_id="psq-tooltip-map",
+        elem_classes=["psq-hidden"],
+    )
 
     run_outputs = [
         console,
         toggle_instruction,
+        tooltip_map_payload,
         suggested_prompt,
         selected_tags_state,
         rows_dirty_state,
@@ -1888,7 +2020,21 @@ with gr.Blocks(css=css, js=client_js) as app:
         *row_checkboxes,
     ]
 
+    image_tags.change(
+        _update_run_button_visibility,
+        inputs=[image_tags, last_run_prompt_state],
+        outputs=[submit_button],
+        queue=False,
+        show_progress="hidden",
+    )
+
     submit_button.click(
+        _mark_run_triggered,
+        inputs=[image_tags],
+        outputs=[submit_button, last_run_prompt_state],
+        queue=False,
+        show_progress="hidden",
+    ).then(
         _prepare_run_ui,
         inputs=[],
         outputs=run_outputs,
@@ -1901,6 +2047,12 @@ with gr.Blocks(css=css, js=client_js) as app:
     )
 
     image_tags.submit(
+        _mark_run_triggered,
+        inputs=[image_tags],
+        outputs=[submit_button, last_run_prompt_state],
+        queue=False,
+        show_progress="hidden",
+    ).then(
         _prepare_run_ui,
         inputs=[],
         outputs=run_outputs,
@@ -1934,6 +2086,7 @@ with gr.Blocks(css=css, js=client_js) as app:
         inputs=[selected_tags_state, row_defs_state, row_values_state, display_top_groups, display_top_tags_per_group, display_rank_top_k],
         outputs=[
             toggle_instruction,
+            tooltip_map_payload,
             suggested_prompt,
             selected_tags_state,
             rows_dirty_state,