Merge pull request #9 from widgetti/solara-support

feat: solara support

.github/workflows/main.yml

@@ -90,9 +90,6 @@ jobs:
         run: playwright install chromium
 
       - name: Run ui-tests
-        env:
-          # do not run solara (yet)
-          SOLARA_TEST_RUNNERS: "jupyter_lab,jupyter_notebook,voila"
         run: pytest tests/ui/ --video=retain-on-failure --solara-update-snapshots-ci -s
 
       - name: Upload Test artifacts
@@ -128,4 +125,3 @@ jobs:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: twine upload --skip-existing dist/*
-

ipypopout/popout_button.py

@@ -4,9 +4,20 @@
 import traitlets
 import ipywidgets
 import ipyvuetify as v
+import sys
 
 
 def get_kernel_id():
+    if "solara" in sys.modules:
+        import solara
+        if solara._using_solara_server():
+            try:
+                import solara.server.kernel_context
+
+                context = solara.server.kernel_context.get_current_context()
+                return context.id
+            except RuntimeError:
+                pass
     ipython = IPython.get_ipython()
     if not ipython or not hasattr(ipython, 'kernel'):
         return ''

ipypopout/popout_button.vue

@@ -65,6 +65,9 @@ module.exports = {
   },
   computed: {
     popoutPageUrl() {
+       if (window.solara && (solara.rootPath !== undefined)) {
+        return solara.rootPath;
+      }
       return 'voila/templates/ipypopout/static/popout.html'
     }
   }

tests/ui/popout_test.py

@@ -28,4 +28,11 @@ def kernel_code():
     new_page.locator("text=Test ipypopout").wait_for()
     # the button should not be on the page
     new_page.locator("_vue=v-btn").wait_for(state="detached")
+    # if we do not go to a blank page, on solara, the server will not get the close beacon
+    # and the kernel will not shut down
+    new_page.goto("about:blank")
+    # wait for the kernel to shut down, if we close the page to early
+    # it seem again the server will not get the close beacon
+    # and solara's test framework fails
+    new_page.wait_for_timeout(1000)
     new_page.close()