Merge #38–#52 for 0.6.0

.github/workflows/ci.yml

@@ -57,6 +57,11 @@ jobs:
       - name: Dashboard-controls apply + slice-id stability
         if: ${{ !cancelled() }}
         run: python tools/ci_live_check.py --base-url http://localhost:8098 --spec tests/fixtures/live_dashboard_controls.json
+      # A waterfall bridge on a virtual dataset made for it: built and read back on
+      # 6.1.0; refused before 6.1.0, where the plain waterfalls are built instead.
+      - name: Waterfall bridge apply + round trip
+        if: ${{ !cancelled() }}
+        run: python tools/ci_live_waterfall.py --base-url http://localhost:8098 --spec tests/fixtures/live_waterfall.json
       # A chart added in Superset: re-apply takes it off the dashboard (4.1.4 and 5.0.0
       # merge chart links on import), never deletes it, and restores match their backups.
       - name: UI-added chart taken off on re-apply
@@ -86,6 +91,16 @@ jobs:
       - name: Locked text visible on the rendered dashboard
         if: ${{ !cancelled() && steps.visual.outcome == 'success' }}
         run: python tools/ci_live_visible.py --base-url http://localhost:8098
+      # Markdown blocks at the height advise --fix gives them show every line with
+      # Windows-style scrollbars on, and a block size.markdown-fit calls cut off is.
+      - name: Markdown blocks fit at the height advise gives them
+        if: ${{ !cancelled() && steps.visual.outcome == 'success' }}
+        run: python tools/ci_live_markdown_fit.py --base-url http://localhost:8098
+      # The type sizes the readability rules model (table and pivot cells, titles,
+      # ECharts labels, big numbers by height) are what this release draws.
+      - name: Type sizes match the readability model
+        if: ${{ !cancelled() && steps.visual.outcome == 'success' }}
+        run: python tools/record_readability_measurements.py --check --base-url http://localhost:8098
       # Saved queries captured from Superset's own frontend, so CSV reports work.
       - name: Chart queries saved for reports
         if: ${{ !cancelled() && steps.visual.outcome == 'success' }}

README.md

@@ -119,7 +119,7 @@ as-is.
   automatically. Dashboards Chartwright did not create are never overwritten;
   to bring a hand-built one under a spec, decompile it and build it at a new
   slug.
-- **What a spec can express**: 15 chart types, metrics as you write them,
+- **What a spec can express**: 17 chart types, metrics as you write them,
   per-chart filters, a native filter bar, tabs, markdown notes, a header and
   footer shown on every tab, and layouts you can draw as ASCII sketches.
 - **Environment promotion**: specs name their data (connection, schema,

chartwright/absorb.py

@@ -22,7 +22,7 @@
 import json
 from dataclasses import asdict, dataclass, field
 
-from .compiler import ROW_UNITS_PER_SPEC_UNIT, _position
+from .compiler import _position, spec_units
 from .spec import DashboardSpec
 
 
@@ -38,12 +38,6 @@ def to_json(self) -> str:
         return json.dumps({"stage": "absorb", **asdict(self)}, indent=2)
 
 
-def _exact_units(row_units: int) -> float | int:
-    """Superset row units (8px) -> spec units (40px), exactly representable."""
-    units = row_units / ROW_UNITS_PER_SPEC_UNIT
-    return int(units) if units.is_integer() else round(units, 1)
-
-
 def absorb_heights(spec: DashboardSpec, spec_data: dict, live_position: dict) -> tuple[dict, AbsorbReport]:
     """Pure core: returns (patched copy of spec_data, report). spec_data is the
     raw JSON the spec file holds; only charts[*].height values are touched."""
@@ -82,7 +76,7 @@ def absorb_heights(spec: DashboardSpec, spec_data: dict, live_position: dict) ->
         live_h = have.get("height")
         if not isinstance(live_h, int) or live_h == want["height"]:
             continue
-        charts_by_name[chart.name]["height"] = _exact_units(live_h)
+        charts_by_name[chart.name]["height"] = spec_units(live_h)
         report.absorbed.append({
             "chart": chart.name,
             "from_px": want["height"] * 8,

chartwright/apply.py

@@ -785,7 +785,7 @@ def _auto_restore(reason: str) -> None:
 
         report.stage = "smoke"
         results: list[SmokeResult] = smoke(spec, resolution, client)
-        report.smoke_results = [asdict(s) for s in results]
+        report.smoke_results = [s.as_dict() for s in results]
         report.warnings.extend(f"{s.chart}: {s.detail}" for s in results if s.warning)
         if any(not s.ok for s in results):
             return report

chartwright/client.py

@@ -278,16 +278,19 @@ def delete_chart(self, chart_id: int) -> None:
     # -- themes (6.0.0+) ----------------------------------------------------
 
     def themes(self) -> list[dict]:
-        """Every theme on the instance: id, uuid and theme_name, from the theme list API
-        (ThemeRestApi, resource "theme", superset/themes/api.py at 6.0.0 and 6.1.0).
-        Themes are few, so all pages are read and names matched here: theme_name has no
-        unique constraint (models/core.py class Theme), and the API's only name search is
-        a substring match over name and JSON alike (themes/filters.py ThemeAllTextFilter)."""
+        """Every theme on the instance: id, uuid, theme_name and json_data (the tokens the
+        design brain's readability rules read), from the theme list API (ThemeRestApi,
+        resource "theme", superset/themes/api.py at 6.0.0 and 6.1.0, whose list_columns
+        hold json_data, :110-120). Themes are few, so all pages are read and names matched
+        here: theme_name has no unique constraint (models/core.py class Theme), and the
+        API's only name search is a substring match over name and JSON alike
+        (themes/filters.py ThemeAllTextFilter)."""
         out: list[dict] = []
         page = 0
         while page < 100:   # 10,000 themes: a runaway guard, not an expected ceiling
             rows = self.get("/api/v1/theme/", q={
-                "columns": ["id", "uuid", "theme_name"], "page": page, "page_size": 100,
+                "columns": ["id", "uuid", "theme_name", "json_data"], "page": page,
+                "page_size": 100,
             })["result"]
             out += rows
             if len(rows) < 100: