Jupyter notebook conversion supported

Author: leriomaggio

src/pyscript/_generator.py

@@ -4,6 +4,12 @@
 import jinja2
 
 from ._node_parser import find_imports, FinderResult
+from ._node_parser import _convert_notebook
+
+
+class UnsupportedFileType(Exception):
+    pass
+
 
 _env = jinja2.Environment(
     loader=jinja2.PackageLoader("pyscript"), trim_blocks=True, lstrip_blocks=True
@@ -33,8 +39,28 @@ def file_to_html(
     Warnings will be returned when scanning for environment, if any.
     """
     output_path = output_path or input_path.with_suffix(".html")
-    import_results = find_imports(input_path)
+
+    fname, extension = input_path.name, input_path.suffix
+    if extension == ".py":
+        with open(input_path, "rt") as f:
+            source = f.read()
+
+    elif extension == ".ipynb":
+        try:
+            import nbconvert
+        except ImportError as e:  # pragma no cover
+            raise ImportError(
+                "Please install nbconvert to serve Jupyter Notebooks."
+            ) from e
+        source = _convert_notebook(input_path)
+
+    else:
+        raise UnsupportedFileType(
+            "{} is neither a script (.py) nor a notebook (.ipynb)".format(fname)
+        )
+
+    import_results = find_imports(source, input_path)
     with input_path.open("r") as fp:
-        string_to_html(fp.read(), title, output_path, pyenv=import_results)
+        string_to_html(source, title, output_path, pyenv=import_results)
     if import_results.has_warnings:
         return import_results

src/pyscript/_node_parser.py

@@ -12,10 +12,6 @@
 from ._supported_packages import PACKAGE_RENAMES, STANDARD_LIBRARY, PYODIDE_PACKAGES
 
 
-class UnsupportedFileType(Exception):
-    pass
-
-
 class NamespaceInfo:
     def __init__(self, source_fpath: Path) -> None:
         # expanding base_folder to absolute as pkgutils.FileFinder will do so - easier for later purging
@@ -164,14 +160,16 @@ def _convert_notebook(source_fpath: Path) -> str:
     return source
 
 
-def find_imports(source_fpath: Path,) -> FinderResult:
+def find_imports(source: str, source_fpath: Path,) -> FinderResult:
     """
     Parse the input source, and returns its dependencies, as organised in
     the sets of external _packages, and local modules, respectively.
     Any modules or package with the same name found in the local
 
     Parameters
     ----------
+    source  : str
+        Python source code to parse
     source_fpath : Path
         Path to the input Python module to parse
 
@@ -182,24 +180,5 @@ def find_imports(source_fpath: Path,) -> FinderResult:
         This instance provides reference to packages and paths to 
         include in the py-env, as well as any unsuppoted import.
     """
-    fname, extension = source_fpath.name, source_fpath.suffix
-    if extension == ".py":
-        with open(source_fpath, "rt") as f:
-            source = f.read()
-
-    elif extension == ".ipynb":
-        try:
-            import nbconvert
-        except ImportError as e:  # pragma no cover
-            raise ImportError(
-                "Please install nbconvert to serve Jupyter Notebooks."
-            ) from e
-
-        source = _convert_notebook(source_fpath)
-
-    else:
-        raise UnsupportedFileType(
-            "{} is neither a script (.py) nor a notebook (.ipynb)".format(fname)
-        )
 
     return _find_modules(source, source_fpath)