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
fix: stop aggressive markdown conversion of non strings (#7208)
Dylan Madisettic3c03881ed46
diff --git a/marimo/_ast/compiler.py b/marimo/_ast/compiler.pyindex 5c1ed7bb3a..7b70da3697 100644--- a/marimo/_ast/compiler.py+++ b/marimo/_ast/compiler.py@@ -8,6 +8,7 @@ import ioimport linecacheimport osimport re+import sysimport textwrapimport token as token_typesimport warnings@@ -146,11 +147,17 @@ def fix_source_position(node: Any, source_position: SourcePosition) -> Any:return node-def const_string(args: list[ast.stmt]) -> str:+def _extract_const_string(args: list[ast.stmt]) -> str:(inner,) = args- if hasattr(inner, "values"):- (inner,) = inner.values- return f"{inner.value}" # type: ignore[attr-defined]+ # Various string types may need to be unpacked+ if isinstance(inner, ast.JoinedStr) or (+ sys.version_info >= (3, 14) and isinstance(inner, ast.TemplateStr)+ ):+ # But we only match if there is 1 entry.+ (inner,) = inner.values # type: ignore[attr-defined]+ assert isinstance(inner, ast.Constant)+ assert isinstance(inner.value, str)+ return inner.valuedef const_or_id(args: ast.stmt) -> str:@@ -171,7 +178,7 @@ def _extract_markdown(tree: ast.Module) -> Optional[str]:assert value.func.value.id == "mo"if not value.args: # Handle mo.md() with no argumentsreturn None- md_lines = const_string(value.args).split("\n")+ md_lines = _extract_const_string(value.args).split("\n")except (AssertionError, AttributeError, ValueError):# No reason to explicitly catch exceptions if we can't parse out# markdown. Just handle it as a code block.diff --git a/tests/_runtime/test_runtime.py b/tests/_runtime/test_runtime.pyindex c85133362e..5f3341f563 100644--- a/tests/_runtime/test_runtime.py+++ b/tests/_runtime/test_runtime.py@@ -3544,6 +3544,92 @@ class TestMarkdownHandling:assert len(regular_stale_ops) == 1assert regular_stale_ops[0].stale_inputs is True+ @pytest.mark.skipif(+ sys.version_info < (3, 14), reason="Template strings only on 3.14"+ )+ async def test_non_markdown_cells_alt_strings(+ self, mocked_kernel: MockedKernel+ ) -> None:+ """Test that non-markdown cells are not affected by markdown handling."""+ k = mocked_kernel.k+ stream = mocked_kernel.stream++ # Create execution requests with markdown and regular cells+ r_markdown_cell_code = "mo.md(r'\\n')"+ f_markdown_cell_code = "mo.md(f'{10*10}')"+ t_markdown_cell_code = "mo.md(t'{10*10}')"+ f_markdown_cell_code_escaped = "mo.md(f'{{mo}}')"+ t_markdown_cell_code_escaped = "mo.md(t'{{mo}}')"++ execution_requests = [+ ExecutionRequest(cell_id="md_cell_r", code=r_markdown_cell_code),+ ExecutionRequest(cell_id="md_cell_f", code=f_markdown_cell_code),+ ExecutionRequest(cell_id="md_cell_t", code=t_markdown_cell_code),+ ExecutionRequest(+ cell_id="md_cell_fe", code=f_markdown_cell_code_escaped+ ),+ ExecutionRequest(+ cell_id="md_cell_te", code=t_markdown_cell_code_escaped+ ),+ ExecutionRequest(cell_id="mo_import", code="import marimo as mo"),+ ]++ creation_request = CreationRequest(+ execution_requests=execution_requests,+ auto_run=False,+ set_ui_element_value_request=SetUIElementValueRequest(+ object_ids=[],+ values=[],+ ),+ )++ # Instantiate the kernel+ await k.instantiate(creation_request)++ # Check that interpolated markdown cells are not matched+ assert "md_cell_f" in k._uninstantiated_execution_requests+ assert "md_cell_t" in k._uninstantiated_execution_requests++ # Without any interpolation can match for rendering+ assert "md_cell_fe" not in k._uninstantiated_execution_requests+ assert "md_cell_te" not in k._uninstantiated_execution_requests+ assert "md_cell_r" not in k._uninstantiated_execution_requests++ async def test_non_markdown_cells_single_call(+ self, mocked_kernel: MockedKernel+ ) -> None:+ """Test that non-markdown cells are not affected by markdown handling."""+ k = mocked_kernel.k+ stream = mocked_kernel.stream++ # Create execution requests with markdown and regular cells+ markdown_cell_code = "mo.md(mo.ui)"+ regular_cell_code = "x = 0"++ execution_requests = [+ ExecutionRequest(cell_id="md_cell", code=markdown_cell_code),+ ExecutionRequest(cell_id="regular_cell", code=regular_cell_code),+ ExecutionRequest(cell_id="mo_import", code="import marimo as mo"),+ ]++ creation_request = CreationRequest(+ execution_requests=execution_requests,+ auto_run=False,+ set_ui_element_value_request=SetUIElementValueRequest(+ object_ids=[],+ values=[],+ ),+ )++ # Instantiate the kernel+ await k.instantiate(creation_request)++ # Check that markdown cell is also in uninstantiated requests-+ # since it does not contain a string+ assert "md_cell" in k._uninstantiated_execution_requests+ # Regular cell should still be there+ assert "regular_cell" in k._uninstantiated_execution_requests+async def test_non_markdown_cells_not_affected(self, mocked_kernel: MockedKernel) -> None: