solara-ui 1.46.0__tar.gz → 1.47.0__tar.gz

{solara_ui-1.46.0 → solara_ui-1.47.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solara-ui
-Version: 1.46.0
+Version: 1.47.0
 Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/solara
 Project-URL: Documentation, https://solara.dev

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/__init__.py

@@ -1,6 +1,6 @@
 """Build webapps using IPywidgets"""
 
-__version__ = "1.46.0"
+__version__ = "1.47.0"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/components/columns.py

@@ -145,7 +145,7 @@ def ColumnsResponsive(
 
     class_ = _combine_classes([*(["flex-nowrap"] if not wrap else []), *classes])
     style_flat = solara.util._flatten_style(style)
-    with rv.Row(class_=class_ if not wrap else "", style_=style_flat, no_gutters=not gutters, dense=gutters_dense) as main:
+    with rv.Row(class_=class_, style_=style_flat, no_gutters=not gutters, dense=gutters_dense) as main:
         for child, xsmall, small, medium, large, xlarge in zip(children, cycle(default), cycle(small), cycle(medium), cycle(large), cycle(xlarge)):
             with rv.Col(
                 cols=xsmall,

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/server/app.py

@@ -8,6 +8,7 @@ import threading
 import traceback
 import warnings
 import weakref
+import html
 from enum import Enum
 from pathlib import Path
 from typing import Any, Dict, List, Optional, cast
@@ -15,6 +16,7 @@ from typing import Any, Dict, List, Optional, cast
 import ipywidgets as widgets
 import reacton
 from reacton.core import Element, render
+from reacton import ipywidgets
 
 import solara
 import solara.lifecycle
@@ -26,7 +28,7 @@ from .utils import pdb_guard
 
 WebSocket = Any
 apps: Dict[str, "AppScript"] = {}
-thread_lock = threading.Lock()
+thread_lock = threading.RLock()
 
 logger = logging.getLogger("solara.server.app")
 
@@ -232,12 +234,22 @@ class AppScript:
 
     def run(self):
         self.check()
-        if reload.reloader.requires_reload or self._first_execute_app is None:
+        if self._first_execute_app is None:
             with thread_lock:
-                if reload.reloader.requires_reload or self._first_execute_app is None:
-                    self._first_execute_app = None
-                    self._first_execute_app = self._execute()
-                    print("Re-executed app", self.name)  # noqa
+                if self._first_execute_app is None:
+                    try:
+                        self._first_execute_app = self._execute()
+                        print("Re-executed app", self.name)  # noqa
+                    except Exception as e:
+                        error = ""
+                        error = "".join(traceback.format_exception(None, e, e.__traceback__))
+                        print(error, file=sys.stdout, flush=True)  # noqa
+
+                        error = html.escape(error)
+                        self._first_execute_app = ipywidgets.HTML(value=f"<pre>{error}</pre>", layout=ipywidgets.Layout(overflow="auto"))
+                        # We now ran the app again, might contain new imports
+
+                        print("Failed to execute app, fix the error and save the file to reload")  # noqa
                     # We now ran the app again, might contain new imports
                     patch.patch_heavy_imports()
 
@@ -319,6 +331,9 @@ class AppScript:
                         except Exception as e:
                             logger.exception("Could not close render context: %s", e)
 
+            self._first_execute_app = None
+            self.run()
+
             # ask all contexts/users to reload
             for context in context_values:
                 with context:

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/server/static/solara_bootstrap.py

@@ -119,7 +119,7 @@ async def main():
     ]
     for dep in requirements:
         await micropip.install(dep, keep_going=True)
-    await micropip.install("/wheels/solara-1.46.0-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.47.0-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/tasks.py

@@ -772,12 +772,15 @@ def task(
     def wrapper(f: Union[None, Callable[P, Union[Coroutine[Any, Any, R], R]]]) -> Task[P, R]:
         # we use wraps to make the key of the reactive variable more unique
         # and less likely to mixup during hot reloads
+        assert f is not None
+        key = solara.toestand._create_key_callable(f)
+
         @functools.wraps(f)  # type: ignore
         def create_task():
             if inspect.iscoroutinefunction(f):
-                return TaskAsyncio[P, R](prefer_threaded and has_threads, f, key=solara.toestand._create_key_callable(create_task))
+                return TaskAsyncio[P, R](prefer_threaded and has_threads, f, key=key)
             else:
-                return TaskThreaded[P, R](cast(Callable[P, R], f), key=solara.toestand._create_key_callable(create_task))
+                return TaskThreaded[P, R](cast(Callable[P, R], f), key=key)
 
         return cast(Task[P, R], Proxy(create_task))
 

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/test/pytest_plugin.py

@@ -334,7 +334,7 @@ class ServerVoila(ServerBase):
 
     def serve(self):
         if self.has_started():
-            raise RuntimeError("Jupyter server already running, use lsof -i :{self.port} to find the process and kill it")
+            raise RuntimeError(f"Jupyter server already running, use lsof -i :{self.port} to find the process and kill it")
         cmd = (
             "voila --no-browser --VoilaTest.log_level=DEBUG --Voila.port_retries=0 --VoilaExecutor.timeout=240"
             f' --Voila.port={self.port} --show_tracebacks=True "{self.notebook_path}" --enable_nbextensions=True'

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/toestand.py

@@ -442,7 +442,7 @@ reactive_df = solara.reactive(df, equals=solara.util.equals_pickle)
             raise ValueError(msg)
 
 
-def _create_key_callable(f: Callable[[], S]):
+def _create_key_callable(f: Callable):
     try:
         prefix = f.__qualname__
     except Exception:

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/widgets/vue/gridlayout.vue

@@ -11,6 +11,7 @@
             :vertical-compact="true"
             :margin="[10, 10]"
             :use-css-transforms="true"
+            @layout-updated="onLayoutUpdated"
     >
 
         <grid-item v-for="item in grid_layout"
@@ -49,6 +50,9 @@ module.exports = {
           // this will cause bqplot to layout itself
           window.dispatchEvent(new Event('resize'));
         },
+        onLayoutUpdated(layout) {
+          this.layout_updated(layout);
+        },
         import(deps) {
           return this.loadRequire().then(
             () => {

{solara_ui-1.46.0 → solara_ui-1.47.0}/solara/widgets/widgets.py

@@ -52,6 +52,11 @@ class GridLayout(v.VuetifyTemplate):
     draggable = traitlets.CBool(True).tag(sync=True)
     resizable = traitlets.CBool(True).tag(sync=True)
     cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+    on_layout_updated = traitlets.traitlets.Callable(None, allow_none=True)
+
+    def vue_layout_updated(self, *args):
+        if self.on_layout_updated is not None:
+            self.on_layout_updated(*args)
 
     @traitlets.default("cdn")
     def _cdn(self):

{solara_ui-1.46.0 → solara_ui-1.47.0}/tests/unit/toestand_test.py

@@ -1303,6 +1303,8 @@ def test_computed_reload(no_kernel_context):
             module = route.module
             assert text.widget.v_model == "3.0"
             solara.server.reload.reloader.requires_reload = True
+            assert solara.server.reload.reloader.on_change is not None
+            solara.server.reload.reloader.on_change("notimportant.py")
             kernel_context.restart()
         solara.toestand.KernelStore._type_counter.clear()
         c = app.run()