solara-enterprise 1.27.0__py2.py3-none-any.whl → 1.28.0__py2.py3-none-any.whl

solara_enterprise/__init__.py

@@ -1,2 +1,2 @@
 "Enterprise features for Solara"
-__version__ = "1.27.0"
+__version__ = "1.28.0"

solara_enterprise/ssg.py

@@ -3,6 +3,7 @@ import multiprocessing.pool
 import threading
 import time
 import typing
+import urllib
 from pathlib import Path
 from typing import List, Optional
 
@@ -124,10 +125,18 @@ def ssg_crawl_route(base_url: str, route: solara.Route, build_path: Path, thread
                 page.locator("#kernel-busy-indicator").wait_for(state="hidden")
                 # page.wait_
                 time.sleep(0.5)
-                html = page.content()
+                raw_html = page.content()
             except Exception:
                 logger.exception("Failure retrieving content for url: %s", url)
                 raise
+            request_path = urllib.parse.urlparse(url).path
+
+            import solara.server.server
+
+            # the html from playwright is not what we want, pass it through the jinja template again
+            html = solara.server.server.read_root(request_path, ssg_data=_ssg_data(raw_html))
+            if html is None:
+                raise Exception(f"Failed to render {url}")
             path.write_text(html, encoding="utf-8")
             rprint(f"Wrote to {path}")
             page.goto("about:blank")
@@ -140,12 +149,8 @@ def ssg_crawl_route(base_url: str, route: solara.Route, build_path: Path, thread
     return results
 
 
-def ssg_data(path: str) -> Optional[SSGData]:
+def ssg_content(path: str) -> Optional[str]:
     license.check("SSG")
-    html = ""
-    # pre_rendered_css = ""
-    styles = []
-    title = "Solara ☀️"
     # still not sure why we sometimes end with a double slash
     if path.endswith("//"):
         path = path[:-2]
@@ -164,38 +169,46 @@ def ssg_data(path: str) -> Optional[SSGData]:
             html_path = html_path.with_suffix(".html")
         if html_path.exists() and html_path.is_file():
             logger.info("Using pre-rendered html at %r", html_path)
-
-            from bs4 import BeautifulSoup, Tag
-
-            soup = BeautifulSoup(html_path.read_text("utf8"), "html.parser")
-            node = soup.find(id="app")
-            # TODO: add classes...
-            if node and isinstance(node, Tag):
-                # only render children
-                html = "".join(str(x) for x in node.contents)
-            title_tag = soup.find("title")
-            if title_tag:
-                title = title_tag.text
-
-            # include all meta tags
-            rendered_metas = soup.find_all("meta")
-            metas = []
-            for meta in rendered_metas:
-                # but only the ones added by solara
-                if meta.attrs.get("data-solara-head-key"):
-                    metas.append(str(meta))
-
-            # include all styles
-            rendered_styles = soup.find_all("style")
-            for style in rendered_styles:
-                style_html = str(style)
-                # in case we want to skip the mathjax css
-                # if "MJXZERO" in style_html:
-                #     continue
-                # pre_rendered_css += style_html
-                styles.append(style_html)
-                logger.debug("Include style (size is %r mb):\n\t%r", len(style_html) / 1024**2, style_html[:200])
-            return SSGData(title=title, html=html, styles=styles, metas=metas)
+            return html_path.read_text("utf8")
         else:
             logger.error("Count not find html at %r", html_path)
     return None
+
+
+def _ssg_data(html: str) -> Optional[SSGData]:
+    license.check("SSG")
+    from bs4 import BeautifulSoup, Tag
+
+    # pre_rendered_css = ""
+    styles = []
+    title = "Solara ☀️"
+
+    soup = BeautifulSoup(html, "html.parser")
+    node = soup.find(id="app")
+    # TODO: add classes...
+    if node and isinstance(node, Tag):
+        # only render children
+        html = "".join(str(x) for x in node.contents)
+    title_tag = soup.find("title")
+    if title_tag:
+        title = title_tag.text
+
+    # include all meta tags
+    rendered_metas = soup.find_all("meta")
+    metas = []
+    for meta in rendered_metas:
+        # but only the ones added by solara
+        if meta.attrs.get("data-solara-head-key"):
+            metas.append(str(meta))
+
+    # include all styles
+    rendered_styles = soup.find_all("style")
+    for style in rendered_styles:
+        style_html = str(style)
+        # in case we want to skip the mathjax css
+        # if "MJXZERO" in style_html:
+        #     continue
+        # pre_rendered_css += style_html
+        styles.append(style_html)
+        logger.debug("Include style (size is %r mb):\n\t%r", len(style_html) / 1024**2, style_html[:200])
+    return SSGData(title=title, html=html, styles=styles, metas=metas)

{solara_enterprise-1.27.0.dist-info → solara_enterprise-1.28.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: solara-enterprise
-Version: 1.27.0
+Version: 1.28.0
 Project-URL: Home, https://www.github.com/widgetti/solara
 Author-email: "Maarten A. Breddels" <maartenbreddels@gmail.com>, Mario Buikhuizen <mariobuikhuizen@gmail.com>
 License: Not open source, contact contact@solara.dev for licencing.
 License-File: LICENSE
 Classifier: License :: Free for non-commercial use
-Requires-Dist: solara==1.27.0
+Requires-Dist: solara==1.28.0
 Provides-Extra: all
 Requires-Dist: solara-enterprise[auth]; extra == 'all'
 Requires-Dist: solara-enterprise[cache]; extra == 'all'

{solara_enterprise-1.27.0.dist-info → solara_enterprise-1.28.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-solara_enterprise/__init__.py,sha256=muiG2xZwijeJnK1ek8nzTBxHsIbf-7W4KwygyOb-ALA,56
+solara_enterprise/__init__.py,sha256=NWlXg-v592B1ymG8jxiCxmHlyV0g3jyq2JiWCkdXH4Y,56
 solara_enterprise/license.py,sha256=GCGEs3x9rtKf0dYUcHkx-yteIQuRlgnS8hPbl9BDAXs,412
-solara_enterprise/ssg.py,sha256=CfLh-ME5_6r5nWns_-JYIq_4YiqsiQyzZd1LO-PhI7M,7176
+solara_enterprise/ssg.py,sha256=eV18QON_bHgJKmVGENG74DcHh8pz0P4oq0DwQYNX9CI,7437
 solara_enterprise/auth/__init__.py,sha256=83RGLIkVJrb6R1iZxg5YS0R3kaCmqMHu4qs8S74LJXo,513
 solara_enterprise/auth/components.py,sha256=AnxtSkziYDdNssx8Cjr09QMtDdEqWpuI12w36Yv4JAk,4010
 solara_enterprise/auth/flask.py,sha256=Y__abnQPnP1cdQAkU8BBg9FuWMZ1rNnUmTLE_x19MlE,3539
@@ -17,7 +17,7 @@ solara_enterprise/search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 solara_enterprise/search/index.py,sha256=iBdvVyM_v7UGPlwBnPwWIBMLhy3ezFSTBvzmeb7SKW4,3307
 solara_enterprise/search/search.py,sha256=rnVHP81AwL0GR8s5vnNU6rpEIqCVnZSgwfFfCuoibCQ,467
 solara_enterprise/search/search.vue,sha256=Aoyp9XPK9dDlKCymJqAtT6eoTsEoAOIe6zXiJYup5f4,6127
-solara_enterprise-1.27.0.dist-info/METADATA,sha256=SFhVYCsUOoI5xqjfOTLs-HIPRXIb7kUexLiEHQBtKh8,932
-solara_enterprise-1.27.0.dist-info/WHEEL,sha256=ccEkY-EGGllEs7ySpwBlD8G4u70wR77CNej8Q6tzIqA,105
-solara_enterprise-1.27.0.dist-info/licenses/LICENSE,sha256=04_xbTWtvdcQomu6IXsIkniKk8EcD9P1GyJM2dYPoSU,59
-solara_enterprise-1.27.0.dist-info/RECORD,,
+solara_enterprise-1.28.0.dist-info/METADATA,sha256=_pqvMngesg0KamQeyMP7mu4bd-7SBebRpFnzTOztBa0,932
+solara_enterprise-1.28.0.dist-info/WHEEL,sha256=ccEkY-EGGllEs7ySpwBlD8G4u70wR77CNej8Q6tzIqA,105
+solara_enterprise-1.28.0.dist-info/licenses/LICENSE,sha256=04_xbTWtvdcQomu6IXsIkniKk8EcD9P1GyJM2dYPoSU,59
+solara_enterprise-1.28.0.dist-info/RECORD,,