vitessce 3.5.5__py3-none-any.whl → 3.5.7__py3-none-any.whl

vitessce/widget.py

@@ -163,7 +163,7 @@ const React = await importWithMap("react", importMap);
 const { createRoot } = await importWithMap("react-dom/client", importMap);
 
 const e = React.createElement;
-const WORKSPACES_URL_KEYWORD = 'https://workspaces-pt'
+const WORKSPACES_URL_KEYWORD = 'https://workspaces-pt';
 const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
 // The jupyter server may be running through a proxy,
 // which means that the client needs to prepend the part of the URL before /proxy/8000 such as
@@ -175,7 +175,6 @@ function prependBaseUrl(config, proxy, hasHostName) {
     }
     const { origin, pathname } = new URL(window.location.href);
     const isInWorkspaces = origin.startsWith(WORKSPACES_URL_KEYWORD);
-
     const jupyterLabConfigEl = document.getElementById('jupyter-config-data');
 
     let baseUrl;
@@ -183,7 +182,8 @@ function prependBaseUrl(config, proxy, hasHostName) {
         const pathSegments = pathname.split('/');
         const passthroughIndex = pathSegments.indexOf('passthrough');
         if (passthroughIndex !== -1) {
-            baseUrl = pathSegments.slice(0, passthroughIndex + 2).join('/');
+            baseUrl = pathSegments.slice(0, passthroughIndex + 3).join('/');
+            baseUrl += '/';
         }
     } else if (jupyterLabConfigEl) {
         // This is jupyter lab
@@ -196,17 +196,13 @@ function prependBaseUrl(config, proxy, hasHostName) {
         ...config,
         datasets: config.datasets.map(d => ({
             ...d,
-            files: d.files.map(f => {
-                if (isInWorkspaces && f.url.startsWith('proxy')) {
-                    // When the user is in workspaces, we do not use jupyter_server_proxy.
-                    // Instead, the workspaces infrastructure has its own "passthrough" functionality.
-                    f.url = f.url.replace('proxy', '');
-                }
-                return {
-                    ...f,
-                    url: `${origin}${baseUrl}${f.url}`,
-                };
-            }),
+            files: d.files.map(f => ({
+                ...f,
+                url: (!(f.url.startsWith('http://') || f.url.startsWith('https://'))
+                    ? `${origin}${baseUrl}${f.url}`
+                    : f.url
+                ),
+            })),
         })),
     };
 }

{vitessce-3.5.5.dist-info → vitessce-3.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vitessce
-Version: 3.5.5
+Version: 3.5.7
 Summary: Jupyter widget facilitating interactive visualization of spatial single-cell data with Vitessce
 Project-URL: repository, https://github.com/vitessce/vitessce-python
 Author-email: Mark Keller <mark_keller@hms.harvard.edu>

{vitessce-3.5.5.dist-info → vitessce-3.5.7.dist-info}/RECORD

@@ -7,7 +7,7 @@ vitessce/file_def_utils.py,sha256=RM9Hj1uwPY-Y37JLOHiKA_acGY40p8C9WsDk8iVjDz8,66
 vitessce/repr.py,sha256=qMmefmZ3E-3sRVxeI5q1DTZnfuwbXKiA85eyqk5MCT4,2287
 vitessce/routes.py,sha256=U8T-L-3QCD_tAbPF8LsUlSMhPWNbyzbLNUnxP9Z9s9o,2140
 vitessce/utils.py,sha256=obzjj65qsagu60_yuhGc-0jmHO-BW0Y-bDs0FgrBqLY,981
-vitessce/widget.py,sha256=1NEtcdWNi7zvxaaVApPdcmVWLFdnSAepkP9mhM-MNdg,31848
+vitessce/widget.py,sha256=1E1PGs656B7AGLdE6qAGlJ63zcH7aBFi1bOS0sMkYks,31623
 vitessce/wrappers.py,sha256=kVqXFcpbuIb8MtZQSB4F7k32JM8bwCgMBrOkcAAhmvc,74676
 vitessce/data_utils/__init__.py,sha256=3mWi1lMjoj4_dNbhMOvyE-HEJu0qpMzcmkhfz_5T6n8,361
 vitessce/data_utils/anndata.py,sha256=iLa5-bRezHgBzL_XCHO7w0pc0RQ4urzZbDsqJbBYeCk,10668
@@ -17,7 +17,7 @@ vitessce/data_utils/ome.py,sha256=aK-iGNgjUmUMsWgdZhW78VrtMBKMW_jIQDYnsupq6BE,54
 vitessce/widget_plugins/__init__.py,sha256=lto2GXnc7KwjIoT-jvzyRYLj0XTJG3uxoX45Hc9EcWA,82
 vitessce/widget_plugins/demo_plugin.py,sha256=14S7nOxdlKSxIHw9DUcNCN83NE_U1EMPy2D4k0FDues,1797
 vitessce/widget_plugins/spatial_query.py,sha256=CYxvmMT1Je_jguikPROQxlegkPgIIzemKGbZSJfZMyI,12314
-vitessce-3.5.5.dist-info/METADATA,sha256=TxKrmFE7fIgpxR_ipuLnjB3oiw52VsXPqk_oLJnmRu8,9556
-vitessce-3.5.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-vitessce-3.5.5.dist-info/licenses/LICENSE,sha256=sNNpI0PQ57AW8_XnTAjU5Yw8YBA_DRNkVHrHYpCIhRU,1067
-vitessce-3.5.5.dist-info/RECORD,,
+vitessce-3.5.7.dist-info/METADATA,sha256=EbK58qfEkCzquClPc-XIIvNBcgUhQgarf-qEaX0THW4,9556
+vitessce-3.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+vitessce-3.5.7.dist-info/licenses/LICENSE,sha256=sNNpI0PQ57AW8_XnTAjU5Yw8YBA_DRNkVHrHYpCIhRU,1067
+vitessce-3.5.7.dist-info/RECORD,,