solara-ui 1.34.0__tar.gz → 1.34.1__tar.gz

{solara_ui-1.34.0 → solara_ui-1.34.1}/PKG-INFO

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

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/__init__.py

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

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/components/echarts.vue

@@ -93,10 +93,7 @@ module.exports = {
         document.head.appendChild(script);
       });
     },
-    getBaseUrl() {
-      if (window.solara && window.solara.rootPath !== undefined) {
-        return solara.rootPath + "/";
-      }
+    getJupyterBaseUrl() {
       // if base url is set, we use ./ for relative paths compared to the base url
       if (document.getElementsByTagName("base").length) {
         return "./";
@@ -113,10 +110,7 @@ module.exports = {
       return base;
     },
     getCdn() {
-      return (
-        (typeof solara_cdn !== "undefined" && solara_cdn) ||
-        `${this.getBaseUrl()}_solara/cdn`
-      );
+      return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`
     },
   },
 };

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/components/markdown.py

@@ -119,7 +119,8 @@ module.exports = {
                 href = location.pathname + href.substr(1);
                 a.attributes['href'].href = href;
             }
-            if(href.startsWith("./") || href.startsWith("/")) {
+            let authLink = href.starswith("/_solara/auth/");
+            if( (href.startsWith("./") || href.startsWith("/")) && !authLink) {
                 a.onclick = e => {
                     console.log("clicked", href)
                     if(href.startsWith("./")) {

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/components/markdown_editor.vue

@@ -247,10 +247,7 @@ module.exports = {
         document.head.appendChild(script);
       });
     },
-    getBaseUrl() {
-      if (window.solara && window.solara.rootPath !== undefined) {
-        return solara.rootPath + "/";
-      }
+    getJupyterBaseUrl() {
       // if base url is set, we use ./ for relative paths compared to the base url
       if (document.getElementsByTagName("base").length) {
         return "./";
@@ -267,7 +264,7 @@ module.exports = {
       return base
     },
     getCdn() {
-      return (typeof solara_cdn !== "undefined" && solara_cdn) || `${this.getBaseUrl()}_solara/cdn`;
+      return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
     },
   },
 };

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/components/sql_code.vue

@@ -83,10 +83,7 @@
           document.head.appendChild(script);
         });
       },
-      getBaseUrl() {
-        if (window.solara && window.solara.rootPath !== undefined) {
-          return solara.rootPath + "/";
-        }
+      getJupyterBaseUrl() {
         // if base url is set, we use ./ for relative paths compared to the base url
         if (document.getElementsByTagName("base").length) {
           return document.baseURI;
@@ -103,7 +100,7 @@
         return base
       },
       getCdn() {
-        return (typeof solara_cdn !== "undefined" && solara_cdn) || `${this.getBaseUrl()}_solara/cdn`;
+        return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
       },
     }
   }

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/server/reload.py

@@ -15,6 +15,7 @@ NO_WATCHDOG = False
 try:
     from watchdog.events import FileSystemEventHandler
     from watchdog.observers import Observer
+    import watchdog.events
 except ImportError:
     pass
     NO_WATCHDOG = True
@@ -99,27 +100,35 @@ else:
                 self.observers.append(observer)
                 self.directories.add(directory)
 
+        def on_moved(self, event):
+            logger.debug("Moved event: %s", event)
+            if isinstance(event, watchdog.events.FileMovedEvent):
+                if event.dest_path in self.files:
+                    self._handle_possible_change(event.dest_path)
+
         def on_modified(self, event):
-            super().on_modified(event)
-            logger.debug("Watch event: %s", event)
+            logger.debug("Modified event: %s", event)
             if not event.is_directory:
                 if event.src_path in self.files:
-                    mtime_new = os.path.getmtime(event.src_path)
-                    changed = mtime_new > self.mtimes[event.src_path]
-                    self.mtimes[event.src_path] = mtime_new
-                    if changed:
-                        logger.debug("File modified: %s", event.src_path)
-                        try:
-                            self.on_change(event.src_path)
-                        except:  # noqa
-                            # we are in the watchdog thread here, all we can do is report
-                            # and continue running (otherwise reload stops working)
-                            logger.exception("Error while executing on change handler")
-                    else:
-                        logger.debug("File reported modified, but mtime did not change: %s", event.src_path)
+                    self._handle_possible_change(event.src_path)
                 else:
                     logger.debug("Ignore file modification: %s", event.src_path)
 
+        def _handle_possible_change(self, path: str):
+            mtime_new = os.path.getmtime(path)
+            changed = mtime_new > self.mtimes[path]
+            self.mtimes[path] = mtime_new
+            if changed:
+                logger.debug("File modified: %s", path)
+                try:
+                    self.on_change(path)
+                except:  # noqa
+                    # we are in the watchdog thread here, all we can do is report
+                    # and continue running (otherwise reload stops working)
+                    logger.exception("Error while executing on change handler")
+            else:
+                logger.debug("File reported modified, but mtime did not change: %s", path)
+
     WatcherType = WatcherWatchdog  # type: ignore
 
 

{solara_ui-1.34.0 → solara_ui-1.34.1}/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.34.0-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.34.1-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/server/templates/solara.html.j2

@@ -237,6 +237,11 @@
     {% endif %}
     <script>
         solara.rootPath = {{ root_path | tojson | safe}};
+        solara.cdn = {{ cdn | tojson | safe }};
+        // the vue templates expect it to not have a trailing slash
+        solara.cdn = solara.cdn.replace(/\/$/, '');
+        // keep this for backwards compatibility
+        window.solara_cdn = solara.cdn;
         console.log("rootPath", solara.rootPath);
 
         async function changeThemeCSS(theme) {

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/website/components/algolia_api.vue

@@ -151,10 +151,7 @@ module.exports = {
                 document.head.appendChild(script);
             });
         },
-        getBaseUrl() {
-            if (window.solara && window.solara.rootPath !== undefined) {
-                return solara.rootPath + "/";
-            }
+        getJupyterBaseUrl() {
             // if base url is set, we use ./ for relative paths compared to the base url
             if (document.getElementsByTagName("base").length) {
                 return document.baseURI;
@@ -171,7 +168,7 @@ module.exports = {
             return base
         },
         getCdn() {
-            return (typeof solara_cdn !== "undefined" && solara_cdn) || `${this.getBaseUrl()}_solara/cdn`;
+            return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
         },
     },
     data(){

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/website/components/sidebar.py

@@ -16,6 +16,7 @@ def Sidebar():
 
     with solara.v.List(expand=True, nav=True, style_="height: 100%; display: flex; flex-direction: column;") as main:
         with solara.v.ListItemGroup(v_model=router.path):
+            # e.g. getting_started, examples, components, api, advanced, faq
             for route in all_routes:
                 if len(route.children) == 1 or route.path == "/":
                     with solara.Link("/documentation/" + route.path if route.path != "/" else "/documentation"):
@@ -24,6 +25,8 @@ def Sidebar():
                                 solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-home"])])
                             solara.v.ListItemTitle(style_="padding: 0 20px;", children=[route.label])
                 else:
+                    path_top_level = "/documentation/" + route.path
+                    top_level_expanded = router.path.startswith(path_top_level)
                     with solara.v.ListGroup(
                         v_slots=[
                             {
@@ -34,57 +37,60 @@ def Sidebar():
                                 ),
                             }
                         ],
-                        value=router.path.startswith("/documentation/" + route.path),
+                        value=top_level_expanded,
+                        eager=True,  # better for SEO
                     ):
                         for item in route.children:
-                            if item.path == "/":
-                                continue
+                            label = item.label
+                            if item.path == "/" and route.path in ["examples", "api", "components"]:
+                                # the 'homepage' of the subpage are named Overview
+                                label = "Overview"
+                            path_sub = "/documentation/" + route.path + "/" + item.path
+                            sub_should_be_expanded = router.path.startswith(path_sub)
                             if item.children != [] and any([c.label is not None and c.path != "/" for c in item.children]):
                                 with solara.v.ListGroup(
                                     v_slots=[
                                         {
                                             "name": "activator",
                                             "children": solara.v.ListItemTitle(
-                                                children=[item.label],
+                                                children=[label],
                                             ),
                                         }
                                     ],
                                     sub_group=True,
                                     no_action=True,
-                                    value=router.path.startswith("/documentation/" + route.path + "/" + item.path),
+                                    eager=True,  # better for SEO
+                                    value=sub_should_be_expanded,
                                 ):
                                     for subitem in item.children:
-                                        # skip pages that are only used to demonstrate Link or Router usage
-                                        if subitem.path == "/" or subitem.label is None:
+                                        # skip the 'homepage' of the examples only
+                                        if subitem.path == "/" and route.path not in ["getting_started", "advanced"]:
                                             continue
                                         path = (
-                                            "/documentation/" + route.path + "/" + item.path + "/" + subitem.path
+                                            "/documentation/" + route.path + "/" + item.path + "/" + (subitem.path if subitem.path != "/" else "")
                                             if item.path != "fullscreen"
                                             else "/apps/" + subitem.path
                                         )
                                         with solara.Link(
                                             path,
                                         ):
-                                            with solara.v.ListItem(dense=True, style_="padding: 0 20px;", value=path):
+                                            with solara.v.ListItem(dense=True, style_="margin-left: 40px; padding: 0 20px;", value=path):
                                                 solara.v.ListItemContent(
                                                     children=[subitem.label],
                                                 )
                             else:
-                                with solara.v.ListItemGroup(value="/documentation/" + route.path + "/" + item.path):
-                                    with solara.Link(
-                                        "/documentation/" + route.path + "/" + item.path,
-                                    ):
-                                        with solara.v.ListItem(dense=True, style_="padding: 0 20px;"):
-                                            solara.v.ListItemContent(
-                                                children=[item.label],
-                                            )
-        with solara.v.ListItemGroup():
+                                path = "/documentation/" + route.path + ("/" + item.path if item.path != "/" else "")
+                                with solara.Link(path):
+                                    with solara.v.ListItem(dense=True, style_="padding: 0 20px;", value=path):
+                                        solara.v.ListItemContent(
+                                            children=[label],
+                                        )
             with solara.Link("/contact"):
-                with solara.v.ListItem():
+                with solara.v.ListItem(value="/contact"):
                     solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-email"])])
                     solara.v.ListItemTitle(style_="padding: 0 20px;", children=["Contact"])
             with solara.Link("/changelog"):
-                with solara.v.ListItem():
+                with solara.v.ListItem(value="/changelog"):
                     solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-history"])])
                     solara.v.ListItemTitle(style_="padding: 0 20px;", children=["Changelog"])
 

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/website/pages/changelog/changelog.md

@@ -1,5 +1,17 @@
 # Solara Changelog
 
+## Version 1.34.0
+
+   * Feature: Enhancements for Solara `InputDate` and `InputDateRange` components [#672](https://github.com/widgetti/solara/pull/672):
+      * Limiting allowed dates with `min_date` and `max_date` arguments.
+      * Monthly granularity with `date_picker_type="month"`.
+      * `InputDateRange` selection can be sorted in ascending order with `sort` argument.
+   * Bug Fix: Typo in `solara.Tooltip`. [#695](https://github.com/widgetti/solara/pull/695)
+   * Bug Fix: `ipywidgets.Accordion` content was not hidden when closed. [#694](https://github.com/widgetti/solara/pull/694)
+   * Bug Fix: `solara.Tooltip` would break any functionality in it's children that relied on the `blur`, `keydown`, or `focus` events. [#696](https://github.com/widgetti/solara/pull/696)
+   * Bug Fix: Raise an error instead of showing a custom page on 404. Enables custom 404 pages in Solara apps. [#670](https://github.com/widgetti/solara/pull/670)
+   * Bug Fix: Prevent broken installation by restricting Numpy version. [#687](https://github.com/widgetti/solara/pull/687) and [`286e196`](https://github.com/widgetti/solara/commit/286e196ee990af814768d0612b98b5138f5ceb51).
+
 ## Version 1.33.0
 
 ### Details

solara_ui-1.34.1/solara/website/pages/documentation/advanced/content/30-enterprise/00-overview.md

@@ -0,0 +1,7 @@
+# Solara enterprise
+
+Solara enterprise is a not Open Source, but the source code is visible, is free for non-commercial use and installable from pypi.
+
+For commercial use, you require a license. Please [contact](/contact) us for more information.
+
+Solara-enterprise will stay free for non-commercial use and features that are in solara will **not be moved to solara-enterprise**.

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/widgets/vue/gridlayout.vue

@@ -78,10 +78,7 @@ module.exports = {
             document.head.appendChild(script);
           });
         },
-        getBaseUrl() {
-          if (window.solara && window.solara.rootPath !== undefined) {
-                return solara.rootPath + "/";
-          }
+        getJupyterBaseUrl() {
           if (document.getElementsByTagName("base").length) {
             return "./";
           }
@@ -97,7 +94,7 @@ module.exports = {
           return base
         },
         getCdn() {
-          return (typeof solara_cdn !== "undefined" && solara_cdn) || `${this.getBaseUrl()}_solara/cdn`;
+          return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
         },
     }
 }

{solara_ui-1.34.0 → solara_ui-1.34.1}/solara/widgets/vue/vegalite.vue

@@ -88,10 +88,7 @@ module.exports = {
                 document.head.appendChild(script);
             });
         },
-        getBaseUrl() {
-            if (window.solara && window.solara.rootPath !== undefined) {
-                return solara.rootPath + "/";
-            }
+        getJupyterBaseUrl() {
             // if base url is set, we use ./ for relative paths compared to the base url
             if (document.getElementsByTagName("base").length) {
                 return "./";
@@ -108,7 +105,7 @@ module.exports = {
             return base
         },
         getCdn() {
-            return this.cdn || (typeof solara_cdn !== "undefined" && solara_cdn) || `${this.getBaseUrl()}_solara/cdn`;
+            return this.cdn || (window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`);
         }
     },
 }

