Final migration details discovered during deployment

Author: FrancescAlted

Makefile

@@ -35,7 +35,10 @@ lite-ext:
 
 lite-build:
 	rm -rf .jupyterlite.doit.db caterva2/services/static/jupyterlite
-	${BIN}/jupyter lite build --output-dir caterva2/services/static/jupyterlite
+	# --lite-dir points at the in-package jupyter-lite.json (contentsAllJsonFile),
+	# so the build picks it up regardless of the working directory (the deploy
+	# builds from elsewhere). See caterva2/services/lite-config/.
+	${BIN}/jupyter lite build --lite-dir caterva2/services/lite-config --output-dir caterva2/services/static/jupyterlite
 
 # Installs our jupyterlite fork from a local copy, for development purposes
 # Before doing this you must run "make build" in our jupyterlite fork

caterva2/services/notebook.py

@@ -44,9 +44,13 @@ def inject_pyodide_bootstrap_cell(content: bytes) -> bytes:
     except Exception:
         return content
 
-    for cell in notebook.cells:
-        if cell.get("metadata", {}).get("caterva2_pyodide_bootstrap"):
-            return content
+    # Drop any previously-injected bootstrap cell(s) and prepend a fresh one, so a
+    # served notebook always carries the *current* bootstrap source. A stale cell may
+    # have been baked into the saved file (e.g. persisted by save-back, or shipped in
+    # the notebook); skipping when one exists would keep serving outdated install code.
+    notebook.cells = [
+        cell for cell in notebook.cells if not cell.get("metadata", {}).get("caterva2_pyodide_bootstrap")
+    ]
 
     bootstrap_cell = nbformat.v4.new_code_cell(PYODIDE_BOOTSTRAP_CELL_SOURCE)
     bootstrap_cell["metadata"]["caterva2_pyodide_bootstrap"] = True

caterva2/tests/test_notebook_bootstrap.py

@@ -1,6 +1,6 @@
 import nbformat
 
-from caterva2.services.notebook import inject_pyodide_bootstrap_cell
+from caterva2.services.notebook import PYODIDE_BOOTSTRAP_CELL_SOURCE, inject_pyodide_bootstrap_cell
 
 
 def _bootstrap_cells(notebook):
@@ -27,3 +27,19 @@ def test_inject_pyodide_bootstrap_cell_is_idempotent():
     patched_notebook = nbformat.reads(patched_twice.decode("utf-8"), as_version=4)
 
     assert len(_bootstrap_cells(patched_notebook)) == 1
+
+
+def test_inject_pyodide_bootstrap_cell_refreshes_stale_cell():
+    # A notebook with an OUTDATED bootstrap cell baked in (e.g. persisted by an
+    # older server / save-back) must be refreshed to the current source, not skipped.
+    stale = nbformat.v4.new_code_cell("# old install code\nawait micropip.install('blosc2')")
+    stale["metadata"]["caterva2_pyodide_bootstrap"] = True
+    notebook = nbformat.v4.new_notebook(cells=[stale, nbformat.v4.new_code_cell("print('hello')")])
+    content = nbformat.writes(notebook).encode("utf-8")
+
+    patched_notebook = nbformat.reads(inject_pyodide_bootstrap_cell(content).decode("utf-8"), as_version=4)
+
+    bootstrap = _bootstrap_cells(patched_notebook)
+    assert len(bootstrap) == 1
+    assert patched_notebook.cells[0]["metadata"]["caterva2_pyodide_bootstrap"] is True
+    assert patched_notebook.cells[0].source == PYODIDE_BOOTSTRAP_CELL_SOURCE