conflict

Author: Carreau

packages/pyodide-kernel-extension/src/index.ts

@@ -59,6 +59,7 @@ const kernel: JupyterLiteServerPlugin<void> = {
     const disablePyPIFallback = !!config.disablePyPIFallback;
     const loadPyodideOptions = config.loadPyodideOptions || {};
     const extraPackagesAndIndexes = config.extraPackagesAndIndexes || [];
+    console.log('extraPackagesAndIndexes', extraPackagesAndIndexes, config);
 
     for (const [key, value] of Object.entries(loadPyodideOptions)) {
       if (key.endsWith('URL') && typeof value === 'string') {

packages/pyodide-kernel/src/kernel.ts

@@ -395,6 +395,6 @@ export namespace PyodideKernel {
      * The Jupyterlite content manager
      */
     contentsManager: Contents.IManager;
-    extraPackagesAndIndexes: Array<{ package: string; indexes: string[] | null }>;
+    extraPackagesAndIndexes: Array<{ packages: string[]; indexes: string[] | null }>;
   }
 }

packages/pyodide-kernel/src/tokens.ts

@@ -93,7 +93,7 @@ export namespace IPyodideWorkerKernel {
     /**
      * List of extra url/wheel paths to load, and extra associated indexes urls (if not a wheel url)
      */
-    extraPackagesAndIndexes: Array<{ package: string; indexes: string[] | null }>;
+    extraPackagesAndIndexes: Array<{ packages: string[]; indexes: string[] | null }>;
 
     /**
      * additional options to provide to `loadPyodide`

packages/pyodide-kernel/src/worker.ts

@@ -65,13 +65,8 @@ export class PyodideRemoteKernel {
       throw new Error('Uninitialized');
     }
 
-    const {
-      pipliteWheelUrl,
-      disablePyPIFallback,
-      pipliteUrls,
-      loadPyodideOptions,
-      extraPackagesAndIndexes,
-    } = this._options;
+    const { pipliteWheelUrl, disablePyPIFallback, pipliteUrls, loadPyodideOptions } =
+      this._options;
 
     const preloaded = (loadPyodideOptions || {}).packages || [];
 
@@ -85,28 +80,6 @@ export class PyodideRemoteKernel {
       await micropip.install('${pipliteWheelUrl}', keep_going=True)
     `);
     }
-    console.debug('extraPackagesAndIndexes', extraPackagesAndIndexes);
-
-    if (extraPackagesAndIndexes.length > 0) {
-      // note that here pkg can be a package name or a wheel url
-      for (let { package: pkg, indexes } of extraPackagesAndIndexes) {
-        let installCmd: string;
-        if (indexes === null) {
-          installCmd = `import micropip\nawait micropip.install('${pkg}', keep_going=True)`;
-        } else {
-          installCmd = `import micropip\nawait micropip.install('${pkg}', index_urls=${JSON.stringify(indexes)}, keep_going=True)`;
-        }
-        console.info('installCmd', installCmd);
-        try {
-          await this._pyodide.runPythonAsync(installCmd);
-          console.info(`Package ${pkg} Installed successfully`);
-        } catch (e) {
-          console.error('Error installing package', e);
-        }
-      }
-    } else {
-      console.info('no extra packages and indexes');
-    }
 
     // get piplite early enough to impact pyodide-kernel dependencies
     await this._pyodide.runPythonAsync(`
@@ -129,6 +102,25 @@ export class PyodideRemoteKernel {
         scriptLines.push(`await piplite.install('${pkgName}', keep_going=True)`);
       }
     }
+    const { extraPackagesAndIndexes } = this._options as IPyodideWorkerKernel.IOptions;
+    if (extraPackagesAndIndexes.length > 0) {
+      // note that here pkg can be a package name or a wheel url
+      for (let { packages: pkgs, indexes } of extraPackagesAndIndexes) {
+        let installCmd: string;
+        if (indexes === null) {
+          installCmd = `import micropip\nawait micropip.install(${JSON.stringify(pkgs)}, keep_going=True)`;
+        } else {
+          installCmd = `import micropip\nawait micropip.install(${JSON.stringify(pkgs)}, index_urls=${JSON.stringify(indexes)}, keep_going=True)`;
+        }
+        console.info('installCmd', installCmd);
+        try {
+          await this._pyodide.runPythonAsync(installCmd);
+          console.info(`Package ${pkgs} Installed successfully`);
+        } catch (e) {
+          console.error('Error installing packages', e);
+        }
+      }
+    }
 
     // import the kernel
     scriptLines.push('import pyodide_kernel');