calkit-python 0.0.5__tar.gz → 0.0.6__tar.gz

{calkit_python-0.0.5 → calkit_python-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: calkit-python
-Version: 0.0.5
+Version: 0.0.6
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://github.com/calkit/calkit
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.0.5 → calkit_python-0.0.6}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.5"
+__version__ = "0.0.6"
 
 from .core import *
 from . import git

{calkit_python-0.0.5 → calkit_python-0.0.6}/calkit/cli.py

@@ -270,15 +270,28 @@ def clean_notebook_outputs(path: str):
 
 
 @notebooks_app.command("execute")
-def execute_notebook(path: str):
-    """Execute notebook and place a copy in the executed notebooks directory.
+def execute_notebook(
+    path: str,
+    to: Annotated[
+        str, typer.Option("--to", help="Output format ('html' or 'notebook').")
+    ] = "notebook",
+):
+    """Execute notebook and place a copy in the relevant directory.
 
     This can be useful to use as a preprocessing DVC stage to use a clean
     notebook as a dependency for a stage that caches and executed notebook.
     """
     if os.path.isabs(path):
         raise ValueError("Path must be relative")
-    fpath_out = os.path.join(".calkit", "notebooks", "executed", path)
+    if to == "html":
+        subdir = "html"
+        fname_out = path.removesuffix(".ipynb") + ".html"
+    elif to == "notebook":
+        subdir = "executed"
+        fname_out = path
+    else:
+        raise ValueError(f"Invalid output format: '{to}'")
+    fpath_out = os.path.join(".calkit", "notebooks", subdir, fname_out)
     folder = os.path.dirname(fpath_out)
     os.makedirs(folder, exist_ok=True)
     subprocess.call(
@@ -288,7 +301,7 @@ def execute_notebook(path: str):
             path,
             "--execute",
             "--to",
-            "notebook",
+            to,
             "--output",
             fpath_out,
         ]