fix: get integration test working and support vega 6

Author: maartenbreddels

.github/workflows/test.yaml

@@ -368,7 +368,7 @@ jobs:
         # osx should work fine (and we test that locally often)
         os: [ubuntu, windows]
         # just 1 version, it's heavy
-        python-version: [3.9]
+        python-version: [3.9, 3.14]
         ipywidgets_major: ["7", "8"]
         include:
           - ipywidgets_major: "7"

packages/solara-enterprise/solara_enterprise/ssg.py

@@ -2,6 +2,7 @@
 import logging
 import threading
 import time
+import sys
 import typing
 import urllib
 import weakref
@@ -65,26 +66,49 @@ def _worker_with_cleanup(*args, **kwargs):
 
 
 class CleanupThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):
-    def _adjust_thread_count(self):
-        # copy of the original code with _worker replaced
-        # if idle threads are available, don't spin new threads
-        if self._idle_semaphore.acquire(timeout=0):
-            return
-
-        # When the executor gets lost, the weakref callback will wake up
-        # the worker threads.
-        def weakref_cb(_, q=self._work_queue):
-            q.put(None)
-
-        num_threads = len(self._threads)
-        if num_threads < self._max_workers:
-            thread_name = "%s_%d" % (self._thread_name_prefix or self, num_threads)
-            t = threading.Thread(
-                name=thread_name, target=_worker_with_cleanup, args=(weakref.ref(self, weakref_cb), self._work_queue, self._initializer, self._initargs)
-            )
-            t.start()
-            self._threads.add(t)  # type: ignore
-            concurrent.futures.thread._threads_queues[t] = self._work_queue  # type: ignore
+    if sys.version_info < (3, 14):
+
+        def _adjust_thread_count(self):
+            # copy of the original code with _worker replaced
+            # if idle threads are available, don't spin new threads
+            if self._idle_semaphore.acquire(timeout=0):
+                return
+
+            # When the executor gets lost, the weakref callback will wake up
+            # the worker threads.
+            def weakref_cb(_, q=self._work_queue):
+                q.put(None)
+
+            num_threads = len(self._threads)
+            if num_threads < self._max_workers:
+                thread_name = "%s_%d" % (self._thread_name_prefix or self, num_threads)
+                t = threading.Thread(
+                    name=thread_name, target=_worker_with_cleanup, args=(weakref.ref(self, weakref_cb), self._work_queue, self._initializer, self._initargs)
+                )
+                t.start()
+                self._threads.add(t)  # type: ignore
+                concurrent.futures.thread._threads_queues[t] = self._work_queue  # type: ignore
+    else:
+
+        def _adjust_thread_count(self):
+            # if idle threads are available, don't spin new threads
+            if self._idle_semaphore.acquire(timeout=0):
+                return
+
+            # When the executor gets lost, the weakref callback will wake up
+            # the worker threads.
+            def weakref_cb(_, q=self._work_queue):
+                q.put(None)
+
+            num_threads = len(self._threads)
+            if num_threads < self._max_workers:
+                thread_name = "%s_%d" % (self._thread_name_prefix or self, num_threads)
+                t = threading.Thread(
+                    name=thread_name, target=_worker_with_cleanup, args=(weakref.ref(self, weakref_cb), self._create_worker_context(), self._work_queue)
+                )
+                t.start()
+                self._threads.add(t)
+                concurrent.futures.thread._threads_queues[t] = self._work_queue  # type: ignore
 
 
 def ssg_crawl(base_url: str):

packages/solara-meta/pyproject.toml

@@ -38,7 +38,8 @@ assets = [
 
 documentation = [
     "bqplot",
-    "altair",
+    "altair ; python_version < '3.14'",
+    "altair @ git+https://github.com/vega/altair.git ; python_version >= '3.14'",
     "folium",
     "ipycanvas",
     "ipyleaflet",
@@ -90,6 +91,9 @@ dev = [
     "numpy<2",
 ]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.hatch.build.targets.wheel]
 include = ["LICENSE"]
 

solara/components/figure_altair.py

@@ -27,12 +27,27 @@ def FigureAltair(
         bundle = chart._repr_mimebundle_()[0]
         key4 = "application/vnd.vegalite.v4+json"
         key5 = "application/vnd.vegalite.v5+json"
-        if key4 not in bundle and key5 not in bundle:
-            raise KeyError(f"{key4} and {key5} not in mimebundle:\n\n{bundle}")
-        spec = bundle.get(key5, bundle.get(key4))
-        return solara.widgets.VegaLite.element(
-            spec=spec, on_click=on_click, listen_to_click=on_click is not None, on_hover=on_hover, listen_to_hover=on_hover is not None
-        )
+        key6 = "application/vnd.vegalite.v6.json"
+        if key6 in bundle:
+            version = 6
+            spec = bundle.get(key6)
+        elif key5 in bundle:
+            version = 5
+            spec = bundle.get(key5)
+        elif key4 in bundle:
+            version = 4
+            spec = bundle.get(key4)
+        else:
+            raise KeyError(f"{key4} and {key5} and {key6} not in mimebundle:\n\n{bundle}")
+
+    return solara.widgets.VegaLite.element(
+        version=version,
+        spec=spec,
+        on_click=on_click,
+        listen_to_click=on_click is not None,
+        on_hover=on_hover,
+        listen_to_hover=on_hover is not None,
+    )
 
 
 # alias for backward compatibility

solara/widgets/vue/vegalite.vue

@@ -74,9 +74,9 @@ module.exports = {
             require.config({
                 map: {
                     '*': {
-                        'vega': `${this.getCdn()}/vega@5/build/vega.min.js`,
-                        'vega-lite': `${this.getCdn()}/vega-lite@5/build/vega-lite.min.js`,
-                        'vega-embed': `${this.getCdn()}/vega-embed@6/build/vega-embed.min.js`,
+                        'vega': `${this.getCdn()}/vega@${this.version}/build/vega.min.js`,
+                        'vega-lite': `${this.getCdn()}/vega-lite@${this.version}/build/vega-lite.min.js`,
+                        'vega-embed': `${this.getCdn()}/vega-embed@${this.version}/build/vega-embed.min.js`,
                     }
                 }
             })

solara/widgets/widgets.py

@@ -22,6 +22,7 @@ class VegaLite(v.VuetifyTemplate):
     on_click = traitlets.traitlets.Callable(None, allow_none=True)
     on_hover = traitlets.traitlets.Callable(None, allow_none=True)
     cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+    version = traitlets.Int(6).tag(sync=True)
 
     def vue_altair_click(self, *args):
         if self.on_click is not None: