fix: update snapshots and types for altair v6.1.0 / vega-lite v6.4.1 (#9415)

CI was failing on main after the altair upgrade landed:
- snapshots referenced vega-lite v6.1.0 schema and old view-hash names
- alt.layer now returns LayerChart | FacetChart, breaking
add_common_config
- vlc.get_*_locale signatures became Literal-typed

Author: mscolnick

.github/renovate.json5

@@ -65,8 +65,6 @@
         "!/.*@oxc.*/",
         // react-hook-form is pinned to 7.54.2
         "!/.*react-hook-form.*/",
-        // vega-lite is pinned to 6.3.1
-        "!/.*vega-lite.*/",
         // pyodide needs to be manually updated
         "!/.*pyodide.*/"
       ],

.github/workflows/test_fe.yaml

@@ -181,10 +181,6 @@ jobs:
             echo "Error: react-hook-form version in package.json must be exactly 7.54.2. As it breaks mo.ui.dataframe"
             exit 1
           fi
-          if ! grep -q '"vega-lite": "6.3.1"' package.json; then
-            echo "Error: vega-lite version in package.json must be exactly 6.3.1. Newer versions break numeric tooltips"
-            exit 1
-          fi
           if ! grep -q '"html-to-image": "1.11.13"' package.json; then
             echo "Error: html-to-image version in package.json must be exactly 1.11.13. Newer versions break matplotlib toolbars"
             exit 1

frontend/package.json

@@ -155,7 +155,7 @@
     "typescript-memoize": "^1.1.1",
     "use-acp": "0.2.6",
     "use-resize-observer": "^9.1.0",
-    "vega-lite": "6.3.1",
+    "vega-lite": "6.4.2",
     "vega-loader": "^5.1.0",
     "vega-parser": "^7.1.0",
     "vega-tooltip": "^1.1.0",

marimo/_data/charts.py

@@ -82,7 +82,9 @@ class ChartParams:
 COMMON_CONFIG = 'properties(width="container").configure_view(stroke=None)'
 
 
-def add_common_config(chart: alt.Chart | alt.LayerChart) -> alt.Chart:
+def add_common_config(
+    chart: alt.Chart | alt.LayerChart | alt.FacetChart,
+) -> alt.Chart:
     return chart.properties(width="container").configure_view(stroke=None)  # type: ignore
 
 

marimo/_output/formatters/altair_formatters.py

@@ -196,7 +196,7 @@ def get_time_format_locale(locale: str) -> dict[str, Any]:
             if DependencyManager.vl_convert_python.has():
                 import vl_convert as vlc  # type: ignore
 
