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: harden conversion path for ipynbs (#8795)
Dylan Madisetti5af91b523ef8
diff --git a/marimo/_convert/ipynb/to_ir.py b/marimo/_convert/ipynb/to_ir.pyindex c956588eea..a75f0336e2 100644--- a/marimo/_convert/ipynb/to_ir.py+++ b/marimo/_convert/ipynb/to_ir.py@@ -3,6 +3,7 @@ from __future__ import annotationsimport astimport json+import loggingimport reimport sysfrom collections import defaultdict@@ -1233,7 +1234,13 @@ def transform_duplicate_definitions(sources: list[str]) -> list[str]:visitor = ScopedVisitor(ignore_local=True, on_def=on_def, on_ref=on_ref)- new_tree = visitor.visit(tree)+ try:+ new_tree = visitor.visit(tree)+ except SyntaxError:+ # Cell contains constructs like `import *` that marimo+ # doesn't support — skip renaming but keep the cell as-is+ new_sources[cell_idx] = source+ continue# Don't unparse if no changes were madeif not renamer.made_changes:@@ -1424,6 +1431,8 @@ def _transform_sources("""from marimo._convert.common.comment_preserver import CommentPreserver+ logger = logging.getLogger(__name__)+# Define transforms that don't need comment preservationsimple_transforms = [transform_strip_whitespace,@@ -1437,13 +1446,45 @@ def _transform_sources(transform_duplicate_definitions,]+ _REPORT_URL = "https://github.com/marimo-team/marimo/issues"++ def _run_transform(+ name: str,+ fn: Callable[[list[str]], list[str]],+ sources: list[str],+ ) -> list[str]:+ try:+ new_sources = fn(sources)+ except Exception:+ logger.warning(+ "Notebook conversion transform '%s' failed; "+ "skipping this optimization. "+ "Please report this at %s",+ name,+ _REPORT_URL,+ exc_info=True,+ )+ return sources++ if len(new_sources) != len(sources):+ logger.warning(+ "Notebook conversion transform '%s' changed cell count "+ "(%d -> %d); skipping this optimization. "+ "Please report this at %s",+ name,+ len(sources),+ len(new_sources),+ _REPORT_URL,+ )+ return sources++ return new_sources+# Run simple transforms first (no comment preservation needed)for source_transform in simple_transforms:- new_sources = source_transform(sources)- assert len(new_sources) == len(sources), (- f"{source_transform.__name__} changed cell count"+ sources = _run_transform(+ source_transform.__name__, source_transform, sources)- sources = new_sources# Create comment preserver from the simplified sourcescomment_preserver = CommentPreserver(sources)@@ -1451,11 +1492,7 @@ def _transform_sources(# Run comment-preserving transformsfor base_transform in comment_preserving_transforms:transform = comment_preserver(base_transform)- new_sources = transform(sources)- assert len(new_sources) == len(sources), (- f"{base_transform.__name__} changed cell count"- )- sources = new_sources+ sources = _run_transform(base_transform.__name__, transform, sources)# Handle exclamation_mark specially since it returns ExclamationMarkResultexclamation_result = transform_exclamation_mark(sources)diff --git a/tests/_convert/ipynb/test_ipynb_to_ir.py b/tests/_convert/ipynb/test_ipynb_to_ir.pyindex 1169c5103e..72ede6905f 100644--- a/tests/_convert/ipynb/test_ipynb_to_ir.py+++ b/tests/_convert/ipynb/test_ipynb_to_ir.py@@ -1383,3 +1383,44 @@ def test_integration_mixed_packages_with_git_url():assert ('"package @ git+https://github.com/user/package.git"' in header_value)+++def test_transform_duplicate_definitions_with_star_import():+ """Star imports should not crash the transform — cells are kept as-is."""+ sources = dd(+ [+ "from os.path import *",+ "x = 1",+ "x = 2",+ ]+ )+ result = transform_duplicate_definitions(sources)+ # Should not raise — star import cell is preserved unchanged+ assert result[0] == sources[0]+ assert len(result) == 3+++def test_convert_from_ipynb_with_star_import():+ """End-to-end: a notebook with star imports should convert successfully."""+ notebook = {+ "cells": [+ {+ "cell_type": "code",+ "source": ["from os.path import *"],+ "metadata": {},+ },+ {+ "cell_type": "code",+ "source": ["x = join('a', 'b')"],+ "metadata": {},+ },+ ],+ "metadata": {},+ "nbformat": 4,+ "nbformat_minor": 2,+ }++ result = convert_from_ipynb_to_notebook_ir(json.dumps(notebook))+ assert len(result.cells) >= 1+ # The star import cell should be present in the output+ assert any("from os.path import *" in c.code for c in result.cells)