@marimo-team/islands 0.25.2-dev14 → 0.25.2-dev17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.25.2-dev14",
+  "version": "0.25.2-dev17",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/wasm/__tests__/bootstrap.test.ts

@@ -3,7 +3,7 @@
 import { loadPyodide } from "pyodide";
 import type { PyodideInterface } from "pyodide";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { DefaultWasmController } from "../worker/bootstrap";
+import { DefaultWasmController, requirementName } from "../worker/bootstrap";
 
 vi.mock("pyodide", () => ({ loadPyodide: vi.fn() }));
 vi.mock("../worker/getMarimoWheel", () => ({
@@ -61,3 +61,35 @@ describe("WASM runtime sources", () => {
     expect(controller.requirePyodide).toBe(pyodide);
   });
 });
+
+describe("requirementName", () => {
+  it("returns the distribution name for a bare requirement", () => {
+    expect(requirementName("pandas")).toBe("pandas");
+  });
+
+  it.each([
+    ["pandas==2.1.0", "pandas"],
+    ["pandas>=2", "pandas"],
+    ["pandas<=2", "pandas"],
+    ["pandas~=2.1", "pandas"],
+    ["pandas!=2.0", "pandas"],
+    ["nltools===0.6.0.dev2", "nltools"],
+  ])("cuts the specifier off %s", (requirement, expected) => {
+    expect(requirementName(requirement)).toBe(expected);
+  });
+
+  it("cuts extras and markers", () => {
+    expect(requirementName("rich[jupyter]>=13")).toBe("rich");
+    expect(requirementName('cowsay==6.1; sys_platform == "emscripten"')).toBe(
+      "cowsay",
+    );
+  });
+
+  it("cuts a URL requirement at the name", () => {
+    expect(requirementName("pkg @ https://example.com/pkg.whl")).toBe("pkg");
+  });
+
+  it("tolerates surrounding whitespace", () => {
+    expect(requirementName("  pandas >= 2  ")).toBe("pandas");
+  });
+});

package/src/core/wasm/worker/bootstrap.ts

@@ -30,6 +30,17 @@ type SessionResources = [
 //   3.b Install from micropip
 // 4. Initialize the notebook
 
+/**
+ * The distribution name of a PEP 508 requirement: "pandas>=2" -> "pandas".
+ *
+ * Extras, markers and URL forms are all cut at their first delimiter, which is
+ * enough for the "already installed" lookups this is used for.
+ */
+export function requirementName(requirement: string): string {
+  // Trim first: a leading space would otherwise split into an empty name.
+  return requirement.trim().split(/[[<>=!~;@\s]/)[0];
+}
+
 export class DefaultWasmController implements WasmController {
   protected pyodide: PyodideInterface | null = null;
   private packageLoadQueue = Promise.resolve();
@@ -314,18 +325,26 @@ export class DefaultWasmController implements WasmController {
     });
     loadSpan.end();
 
-    // Load from micropip
+    // Load from micropip.
+    //
+    // `imports` are PEP 508 requirements and may carry a version specifier
+    // ("pandas>=2", "nltools==0.6.0.dev2"). micropip wants them whole, but the
+    // "do we already have this?" checks below are keyed by name, so compare on
+    // the name and install the requirement.
     loadSpan = t.startSpan("micropip.install");
     const missingPackages = imports.filter(
-      (pkg) => !pyodide.loadedPackages[pkg],
+      (pkg) => !pyodide.loadedPackages[requirementName(pkg)],
     );
     if (missingPackages.length > 0) {
+      const byName = missingPackages.map(
+        (pkg) => [requirementName(pkg), pkg] as const,
+      );
       await pyodide
         .runPythonAsync(`
         import micropip
         import sys
         # Filter out builtins
-        missing = [p for p in ${JSON.stringify(missingPackages)} if p not in sys.modules]
+        missing = [req for name, req in ${JSON.stringify(byName)} if name not in sys.modules]
         if len(missing) > 0:
           print("Loading from micropip:", missing)
           await micropip.install(missing)