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.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
Remove unused host snapshot wrappers (#11251)
Trevor Manzbbd568a6e930
diff --git a/marimo/_core/notebook.py b/marimo/_core/notebook.pyindex f44673fe15..0b1aaed6f8 100644--- a/marimo/_core/notebook.py+++ b/marimo/_core/notebook.py@@ -3,7 +3,6 @@from __future__ import annotations-from dataclasses import dataclassfrom typing import TYPE_CHECKING, Anyimport msgspec@@ -19,31 +18,10 @@ if TYPE_CHECKING:from collections.abc import Callable, Mapping, Sequencefrom marimo._core.document import CellSource, Changed, Document- from marimo._core.executions import CellExecution, Change+ from marimo._core.executions import Changefrom marimo._core.stream import Body, Sink-@dataclass(frozen=True)-class CellSnapshot:- """A cell and its retained execution, if any."""-- cell: protocol.Cell- execution: CellExecution | None = None---@dataclass(frozen=True)-class NotebookSnapshot:- """A document and its cells with their completed executions.-- Cells are in document order. Runtimes, attachments, and active work- are excluded. Restore with `Document.from_records` and- `Executions.restore` before constructing a notebook.- """-- document: protocol.Document- cells: tuple[CellSnapshot, ...]--class Notebook:"""A document, its execution results, and the runtime that produces them.diff --git a/tests/_core/conftest.py b/tests/_core/conftest.pyindex 5c871002bd..5b2b42821a 100644--- a/tests/_core/conftest.py+++ b/tests/_core/conftest.py@@ -3,17 +3,15 @@from __future__ import annotations-from copy import deepcopy-import pytestfrom marimo._core import backend as be, protocol-from marimo._core.document import Analyzer, Document, code_hash+from marimo._core.document import Document, code_hashfrom marimo._core.executions import CellExecution, Executionsfrom marimo._core.host import Host-from marimo._core.notebook import CellSnapshot, Notebook, NotebookSnapshot+from marimo._core.notebook import Notebookfrom marimo._core.run_log import RetentionPolicy-from marimo._core.stream import Event, Sink, Stream+from marimo._core.stream import Event, SinkOPERATIONS = ["notebook.create", "runtime.start", "runtime.run"]@@ -85,62 +83,6 @@ def make_notebook()-def snapshot_of(- document: Document,- executions: dict[str, CellExecution] | None = None,-) -> NotebookSnapshot:- """A snapshot of the document with executions retained by cell id."""- return NotebookSnapshot(- document._record,- tuple(- CellSnapshot(cell, (executions or {}).get(cell.id))- for cell in document- ),- )---def capture(notebook: Notebook) -> NotebookSnapshot:- """The snapshot a host would prepare from the notebook's state."""- return deepcopy(- NotebookSnapshot(- notebook.document._record,- tuple(- CellSnapshot(cell, notebook.executions.current(cell.id))- for cell in notebook.document- ),- )- )---def restore(- snapshot: NotebookSnapshot,- backend: ScriptedBackend | None = None,- *,- analyzer: Analyzer | None = None,- sink: Sink | None = None,-) -> Notebook:- """Build a notebook from a snapshot, one core at a time."""- document = Document.from_records(- snapshot.document,- [entry.cell for entry in snapshot.cells],- analyzer=analyzer,- )- executions = Executions.restore(- {- entry.cell.id: entry.execution- for entry in snapshot.cells- if entry.execution is not None- },- cells=document,- )- return Notebook(- document,- executions,- backend or ScriptedBackend(),- sink if sink is not None else Stream(history=0),- )--async def add_notebook(host: Host,record: protocol.Notebook,diff --git a/tests/_core/test_notebook.py b/tests/_core/test_notebook.pyindex f041f29179..2465b7cbf2 100644--- a/tests/_core/test_notebook.py+++ b/tests/_core/test_notebook.py@@ -15,7 +15,7 @@ from msgspec.structs import replacefrom marimo._core import backend as befrom marimo._core.document import CellSource, Documentfrom marimo._core.errors import Conflict, NoRuntime, NotFound-from marimo._core.executions import CellExecution+from marimo._core.executions import CellExecution, Executionsfrom marimo._core.host import Hostfrom marimo._core.notebook import Notebookfrom marimo._core.protocol import (@@ -45,11 +45,10 @@ from marimo._core.protocol import (RuntimeMessage,ValueOutcome,)-from marimo._core.stream import Event+from marimo._core.stream import Event, Streamfrom tests._core.conftest import (Clock,ScriptedBackend,- capture,finish,fold,host_at,@@ -58,10 +57,8 @@ from tests._core.conftest import (project,record,request_ids,- restore,retained_execution,runtime_id_of,- snapshot_of,)@@ -1139,13 +1136,18 @@ async def test_initial_results_are_published_and_replaced_by_live_execution(run_id: str | None,) -> None:retained = retained_execution(run_id=run_id)- snapshot = snapshot_of(- Document(record().id, [CellSource("c1", "42")], {}),- {"c1": retained},- )+ document = Document(record().id, [CellSource(CellId("c1"), "42")], {})host = Host(operations=[])host.update_project(project())- host.add_notebook(record(), lambda _, sink: restore(snapshot, sink=sink))+ host.add_notebook(+ record(),+ lambda _, sink: Notebook(+ document,+ Executions.restore({CellId("c1"): retained}, cells=document),+ ScriptedBackend(),+ sink,+ ),+ )live: list[Event] = []host.subscribe(live.append, notebook_id=record().id)notebook = await host.notebook(record().id)@@ -1168,7 +1170,7 @@ async def test_initial_results_are_published_and_replaced_by_live_execution(async def test_current_cell_results_can_seed_another_notebook() -> None:_, notebook = await host_at(Clock())- notebook.replace([CellSource("c1", "code")], {})+ notebook.replace([CellSource(CellId("c1"), "code")], {})run = notebook.run("code", request_id="request")execution = plan(notebook, run, "cell", "c1")notebook.observe(@@ -1176,9 +1178,20 @@ async def test_current_cell_results_can_seed_another_notebook() -> None:)finish(notebook, execution)notebook.observe(be.Done(run.id, "succeeded"))- snapshot = capture(notebook)- restored = restore(snapshot)- assert capture(restored) == snapshot+ document = Document.from_records(+ notebook.document._record, list(notebook.document)+ )+ retained = notebook.executions.current(CellId("c1"))+ assert retained is not None+ restored = Notebook(+ document,+ Executions.restore({CellId("c1"): retained}, cells=document),+ ScriptedBackend(),+ Stream(history=0),+ )+ assert restored.document._record == notebook.document._record+ assert list(restored.document) == list(notebook.document)+ assert restored.executions.current(CellId("c1")) == retainedassert fold(restored._snapshot()) == {key: valuefor key, value in fold(notebook._snapshot()).items()@@ -1187,20 +1200,25 @@ async def test_current_cell_results_can_seed_another_notebook() -> None:@pytest.mark.parametrize("saved", [False, True])-def test_snapshot_round_trip_preserves_revisions_outputs_and_analysis(+def test_restoration_preserves_revisions_outputs_and_analysis(saved: bool,) -> None:document = Document(record().id,- [CellSource("c1", "42")],+ [CellSource(CellId("c2"), "pass"), CellSource(CellId("c1"), "42")],{"width": "full"},policy="lazy",saved=saved,- analyzer=lambda _: {"c1": Analysis(defs=(), refs=(), errors=())},+ analyzer=lambda codes: {+ cell_id: Analysis(defs=(), refs=(), errors=()) for cell_id in codes+ },)# The output belongs to the previous source, and the saved revision can# precede the current one. Neither is rewritten during restoration.- document.replace([CellSource("c1", "43")], {"width": "full"})+ document.replace(+ [CellSource(CellId("c2"), "pass"), CellSource(CellId("c1"), "43")],+ {"width": "full"},+ )seed = retained_execution(run_id="historical-run")retained = CellExecution(seed.execution,@@ -1216,34 +1234,44 @@ def test_snapshot_round_trip_preserves_revisions_outputs_and_analysis(replace(seed.outputs[0], id=ItemId("last"), seq=2),),)- snapshot = snapshot_of(document, {"c1": retained})- original = deepcopy(snapshot)+ document_record, cells = deepcopy((document._record, list(document)))+ restored = Document.from_records(document_record, cells[::-1])backend = ScriptedBackend()- notebook = restore(snapshot, backend)- assert capture(notebook) == original- assert capture(restore(capture(notebook), backend)) == original+ notebook = Notebook(+ restored,+ Executions.restore({CellId("c1"): retained}, cells=restored),+ backend,+ Stream(history=0),+ )+ assert notebook.document._record == document._record+ assert list(notebook.document) == list(document)+ assert notebook.executions.current(CellId("c1")) == retainedassert backend.calls == []outputs = [e for e in notebook._snapshot() if e.kind in ("console", "display")]assert [getattr(e.data, e.kind).seq for e in outputs] == [0, 1, 2]- # Restoration copies its input, and capture returns detached data.- snapshot.document.app_config["width"] = "medium"- capture(notebook).document.app_config["width"] = "columns"- assert capture(notebook) == original+ # Restoration copies the supplied records.+ document_record.app_config["width"] = "medium"+ assert notebook.document._record == document._recordasync def test_edits_preserve_results_and_deletion_removes_them() -> None:retained = retained_execution()- snapshot = snapshot_of(- Document(record().id, [CellSource("c1", "42")], {}),- {"c1": retained},- )+ document = Document(record().id, [CellSource(CellId("c1"), "42")], {})host = Host(operations=[])host.update_project(project())- host.add_notebook(record(), lambda _, sink: restore(snapshot, sink=sink))+ host.add_notebook(+ record(),+ lambda _, sink: Notebook(+ document,+ Executions.restore({CellId("c1"): retained}, cells=document),+ ScriptedBackend(),+ sink,+ ),+ )notebook = await host.notebook(record().id)- notebook.replace([CellSource("c1", "43")], {})+ notebook.replace([CellSource(CellId("c1"), "43")], {})assert notebook.executions.current(CellId("c1")) == retainedassert (next(iter(notebook.document)).code_hash != retained.execution.code_hash@@ -1251,7 +1279,8 @@ async def test_edits_preserve_results_and_deletion_removes_them() -> None:live: list[Event] = []host.subscribe(live.append, notebook_id=notebook.id)notebook.replace([], {})- assert capture(notebook).cells == ()+ assert list(notebook.document) == []+ assert notebook.executions.current(CellId("c1")) is Noneassert fold(host.events(notebook_id=notebook.id)) == {}assert names(live) == ["console.removed",@@ -1261,25 +1290,37 @@ async def test_edits_preserve_results_and_deletion_removes_them() -> None:]-async def test_snapshot_excludes_live_work_and_cleans_up_deleted_active_cells() -> (+async def test_restoration_excludes_live_work_and_cleans_up_deleted_active_cells() -> (None):_, notebook = await host_at(Clock())- notebook.replace([CellSource("c1", "code")], {})+ notebook.replace([CellSource(CellId("c1"), "code")], {})notebook.attach()run = notebook.run("code", request_id="request")execution = plan(notebook, run, "active", "c1")notebook.observe(be.Produced(Console(execution, ItemId("out"), "stdout", 0, "x")))- snapshot = capture(notebook)- assert snapshot.cells[0].execution is None- restored = restore(snapshot)+ assert notebook.executions.current(CellId("c1")) is None+ document = Document.from_records(+ notebook.document._record, list(notebook.document)+ )+ executions = Executions.restore(+ {+ cell.id: result+ for cell in notebook.document+ if (result := notebook.executions.current(cell.id)) is not None+ },+ cells=document,+ )+ restored = Notebook(+ document, executions, ScriptedBackend(), Stream(history=0)+ )assert names(restored._snapshot()) == ["cell", "document"]notebook.replace([], {})finish(notebook, execution)notebook.observe(be.Done(run.id, "succeeded"))- assert capture(notebook).cells == ()+ assert list(notebook.document) == []assert fold(notebook._snapshot()) == {}