fix: --no-fix

Author: dmadisetti

marimo/_cli/convert/commands.py

@@ -24,9 +24,20 @@
         "If not provided, the converted notebook will be printed to stdout."
     ),
 )
+@click.option(
+    "--no-fix",
+    type=bool,
+    default=False,
+    help=(
+        "If set, do not attempt to fix common issues in the converted "
+        "notebook. Only applicable when converting from .ipynb files."
+    ),
+    hidden=True,
+)
 def convert(
     filename: str,
     output: Optional[Path],
+    no_fix: bool = False,
 ) -> None:
     r"""Convert a Jupyter notebook, Markdown file, or Python script to a marimo notebook.
 
@@ -79,7 +90,7 @@ def convert(
 
     text = load_external_file(filename, ext)
     if ext == ".ipynb":
-        notebook = MarimoConvert.from_ipynb(text).to_py()
+        notebook = MarimoConvert.from_ipynb(text, fix=not no_fix).to_py()
     elif ext in (".md", ".qmd"):
         notebook = MarimoConvert.from_md(text).to_py()
     else:

marimo/_convert/converters.py

@@ -115,15 +115,19 @@ def from_md(source: str) -> MarimoConverterIntermediate:
         return MarimoConvert.from_ir(convert_from_md_to_marimo_ir(source))
 
     @staticmethod
-    def from_ipynb(source: str) -> MarimoConverterIntermediate:
+    def from_ipynb(
+        source: str, fix: bool = True
+    ) -> MarimoConverterIntermediate:
         """Convert from Jupyter notebook JSON.
 
         Args:
             source: Jupyter notebook JSON string
         """
         from marimo._convert.ipynb import convert_from_ipynb_to_notebook_ir
 
-        return MarimoConvert.from_ir(convert_from_ipynb_to_notebook_ir(source))
+        return MarimoConvert.from_ir(
+            convert_from_ipynb_to_notebook_ir(source, fix=fix)
+        )
 
     @staticmethod
     def from_notebook_v1(

marimo/_convert/ipynb.py

@@ -14,6 +14,7 @@
 from marimo._ast.transformers import NameTransformer, RemoveImportTransformer
 from marimo._ast.variables import is_local
 from marimo._ast.visitor import Block, NamedNode, ScopedVisitor
+from marimo._convert.comment_preserver import CommentPreserver
 from marimo._convert.utils import markdown_to_marimo
 from marimo._runtime.dataflow import DirectedGraph
 from marimo._schemas.serialization import (
@@ -709,7 +710,10 @@ def extract_inline_meta(script: str) -> tuple[str | None, str]:
 
 
 def _transform_sources(
-    sources: list[str], metadata: list[dict[str, Any]], hide_flags: list[bool]
+    sources: list[str],
+    metadata: list[dict[str, Any]],
+    hide_flags: list[bool],
+    fix: bool = True,
 ) -> list[CodeCell]:
     """
     Process raw sources and metadata into finalized cells.
@@ -721,7 +725,6 @@ def _transform_sources(
 
     After this step, cells are ready for execution or rendering.
     """
-    from marimo._convert.comment_preserver import CommentPreserver
 
     # Define transforms that don't need comment preservation
     simple_transforms = [
@@ -730,13 +733,6 @@ def _transform_sources(
         transform_exclamation_mark,
     ]
 
-    # Define transforms that should preserve comments
-    comment_preserving_transforms = [
-        transform_remove_duplicate_imports,
-        transform_fixup_multiple_definitions,
-        transform_duplicate_definitions,
-    ]
-
     # Run simple transforms first (no comment preservation needed)
     for source_transform in simple_transforms:
         new_sources = source_transform(sources)
@@ -745,6 +741,16 @@ def _transform_sources(
         )
         sources = new_sources
 
+    if not fix:
+        return bind_cell_metadata(sources, metadata, hide_flags)
+
+    # Define transforms that should preserve comments
+    comment_preserving_transforms = [
+        transform_remove_duplicate_imports,
+        transform_fixup_multiple_definitions,
+        transform_duplicate_definitions,
+    ]
+
     # Create comment preserver from the simplified sources
     comment_preserver = CommentPreserver(sources)
 
@@ -773,6 +779,7 @@ def _transform_sources(
 
 def convert_from_ipynb_to_notebook_ir(
     raw_notebook: str,
+    fix: bool = True,
 ) -> NotebookSerializationV1:
     """
     Convert a raw notebook to a NotebookSerializationV1 object.
@@ -801,7 +808,9 @@ def convert_from_ipynb_to_notebook_ir(
             metadata.append(cell.get("metadata", {}))
             hide_flags.append(is_markdown)
 
-    transformed_cells = _transform_sources(sources, metadata, hide_flags)
+    transformed_cells = _transform_sources(
+        sources, metadata, hide_flags, fix=fix
+    )
 
     return NotebookSerializationV1(
         app=AppInstantiation(),