scatter3d-anywidget 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

scatter3d/scatter3d.py

@@ -519,6 +519,9 @@ class Scatter3dWidget(anywidget.AnyWidget):
         super().__init__()
         self._category_cb_id: int | None = None
 
+        # Guard to suppress trait observers during multi-traitlet sync bursts
+        self._syncing_category = False
+
         if category is not None and xyz.shape[0] != category.num_values:
             raise ValueError(
                 f"The number of points ({xyz.shape[0]}) should match "
@@ -629,24 +632,30 @@ class Scatter3dWidget(anywidget.AnyWidget):
 
     @traitlets.observe("active_category_t")
     def _on_active_category_t(self, change) -> None:
-        if self.interaction_mode_t == "lasso" and change.get("new") is None:
-            # NOTE: traitlets bypasses @validate(...) when allow_none=True.
-            # In lasso mode, clearing is a hard error (no silent fallback).
+        old = change.get("old")
+        new = change.get("new")
+
+        # Keep your existing policy/logic:
+        if self.interaction_mode_t == "lasso" and new is None:
             old = change.get("old")
             if old is not None:
-                # restore previous valid value to keep state consistent
                 self.set_trait("active_category_t", old)
             raise traitlets.TraitError("active_category_t cannot be None in lasso mode")
 
     @traitlets.observe("labels_t")
     def _on_labels_t(self, change) -> None:
-        if self.interaction_mode_t == "lasso":
-            self._ensure_active_category_invariants()
-        elif self.active_category_t is not None and self.active_category_t not in (
+        # During category sync we temporarily allow intermediate inconsistent states.
+        if getattr(self, "_syncing_category", False):
+            return
+
+        # After our new policy, we should never be in lasso mode during a category switch,
+        # and active_category_t should be None. Still, be defensive: never crash.
+        if self.active_category_t is not None and self.active_category_t not in (
             change.get("new") or []
         ):
-            # in rotate mode, invalid active is a real error
-            raise RuntimeError(...)
+            self.active_category_t = None
+            if self.interactive_ready_t:
+                self.send_state("active_category_t")
 
     @traitlets.observe("client_ready_t")
     def _on_client_ready_t(self, change) -> None:
@@ -735,11 +744,9 @@ class Scatter3dWidget(anywidget.AnyWidget):
                 )
             return v
 
-        # rotate mode
+        # rotate mode: do not crash on stale frontend values
         if labels and v not in labels:
-            raise traitlets.TraitError(
-                f"active_category_t={v!r} is not present in labels_t"
-            )
+            return None
         return v
 
     @property
@@ -855,46 +862,47 @@ class Scatter3dWidget(anywidget.AnyWidget):
         if self._category is None:
             raise RuntimeError("The category should be set")
 
-        cat = self._category
-
-        # labels_t must be JSON-friendly; enforce str
-        labels = [str(lbl) for lbl in cat.label_list]
-        self.labels_t = labels
+        self._syncing_category = True
+        try:
+            cat = self._category
 
-        self.category_editable_t = cat.editable
+            # labels_t must be JSON-friendly; enforce str
+            labels = [str(lbl) for lbl in cat.label_list]
+            self.labels_t = labels
 
-        if not self.category_editable_t and self.interaction_mode_t == "lasso":
-            self.interaction_mode_t = "rotate"
-            if self.interactive_ready_t:
-                self.send_state("interaction_mode_t")
-
-        # coded values: uint16 bytes, length N
-        coded = cat.coded_values
-        if coded.shape[0] != self.num_points:
-            raise RuntimeError(
-                f"Category has {coded.shape[0]} values but xyz has {self.num_points} points"
-            )
-        self.coded_values_t = self._pack_u16_c(coded)
+            self.category_editable_t = cat.editable
 
-        # colors aligned with labels order
-        # Category stores palette keyed by original labels; we reconstruct in label_list order.
-        palette = cat.color_palette  # label -> (r,g,b)
-        self.colors_t = [list(map(float, palette[lbl])) for lbl in cat.label_list]
+            # coded values: uint16 bytes, length N
+            coded = cat.coded_values
+            if coded.shape[0] != self.num_points:
+                raise RuntimeError(
+                    f"Category has {coded.shape[0]} values but xyz has {self.num_points} points"
+                )
+            self.coded_values_t = self._pack_u16_c(coded)
 
-        # missing color
-        self.missing_color_t = list(map(float, cat.missing_color))
+            # colors aligned with labels order
+            palette = cat.color_palette  # label -> (r,g,b)
+            self.colors_t = [list(map(float, palette[lbl])) for lbl in cat.label_list]
 
-        if len(self.colors_t) != len(self.labels_t):
-            raise RuntimeError(
-                "Internal error: colors_t length must match labels_t length"
-            )
+            # missing color
+            self.missing_color_t = list(map(float, cat.missing_color))
 
-        self._ensure_active_category_invariants()
+            if len(self.colors_t) != len(self.labels_t):
+                raise RuntimeError(
+                    "Internal error: colors_t length must match labels_t length"
+                )
+        finally:
+            self._syncing_category = False
 
     def _get_category(self):
         return self._category
 
     def _set_category(self, category: Category) -> None:
+        # Idempotence: marimo may re-run cells and re-assign the same Category.
+        # That must be a no-op (must not clear active category, mode, etc).
+        if category is self._category:
+            return
+
         if self._xyz is not None and category.num_values != self.num_points:
             raise ValueError(
                 f"The number of values in the category ({category.num_values}) "
@@ -904,6 +912,19 @@ class Scatter3dWidget(anywidget.AnyWidget):
             self._category.unsubscribe(self._category_cb_id)
 
         self._category = category
+
+        # POLICY: changing the category object resets interaction to rotate and clears active.
+        # This must NOT run on Category mutations (coded values edits, palette tweaks, etc.).
+        if self.interaction_mode_t != "rotate":
+            self.interaction_mode_t = "rotate"
+            if self.interactive_ready_t:
+                self.send_state("interaction_mode_t")
+
+        if self.active_category_t is not None:
+            self.active_category_t = None
+            if self.interactive_ready_t:
+                self.send_state("active_category_t")
+
         # Subscribe to new category
         self._category_cb_id = category.subscribe(self._on_category_changed)
         self._sync_traitlets_from_category()