fix: update trame to streamline jupyter usage

setup.cfg

@@ -27,7 +27,7 @@ keywords =
 packages = find:
 include_package_data = True
 install_requires =
-    trame>=3.2.5
+    trame>=3.2.7
     trame-vuetify
     trame-components>=2.2.1
     trame-plotly>=3.0.2

xaitk_saliency_demo/app/core.py

@@ -22,23 +22,14 @@
 @TrameApp()
 class XaitkSaliency:
     def __init__(self, server):
-        if server is None:
-            server = get_server()
-
-        if isinstance(server, str):
-            server = get_server(server)
-
-        self.server = server
+        self.server = get_server(server, client_type="vue3")
         self._task = None
         self._model = None
         self._xaitk_config = None
         self._image_1 = None
         self._image_2 = None
         self._layout = None
 
-        # Fix version of vue
-        server.client_type = "vue3"
-
         # State defaults
         self.state.setdefault("input_expected", 1)
         self.state.update(

xaitk_saliency_demo/app/jupyter.py

@@ -5,10 +5,6 @@
 from .ml.models import update_ml_device
 
 
-def jupyter_hub_url_builder(base_url, port, template_name):
-    return f"{os.environ['JUPYTERHUB_SERVICE_PREFIX']}/proxy/{port}/index.html?ui={template_name[16:]}&reconnect=auto"
-
-
 async def create_app(server=None):
     # Disable logging
     engine_logger = logging.getLogger("xaitks_saliency_demo")
@@ -20,7 +16,7 @@ async def create_app(server=None):
     # Create app
     app = XaitkSaliency(server)
     if os.environ.get("JUPYTERHUB_SERVICE_PREFIX"):
-        app.gui.iframe_url_builder = jupyter_hub_url_builder
+        app.gui.iframe_builder = "jupyter-hub"
 
     # Start server and wait for it to be ready
     await app.gui.ready

xaitk_saliency_demo/app/main.py

@@ -4,12 +4,7 @@
 
 
 def main(server=None, **kwargs):
-    # Get or create server
-    if server is None:
-        server = get_server()
-
-    if isinstance(server, str):
-        server = get_server(server)
+    server = get_server(server, client_type="vue3")
 
     # CLI
     server.cli.add_argument(