solara-ui 1.55.1__py3-none-any.whl → 1.57.0__py3-none-any.whl

solara/__init__.py

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

solara/components/file_browser.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 from os.path import isfile, join
 from pathlib import Path
@@ -8,6 +9,11 @@ import humanize
 import ipyvuetify as vy
 import traitlets
 
+try:
+    import watchfiles
+except ModuleNotFoundError:
+    watchfiles = None  # type: ignore
+
 import solara
 from solara.components import Div
 
@@ -84,6 +90,7 @@ def FileBrowser(
     on_file_name: Optional[Callable[[str], None]] = None,
     start_directory=None,
     can_select=False,
+    watch: bool = False,
 ):
     """File/directory browser at the server side.
 
@@ -109,6 +116,8 @@ def FileBrowser(
      * `directory_first`: If `True` directories are shown before files. Default: `False`.
      * `on_file_name`: (deprecated) Use on_file_open instead.
      * `start_directory`: (deprecated) Use directory instead.
+     * `watch`: If `True`, watch the current directory for file changes and automatically refresh the file list.
+        Requires the `watchfiles` package to be installed.
     """
     if start_directory is not None:
         directory = start_directory  # pragma: no cover
@@ -122,6 +131,8 @@ def FileBrowser(
     warning, set_warning = solara.use_state(cast(Optional[str], None))
     scroll_pos_stack, set_scroll_pos_stack = solara.use_state(cast(List[int], []))
     scroll_pos, set_scroll_pos = solara.use_state(0)
+    # Counter to trigger re-render when files change
+    file_change_counter, set_file_change_counter = solara.use_state(0)
     selected_private, set_selected_private = use_reactive_or_value(
         selected,
         on_value=on_path_select if can_select else lambda x: None,
@@ -137,12 +148,48 @@ def FileBrowser(
             # if we select a file, we need to make sure the directory is correct
             # NOTE: although we expect a Path, abuse might make it a string
             if isinstance(selected_private, Path):
-                # Note that we do not call .resolve() before using .parent, otherwise /some/path/.. will
-                # set the current directory to /, moving up two levels.
-                current_dir.value = selected_private.parent.resolve()
+                # Only sync directory from selected if the path is absolute.
+                # Relative paths would resolve against the process CWD, not the
+                # current directory shown in the FileBrowser, leading to incorrect paths.
+                if selected_private.is_absolute():
+                    # Note that we do not call .resolve() before using .parent, otherwise /some/path/.. will
+                    # set the current directory to /, moving up two levels.
+                    current_dir.value = selected_private.parent.resolve()
 
     solara.use_effect(sync_directory_from_selected, [selected_private])
 
+    def watch_directory():
+        if not watch:
+            return
+        if not watchfiles:
+            logger.warning("watchfiles not installed, cannot watch directory")
+            return
+
+        # Check if there's a running event loop before creating the coroutine
+        try:
+            asyncio.get_running_loop()
+        except RuntimeError:
+            # No running event loop (e.g., in unit tests or non-server environments)
+            logger.warning("No running event loop, cannot watch directory for changes")
+            return
+
+        dir_to_watch = current_dir.value
+
+        async def watch_task():
+            try:
+                async for _ in watchfiles.awatch(dir_to_watch):
+                    logger.debug("Directory %s changed, refreshing file list", dir_to_watch)
+                    set_file_change_counter(lambda x: x + 1)
+            except RuntimeError:
+                pass  # swallow the RuntimeError: Already borrowed errors from watchfiles
+            except Exception:
+                logger.exception("Error watching directory")
+
+        future = asyncio.create_task(watch_task())
+        return future.cancel
+
+    solara.use_effect(watch_directory, [watch, current_dir.value])
+
     def change_dir(new_dir: Path):
         if os.access(new_dir, os.R_OK):
             current_dir.value = new_dir

solara/components/file_download.py

@@ -1,5 +1,6 @@
+import asyncio
 from pathlib import Path
-from typing import BinaryIO, Callable, List, Optional, Union, cast
+from typing import Any, BinaryIO, Callable, Coroutine, List, Optional, Union, cast
 
 import ipyvuetify as vy
 import ipywidgets as widgets
@@ -19,7 +20,13 @@ class FileDownloadWidget(vy.VuetifyTemplate):
 
 @solara.component
 def FileDownload(
-    data: Union[str, bytes, BinaryIO, Callable[[], Union[str, bytes, BinaryIO]]],
+    data: Union[
+        str,
+        bytes,
+        BinaryIO,
+        Callable[[], Union[str, bytes, BinaryIO]],
+        Callable[[], Coroutine[Any, Any, Union[str, bytes, BinaryIO]]],
+    ],
     filename: Optional[str] = None,
     label: Optional[str] = None,
     icon_name: Optional[str] = "mdi-cloud-download-outline",
@@ -130,7 +137,7 @@ def FileDownload(
 
     ## Arguments
 
-     * `data`: The data to download. Can be a string, bytes, or a file like object, or a function that returns one of these.
+     * `data`: The data to download. Can be a string, bytes, or a file like object, or a function (or coroutine function) that returns one of these.
      * `filename`: The name of the file the user will see as default when downloading (default name is "solara-download.dat").
         If a file object is provided, the filename will be extracted from the file object if possible.
      * `label`: The label of the button. If not provided, the label will be "Download: {filename}".
@@ -162,7 +169,11 @@ def FileDownload(
     def get_data() -> Optional[bytes]:
         if request_download:
             if callable(data):
-                data_non_lazy = data()
+                # if it is a coroutine, we start a new event loop and run it
+                if asyncio.iscoroutinefunction(data):
+                    data_non_lazy = asyncio.run(data())
+                else:
+                    data_non_lazy = data()
             else:
                 data_non_lazy = data
             if hasattr(data_non_lazy, "read"):

solara/server/server.py

@@ -392,6 +392,7 @@ def read_root(
         "path": path,
         "root_path": root_path,
         "jupyter_root_path": jupyter_root_path,
+        "force_refresh": settings.theme.force_refresh,
         "resources": resources,
         "theme": settings.theme.dict(),
         "production": settings.main.mode == "production",

solara/server/settings.py

@@ -39,6 +39,7 @@ class ThemeSettings(BaseSettings):
     loader: str = "solara"
     show_banner: bool = True
     title: str = "Solara ☀️"
+    force_refresh: bool = False
 
     class Config:
         env_prefix = "solara_theme_"

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.55.1-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.57.0-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

solara/server/templates/solara.html.j2

@@ -245,6 +245,7 @@
         solara.rootPath = {{ root_path | tojson | safe}};
         solara.jupyterRootPath = {{ jupyter_root_path | tojson | safe}};
         solara.cdn = {{ cdn | tojson | safe }};
+        solara.forceRefresh = {{ force_refresh | tojson | safe }};
         // the vue templates expect it to not have a trailing slash
         solara.cdn = solara.cdn.replace(/\/$/, '');
         // keep this for backwards compatibility
@@ -364,7 +365,9 @@
                     }
                 },
                 needsRefresh: function (value) {
-                    if (this.needsRefresh && !this.cancelAutoRefresh && !solara.production) {
+                    if(solara.forceRefresh) {
+                        this.reload();
+                    } else if (this.needsRefresh && !this.cancelAutoRefresh && !solara.production) {
                         console.log('value for needRefresh', value);
                         setTimeout(() => {
                             console.log('this.autoRefreshCount', this.autoRefreshCount)

{solara_ui-1.55.1.dist-info → solara_ui-1.57.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solara-ui
-Version: 1.55.1
+Version: 1.57.0
 Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/solara
 Project-URL: Documentation, https://solara.dev
@@ -27,7 +27,7 @@ License: The MIT License (MIT)
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
         THE SOFTWARE.
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Requires-Dist: humanize
 Requires-Dist: ipyvue>=1.9.0
 Requires-Dist: ipyvuetify>=1.6.10
@@ -40,7 +40,6 @@ Requires-Dist: markdown; extra == 'all'
 Requires-Dist: numpy; extra == 'all'
 Requires-Dist: pillow; extra == 'all'
 Requires-Dist: pygments; extra == 'all'
-Requires-Dist: pygments==2.10; (python_version < '3.7') and extra == 'all'
 Requires-Dist: pymdown-extensions; extra == 'all'
 Provides-Extra: cache
 Requires-Dist: cachetools; extra == 'cache'
@@ -50,7 +49,6 @@ Requires-Dist: pillow; extra == 'extra'
 Provides-Extra: markdown
 Requires-Dist: markdown; extra == 'markdown'
 Requires-Dist: pygments; extra == 'markdown'
-Requires-Dist: pygments==2.10; (python_version < '3.7') and extra == 'markdown'
 Requires-Dist: pymdown-extensions; extra == 'markdown'
 Description-Content-Type: text/markdown
 

{solara_ui-1.55.1.dist-info → solara_ui-1.57.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 prefix/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
 prefix/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara/__init__.py,sha256=-kOoajHZOJA7rILhQiR19_A8BVLw1CANxybDiFOD7sE,3647
+solara/__init__.py,sha256=YfpMbibOxKDM1T7D6kwzffLEKo-WZeoGf_jo-bADrqw,3647
 solara/__main__.py,sha256=J_f3D_mgiNicU_ay_I-qn08GOViSXm04Ym0mopqh2Os,24853
 solara/_stores.py,sha256=N2Ec-61XNFXwigBx8f5QYPx7gDXenCOBdmLPXiJB45E,12320
 solara/alias.py,sha256=9vfLzud77NP8in3OID9b5mmIO8NyrnFjN2_aE0lSb1k,216
@@ -43,8 +43,8 @@ solara/components/download.vue,sha256=xdh4olwVvGkQwGNRMU5eVUW1FGvcXrYrCyjddJbvH7
 solara/components/echarts.py,sha256=aAedLqKuVJnBi3FwhSdQIgAn-w55sNb_hGSmqkosfuA,3069
 solara/components/echarts.vue,sha256=7TGmxaRUmH-LeH16jHiUzyuZgebGu_JDiWsa2DBSWW4,4056
 solara/components/figure_altair.py,sha256=t4EEwXrdoisrbV5j2MS-HBlPc5HSFCK5r4mRXvYRH9w,1150
-solara/components/file_browser.py,sha256=vd9BRENagoxxL-RtH5HheQm_0zFrnBiipjtNNvJkIdU,9762
-solara/components/file_download.py,sha256=Lil0qyiozU_Pxyb_HgnJXOumrxMeDwwavEmZZw6kAs8,7475
+solara/components/file_browser.py,sha256=JKSjMOPulEY0zlgSP0jxyfV9Eg7rUX7bLMYN9v0TBfw,11721
+solara/components/file_download.py,sha256=fnt6KqgGIVk1m_lwxURK82Cz3wMdxuVtTn3FOuv5p6M,7854
 solara/components/file_drop.py,sha256=BA53EZsCzzPCS8i2ZH_S1NAkmmQlTOvNEoXAt0_1l4A,5239
 solara/components/file_drop.vue,sha256=7V6YjHhoqOCVDMVPtObNwfHz2MdXLCFlNEqK1brl3zI,2243
 solara/components/file_list_widget.vue,sha256=atp-FO9tBjvyCQ_32NqeB9Rcehg03vPLD1eIROgBDDU,1860
@@ -117,8 +117,8 @@ solara/server/kernel_context.py,sha256=nOgBgchZZmZpHpHtI6_JRpxgJApZ50eKVIOk_EnyX
 solara/server/patch.py,sha256=KMoO3IK5sk-BWnwPNXhmGW4MGAgxGosgtUKMFf7oNm0,19902
 solara/server/qt.py,sha256=QdMxX2T0Ol_j3QHYwInDyT5Gy4sOhYljMPYfru5kwLg,3774
 solara/server/reload.py,sha256=BBH7QhrV1-e9RVyNE3uz1oPj1DagC3t_XSqGPNz0nJE,9747
-solara/server/server.py,sha256=YbOVCeho_tmYC2xcrJTzDe62H_xTpwiMuqsBWvgN_2A,17125
-solara/server/settings.py,sha256=TOtXN7R7Zz19APXlXpFCjh3Uk-U8u3HHpE56X09O6i0,7632
+solara/server/server.py,sha256=zz-ht0RjtG6HqWApNqjZ4YHSSIKFiMYwPuOLEHrpMoY,17180
+solara/server/settings.py,sha256=5Lzl5LvQuw1dejqAzYRUfgnuG-BeCi5f0EyVnq51BxU,7664
 solara/server/shell.py,sha256=eLrpTAw3j_1pU-2S7_Jzd4xkoSs_CA7Nv7w0Q7IVLUM,9333
 solara/server/starlette.py,sha256=gEBSJf-jZQ6Ep3HKIkcZNadpxgCp6VWdvlq67TjxJQ8,32934
 solara/server/telemetry.py,sha256=GPKGA5kCIqJb76wgxQ2_U2uV_s0r-1tKqv-GVxo5hs8,6038
@@ -146,7 +146,7 @@ solara/server/static/highlight-dark.css,sha256=xO8-vta9vG4s1OfJNHXWqiLWzx_gM03jo
 solara/server/static/highlight.css,sha256=k8ZdT5iwrGQ5tXTQHAXuxvZrSUq3kwCdEpy3mlFoZjs,2637
 solara/server/static/main-vuetify.js,sha256=R3qM4xMlstMpRUdRaul78p34z_Av2ONSTXksg2V9TqQ,9503
 solara/server/static/main.js,sha256=mcx4JNQ4Lg4pNdUIqMoZos1mZyYFS48yd_JNFFJUqIE,5679
-solara/server/static/solara_bootstrap.py,sha256=38HW-1RWpzOwrCYtVEwprLqVFFEa5-kyQQriR3990LE,3195
+solara/server/static/solara_bootstrap.py,sha256=oCCjKpqoeGJ7_P-pxwMZs09xnX1mKSRocfx0nUpYkMw,3195
 solara/server/static/sun.svg,sha256=jEKBAGCr7b9zNYv0VUb7lMWKjnU2dX69_Ye_DZWGXJI,6855
 solara/server/static/webworker.js,sha256=cjAFz7-SygStHJnYlJUlJs-gE_7YQeQ-WBDcmKYyjvo,1372
 solara/server/templates/index.html.j2,sha256=JXQo1M-STFHLBOFetgG7509cAq8xUP0VAEtYDzz35fY,31
@@ -155,7 +155,7 @@ solara/server/templates/loader-plain.html,sha256=VEtMDC8MQj75o2iWJ_gR70Jp05oOoyR
 solara/server/templates/loader-solara.css,sha256=QerfzwlenkSJMq8uk_qEtoSdcI-DKMRrH9XXDEPsrUA,1670
 solara/server/templates/loader-solara.html,sha256=wFPnTevFBcRXQj6ZCZdgkOGTMwAAiOmNlgFdzdJLpXA,2744
 solara/server/templates/plain.html,sha256=yO1r2hidA3bxOclaxtI_vTZtdDTFn2KKeeoldJuinXk,2762
-solara/server/templates/solara.html.j2,sha256=qbhRj-KYUr-HMlUpFOblGCNXg4ko6QXArIywvpCCirM,21850
+solara/server/templates/solara.html.j2,sha256=dYVPXPWVs2Y8oBr5bJQ_yUDVrg7SzAJYUBcAMYdj2T8,22009
 solara/template/button.py,sha256=HM382prl4bNLF8sLBd9Sh43ReMGedG_z_h4XN4mDYRI,311
 solara/template/markdown.py,sha256=31G3ezFooiveSrUH5afz5_nJ8SStjbx-_x5YLXv_hPk,1137
 solara/template/portal/.flake8,sha256=wxWLwamdP33Jm1mPa1sVe3uT0AZkG_wHPbY3Ci7j5-g,136
@@ -456,9 +456,9 @@ solara/widgets/vue/gridlayout.vue,sha256=LZk-YlqM7nv_7Y5TTq2xqfH1j2SLP1QOH5eiz7G
 solara/widgets/vue/html.vue,sha256=48K5rjp0AdJDeRV6F3nOHW3J0WXPeHn55r5pGClK2fU,112
 solara/widgets/vue/navigator.vue,sha256=3hhh2_sXpnsdM1vrs2nQ0bZHLCB10HhtQeYLS-tO85s,4790
 solara/widgets/vue/vegalite.vue,sha256=zhocRsUCNIRQCEbD16er5sYnuHU0YThatRHnorA3P18,4596
-solara_ui-1.55.1.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
-solara_ui-1.55.1.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara_ui-1.55.1.dist-info/METADATA,sha256=08VRBHu8t0-txUDqxhT2vJjIwQOHyhV53cQLvdQrjzY,7459
-solara_ui-1.55.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-solara_ui-1.55.1.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
-solara_ui-1.55.1.dist-info/RECORD,,
+solara_ui-1.57.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
+solara_ui-1.57.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
+solara_ui-1.57.0.dist-info/METADATA,sha256=xVxjY3GG79bODxOZRc8unZUpjcO5zmBpvT5zykRME_k,7304
+solara_ui-1.57.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+solara_ui-1.57.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
+solara_ui-1.57.0.dist-info/RECORD,,