solara-enterprise 1.30.0__py2.py3-none-any.whl → 1.31.0__py2.py3-none-any.whl

solara_enterprise/__init__.py

@@ -1,2 +1,3 @@
 "Enterprise features for Solara"
-__version__ = "1.30.0"
+
+__version__ = "1.31.0"

solara_enterprise/search/index.py

@@ -56,7 +56,7 @@ def add_document(base_url: str, route: solara.Route, build_path: Path, documents
             else:
                 # split by h1 and h2
                 parts: List[List[Any]] = [[]]
-                ids = [None]
+                ids = []
                 titles = [soup.title.string if soup.title else ""]
                 current = parts[-1]
                 # remove invisible title elements

solara_enterprise/ssg.py

@@ -1,11 +1,12 @@
+import concurrent.futures.thread
 import logging
-import multiprocessing.pool
 import threading
 import time
 import typing
 import urllib
+import weakref
 from pathlib import Path
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
 import solara
 from rich import print as rprint
@@ -29,7 +30,7 @@ class Playwright(threading.local):
 
 
 pw = Playwright()
-playwrights: List[Playwright] = []
+_used: List[Tuple["playwright.sync_api.Browser", "playwright.sync_api._context_manager.PlaywrightContextManager"]] = []
 
 
 class SSGData(TypedDict):
@@ -44,15 +45,48 @@ def _get_playwright():
         return pw
     from playwright.sync_api import sync_playwright
 
+    pw.number = 42
     pw.context_manager = sync_playwright()
     pw.sync_playwright = pw.context_manager.start()
 
     pw.browser = pw.sync_playwright.chromium.launch(headless=not settings.ssg.headed)
     pw.page = pw.browser.new_page()
-    playwrights.append(pw)
+    _used.append((pw.browser, pw.context_manager))
     return pw
 
 
+def _worker_with_cleanup(*args, **kwargs):
+    try:
+        concurrent.futures.thread._worker(*args, **kwargs)
+    finally:
+        pw = _get_playwright()
+        pw.browser.close()
+        pw.context_manager.__exit__(None, None, None)
+
+
+class CleanupThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):
+    def _adjust_thread_count(self):
+        # copy of the original code with _worker replaced
+        # if idle threads are available, don't spin new threads
+        if self._idle_semaphore.acquire(timeout=0):
+            return
+
+        # When the executor gets lost, the weakref callback will wake up
+        # the worker threads.
+        def weakref_cb(_, q=self._work_queue):
+            q.put(None)
+
+        num_threads = len(self._threads)
+        if num_threads < self._max_workers:
+            thread_name = "%s_%d" % (self._thread_name_prefix or self, num_threads)
+            t = threading.Thread(
+                name=thread_name, target=_worker_with_cleanup, args=(weakref.ref(self, weakref_cb), self._work_queue, self._initializer, self._initargs)
+            )
+            t.start()
+            self._threads.add(t)  # type: ignore
+            concurrent.futures.thread._threads_queues[t] = self._work_queue  # type: ignore
+
+
 def ssg_crawl(base_url: str):
     license.check("SSG")
     import solara.server.app
@@ -69,31 +103,26 @@ def ssg_crawl(base_url: str):
     # although in theory we should be able to run this with multiple threads
     # there are issues with uvloop:
     #  e.g.: "Racing with another loop to spawn a process."
-    thread_pool = multiprocessing.pool.ThreadPool(1)
+    thread_pool = CleanupThreadPoolExecutor(max_workers=1)
 
     results = []
     for route in routes:
-        results.append(thread_pool.apply_async(ssg_crawl_route, [f"{base_url}/", route, build_path, thread_pool]))
+        results.append(thread_pool.submit(ssg_crawl_route, f"{base_url}/", route, build_path, thread_pool))
 
     def wait(async_result):
-        results = async_result.get()
+        results = async_result.result()
         for result in results:
             wait(result)
 
     for result in results:
         wait(result)
-    thread_pool.close()
-    thread_pool.join()
-    for pw in playwrights:
-        assert pw.browser is not None
-        assert pw.context_manager is not None
-        pw.browser.close()
-        pw.context_manager.__exit__(None, None, None)
+
+    thread_pool.shutdown()
 
     rprint("Done building SSG")
 
 
-def ssg_crawl_route(base_url: str, route: solara.Route, build_path: Path, thread_pool: multiprocessing.pool.ThreadPool):
+def ssg_crawl_route(base_url: str, route: solara.Route, build_path: Path, thread_pool: CleanupThreadPoolExecutor):
     # if route
     url = base_url + (route.path if route.path != "/" else "")
     if not route.children:
