Prevent option collisions in Marimo pickers.

Disambiguate duplicate labels for recent results and connection dropdowns so entries are never dropped, and add tests for both mappings.

Author: eddietejeda

hotdata_marimo/display.py

@@ -9,6 +9,19 @@
 from hotdata_runtime.result import QueryResult
 
 
+def _option_map_with_unique_labels(
+    pairs: list[tuple[str, str]],
+) -> dict[str, str]:
+    counts: dict[str, int] = {}
+    options: dict[str, str] = {}
+    for label, value in pairs:
+        count = counts.get(label, 0)
+        counts[label] = count + 1
+        key = label if count == 0 else f"{label} ({count + 1})"
+        options[key] = value
+    return options
+
+
 def query_result(
     result: QueryResult,
     *,
@@ -61,9 +74,11 @@ def __init__(self, client: HotdataClient, *, limit: int = 50) -> None:
         self._client = client
         listing = client.results().list_results(limit=limit, offset=0)
         self._results = listing.results
-        options = {
-            f"{r.created_at} · {r.status} · {r.id}": r.id for r in self._results
-        }
+        option_pairs = [
+            (f"{r.created_at} · {r.status} · {r.id}", r.id)
+            for r in self._results
+        ]
+        options = _option_map_with_unique_labels(option_pairs)
         self.pick = mo.ui.dropdown(
             options=options or {"(no results)": ""},
             label="Recent results",

hotdata_marimo/table_browser.py

@@ -7,6 +7,18 @@
 from hotdata_runtime.client import HotdataClient
 
 
+def _connection_options(conns: list[Any]) -> dict[str, str]:
+    counts: dict[str, int] = {}
+    options: dict[str, str] = {}
+    for c in conns:
+        label = c.name
+        count = counts.get(label, 0)
+        counts[label] = count + 1
+        key = label if count == 0 else f"{label} ({c.id})"
+        options[key] = c.id
+    return options
+
+
 def connection_picker(
     client: HotdataClient,
     *,
@@ -21,7 +33,7 @@ def connection_picker(
             label=label,
             full_width=full_width,
         )
-    options = {c.name: c.id for c in conns}
+    options = _connection_options(conns)
     return mo.ui.dropdown(
         options=options,
         label=label,

tests/test_options.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from types import SimpleNamespace
+
+from hotdata_marimo.display import _option_map_with_unique_labels
+from hotdata_marimo.table_browser import _connection_options
+
+
+def test_option_map_with_unique_labels_keeps_all_values():
+    options = _option_map_with_unique_labels(
+        [("dup", "a"), ("dup", "b"), ("dup", "c")]
+    )
+    assert options == {
+        "dup": "a",
+        "dup (2)": "b",
+        "dup (3)": "c",
+    }
+
+
+def test_connection_options_disambiguates_duplicate_names():
+    conns = [
+        SimpleNamespace(name="Warehouse", id="conn_1"),
+        SimpleNamespace(name="Warehouse", id="conn_2"),
+        SimpleNamespace(name="Analytics", id="conn_3"),
+    ]
+    options = _connection_options(conns)
+    assert options == {
+        "Warehouse": "conn_1",
+        "Warehouse (conn_2)": "conn_2",
+        "Analytics": "conn_3",
+    }