Replace NSD toggle with RadioButtonGroup, hide dataset dropdown when no compare data

scripts/explorer_app.py

@@ -57,7 +57,7 @@ from bokeh.events import MouseMove
 from bokeh.models import (
     ColumnDataSource, HoverTool, Div, Select, TextInput, Button,
     DataTable, TableColumn, NumberFormatter, IntEditor, NumberEditor,
-    Slider, Toggle, CustomJS,
+    Slider, Toggle, RadioButtonGroup, CustomJS,
 )
 from bokeh.plotting import figure
 from bokeh.palettes import Turbo256
@@ -1571,12 +1571,10 @@ HAS_NSD_SUBSET = False
 nsd_top_img_idx = nsd_top_img_act = nsd_mean_img_idx = nsd_mean_img_act = None
 nsd_top_heatmaps = nsd_mean_heatmaps = None
 _nsd_clip_embeds = None
-nsd_subset_toggle = Toggle(
-    label="NSD Subset (sub01)",
-    active=False,
-    visible=True,
-    width=160,
-    button_type="success",
+nsd_subset_toggle = RadioButtonGroup(
+    labels=["All images", "NSD sub01"],
+    active=0,
+    width=220,
 )
 
 N_DISPLAY = 9
@@ -1676,7 +1674,7 @@ def update_feature_display(feature_idx):
                 return (ph, f"Error: {e}")
 
         # --- Top images ---
-        _use_nsd = nsd_subset_toggle.active and HAS_NSD_SUBSET
+        _use_nsd = nsd_subset_toggle.active == 1 and HAS_NSD_SUBSET
         _top_idx  = nsd_top_img_idx  if _use_nsd else top_img_idx
         _top_act  = nsd_top_img_act  if _use_nsd else top_img_act
         _mean_idx = nsd_mean_img_idx if _use_nsd else mean_img_idx
@@ -2480,7 +2478,7 @@ def _build_clip_panel():
         elif _clip_embeds is not None or _nsd_clip_embeds is not None:
             # Free-text: encode on-the-fly with CLIP, dot with feature image embeds.
             # Use NSD-specific embeds when the subset toggle is active.
-            _use_nsd_embeds = nsd_subset_toggle.active and _nsd_clip_embeds is not None
+            _use_nsd_embeds = nsd_subset_toggle.active == 1 and _nsd_clip_embeds is not None
             _active_embeds  = _nsd_clip_embeds if _use_nsd_embeds else _clip_embeds
             result_div.text = "<i>Encoding query with CLIP…</i>"
             try:
@@ -2498,7 +2496,7 @@ def _build_clip_panel():
             return
 
         # When NSD subset toggle is active, restrict to features with at least one NSD image
-        if nsd_subset_toggle.active and HAS_NSD_SUBSET:
+        if nsd_subset_toggle.active == 1 and HAS_NSD_SUBSET:
             nsd_mask = nsd_top_img_idx[:, 0] >= 0   # (d_model,) bool
             scores_vec = scores_vec.clone()
             scores_vec[~nsd_mask] = float('-inf')
@@ -2514,7 +2512,7 @@ def _build_clip_panel():
             phi_c_val=_phi_c_vals(top_indices),
             name=[_display_name(int(i)) for i in top_indices],
         )
-        _subset_note = " [NSD sub01]" if (nsd_subset_toggle.active and HAS_NSD_SUBSET) else ""
+        _subset_note = " [NSD sub01]" if (nsd_subset_toggle.active == 1 and HAS_NSD_SUBSET) else ""
         result_div.text = (
             f'<span style="color:#1a6faf"><b>{len(top_indices)}</b> features for '
             f'&ldquo;{query}&rdquo;{_subset_note}</span>'
@@ -2588,13 +2586,17 @@ summary_section     = _make_collapsible("SAE Summary",          summary_div)
 patch_section       = _make_collapsible("Patch Explorer",       patch_explorer_panel)
 clip_section        = _make_collapsible("CLIP Text Search",     clip_search_panel)
 
-left_panel = column(dataset_select, controls, umap_fig, feature_list_panel)
+_ds_select_row = ([dataset_select] if len(_all_datasets) > 1 and args.compare_data else [])
+left_panel = column(*_ds_select_row, controls, umap_fig, feature_list_panel)
 
 middle_panel = column(
     status_div,
     stats_div,
     name_panel,
-    row(view_select, nsd_subset_toggle, zoom_slider, heatmap_alpha_slider),
+    row(view_select,
+        column(Div(text="<b>Images:</b>", width=60, height=15, styles={"padding-top":"5px"}),
+               nsd_subset_toggle),
+        zoom_slider, heatmap_alpha_slider),
     compare_agg_div,
     top_heatmap_div,
     mean_heatmap_div,