plot3 0.6.6__tar.gz → 0.6.7__tar.gz

{plot3-0.6.6 → plot3-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.6
+Version: 0.6.7
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT

plot3-0.6.7/plot3/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.6.7"

{plot3-0.6.6 → plot3-0.6.7}/plot3/build.py

@@ -1970,6 +1970,9 @@ def build_spec(g: ggplot) -> tuple[dict, list[tuple[str, str]]]:
             "slider() cannot be combined with transition_time() "
             "or transition_states()"
         )
+    if slider is not None:
+        # Default steps shrink to fit while layers expand; keep that per render.
+        slider = copy.copy(slider)
     domains = None
     if any(getattr(layer, "kind", None) == "function" for layer in layers_in):
         from plot3.function import data_domains
@@ -1978,27 +1981,35 @@ def build_spec(g: ggplot) -> tuple[dict, list[tuple[str, str]]]:
     addon_map: dict[int, list] = {}
     for index, addon in getattr(g, "_addons", None) or []:
         addon_map.setdefault(int(index), []).append(addon)
-    expanded = []
-    for index, geom in enumerate(layers_in):
-        layer_data = getattr(geom, "layer_data", None)
-        if getattr(geom, "kind", None) == "box3d":
-            # Box classes take the figure theme's group colours.
-            geom = copy.copy(geom)
-            geom._palette = list(theme["cat"])
-        result = expand_stat_geom(
-            geom,
-            g.mapping,
-            data if layer_data is None else layer_data,
-            domains,
-            transition,
-            slider,
-            coord,
-            addon_map.get(index),
-        )
-        if isinstance(result, list):
-            expanded.extend(result)
-        else:
-            expanded.append(result)
+    def expand_all() -> list:
+        out = []
+        for index, geom in enumerate(layers_in):
+            layer_data = getattr(geom, "layer_data", None)
+            if getattr(geom, "kind", None) == "box3d":
+                # Box classes take the figure theme's group colours.
+                geom = copy.copy(geom)
+                geom._palette = list(theme["cat"])
+            result = expand_stat_geom(
+                geom,
+                g.mapping,
+                data if layer_data is None else layer_data,
+                domains,
+                transition,
+                slider,
+                coord,
+                addon_map.get(index),
+            )
+            if isinstance(result, list):
+                out.extend(result)
+            else:
+                out.append(result)
+        return out
+
+    steps_before = getattr(slider, "steps", None)
+    expanded = expand_all()
+    if getattr(slider, "steps", None) != steps_before:
+        # A later layer lowered the default steps: every layer shares one grid.
+        expanded = expand_all()
     from plot3.calculus import mark_intersections
 
     expanded = mark_intersections(expanded)

{plot3-0.6.6 → plot3-0.6.7}/plot3/function.py

@@ -938,6 +938,16 @@ def _guard_slider(source: Any, n_samples: int, what: str) -> None:
     cells = int(n_samples) * n_frames
     if cells <= _SLIDER_CELL_CAP:
         return