-                return dict(vlc.get_time_format_locale(locale))
+                return dict(vlc.get_time_format_locale(locale))  # type: ignore[arg-type]
             else:
                 with urlopen(
                     TIME_FORMAT_LOCALE_URL.format(locale=locale),
@@ -212,7 +212,7 @@ def get_format_locale(locale: str) -> dict[str, Any]:
             if DependencyManager.vl_convert_python.has():
                 import vl_convert as vlc  # type: ignore
 
-                return dict(vlc.get_format_locale(locale))
+                return dict(vlc.get_format_locale(locale))  # type: ignore[arg-type]
             else:
                 with urlopen(
                     FORMAT_LOCALE_URL.format(locale=locale),

marimo/_sql/engines/adbc.py

@@ -534,7 +534,7 @@ def convert_to_polars() -> pl.DataFrame | pl.Series:
                 return pl.from_arrow(arrow_table)
 
             def convert_to_pandas() -> pd.DataFrame:
-                return arrow_table.to_pandas()
+                return cast("pd.DataFrame", arrow_table.to_pandas())
 
             result = convert_to_output(
                 sql_output_format=sql_output_format,

pnpm-lock.yaml

@@ -271,7 +271,7 @@
    "outputs": [
     {
      "data": {
-      "application/vnd.vegalite.v6+json": "{\n  \"$schema\": \"https://vega.github.io/schema/vega-lite/v6.1.0.json\",\n  \"config\": {\n    \"view\": {\n      \"continuousHeight\": 300,\n      \"continuousWidth\": 300\n    }\n  },\n  \"data\": {\n    \"name\": \"data-a202e5dd04552c98b78a4bc5fc59f367\"\n  },\n  \"datasets\": {\n    \"data-a202e5dd04552c98b78a4bc5fc59f367\": [\n      {\n        \"x\": 1,\n        \"y\": 1\n      }\n    ]\n  },\n  \"encoding\": {\n    \"x\": {\n      \"field\": \"x\",\n      \"type\": \"ordinal\"\n    },\n    \"y\": {\n      \"field\": \"y\",\n      \"type\": \"quantitative\"\n    }\n  },\n  \"mark\": {\n    \"type\": \"circle\"\n  },\n  \"usermeta\": {\n    \"embedOptions\": {}\n  }\n}"
+      "application/vnd.vegalite.v6+json": "{\n  \"$schema\": \"https://vega.github.io/schema/vega-lite/v6.4.1.json\",\n  \"config\": {\n    \"view\": {\n      \"continuousHeight\": 300,\n      \"continuousWidth\": 300\n    }\n  },\n  \"data\": {\n    \"name\": \"data-a202e5dd04552c98b78a4bc5fc59f367\"\n  },\n  \"datasets\": {\n    \"data-a202e5dd04552c98b78a4bc5fc59f367\": [\n      {\n        \"x\": 1,\n        \"y\": 1\n      }\n    ]\n  },\n  \"encoding\": {\n    \"x\": {\n      \"field\": \"x\",\n      \"type\": \"ordinal\"\n    },\n    \"y\": {\n      \"field\": \"y\",\n      \"type\": \"quantitative\"\n    }\n  },\n  \"mark\": {\n    \"type\": \"circle\"\n  },\n  \"usermeta\": {\n    \"embedOptions\": {}\n  }\n}"
      },
      "metadata": {},
      "output_type": "display_data"
@@ -292,7 +292,7 @@
    "outputs": [
     {
      "data": {
-      "application/vnd.vega.v6+json": "{\n  \"$schema\": \"https://vega.github.io/schema/vega-lite/v6.1.0.json\",\n  \"config\": {\n    \"view\": {\n      \"continuousHeight\": 300,\n      \"continuousWidth\": 300\n    }\n  },\n  \"data\": {\n    \"name\": \"data-a202e5dd04552c98b78a4bc5fc59f367\"\n  },\n  \"datasets\": {\n    \"data-a202e5dd04552c98b78a4bc5fc59f367\": [\n      {\n        \"x\": 1,\n        \"y\": 1\n      }\n    ]\n  },\n  \"encoding\": {\n    \"x\": {\n      \"field\": \"x\",\n      \"type\": \"ordinal\"\n    },\n    \"y\": {\n      \"field\": \"y\",\n      \"type\": \"quantitative\"\n    }\n  },\n  \"mark\": {\n    \"type\": \"circle\"\n  },\n  \"usermeta\": {\n    \"embedOptions\": {}\n  }\n}"
+      "application/vnd.vega.v6+json": "{\n  \"$schema\": \"https://vega.github.io/schema/vega-lite/v6.4.1.json\",\n  \"config\": {\n    \"view\": {\n      \"continuousHeight\": 300,\n      \"continuousWidth\": 300\n    }\n  },\n  \"data\": {\n    \"name\": \"data-a202e5dd04552c98b78a4bc5fc59f367\"\n  },\n  \"datasets\": {\n    \"data-a202e5dd04552c98b78a4bc5fc59f367\": [\n      {\n        \"x\": 1,\n        \"y\": 1\n      }\n    ]\n  },\n  \"encoding\": {\n    \"x\": {\n      \"field\": \"x\",\n      \"type\": \"ordinal\"\n    },\n    \"y\": {\n      \"field\": \"y\",\n      \"type\": \"quantitative\"\n    }\n  },\n  \"mark\": {\n    \"type\": \"circle\"\n  },\n  \"usermeta\": {\n    \"embedOptions\": {}\n  }\n}"
      },
      "metadata": {},
      "output_type": "display_data"

tests/_cli/snapshots/export/ipynb/ipynb_with_media_outputs.txt

@@ -1,6 +1,6 @@
 # boolean
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "view": {
       "continuousHeight": 300,
@@ -160,7 +160,7 @@
 
 # date
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "axis": {
       "grid": false
@@ -327,7 +327,7 @@
         "strokeWidth": 1,
         "type": "rule"
       },
-      "name": "view_08552f810e029e90_2",
+      "name": "view_f88a3e6c17252800_2",
       "transform": [
         {
           "filter": "datum.some_column != null"
@@ -363,7 +363,7 @@
         "type": "point"
       },
       "views": [
-        "view_08552f810e029e90_2"
+        "view_f88a3e6c17252800_2"
       ]
     }
   ],
@@ -372,7 +372,7 @@
 
 # datetime
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "axis": {
       "grid": false
@@ -539,7 +539,7 @@
         "strokeWidth": 1,
         "type": "rule"
       },
-      "name": "view_08552f810e029e90_2",
+      "name": "view_f88a3e6c17252800_2",
       "transform": [
         {
           "filter": "datum.some_column != null"
@@ -575,7 +575,7 @@
         "type": "point"
       },
       "views": [
-        "view_08552f810e029e90_2"
+        "view_f88a3e6c17252800_2"
       ]
     }
   ],
@@ -584,7 +584,7 @@
 
 # time
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "axis": {
       "grid": false
@@ -751,7 +751,7 @@
         "strokeWidth": 1,
         "type": "rule"
       },
-      "name": "view_08552f810e029e90_2",
+      "name": "view_f88a3e6c17252800_2",
       "transform": [
         {
           "filter": "datum.some_column != null"
@@ -787,7 +787,7 @@
         "type": "point"
       },
       "views": [
-        "view_08552f810e029e90_2"
+        "view_f88a3e6c17252800_2"
       ]
     }
   ],
@@ -796,7 +796,7 @@
 
 # integer
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "view": {
       "continuousHeight": 300,
@@ -857,7 +857,7 @@
 
 # number
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "view": {
       "continuousHeight": 300,
@@ -919,7 +919,7 @@
 
 # string
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "axis": {
       "grid": false
@@ -1117,7 +1117,7 @@
 
 # string (limit to 10 items)
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "axis": {
       "grid": false
@@ -1321,7 +1321,7 @@
 
 # unknown
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "view": {
       "continuousHeight": 300,

tests/_data/snapshots/charts_json.txt

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v6.1.0.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.4.1.json",
   "config": {
     "axis": {
       "grid": false