Sync explorer_app.py and clip_utils.py from main repo

scripts/explorer_app.py

@@ -649,14 +649,14 @@ def make_compare_aggregations_html(top_infos, mean_infos, p75_infos, feat, n_eac
     return html
 
 
-def make_cross_sae_comparison_html(ds_a, feat_a, ds_b, feat_b, n=4, size=160):
+def make_cross_sae_comparison_html(ds_a, feat_a, ds_b, feat_b, n=4, size=160, alpha=1.0):
     """
     Two side-by-side 2×2 grids: left = SAE A / feat_a, right = SAE B / feat_b.
     """
     def _collect(ds, feat):
         items = []
         for slot in range(min(n, ds['top_img_idx'].shape[1])):
-            result = _render_overlay_from_ds(ds, feat, slot, size=size)
+            result = _render_overlay_from_ds(ds, feat, slot, size=size, alpha=alpha)
             if result:
                 items.append(result)
             if len(items) == n:
@@ -1889,10 +1889,28 @@ cmp_feat_a = TextInput(title="Feature (SAE A):", value="0", width=100)
 cmp_ds_b = Select(title="SAE B:", value=str(min(1, len(_all_datasets)-1)),
     options=[(str(i), ds['label']) for i, ds in enumerate(_all_datasets)])
 cmp_feat_b = TextInput(title="Feature (SAE B):", value="0", width=100)
+cmp_alpha_slider = Slider(title="Heatmap opacity", value=1.0, start=0.0, end=1.0, step=0.05, width=220)
 cmp_btn = Button(label="Generate Comparison", button_type="primary", width=200)
 cmp_output_div = Div(text="", width=400)
 
 def _on_cmp_generate():
+    if not cmp_output_div.text:
+        return
+    try:
+        idx_a = int(cmp_ds_a.value)
+        idx_b = int(cmp_ds_b.value)
+        fa = int(cmp_feat_a.value)
+        fb = int(cmp_feat_b.value)
+        _ensure_loaded(idx_a)
+        _ensure_loaded(idx_b)
+        ds_a = _all_datasets[idx_a]
+        ds_b = _all_datasets[idx_b]
+        cmp_output_div.text = make_cross_sae_comparison_html(
+            ds_a, fa, ds_b, fb, alpha=cmp_alpha_slider.value)
+    except Exception as e:
+        cmp_output_div.text = f'<p style="color:red">Error: {e}</p>'
+
+def _on_cmp_btn():
     try:
         idx_a = int(cmp_ds_a.value)
         idx_b = int(cmp_ds_b.value)
@@ -1902,16 +1920,18 @@ def _on_cmp_generate():
         _ensure_loaded(idx_b)
         ds_a = _all_datasets[idx_a]
         ds_b = _all_datasets[idx_b]
-        cmp_output_div.text = make_cross_sae_comparison_html(ds_a, fa, ds_b, fb)
+        cmp_output_div.text = make_cross_sae_comparison_html(
+            ds_a, fa, ds_b, fb, alpha=cmp_alpha_slider.value)
     except Exception as e:
         cmp_output_div.text = f'<p style="color:red">Error: {e}</p>'
 
-cmp_btn.on_click(lambda: _on_cmp_generate())
+cmp_btn.on_click(lambda: _on_cmp_btn())
+cmp_alpha_slider.on_change('value', lambda attr, old, new: _on_cmp_generate())
 
 cmp_section = _make_collapsible("Cross-SAE Comparison", column(
     row(cmp_ds_a, cmp_feat_a),
     row(cmp_ds_b, cmp_feat_b),
-    cmp_btn,
+    row(cmp_alpha_slider, cmp_btn),
     cmp_output_div,
 ))