solara-ui 1.55.1__tar.gz → 1.57.0__tar.gz

{solara_ui-1.55.1 → solara_ui-1.57.0}/PKG-INFO

@@ -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 → solara_ui-1.57.0}/pyproject.toml

@@ -8,7 +8,7 @@ name = "solara-ui"
 readme = "README.md"
 authors = [{name = "Maarten A. Breddels", email = "maartenbreddels@gmail.com"}]
 license = {file = "LICENSE"}
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = ["License :: OSI Approved :: MIT License"]
 dynamic = ["version", "description"]
 packages = [
@@ -70,7 +70,6 @@ markdown = [
     "markdown",
     "pymdown-extensions",
     "pygments",
-    "pygments==2.10; python_version < '3.7'",
 ]
 
 cache = [

{solara_ui-1.55.1 → solara_ui-1.57.0}/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_ui-1.55.1 → solara_ui-1.57.0}/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_ui-1.55.1 → solara_ui-1.57.0}/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_ui-1.55.1 → solara_ui-1.57.0}/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_ui-1.55.1 → solara_ui-1.57.0}/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_ui-1.55.1 → solara_ui-1.57.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.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_ui-1.55.1 → solara_ui-1.57.0}/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 → solara_ui-1.57.0}/tests/integration/enterprise/oauth_test.py

@@ -1,5 +1,4 @@
 import os
-import sys
 
 import playwright.sync_api
 import pytest
@@ -10,9 +9,6 @@ from solara_enterprise.auth import get_logout_url  # noqa
 
 from solara.server import settings  # noqa
 
-if sys.version_info[:2] <= (3, 6):
-    pytest.skip("Test requires python 3.7 or higher", allow_module_level=True)
-
 
 @pytest.mark.skipif(not bool(os.environ.get("AUTH0_PASSWORD")), reason="AUTH0_PASSWORD not set")
 def test_oauth_from_app_auth0(page_session: playwright.sync_api.Page, solara_server, solara_app):

{solara_ui-1.55.1 → solara_ui-1.57.0}/tests/integration/esm_test.py

@@ -1,4 +1,3 @@
-import sys
 from pathlib import Path
 
 import ipyreact
@@ -37,7 +36,6 @@ def PageDefineDuringRun():
     ipyreact.ValueWidget.element(_module="solara-test-dynamic", value=0, on_value=value.set)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 7, 0), reason="ipyreact requires python 3.7 or higher")
 @pytest.mark.parametrize("app", ["esm_test:Page", "esm_test:PageDefineDuringRun"])
 def test_ipyreact(browser: playwright.sync_api.Browser, page_session: playwright.sync_api.Page, solara_server, solara_app, extra_include_path, app):
     with extra_include_path(HERE), solara_app(app):

{solara_ui-1.55.1 → solara_ui-1.57.0}/tests/unit/file_browser_test.py

@@ -1,3 +1,4 @@
+import asyncio
 import platform
 import unittest.mock
 from pathlib import Path
@@ -290,3 +291,197 @@ def test_file_browser_programmatic_select():
     selected.value = current_dir.value / ".." / "unit" / ".."
     assert current_dir.value == HERE.parent
     rc.close()
