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: Catch script edgecase for convert (#6115)
Dylan Madisetti30628ea003d7
diff --git a/marimo/_cli/cli.py b/marimo/_cli/cli.pyindex 48ac19d36c..0aac630fb1 100644--- a/marimo/_cli/cli.py+++ b/marimo/_cli/cli.py@@ -15,6 +15,7 @@ import marimo._cli.cli_validators as validatorsfrom marimo import _loggersfrom marimo._ast import codegenfrom marimo._ast.load import get_notebook_status+from marimo._ast.parse import MarimoFileErrorfrom marimo._cli.config.commands import configfrom marimo._cli.convert.commands import convertfrom marimo._cli.development.commands import development@@ -117,7 +118,7 @@ def check_app_correctness_or_convert(filename: str) -> None:code = file.read_text(encoding="utf-8")try:return check_app_correctness(filename, noninteractive=True)- except click.ClickException:+ except (click.ClickException, MarimoFileError):# A click exception is raised if a python script could not be convertedcode = MarimoConvert.from_non_marimo_python_script(source=code, aggressive=Truediff --git a/tests/_cli/test_cli.py b/tests/_cli/test_cli.pyindex f60ae10567..45bed9a7c5 100644--- a/tests/_cli/test_cli.py+++ b/tests/_cli/test_cli.py@@ -156,11 +156,23 @@ def _read_toml(filepath: str) -> Optional[dict[str, Any]]:return read_toml(filepath)-def temp_marimo_file_with_inline_metadata() -> Generator[str, None, None]:+def _write_temp_notebook(notebook: str) -> Generator[str, None, None]:tmp_dir = tempfile.TemporaryDirectory()tmp_file = os.path.join(tmp_dir.name, "notebook.py")- content = inspect.cleandoc(+ content = inspect.cleandoc(notebook)++ try:+ with open(tmp_file, "w") as f:+ f.write(content)+ yield tmp_file+ finally:+ tmp_dir.cleanup()+++def temp_marimo_file_with_inline_metadata() -> Generator[str, None, None]:+ with _write_temp_notebook("""# /// script# requires-python = ">=3.11"@@ -183,14 +195,59 @@ def temp_marimo_file_with_inline_metadata() -> Generator[str, None, None]:if __name__ == "__main__":app.run()"""- )+ ) as temp_file:+ yield temp_file- try:- with open(tmp_file, "w") as f:- f.write(content)- yield tmp_file- finally:- tmp_dir.cleanup()++def temp_non_marimo_file() -> Generator[str, None, None]:+ with _write_temp_notebook(+ """+ import numpy as np++ np.random.seed(42)++ if __name__ == "__main__":+ print("This is a non-marimo file.")+ """+ ) as temp_file:+ yield temp_file+++def temp_non_marimo_file_with_marimo() -> Generator[str, None, None]:+ with _write_temp_notebook(+ """+ import numpy as np+ import marimo as mo++ if __name__ == "__main__":+ print("This is a non-marimo file with a marimo import.")+ """+ ) as temp_file:+ yield temp_file+++def temp_text_file() -> Generator[str, None, None]:+ with _write_temp_notebook(+ """+ This is a syntax invalid file.+ """+ ) as temp_file:+ yield temp_file+++ params=[+ "temp_marimo_file_with_inline_metadata",+ "temp_non_marimo_file",+ "temp_non_marimo_file_with_marimo",+ "temp_text_file",+ ]+)+def temp_possible_file(request: Any) -> str:+ return request.getfixturevalue(request.param)def test_cli_help_exit_code() -> None:@@ -1129,3 +1186,40 @@ def test_cli_run_docker_remote_url():assert p.returncode != 0assert p.stdout is not Noneassert "Docker is not installed" in p.stdout.read().decode()+++def test_cli_edit_with_convert(+ temp_possible_file: str,+) -> None:+ # Convert should be able to handle anything.+ port = _get_port()+ p = subprocess.Popen(+ [+ "marimo",+ "edit",+ "--convert",+ temp_possible_file,+ "--port",+ str(port),+ "--no-token",+ "--headless",+ "--sandbox",+ ],+ stderr=subprocess.PIPE,+ stdout=subprocess.PIPE,+ text=True,+ )++ contents = _try_fetch(port)++ # If fetch fails, capture and print server output for debugging+ if contents is None:+ stdout, stderr = p.communicate(timeout=5)+ raise AssertionError(+ f"Server failed to start. stdout:\n{stdout}\nstderr:\n{stderr}"+ )++ _check_contents(p, b"read", contents)++ p.terminate()+ p.wait(timeout=5)