fixed failing ipynb conversion

Author: Red Giuliano

zt_backend/tests/test_convert.py

@@ -1,51 +1,36 @@
 from zt_backend.models.state.notebook_state import NotebookState
-from zt_backend.models import notebook
-import rtoml
 import subprocess
 from pathlib import Path
 import os
+import importlib.util
 
-notebook_state = NotebookState()
+IPYNB_PATH = Path("test_file.ipynb").resolve()
+OUTPUT_PATH = Path("notebook.py").resolve()
+NOTEBOOK_PATH = Path("test_notebook.py").resolve()
 
-IPYNB_PATH = Path("zt_backend/tests/test_file.ipynb").resolve()
-OUTPUT_PATH = Path("zt_backend/tests/notebook.py").resolve()
-NOTEBOOK_PATH = Path("zt_backend/tests/test_notebook.py").resolve()
+def dynamic_import(module_path):
+    spec = importlib.util.spec_from_file_location("notebook_module", module_path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
 
 def test_ipynb_to_ztnb():
 
+    # Step 1: Convert the IPYNB file to a Python file
     convert = subprocess.Popen(
         ["zero-true", "jupyter-convert", IPYNB_PATH, OUTPUT_PATH]
     )
     convert.wait()
 
-    with open(NOTEBOOK_PATH, "r", encoding="utf-8") as file:
-        expected_data = rtoml.loads(file.read().replace("\\", "\\\\"))
-
-    expected_notebook_data = {
-        "notebookId": "test_id",
-        "notebookName": expected_data.get("notebookName", "Zero True"),
-        "userId": "",
-        "cells": {
-            f"{index}": notebook.CodeCell(id=f"{index}", **cell_data, output="")
-            for index, (cell_id, cell_data) in enumerate(expected_data["cells"].items())
-        },
-    }
-    expected_notebook = notebook.Notebook(**expected_notebook_data)
-
-    with open(OUTPUT_PATH, "r", encoding="utf-8") as file:
-        output_data = rtoml.loads(file.read().replace("\\", "\\\\"))
-
-    output_notebook_data = {
-        "notebookId": "test_id",
-        "notebookName": output_data.get("notebookName", "Zero True"),
-        "userId": "",
-        "cells": {
-            f"{index}": notebook.CodeCell(id=f"{index}", **cell_data, output="")
-            for index, (cell_id, cell_data) in enumerate(output_data["cells"].items())
-        },
-    }
-    output_notebook = notebook.Notebook(**output_notebook_data)
-
-    assert expected_notebook == output_notebook
-
-    os.remove(OUTPUT_PATH)
+    # Step 2: Import the expected notebook from test_notebook.py
+    from test_notebook import notebook as expected_notebook
+    output_module = dynamic_import(OUTPUT_PATH)
+    output_notebook = output_module.notebook
+    # Step 3: Import the generated notebook from notebook.py
+    expected_notebook.notebookId='0'
+    output_notebook.notebookId='0'
+    # Step 4: Assert that the generated notebook matches the expected notebook
+    assert output_notebook == expected_notebook
+
+    # Step 5: Clean up the generated file
+    os.remove(OUTPUT_PATH)

zt_cli/cli.py

@@ -243,7 +243,7 @@ def jupyter_convert(
 
     try:
         with open(ipynb_path, "r", encoding="utf-8") as f:
-            notebook = json.loads(f.read())
+            notebook = json.load(f)
     except Exception as e:
         typer.echo(f"Error occured: {e}")
         return
@@ -257,8 +257,7 @@ def jupyter_convert(
         typer.echo(f"Successfully converted {ipynb_path} to {nb_path}")
         return
 
-def jupyter_convert_func(ipynb_string):
-    notebook = json.loads(ipynb_string)
+def jupyter_convert_func(notebook):
     output_lines = []
 
     # Add notebook metadata
@@ -267,31 +266,34 @@ def jupyter_convert_func(ipynb_string):
     output_lines.append("")
 
     # Generate Python functions for each cell
-    for index, cell in enumerate(notebook["cells"], start=1):
+    for index, cell in enumerate(notebook["cells"], start=0):
         cell_id = f"cell_{index}"
         if cell["cell_type"] == "code":
             output_lines.append(f"def {cell_id}():")
-            for line in cell["source"]:
-                output_lines.append(f"    {line.strip()}")
-            output_lines.append("")
+            # Join the source lines with proper indentation
+            source_code = "".join(cell["source"])
+            for line in source_code.splitlines():
+                output_lines.append(f"    {line}")
+            output_lines.append("")  # Add an empty line after the function
 
         elif cell["cell_type"] == "markdown":
             markdown_content = "".join(cell["source"]).strip().replace('"""', "'''")
             output_lines.append(f"def {cell_id}():")
             output_lines.append(f"    zt.markdown(\"\"\"{markdown_content}\"\"\")")
-            output_lines.append("")
+            output_lines.append("")  # Add an empty line after the function
 
     # Add notebook definition
     output_lines.append(f"notebook = zt.notebook(")
     output_lines.append(f"    id='{notebook_id}',")
     output_lines.append(f"    name='Zero True',")
     output_lines.append(f"    cells=[")
-    for index in range(1, len(notebook["cells"]) + 1):
-        output_lines.append(f"        zt.cell(cell_{index}, type='{'markdown' if notebook['cells'][index-1]['cell_type'] == 'markdown' else 'code'}'),")
+    for index in range(0, len(notebook["cells"])):
+        output_lines.append(f"        zt.cell(cell_{index}, type='{'markdown' if notebook['cells'][index]['cell_type'] == 'markdown' else 'code'}'),")
     output_lines.append(f"    ]")
     output_lines.append(f")")
 
-    return "\n".join(output_lines)
+    return output_lines  # Return the list of output lines directly
+