+    if getattr(source, "auto_steps", False):
+        # Default steps: take the largest count that fits. build_spec hands
+        # each render its own copy and re-expands if this lowered it.
+        count = len(source.ranges)
+        steps = int(source.steps)
+        while steps > 2 and int(n_samples) * steps**count > _SLIDER_CELL_CAP:
+            steps -= 1
+        if int(n_samples) * steps**count <= _SLIDER_CELL_CAP:
+            source.steps = steps
+            return
     raise ValueError(
         f"slider() would sample {n_frames} frames of {n_samples} {what} "
         f"({cells} values). Pass a smaller steps= or n=."

{plot3-0.6.6 → plot3-0.6.7}/plot3/geoms.py

@@ -2181,20 +2181,23 @@ class slider:
 
         ggplot() + geom_function("y = a sin(k x)") + slider(a=(0, 3), k=(1, 5))
 
-    ``steps`` defaults to 25 per parameter. A surface on the default grid
-    is too large for several parameters at that count; pass a smaller
-    ``steps`` or ``n``. Do not combine with ``transition_time()``.
+    ``steps`` defaults to 25 per parameter, lowered as far as needed for
+    the whole grid to fit (three parameters on a curve get 9). An explicit
+    ``steps`` is kept as given and refused if it is too large; pass a
+    smaller ``steps`` or ``n``. Do not combine with ``transition_time()``.
     """
 
     kind = "slider"
 
-    def __init__(self, *, steps: int = 25, **ranges):
+    def __init__(self, *, steps: int | None = None, **ranges):
         if not ranges:
             raise TypeError(
                 "slider() needs a parameter range, for example slider(a=(0, 3))"
             )
+        # Only the default shrinks to fit; an explicit count is the user's.
+        self.auto_steps = steps is None
         try:
-            nsteps = int(steps)
+            nsteps = 25 if steps is None else int(steps)
         except (TypeError, ValueError):
             raise TypeError(
                 "slider() steps= must be an integer, for example steps=25"

{plot3-0.6.6 → plot3-0.6.7}/plot3/ggplot.py

@@ -42,6 +42,25 @@ from plot3.table import as_table, detect_backend
 from plot3.themes import _THEMES
 
 
+def _error_text(exc: BaseException) -> str:
+    return f"plot3 could not draw this figure.\n{type(exc).__name__}: {exc}"
+
+
+def _error_html(exc: BaseException) -> str:
+    import traceback
+
+    trace = "".join(traceback.format_exception(type(exc), exc, exc.__traceback__))
+    return (
+        '<div class="plot3-error" style="border-left:4px solid #d9534f;'
+        "padding:8px 12px;font-family:ui-monospace,Menlo,monospace;"
+        'font-size:13px;white-space:pre-wrap">'
+        "<strong>plot3 could not draw this figure.</strong>\n"
+        f"{_htmlesc.escape(type(exc).__name__)}: {_htmlesc.escape(str(exc))}"
+        '<details style="margin-top:6px"><summary>Traceback</summary>'
+        f"{_htmlesc.escape(trace)}</details></div>"
+    )
+
+
 def _env_flag(name: str) -> bool | None:
     raw = os.environ.get(name)
     if raw is None or raw == "":
@@ -422,7 +441,10 @@ class ggplot:
         # Used by hosts that only understand HTML reprs (and by tests).
         # Prefer ``display(fig)`` / ``fig.show()`` so VS Code can open a browser.
         self._maybe_hide_from_ai()
-        return self._iframe()
+        try:
+            return self._iframe()
+        except Exception as exc:
+            return _error_html(exc)
 
     def _repr_mimebundle_(self, include=None, exclude=None):
         """HTML plus optional PlotPayload mime for CRAFT host handoff.
@@ -435,7 +457,12 @@ class ggplot:
         from plot3.remote import MIME_PLOT3
 
         self._maybe_hide_from_ai()
-        bundle: dict = {"text/html": self._iframe()}
+        try:
+            bundle: dict = {"text/html": self._iframe()}
+        except Exception as exc:
+            # Notebook hosts swallow repr errors and fall back to the bare
+            # object repr, so the reason a plot is missing must be the output.
+            return {"text/html": _error_html(exc), "text/plain": _error_text(exc)}
         try:
             if self.facet is None and (
                 self._payload is not None or self.data is not None or self.layers

{plot3-0.6.6 → plot3-0.6.7}/plot3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.6
+Version: 0.6.7
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT

{plot3-0.6.6 → plot3-0.6.7}/tests/test_animation.py

@@ -671,3 +671,33 @@ def test_swept_parameter_is_not_frozen_into_labels():
     )
     assert "t = 0" not in spec
     assert "(a = 2)" in spec  # fixed coefficients still show their value
+
+
+def test_default_slider_steps_shrink_to_fit():
+    from plot3 import geom_function
+
+    g = (
+        ggplot()
+        + geom_function("y = a*(x-h)^2 + k", xlim=(-5, 5))
+        + slider(a=(0.2, 3), h=(-3, 3), k=(-3, 3))
+    )
+    spec, _ = build_spec(g)
+    assert [p["n"] for p in spec["slider"]["params"]] == [9, 9, 9]
+    assert spec["slider"]["nFrames"] == 729
+    # The figure's own slider keeps its default for later renders.
+    assert g.slider.steps == 25
+
+
+def test_render_error_is_shown_instead_of_the_bare_repr():
+    from plot3 import geom_function
+
+    g = (
+        ggplot()
+        + geom_function("y = a x + k")
+        + slider(a=(0, 1), k=(0, 1), steps=2000)
+    )
+    bundle = g._repr_mimebundle_()
+    assert "plot3-error" in bundle["text/html"]
+    assert "smaller steps" in bundle["text/html"]
+    assert "ValueError" in bundle["text/plain"]
+    assert "smaller steps" in g._repr_html_()

plot3-0.6.6/plot3/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.6.6"