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: dont rasterize images in the /pdf endpoint (#8558)

Myles Scolnick14e78025a072
diff --git a/frontend/e2e-tests/py/kitchen_sink.py b/frontend/e2e-tests/py/kitchen_sink.py
index 8bad2ce9db..cbb4773512 100644
--- a/frontend/e2e-tests/py/kitchen_sink.py
+++ b/frontend/e2e-tests/py/kitchen_sink.py
@@ -9,8 +9,6 @@
# ]
# [tool.marimo.runtime]
# auto_instantiate = true
-# [tool.marimo.experimental]
-# server_side_pdf_export = true
# ///
import marimo
diff --git a/frontend/src/components/app-config/user-config-form.tsx b/frontend/src/components/app-config/user-config-form.tsx
index f066b3caea..b93bfd3cb0 100644
--- a/frontend/src/components/app-config/user-config-form.tsx
+++ b/frontend/src/components/app-config/user-config-form.tsx
@@ -1371,39 +1371,6 @@ export const UserConfigForm: React.FC = () => {
</div>
)}
/>
- <FormField
- control={form.control}
- name="experimental.server_side_pdf_export"
- render={({ field }) => (
- <div className="flex flex-col gap-y-1">
- <FormItem className={formItemClasses}>
- <FormLabel className="font-normal">
- Better PDF Export
- </FormLabel>
- <FormControl>
- <Checkbox
- data-testid="server-side-pdf-export-checkbox"
- checked={field.value === true}
- onCheckedChange={field.onChange}
- />
- </FormControl>
- </FormItem>
- <IsOverridden
- userConfig={config}
- name="experimental.server_side_pdf_export"
- />
- <FormDescription>
- Enable PDF export using{" "}
- <Kbd className="inline">nbconvert</Kbd> and{" "}
- <Kbd className="inline">playwright</Kbd>. Refer to{" "}
- <ExternalLink href="https://docs.marimo.io/guides/exporting/#exporting-to-pdf-slides-or-rst">
- the docs
- </ExternalLink>
- .
- </FormDescription>
- </div>
- )}
- />
<FormField
control={form.control}
name="experimental.storage_inspector"
diff --git a/frontend/src/components/editor/actions/__tests__/pdf-export.test.ts b/frontend/src/components/editor/actions/__tests__/pdf-export.test.ts
index eca4275577..aa1ddc0585 100644
--- a/frontend/src/components/editor/actions/__tests__/pdf-export.test.ts
+++ b/frontend/src/components/editor/actions/__tests__/pdf-export.test.ts
@@ -15,10 +15,10 @@ describe("runServerSidePDFDownload", () => {
expect(downloadPDF).toHaveBeenCalledWith({
filename: "slides.py",
- webpdf: true,
+ webpdf: false,
preset: "document",
- includeInputs: false,
- rasterServer: "live",
+ includeInputs: true,
+ rasterServer: "static",
});
});
@@ -33,10 +33,10 @@ describe("runServerSidePDFDownload", () => {
expect(downloadPDF).toHaveBeenCalledWith({
filename: "slides.py",
- webpdf: true,
+ webpdf: false,
preset: "slides",
- includeInputs: false,
- rasterServer: "live",
+ includeInputs: true,
+ rasterServer: "static",
});
});
});
diff --git a/frontend/src/components/editor/actions/pdf-export.ts b/frontend/src/components/editor/actions/pdf-export.ts
index cb4cbca54f..473764c6b4 100644
--- a/frontend/src/components/editor/actions/pdf-export.ts
+++ b/frontend/src/components/editor/actions/pdf-export.ts
@@ -18,9 +18,9 @@ export async function runServerSidePDFDownload(opts: {
await downloadPDF({
filename,
- webpdf: true,
+ webpdf: false,
preset,
- includeInputs: false,
- rasterServer: "live",
+ includeInputs: true,
+ rasterServer: "static",
});
}
diff --git a/frontend/src/components/editor/actions/useNotebookActions.tsx b/frontend/src/components/editor/actions/useNotebookActions.tsx
index 59207ab839..6ed3652998 100644
--- a/frontend/src/components/editor/actions/useNotebookActions.tsx
+++ b/frontend/src/components/editor/actions/useNotebookActions.tsx
@@ -55,8 +55,11 @@ import {
} from "@/core/cells/cells";
import { disabledCellIds } from "@/core/cells/utils";
import { useResolvedMarimoConfig } from "@/core/config/config";
-import { getFeatureFlag } from "@/core/config/feature-flag";
import { Constants } from "@/core/constants";
+import {
+ updateCellOutputsWithScreenshots,
+ useEnrichCellOutputs,
+} from "@/core/export/hooks";
import { useLayoutActions, useLayoutState } from "@/core/layout/layout";
import { useTogglePresenting } from "@/core/layout/useTogglePresenting";
import { kioskModeAtom, viewStateAtom } from "@/core/mode";
@@ -75,6 +78,7 @@ import {
} from "@/utils/download";
import { Filenames } from "@/utils/filenames";
import { Objects } from "@/utils/objects";
+import type { ProgressState } from "@/utils/progress";
import { newNotebookURL } from "@/utils/urls";
import { useRunAllCells } from "../cell/useRunCells";
import { useChromeActions, useChromeState } from "../chrome/state";
@@ -119,7 +123,9 @@ export function useNotebookActions() {
const setCommandPaletteOpen = useSetAtom(commandPaletteAtom);
const setSettingsDialogOpen = useSetAtom(settingDialogAtom);
const setKeyboardShortcutsOpen = useSetAtom(keyboardShortcutsAtom);
- const { exportAsMarkdown, readCode, saveCellConfig } = useRequestClient();
+ const { exportAsMarkdown, readCode, saveCellConfig, updateCellOutputs } =
+ useRequestClient();
+ const takeScreenshots = useEnrichCellOutputs();
const hasDisabledCells = useAtomValue(hasDisabledCellsAtom);
const canUndoDeletes = useAtomValue(canUndoDeletesAtom);
@@ -130,11 +136,9 @@ export function useNotebookActions() {
const sharingHtmlEnabled = resolvedConfig.sharing?.html ?? true;
const sharingWasmEnabled = resolvedConfig.sharing?.wasm ?? true;
- const isServerSidePdfExportEnabled = getFeatureFlag("server_side_pdf_export");
- // With server side pdf export, it doesn't matter what mode we are in,
- // Default export uses browser print, which is better in present mode
- const pdfDownloadEnabled =
- isServerSidePdfExportEnabled || viewState.mode === "present";
+ // Server-side PDF export is always available outside WASM.
+ // Browser print fallback is used in WASM.
+ const serverSidePdfEnabled = !isWasm();
const isSlidesLayout = selectedLayout === "slides";
const renderCheckboxElement = (checked: boolean) => (
@@ -166,7 +170,11 @@ export function useNotebookActions() {
return;
}
- const runDownload = async () => {
+ const runDownload = async (progress: ProgressState) => {
+ await updateCellOutputsWithScreenshots({
+ takeScreenshots: () => takeScreenshots({ progress }),
+ updateCellOutputs,
+ });
await runServerSidePDFDownload({
filename,
preset,
@@ -258,21 +266,13 @@ export function useNotebookActions() {
icon: <FileIcon size={14} strokeWidth={1.5} />,
label: "Download as PDF",
handle: NOOP_HANDLER,
- disabled: !pdfDownloadEnabled && !isServerSidePdfExportEnabled,
dropdown: [
{
icon: <FileIcon size={14} strokeWidth={1.5} />,
label: "Document Layout",
rightElement: renderRecommendedElement(!isSlidesLayout),
- disabled: !pdfDownloadEnabled,
- tooltip: pdfDownloadEnabled ? undefined : (
- <span>
- Only available in app view. <br />
- Toggle with: {renderShortcut("global.hideCode", false)}
- </span>
- ),
handle: async () => {
- if (isServerSidePdfExportEnabled) {
+ if (serverSidePdfEnabled) {
await downloadServerSidePDF({
preset: "document",
title: "Downloading Document PDF...",
@@ -294,12 +294,7 @@ export function useNotebookActions() {
icon: <FileIcon size={14} strokeWidth={1.5} />,
label: "Slides Layout",
rightElement: renderRecommendedElement(isSlidesLayout),
- disabled: !isServerSidePdfExportEnabled,
- tooltip: isServerSidePdfExportEnabled ? undefined : (
- <span>
- Requires Better PDF Export in Settings &gt; Experimental.
- </span>
- ),
+ hidden: !serverSidePdfEnabled,
handle: async () => {
await downloadServerSidePDF({
preset: "slides",
diff --git a/frontend/src/core/config/feature-flag.tsx b/frontend/src/core/config/feature-flag.tsx
index c27a64eb2b..e5995c65d1 100644
--- a/frontend/src/core/config/feature-flag.tsx
+++ b/frontend/src/core/config/feature-flag.tsx
@@ -11,7 +11,6 @@ export interface ExperimentalFeatures {
rtc_v2: boolean;
cache_panel: boolean;
external_agents: boolean;
- server_side_pdf_export: boolean;
storage_inspector: boolean;
// Add new feature flags here
}
@@ -22,7 +21,6 @@ const defaultValues: ExperimentalFeatures = {
rtc_v2: false,
cache_panel: false,
external_agents: import.meta.env.DEV,
- server_side_pdf_export: true,
storage_inspector: false,
};
diff --git a/frontend/src/utils/__tests__/download.test.tsx b/frontend/src/utils/__tests__/download.test.tsx
index 2226ef23fd..61bf7f3bc3 100644
--- a/frontend/src/utils/__tests__/download.test.tsx
+++ b/frontend/src/utils/__tests__/download.test.tsx
@@ -205,7 +205,7 @@ describe("downloadAsPDF", () => {
expect(mockExportAsPDF).toHaveBeenCalledWith({
webpdf: false,
preset: "slides",
- includeInputs: false,
+ includeInputs: true,
rasterizeOutputs: true,
rasterScale: 4,
rasterServer: "static",
diff --git a/frontend/src/utils/download.ts b/frontend/src/utils/download.ts
index d816de10bb..3f9daf1860 100644
--- a/frontend/src/utils/download.ts
+++ b/frontend/src/utils/download.ts
@@ -210,7 +210,7 @@ export async function downloadAsPDF(opts: {
filename,
webpdf,
preset = "document",
- includeInputs = false,
+ includeInputs = true,
rasterizeOutputs = true,
rasterScale = 4,
rasterServer = "static",
diff --git a/marimo/_server/api/endpoints/export.py b/marimo/_server/api/endpoints/export.py
index 4b3f432a9b..bca891ed48 100644
--- a/marimo/_server/api/endpoints/export.py
+++ b/marimo/_server/api/endpoints/export.py
@@ -463,38 +463,17 @@ async def export_as_pdf(*, request: Request) -> Response:
detail="File must have a name before exporting",
)
- from marimo._server.export._pdf_raster import (
- PDFRasterizationOptions,
- collect_pdf_png_fallbacks,
- )
-
- raster_options = PDFRasterizationOptions(
- enabled=body.rasterize_outputs,
- scale=body.raster_scale,
- server_mode=body.raster_server,
- )
-
- png_fallbacks = await collect_pdf_png_fallbacks(
- app=session.app_file_manager.app,
- session_view=session.session_view,
- filename=session.app_file_manager.filename,
- filepath=session.app_file_manager.path,
- options=raster_options,
- )
-
exporter = Exporter()
if body.preset == "slides":
pdf_data = await exporter.export_as_slides_pdf(
app=session.app_file_manager.app,
session_view=session.session_view,
- png_fallbacks=png_fallbacks,
include_inputs=body.include_inputs,
)
else:
pdf_data = exporter.export_as_pdf(
app=session.app_file_manager.app,
session_view=session.session_view,
- png_fallbacks=png_fallbacks,
webpdf=body.webpdf,
include_inputs=body.include_inputs,
)
diff --git a/marimo/_server/export/_live_notebook_server.py b/marimo/_server/export/_live_notebook_server.py
index 4c70d38c7b..81bfaf608a 100644
--- a/marimo/_server/export/_live_notebook_server.py
+++ b/marimo/_server/export/_live_notebook_server.py
@@ -92,12 +92,16 @@ class LiveNotebookServer(AbstractContextManager["LiveNotebookServer"]):
sys.executable,
"-m",
"marimo",
+ # We don't want to prompt for anything.
+ "-y",
"run",
self._filepath,
"--headless",
"--no-token",
"--no-skew-protection",
"--no-check",
+ # We don't need a sandbox because we are going to use the same marimo process.
+ "--no-sandbox",
"--host",
"127.0.0.1",
"--port",
diff --git a/marimo/_server/print.py b/marimo/_server/print.py
index 493c5508b7..5ad9aa4872 100644
--- a/marimo/_server/print.py
+++ b/marimo/_server/print.py
@@ -152,6 +152,7 @@ def print_experimental_features(config: MarimoConfig) -> None:
"sql_mode",
"performant_table_charts",
"chat_modes",
+ "server_side_pdf_export",
}
keys = keys - finished_experiments