Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions frontend/src/mount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ import {
import { Logger } from "@/utils/Logger";
import { ErrorBoundary } from "./components/editor/boundary/ErrorBoundary";
import { notebookAtom } from "./core/cells/cells";
import type { UIElementId } from "./core/cells/ids";
import { notebookStateFromSession } from "./core/cells/session";
import {
parseAppConfig,
parseConfigOverrides,
parseUserConfig,
} from "./core/config/config-schema";
import { UI_ELEMENT_REGISTRY } from "./core/dom/uiregistry";
import { MarimoApp, preloadPage } from "./core/MarimoApp";
import { type AppMode, initialModeAtom, viewStateAtom } from "./core/mode";
import { cleanupAuthQueryParams } from "./core/network/auth";
Expand Down Expand Up @@ -341,6 +343,16 @@ function initStore(options: unknown) {
if (notebook) {
store.set(notebookAtom, notebook);
}

// Restore widget state from session snapshot in static mode
if (isStaticNotebook()) {
const uiValues = parsedOptions.data.session?.ui_values;
if (uiValues) {
for (const [objectId, value] of Object.entries(uiValues)) {
UI_ELEMENT_REGISTRY.set(objectId as UIElementId, value);
}
}
}
}

/**
Expand Down
4 changes: 4 additions & 0 deletions marimo/_schemas/generated/session.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ components:
type: array
metadata:
$ref: '#/components/schemas/NotebookSessionMetadata'
ui_values:
additionalProperties: {}
nullable: true
type: object
version:
type: string
required:
Expand Down
2 changes: 2 additions & 0 deletions marimo/_schemas/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ class NotebookSessionV1(BaseDict):
metadata: NotebookSessionMetadata
# The cells in the notebook
cells: list[Cell]
# Widget/UI element values at time of export
ui_values: Optional[dict[str, Any]]

# In future, we may want to add
# - variables
Expand Down
1 change: 1 addition & 0 deletions marimo/_session/state/serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ def serialize_session_view(
script_metadata_hash=script_metadata_hash,
),
cells=cells,
ui_values=dict(view.ui_values),
)


Expand Down
3 changes: 3 additions & 0 deletions packages/openapi/src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ export interface components {
NotebookSessionV1: {
cells: components["schemas"]["Cell"][];
metadata: components["schemas"]["NotebookSessionMetadata"];
ui_values?: {
[key: string]: unknown;
} | null;
version: string;
};
StreamMediaOutput: {
Expand Down
5 changes: 3 additions & 2 deletions tests/_session/state/snapshots/basic_session.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
],
"console": []
}
]
}
],
"ui_values": {}
}
3 changes: 2 additions & 1 deletion tests/_session/state/snapshots/console_session.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
}
]
}
]
],
"ui_values": {}
}
5 changes: 3 additions & 2 deletions tests/_session/state/snapshots/error_session.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
],
"console": []
}
]
}
],
"ui_values": {}
}
5 changes: 3 additions & 2 deletions tests/_session/state/snapshots/mime_bundle_session.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
],
"console": []
}
]
}
],
"ui_values": {}
}
3 changes: 2 additions & 1 deletion tests/_session/state/snapshots/mixed_error_session.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
],
"console": []
}
]
],
"ui_values": {}
}
Loading