+
+
+def test_file_browser_watch_no_event_loop(tmpdir: Path):
+    """Test that watch=True gracefully handles no running event loop."""
+    tmpdir = Path(tmpdir)
+    (tmpdir / "test.txt").write_text("test")
+
+    # When watch=True but no event loop is available, it should log a warning but not crash
+    with unittest.mock.patch.object(solara.components.file_browser.logger, "warning") as mock_warning:
+
+        @solara.component
+        def Test():
+            return solara.FileBrowser(tmpdir, watch=True)
+
+        div, rc = solara.render_fixed(Test(), handle_error=False)
+        file_list: solara.components.file_browser.FileListWidget = div.children[1]
+
+        # Verify files are still shown correctly
+        files = {k["name"] for k in file_list.files}
+        assert "test.txt" in files
+
+        # Verify warning was logged about no event loop
+        mock_warning.assert_called_with("No running event loop, cannot watch directory for changes")
+        rc.close()
+
+
+def test_file_browser_watch_disabled_by_default():
+    """Test that watch is disabled by default (no warning when watchfiles not available)."""
+
+    @solara.component
+    def Test():
+        return solara.FileBrowser(HERE.parent)
+
+    # This should work without any issues even if watchfiles is not installed
+    div, rc = solara.render_fixed(Test(), handle_error=False)
+    file_list: solara.components.file_browser.FileListWidget = div.children[1]
+    assert "file_browser_test.py" in file_list
+    rc.close()
+
+
+def test_file_browser_watch_no_watchfiles(tmpdir: Path):
+    """Test that watch=True logs a warning when watchfiles is not installed."""
+    tmpdir = Path(tmpdir)
+    (tmpdir / "test.txt").write_text("test")
+
+    with unittest.mock.patch.object(solara.components.file_browser, "watchfiles", None):
+        with unittest.mock.patch.object(solara.components.file_browser.logger, "warning") as mock_warning:
+
+            @solara.component
+            def Test():
+                return solara.FileBrowser(tmpdir, watch=True)
+
+            div, rc = solara.render_fixed(Test(), handle_error=False)
+
+            # Give the effect a chance to run
+            import time
+
+            time.sleep(0.1)
+
+            mock_warning.assert_called_with("watchfiles not installed, cannot watch directory")
+            rc.close()
+
+
+@pytest.mark.asyncio
+async def test_file_browser_watch_detects_new_file(tmpdir: Path):
+    """Test that watch=True actually detects when a new file is added."""
+    tmpdir = Path(tmpdir)
+    (tmpdir / "initial.txt").write_text("initial")
+
+    files_changed_event = asyncio.Event()
+
+    @solara.component
+    def Test():
+        return solara.FileBrowser(tmpdir, watch=True)
+
+    div, rc = solara.render_fixed(Test(), handle_error=False)
+    file_list: solara.components.file_browser.FileListWidget = div.children[1]
+
+    # Verify initial state
+    initial_files = {k["name"] for k in file_list.files}
+    assert "initial.txt" in initial_files
+    assert "new_file.txt" not in initial_files
+
+    # Set up observer to detect when files trait changes
+    def on_files_change(change):
+        files_changed_event.set()
+
+    file_list.observe(on_files_change, "files")
+
+    # Give the watcher task a moment to start
+    await asyncio.sleep(0.1)
+
+    # Create a new file - this should trigger the watcher
+    (tmpdir / "new_file.txt").write_text("new content")
+
+    # Wait for the watcher to detect the change
+    try:
+        await asyncio.wait_for(files_changed_event.wait(), timeout=5.0)
+    except asyncio.TimeoutError:
+        pytest.fail("File change was not detected within timeout")
+
+    # Verify the new file is now in the list
+    new_files = {k["name"] for k in file_list.files}
+    assert "new_file.txt" in new_files
+    assert "initial.txt" in new_files
+
+    rc.close()
+
+
+@pytest.mark.asyncio
+async def test_file_browser_watch_detects_deleted_file(tmpdir: Path):
+    """Test that watch=True detects when a file is deleted."""
+    tmpdir = Path(tmpdir)
+    (tmpdir / "file1.txt").write_text("content1")
+    (tmpdir / "file2.txt").write_text("content2")
+
+    files_changed_event = asyncio.Event()
+
+    @solara.component
+    def Test():
+        return solara.FileBrowser(tmpdir, watch=True)
+
+    div, rc = solara.render_fixed(Test(), handle_error=False)
+    file_list: solara.components.file_browser.FileListWidget = div.children[1]
+
+    # Verify initial state
+    initial_files = {k["name"] for k in file_list.files}
+    assert "file1.txt" in initial_files
+    assert "file2.txt" in initial_files
+
+    # Set up observer
+    def on_files_change(change):
+        files_changed_event.set()
+
+    file_list.observe(on_files_change, "files")
+
+    # Give the watcher task a moment to start
+    await asyncio.sleep(0.1)
+
+    # Delete a file
+    (tmpdir / "file2.txt").unlink()
+
+    # Wait for the watcher to detect the change
+    try:
+        await asyncio.wait_for(files_changed_event.wait(), timeout=5.0)
+    except asyncio.TimeoutError:
+        pytest.fail("File deletion was not detected within timeout")
+
+    # Verify file2 is gone
+    new_files = {k["name"] for k in file_list.files}
+    assert "file1.txt" in new_files
+    assert "file2.txt" not in new_files
+
+    rc.close()
+
+
+def test_file_browser_selected_relative_path_after_full_path(tmpdir: Path):
+    """Test that FileBrowser handles setting selected to a relative path after a full path.
+
+    Regression test for issue where:
+    1. User sets selected to a full path like /some/path/subdir/file.txt
+    2. User then sets selected to a relative path like subdir/file.txt
+    3. The current_dir would incorrectly become /some/path/subdir/subdir
+       because the relative path's parent was appended to the existing directory.
+    """
+    tmpdir = Path(tmpdir)
+    subdir = tmpdir / "subdir"
+    subdir.mkdir()
+    (subdir / "file.txt").write_text("content")
+
+    selected = solara.reactive(cast(Optional[Path], None))
+
+    @solara.component
+    def Test():
+        return solara.FileBrowser(tmpdir, selected=selected, can_select=True)
+
+    div, rc = solara.render_fixed(Test(), handle_error=False)
+
+    # First, set selected to a full path
+    full_path = subdir / "file.txt"
+    selected.value = full_path
+
+    # Verify we're now in the subdir
+    current_dir_text = div.children[0].children[0]
+    assert str(subdir) in current_dir_text
+
+    # Now set selected to a relative path (simulating user setting selected to "subdir/file.txt")
+    # This should work and stay in the same subdir, not create /subdir/subdir
+    relative_path = Path("subdir") / "file.txt"
+    selected.value = relative_path
+
+    # This should not raise FileNotFoundError
+    # The current_dir should resolve relative to cwd, not to the previous current_dir
+    rc.close()