@galaxyproject/jupyterlite 0.0.29 → 0.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@galaxyproject/jupyterlite",
-    "version": "0.0.29",
+    "version": "0.0.30",
     "type": "module",
     "files": [
         "static"
@@ -18,7 +18,6 @@
     },
     "devDependencies": {
         "@playwright/test": "^1.52.0",
-        "axios": "^1.9.0",
         "cpx": "^1.5.0",
         "node-fetch": "^3.3.2",
         "playwright": "^1.52.0",

package/static/dist/_output/config-utils.js

@@ -248,55 +248,71 @@ function addFavicon(config) {
 async function main() {
   const config = await jupyterConfigData();
 //__GXY__INJECTION__
+const AI_SETTINGS = "@jupyterlite/ai:settings-model";
+const PYODIDE_KERNEL = "@jupyterlite/pyodide-kernel-extension:kernel";
+const searchParams = Object.fromEntries(new URL(window.location.href).searchParams.entries());
+const galaxyRoot = searchParams.root || "/";
+const galaxyApiBase = galaxyRoot + "api/plugins/jupyterlite";
+
+// Intercept fetch to strip Authorization header for Galaxy API requests
+const originalFetch = window.fetch;
+const galaxyApiPath = galaxyApiBase.startsWith("http") ? new URL(galaxyApiBase).pathname : galaxyApiBase;
+window.fetch = async function (url, init) {
+    // Normalize URL to pathname for comparison
+    let pathname;
+    if (typeof url === "string") {
+        pathname = url.startsWith("http") ? new URL(url).pathname : url;
+    } else if (url instanceof URL) {
+        pathname = url.pathname;
+    } else if (url instanceof Request) {
+        pathname = new URL(url.url).pathname;
+    } else {
+        pathname = String(url);
+    }
 
-    const AI_SETTINGS = "@jupyterlite/ai:settings-model";
-    const PYODIDE_KERNEL = "@jupyterlite/pyodide-kernel-extension:kernel";
-    const searchParams = Object.fromEntries(new URL(window.location.href).searchParams.entries());
-    const galaxyApiBase = searchParams.root + "api/plugins/jupyterlite";
-
-    // Intercept fetch to strip Authorization header for Galaxy API requests
-    const originalFetch = window.fetch;
-    window.fetch = async function(url, init) {
-        let urlStr;
-        if (typeof url === "string") {
-            urlStr = url;
-        } else if (url instanceof URL) {
-            urlStr = url.toString();
-        } else if (url instanceof Request) {
-            urlStr = url.url;
-        } else {
-            urlStr = String(url);
+    // Check if this is a Galaxy API request
+    if (pathname.startsWith(galaxyApiPath)) {
+        // Handle Request objects with built-in headers
+        if (url instanceof Request) {
+            const headers = new Headers(url.headers);
+            headers.delete("Authorization");
+            url = new Request(url, { headers });
         }
-        if (urlStr.startsWith(galaxyApiBase)) {
-            if (init?.headers) {
-                const headers = new Headers(init.headers);
-                headers.delete("Authorization");
-                init = { ...init, headers };
-            }
+        // Handle headers in init options
+        if (init?.headers) {
+            const headers = new Headers(init.headers);
+            headers.delete("Authorization");
+            init = { ...init, headers };
         }
-        return originalFetch.call(this, url, init);
-    };
-
-    config.litePluginSettings[PYODIDE_KERNEL].loadPyodideOptions.env = {
-        __gxy__: JSON.stringify(searchParams)
-    };
-    config.settingsOverrides = {};
-    config.settingsOverrides[AI_SETTINGS] = {
-        defaultProvider: "jnaut",
-        useSameProviderForChatAndCompleter: false,
-        providers: [
-            {
-                id: "jnaut",
-                name: "jnaut",
-                provider: "generic",
-                model: "jnaut",
-                baseURL: galaxyApiBase,
-                parameters: {
-                    maxTokens: 4096
-                }
-            }
-        ]
-    };
+    }
+    return originalFetch.call(this, url, init);
+};
+
+// Ensure nested config structure exists
+config.litePluginSettings = config.litePluginSettings || {};
+config.litePluginSettings[PYODIDE_KERNEL] = config.litePluginSettings[PYODIDE_KERNEL] || {};
+config.litePluginSettings[PYODIDE_KERNEL].loadPyodideOptions =
+    config.litePluginSettings[PYODIDE_KERNEL].loadPyodideOptions || {};
+config.litePluginSettings[PYODIDE_KERNEL].loadPyodideOptions.env = {
+    __gxy__: JSON.stringify(searchParams),
+};
+config.settingsOverrides = {};
+config.settingsOverrides[AI_SETTINGS] = {
+    defaultProvider: "jnaut",
+    useSameProviderForChatAndCompleter: false,
+    providers: [
+        {
+            id: "jnaut",
+            name: "jnaut",
+            provider: "generic",
+            model: "jnaut",
+            baseURL: galaxyApiBase,
+            parameters: {
+                maxTokens: 4096,
+            },
+        },
+    ],
+};
 
 //__GXY__INJECTION__
   if (config.baseUrl === new URL(here()).pathname) {