@@ -146,7 +175,7 @@ def ssg_crawl_route(base_url: str, route: solara.Route, build_path: Path, thread
             rprint(f"Skipping existing render: {path}")
     results = []
     for child in route.children:
-        result = thread_pool.apply_async(ssg_crawl_route, [url + "/", child, build_path / Path(route.path), thread_pool])
+        result = thread_pool.submit(ssg_crawl_route, url + "/", child, build_path / Path(route.path), thread_pool)
         results.append(result)
     return results
 

{solara_enterprise-1.30.0.dist-info → solara_enterprise-1.31.0.dist-info}/METADATA

@@ -1,13 +1,14 @@
 Metadata-Version: 2.3
 Name: solara-enterprise
-Version: 1.30.0
+Version: 1.31.0
 Dynamic: Summary
 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.30.0
+Requires-Dist: solara-server==1.31.0
+Requires-Dist: solara-ui==1.31.0
 Provides-Extra: all
 Requires-Dist: solara-enterprise[auth]; extra == 'all'
 Requires-Dist: solara-enterprise[cache]; extra == 'all'

{solara_enterprise-1.30.0.dist-info → solara_enterprise-1.31.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-solara_enterprise/__init__.py,sha256=f6ygSLlQDtvby6-n5y_34u7Y3i_YhpykKxJ6ateEkRU,56
+solara_enterprise/__init__.py,sha256=vG6BIPBmxJi9QnG-XEOBuf7G4XvVPTohOVlUVacScJg,57
 solara_enterprise/license.py,sha256=GCGEs3x9rtKf0dYUcHkx-yteIQuRlgnS8hPbl9BDAXs,412
-solara_enterprise/ssg.py,sha256=Effd_X5VbTFIbyrGlZDAnoUWID1VbQb8w59xjVLJsu8,7752
+solara_enterprise/ssg.py,sha256=uw3397RX0Qmg-OqOsgwaePDymhUvZTTFcBKkSWy1uCk,8935
 solara_enterprise/auth/__init__.py,sha256=83RGLIkVJrb6R1iZxg5YS0R3kaCmqMHu4qs8S74LJXo,513
 solara_enterprise/auth/components.py,sha256=mTazvLWJrduS6CrcsY60BJgkvQztH5X67CkOCRFXYV4,4038
 solara_enterprise/auth/flask.py,sha256=Y__abnQPnP1cdQAkU8BBg9FuWMZ1rNnUmTLE_x19MlE,3539
@@ -14,10 +14,10 @@ solara_enterprise/cache/memory_size.py,sha256=5PAUaxVvHMIFINA3Z4z48zDvAATTFkEd0e
 solara_enterprise/cache/multi_level.py,sha256=hMjruI1cwNwDajaRXAJ7TxQqfw5XWRvtYuAU7M4f_W8,710
 solara_enterprise/cache/redis.py,sha256=_GlACNJ5hfpRJ2Hw_2k3ma6gwEVLoVNTplS0Q5cGcRk,779
 solara_enterprise/search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solara_enterprise/search/index.py,sha256=iBdvVyM_v7UGPlwBnPwWIBMLhy3ezFSTBvzmeb7SKW4,3307
+solara_enterprise/search/index.py,sha256=W98DC_6SmQDCfX5YcmS6OfZbO0LheleBmo0FUI7NOqU,3303
 solara_enterprise/search/search.py,sha256=rnVHP81AwL0GR8s5vnNU6rpEIqCVnZSgwfFfCuoibCQ,467
 solara_enterprise/search/search.vue,sha256=Aoyp9XPK9dDlKCymJqAtT6eoTsEoAOIe6zXiJYup5f4,6127
-solara_enterprise-1.30.0.dist-info/METADATA,sha256=y4VnOTR6RtpxV0P0Jq3f2uOi1FhW5Ylqxc-0sefa_Hw,949
-solara_enterprise-1.30.0.dist-info/WHEEL,sha256=q6Ejfpj4HRnt7o1XWgEOo5g7W0PKmxxzhdMpcVNBe68,105
-solara_enterprise-1.30.0.dist-info/licenses/LICENSE,sha256=04_xbTWtvdcQomu6IXsIkniKk8EcD9P1GyJM2dYPoSU,59
-solara_enterprise-1.30.0.dist-info/RECORD,,
+solara_enterprise-1.31.0.dist-info/METADATA,sha256=5X2Nqy5Cgu_JiSbFzwtLlrwzfGQrLrSWoQ5MpIhrgtM,989
+solara_enterprise-1.31.0.dist-info/WHEEL,sha256=L5_n4Kc1NmrSdVgbp6hdnwwVwBnoYOCnbHBRMD-qNJ4,105
+solara_enterprise-1.31.0.dist-info/licenses/LICENSE,sha256=04_xbTWtvdcQomu6IXsIkniKk8EcD9P1GyJM2dYPoSU,59
+solara_enterprise-1.31.0.dist-info/RECORD,,

{solara_enterprise-1.30.0.dist-info → solara_enterprise-1.31.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.22.4
+Generator: hatchling 1.22.2
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any