@cfasim-ui/pyodide 0.3.14 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfasim-ui/pyodide",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "type": "module",
   "description": "Pyodide (Python-in-browser) integration for cfasim-ui",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "pyodide": "^0.29.3",
-    "@cfasim-ui/shared": "0.3.14"
+    "@cfasim-ui/shared": "0.3.16"
   },
   "peerDependencies": {
     "vue": "^3.5.0"

package/src/pyodide.worker.ts

@@ -17,18 +17,48 @@ let wheelMap: Record<string, string> = {};
 
 const baseUrl = import.meta.env.BASE_URL ?? "/";
 
+const DEFAULT_PYODIDE_PACKAGES = ["micropip", "numpy"];
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let micropip: any;
 
+async function fetchPyodidePackages(): Promise<string[]> {
+  const url = `${self.location.origin}${baseUrl}pyodide-packages.json`;
+  try {
+    const res = await fetch(url);
+    if (!res.ok) {
+      console.warn(
+        `[pyodide-worker] ${url} returned ${res.status}; falling back to default packages`,
+      );
+      return DEFAULT_PYODIDE_PACKAGES;
+    }
+    const list = await res.json();
+    if (!Array.isArray(list)) {
+      console.warn(
+        `[pyodide-worker] ${url} did not contain an array; falling back to default packages`,
+      );
+      return DEFAULT_PYODIDE_PACKAGES;
+    }
+    return list as string[];
+  } catch (err) {
+    console.warn(
+      `[pyodide-worker] failed to load ${url}; falling back to default packages`,
+      err,
+    );
+    return DEFAULT_PYODIDE_PACKAGES;
+  }
+}
+
 const pyodideReadyPromise = (async () => {
-  // @ts-expect-error - Pyodide types from CDN
-  const { loadPyodide } = await import(
-    /* @vite-ignore */ "https://cdn.jsdelivr.net/pyodide/v0.29.3/full/pyodide.mjs"
-  );
-  // Load micropip and numpy in parallel with Pyodide bootstrap
-  const pyodide = await loadPyodide({
-    packages: ["micropip", "numpy"],
-  });
+  const [pyodideModule, packages] = await Promise.all([
+    // @ts-expect-error - Pyodide types from CDN
+    import(
+      /* @vite-ignore */ "https://cdn.jsdelivr.net/pyodide/v0.29.3/full/pyodide.mjs"
+    ),
+    fetchPyodidePackages(),
+  ]);
+  const { loadPyodide } = pyodideModule;
+  const pyodide = await loadPyodide({ packages });
 
   micropip = pyodide.pyimport("micropip");
 

package/src/vitePlugin.js

@@ -6,17 +6,23 @@ import { resolve } from "node:path";
  * @typedef {object} CfasimPyodideOptions
  * @property {string} [model] Path to the Python model directory (default: "model")
  * @property {string[]} [pypiDeps] PyPI packages to download at build time and serve locally
+ * @property {string[]} [pyodidePackages] Pyodide built-in packages to preload in the worker (e.g. "scipy", "pandas"). See https://pyodide.org/en/stable/usage/packages-in-pyodide.html. `micropip` and `numpy` are always included.
  * @property {string} [pipCommand] Command used to invoke pip for downloading `pypiDeps` (default: "uvx pip"). Override with e.g. "pip" or "uv run pip".
  * @property {string} [pythonVersion] Python version passed to pip's --python-version flag when downloading `pypiDeps` (default: "3.12"). Should match the Python shipped by your Pyodide runtime.
  */
 
+const DEFAULT_PYODIDE_PACKAGES = ["micropip", "numpy"];
+
 /**
  * Vite plugin that builds a Python wheel from a local model directory
- * and generates wheels.json in the public directory.
+ * and generates wheels.json + pyodide-packages.json in the public directory.
  *
  * Use `pypiDeps` to prebuild PyPI packages (like cfasim-model) as local
  * wheels for faster browser runtime — avoids PyPI round-trips on page load.
  *
+ * Use `pyodidePackages` to preload Pyodide built-in packages (scipy, pandas,
+ * etc.) into the Pyodide worker on startup.
+ *
  * @param {CfasimPyodideOptions} [options]
  * @returns {import("vite").Plugin}
  */
@@ -24,6 +30,10 @@ export function cfasimPyodide(options) {
   const modelDir = options?.model ?? "model";
   const pipCommand = options?.pipCommand ?? "uvx pip";
   const pythonVersion = options?.pythonVersion ?? "3.12";
+  const extraPackages = options?.pyodidePackages ?? [];
+  const pyodidePackages = [
+    ...new Set([...DEFAULT_PYODIDE_PACKAGES, ...extraPackages]),
+  ];
 
   function build(root) {
     const publicDir = resolve(root, "public");
@@ -40,6 +50,10 @@ export function cfasimPyodide(options) {
     });
     const wheels = readdirSync(publicDir).filter((f) => f.endsWith(".whl"));
     writeFileSync(resolve(publicDir, "wheels.json"), JSON.stringify(wheels));
+    writeFileSync(
+      resolve(publicDir, "pyodide-packages.json"),
+      JSON.stringify(pyodidePackages),
+    );
   }
 
   return {