{solara_ui-1.34.0 → solara_ui-1.34.1}/tests/integration/api_test.py

@@ -21,14 +21,14 @@ from playwright.sync_api import expect
 def test_api_markdown_editor(page_session: playwright.sync_api.Page, solara_server, solara_app):
     with solara_app("solara.website.pages"):
         page_session.goto(solara_server.base_url + "/documentation/components/")
-        page_session.locator("text=Markdown Editor").first.click()
+        page_session.locator(".v-card >> text=Markdown Editor").first.click()
         page_session.locator('h1:has-text("Large heading")').wait_for()
 
 
 def test_api_file_browser(page_session: playwright.sync_api.Page, solara_server, solara_app):
     with solara_app("solara.website.pages"):
         page_session.goto(solara_server.base_url + "/documentation/components/")
-        page_session.locator("text=File Browser").first.click()
+        page_session.locator(".v-card >> text=File Browser").first.click()
         page_session.locator("text=You are in directory").wait_for()
 
 

{solara_ui-1.34.0 → solara_ui-1.34.1}/tests/integration/server_test.py

@@ -28,7 +28,7 @@ def test_docs_basics(page_session: playwright.sync_api.Page, solara_server, sola
 
         page_session.locator("text=Search the Solara Documentation").wait_for()
         page_session.locator(".docs-card", has_text="Examples").first.click()
-        page_session.locator("text=Calculator").first.click()
+        page_session.locator(".v-card >> text=Calculator").first.click()
         page_session.locator("text=+/-").wait_for()
         page_session.screenshot(path="tmp/screenshot_calculator.png")
 
@@ -39,7 +39,7 @@ def test_docs_basics(page_session: playwright.sync_api.Page, solara_server, sola
 
         page_session.locator("text=Visualization").first.click()
         page_session.locator("text=Scatter plot using Plotly").first.click()
-        page_session.locator("text=plotly express").first.wait_for()
+        page_session.locator("text=This example shows how to use Plotly").wait_for()
         page_session.screenshot(path="tmp/screenshot_plotly.png")
 
         page_session.locator("text=Plotly Image Annotator").first.click()

solara_ui-1.34.0/solara/website/pages/documentation/advanced/content/30-enterprise/00-overview.md

@@ -1 +0,0 @@
-# Solara enterprise