Port selection handlers to use widgets where possible. Add LLMSummary for general LLMs.

Author: lmcinnes

datamapplot/__init__.py

@@ -29,6 +29,7 @@
     DisplaySample,
     WordCloud,
     CohereSummary,
+    LLMSummary,
     TagSelection,
     DataTable,
     ExportSelection,
@@ -71,6 +72,7 @@
     "DisplaySample",
     "WordCloud",
     "CohereSummary",
+    "LLMSummary",
     "TagSelection",
     "DataTable",
     "ExportSelection",

datamapplot/interactive_helpers.py

@@ -2686,50 +2686,49 @@ def prepare_selection_handler(selection_handler, custom_html, custom_js, custom_
     Returns
     -------
     tuple
-        (custom_html, custom_js, custom_css) with handler content merged.
+        (custom_html, custom_js, custom_css, handler_widgets) with handler
+        content merged.  ``handler_widgets`` is a list of widget instances
+        owned by the handlers (may be empty).
     """
-    if selection_handler is None:
-        return custom_html, custom_js, custom_css
+    handler_widgets = []
 
-    if isinstance(selection_handler, Iterable) and not isinstance(
-        selection_handler, SelectionHandlerBase
-    ):
-        for handler in selection_handler:
-            if custom_html is None:
-                custom_html = handler.html
-            else:
-                custom_html += handler.html
-
-            if custom_js is None:
-                custom_js = handler.javascript
-            else:
-                custom_js += handler.javascript
+    if selection_handler is None:
+        return custom_html, custom_js, custom_css, handler_widgets
 
-            if custom_css is None:
-                custom_css = handler.css
-            else:
-                custom_css += handler.css
-    elif isinstance(selection_handler, SelectionHandlerBase):
+    def _process_one(handler):
+        nonlocal custom_html, custom_js, custom_css
         if custom_html is None:
-            custom_html = selection_handler.html
+            custom_html = handler.html
         else:
-            custom_html += selection_handler.html
+            custom_html += handler.html
 
         if custom_js is None:
-            custom_js = selection_handler.javascript
+            custom_js = handler.javascript
         else:
-            custom_js += selection_handler.javascript
+            custom_js += handler.javascript
 
         if custom_css is None:
-            custom_css = selection_handler.css
+            custom_css = handler.css
         else:
-            custom_css += selection_handler.css
+            custom_css += handler.css
+
+        # Collect any widgets owned by this handler
+        if hasattr(handler, "widgets"):
+            handler_widgets.extend(handler.widgets)
+
+    if isinstance(selection_handler, Iterable) and not isinstance(
+        selection_handler, SelectionHandlerBase
+    ):
+        for handler in selection_handler:
+            _process_one(handler)
+    elif isinstance(selection_handler, SelectionHandlerBase):
+        _process_one(selection_handler)
     else:
         raise ValueError(
             "selection_handler must be an instance of SelectionHandlerBase or an iterable of SelectionHandlerBase instances"
         )
 
-    return custom_html, custom_js, custom_css
+    return custom_html, custom_js, custom_css, handler_widgets
 
 
 def prepare_dynamic_tooltip(dynamic_tooltip):

datamapplot/interactive_rendering.py

@@ -228,6 +228,22 @@
 ]
 
 
+def _collect_handler_widgets(selection_handler):
+    """Return a flat list of widgets owned by the given selection handler(s)."""
+    widgets = []
+    if selection_handler is None:
+        return widgets
+    handlers = (
+        selection_handler
+        if isinstance(selection_handler, (list, tuple))
+        else [selection_handler]
+    )
+    for handler in handlers:
+        if hasattr(handler, "widgets"):
+            widgets.extend(handler.widgets)
+    return widgets
+
+
 def _get_jinja_env():
     """Get a Jinja2 Environment configured with template directories.
 
@@ -1254,6 +1270,7 @@ def render_html(
             widgets is not None
             or widget_layout is not None
             or default_widget_config is not None
+            or len(_collect_handler_widgets(selection_handler)) > 0
         )
 
     # Initialize widget containers
@@ -1323,6 +1340,12 @@ def render_html(
                 logo_width=logo_width,
             )
 
+        # Collect widgets owned by selection handlers and add them to
+        # the widget list *before* grouping so that drawer enablement
+        # and placement are handled through the normal widget pipeline.
+        handler_widgets = _collect_handler_widgets(selection_handler)
+        all_widgets += handler_widgets
+
         # Group widgets by location, applying layout overrides
         widgets_by_location = group_widgets_by_location(all_widgets, merged_layout)
 
@@ -1430,8 +1453,10 @@ def render_html(
     font_data = font_result["font_data"]
     api_tooltip_fontname = font_result["api_tooltip_fontname"]
 
-    # Process selection handler(s)
-    custom_html, custom_js, custom_css = prepare_selection_handler(
+    # Process selection handler(s) — handler-owned widgets were already
+    # injected into ``all_widgets`` above so they are rendered inside the
+    # correct drawer / stack containers by the template.
+    custom_html, custom_js, custom_css, _handler_widgets = prepare_selection_handler(
         selection_handler, custom_html, custom_js, custom_css
     )