Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

fix(wasm): make the streaming micropip install engine actually run (#10522)

Dylan Madisettic3717b75cb64
diff --git a/marimo/_runtime/packages/_micropip_streaming.py b/marimo/_runtime/packages/_micropip_streaming.py
index f9a42ac89e..6595eda982 100644
--- a/marimo/_runtime/packages/_micropip_streaming.py
+++ b/marimo/_runtime/packages/_micropip_streaming.py
@@ -80,7 +80,7 @@ async def stream_transaction_install(
(via `asyncio.as_completed`) instead of waiting for an opaque end-to-end call.
`index_urls` and `constraints`, when None, fall back to the values on
- `micropip._micropip` (the global singleton); when provided, they override
+ micropip's global `PackageManager` singleton; when provided, they override
the singleton for this transaction only.
Yields `(package_name, success)` per requested package. Packages that
@@ -91,14 +91,12 @@ async def stream_transaction_install(
# (where micropip isn't installed). A ModuleNotFoundError here propagates
# as ImportError, which the marimo-side wrapper catches and falls back.
micropip = importlib.import_module("micropip")
- default_environment = importlib.import_module(
- "micropip._utils"
- ).default_environment
Transaction = importlib.import_module("micropip.transaction").Transaction
+ from packaging.markers import default_environment
from packaging.requirements import Requirement
from packaging.utils import canonicalize_name
- mgr = micropip._micropip # singleton PackageManager
+ mgr = micropip._package_manager_singleton
ctx = default_environment()
wheel_base = Path(getsitepackages()[0])
@@ -144,9 +142,10 @@ async def stream_transaction_install(
base_name = spec
requested[canonicalize_name(base_name)] = (spec, base_name)
- for failed_name in transaction.failed:
- normalized = canonicalize_name(failed_name)
- original, _ = requested.pop(normalized, (failed_name, failed_name))
+ for failed_req in transaction.failed:
+ # NB. `failed` holds Requirements, not strings.
+ name = failed_req.name
+ original, _ = requested.pop(canonicalize_name(name), (name, name))
yield (original, False)
async def _install_wheel(wheel: Any) -> tuple[str, Exception | None]:
diff --git a/tests/_pyodide/test_pyodide_acceptance.mjs b/tests/_pyodide/test_pyodide_acceptance.mjs
index 8e7c00f341..1ef636cd5c 100644
--- a/tests/_pyodide/test_pyodide_acceptance.mjs
+++ b/tests/_pyodide/test_pyodide_acceptance.mjs
@@ -419,6 +419,36 @@ print("polars WASM I/O patches verified")
`);
console.log("");
+ // Step 8: Test the streaming micropip install engine against real micropip.
+ //
+ // The engine drives micropip's private Transaction API. Its callers catch a
+ // mismatch and fall back to sequential installs, so drift is otherwise
+ // silent. Call the engine directly to make drift fail here.
+ console.log("Step 8: Testing streaming micropip install engine...");
+
+ await pyodide.runPythonAsync(`
+from marimo._runtime.packages._micropip_streaming import (
+ stream_transaction_install,
+)
+
+# Pyodide bundles neither package, so both resolve through the Transaction
+# path rather than loadPackage. Assert on the installs, not on the private
+# names, so any future rename still surfaces here.
+results = {}
+async for name, ok in stream_transaction_install(["cowsay", "shortuuid"]):
+ results[name] = ok
+print(f" - stream results: {results}")
+assert results == {"cowsay": True, "shortuuid": True}, f"unexpected results: {results}"
+
+# Importable now, so the wheels really installed.
+import cowsay # noqa: F401
+import shortuuid # noqa: F401
+print(" - both packages importable: OK")
+
+print("streaming micropip install engine verified")
+`);
+ console.log("");
+
console.log("");
console.log("Verification results:", result);
console.log("");
diff --git a/tests/_runtime/packages/test_micropip_streaming.py b/tests/_runtime/packages/test_micropip_streaming.py
index aa301d4cea..3bef710354 100644
--- a/tests/_runtime/packages/test_micropip_streaming.py
+++ b/tests/_runtime/packages/test_micropip_streaming.py
@@ -1,9 +1,10 @@
# Copyright 2026 Marimo. All rights reserved.
"""Unit tests for the marimo-free `stream_transaction_install` engine.
-micropip itself only runs inside Pyodide, so we monkeypatch
-`micropip._micropip` + `micropip.transaction.Transaction` with stubs that
-simulate the resolution / install steps deterministically.
+micropip itself only runs inside Pyodide, so we monkeypatch its package-manager
+singleton and `micropip.transaction.Transaction` with stubs that simulate the
+resolution and install steps deterministically. These stubs prove the engine's
+logic, not that it still matches micropip's private API.
"""
from __future__ import annotations
@@ -34,7 +35,8 @@ class _FakeWheel:
@dataclass
class _FakeTransaction:
wheels: list[_FakeWheel] = field(default_factory=list)
- failed: list[str] = field(default_factory=list)
+ # micropip stores `Requirement`s here; strings cover older releases.
+ failed: list[Any] = field(default_factory=list)
pyodide_packages: list[tuple[str, str, str]] = field(default_factory=list)
seen_requirements: list[str] = field(default_factory=list)
init_kwargs: dict[str, Any] = field(default_factory=dict)
@@ -64,16 +66,16 @@ class _FakeMicropipManager:
def _install_fake_micropip(
monkeypatch: Any, fake_tx: _FakeTransaction
) -> _FakeMicropipManager:
- """Install fake `micropip`, `micropip._utils`, `micropip.transaction`, and
- `packaging.utils` modules into sys.modules so the engine resolves to them.
+ """Install fake `micropip` and `micropip.transaction` modules into
+ sys.modules so the engine resolves to them.
+
+ These stubs must track micropip's private API. A stub that drifts from the
+ real thing hides the breakage it exists to catch.
"""
fake_mgr = _FakeMicropipManager()
micropip_mod = types.ModuleType("micropip")
- micropip_mod._micropip = fake_mgr # type: ignore[attr-defined]
-
- utils_mod = types.ModuleType("micropip._utils")
- utils_mod.default_environment = dict # type: ignore[attr-defined]
+ micropip_mod._package_manager_singleton = fake_mgr # type: ignore[attr-defined]
txn_mod = types.ModuleType("micropip.transaction")
@@ -84,7 +86,6 @@ def _install_fake_micropip(
txn_mod.Transaction = _Transaction # type: ignore[attr-defined]
monkeypatch.setitem(sys.modules, "micropip", micropip_mod)
- monkeypatch.setitem(sys.modules, "micropip._utils", utils_mod)
monkeypatch.setitem(sys.modules, "micropip.transaction", txn_mod)
return fake_mgr
@@ -134,17 +135,37 @@ async def test_wheel_install_failure_no_double_yield(
async def test_resolution_failure_yields_false(
monkeypatch: pytest.MonkeyPatch,
) -> None:
+ """micropip records failures as `Requirement`s, not strings."""
+ from packaging.requirements import Requirement
+
from marimo._runtime.packages._micropip_streaming import (
stream_transaction_install,
)
- tx = _FakeTransaction(failed=["foo"])
+ tx = _FakeTransaction(failed=[Requirement("foo")])
_install_fake_micropip(monkeypatch, tx)
results = await _drain(stream_transaction_install(["foo"]))
assert results == [("foo", False)]
+async def test_failed_requirement_with_specifier_reports_base_name(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ """A versioned request must be reported back under the caller's spelling."""
+ from packaging.requirements import Requirement
+
+ from marimo._runtime.packages._micropip_streaming import (
+ stream_transaction_install,
+ )
+
+ tx = _FakeTransaction(failed=[Requirement("foo==1.2.3")])
+ _install_fake_micropip(monkeypatch, tx)
+
+ results = await _drain(stream_transaction_install(["foo==1.2.3"]))
+ assert results == [("foo==1.2.3", False)]
+
+
async def test_pyodide_package_only_loadpackage_once(
monkeypatch: pytest.MonkeyPatch,
) -> None:
@@ -448,9 +469,7 @@ async def test_loadpackage_failure_yields_false_no_terminate(
)
micropip_mod = types.ModuleType("micropip")
- micropip_mod._micropip = fake_mgr # type: ignore[attr-defined]
- utils_mod = types.ModuleType("micropip._utils")
- utils_mod.default_environment = dict # type: ignore[attr-defined]
+ micropip_mod._package_manager_singleton = fake_mgr # type: ignore[attr-defined]
txn_mod = types.ModuleType("micropip.transaction")
def _Transaction(**kwargs: Any) -> _FakeTransaction:
@@ -459,7 +478,6 @@ async def test_loadpackage_failure_yields_false_no_terminate(
txn_mod.Transaction = _Transaction # type: ignore[attr-defined]
monkeypatch.setitem(sys.modules, "micropip", micropip_mod)
- monkeypatch.setitem(sys.modules, "micropip._utils", utils_mod)
monkeypatch.setitem(sys.modules, "micropip.transaction", txn_mod)
results = await _drain(stream_transaction_install(["foo", "numpy"]))
@@ -467,3 +485,20 @@ async def test_loadpackage_failure_yields_false_no_terminate(
assert ("numpy", False) in results
# foo wheel still succeeded independently.
assert ("foo", True) in results
+
+
+async def test_marker_environment_passed_to_transaction(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ """micropip evaluates environment markers against this context."""
+ from marimo._runtime.packages._micropip_streaming import (
+ stream_transaction_install,
+ )
+
+ tx = _FakeTransaction(wheels=[_FakeWheel("foo")])
+ _install_fake_micropip(monkeypatch, tx)
+
+ await _drain(stream_transaction_install(["foo"]))
+ assert tx.init_kwargs["ctx"]["python_version"] == ".".join(
+ str(part) for part in sys.version_info[:2]
+ )