calkit-python 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

calkit/__init__.py

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

calkit/cli.py

@@ -11,16 +11,37 @@ import git
 import typer
 from typing_extensions import Annotated, Optional
 
+import calkit
 from calkit.core import ryaml
 
 from . import config
 from .dvc import configure_remote, set_remote_auth
 
-app = typer.Typer()
-config_app = typer.Typer()
-new_app = typer.Typer()
+app = typer.Typer(
+    invoke_without_command=True,
+    no_args_is_help=True,
+    context_settings=dict(help_option_names=["-h", "--help"]),
+)
+config_app = typer.Typer(no_args_is_help=True)
+new_app = typer.Typer(no_args_is_help=True)
+notebooks_app = typer.Typer(no_args_is_help=True)
 app.add_typer(config_app, name="config", help="Configure Calkit.")
-app.add_typer(new_app, name="new", help="Add new Calkit object.")
+app.add_typer(
+    new_app, name="new", help="Add new Calkit object (to calkit.yaml)."
+)
+app.add_typer(notebooks_app, name="nb", help="Work with Jupyter notebooks.")
+
+
+@app.callback()
+def main(
+    version: Annotated[
+        bool,
+        typer.Option("--version", help="Show version and exit."),
+    ] = False,
+):
+    if version:
+        typer.echo(calkit.__version__)
+        raise typer.Exit()
 
 
 @config_app.command(name="set")
@@ -135,7 +156,7 @@ def new_figure(
     description: Annotated[str, typer.Option("--desc")] = None,
     commit: Annotated[bool, typer.Option("--commit")] = False,
 ):
-    """Add a new figure to ``calkit.yaml``."""
+    """Add a new figure."""
     if os.path.isfile("calkit.yaml"):
         with open("calkit.yaml") as f:
             ck_info = ryaml.load(f)
@@ -163,6 +184,7 @@ def new_question(
     question: str,
     commit: Annotated[bool, typer.Option("--commit")] = False,
 ):
+    """Add a new question."""
     if os.path.isfile("calkit.yaml"):
         with open("calkit.yaml") as f:
             ck_info = ryaml.load(f)
@@ -183,6 +205,109 @@ def new_question(
         repo.git.commit(["-m", "Add question"])
 
 
+@new_app.command("notebook")
+def new_notebook(
+    path: Annotated[str, typer.Argument(help="Notebook path (relative)")],
+    title: Annotated[str, typer.Option("--title")],
+    description: Annotated[str, typer.Option("--desc")] = None,
+    commit: Annotated[bool, typer.Option("--commit")] = False,
+):
+    """Add a new notebook."""
+    if os.path.isabs(path):
+        raise ValueError("Path must be relative")
+    if not os.path.isfile(path):
+        raise ValueError("Path is not a file")
+    if not path.endswith(".ipynb"):
+        raise ValueError("Path does not have .ipynb extension")
+    # TODO: Add option to create stages that run `calkit nb clean` and
+    # `calkit nb execute`
+    if os.path.isfile("calkit.yaml"):
+        with open("calkit.yaml") as f:
+            ck_info = ryaml.load(f)
+    else:
+        ck_info = {}
+    notebooks = ck_info.get("notebooks", [])
+    paths = [f.get("path") for f in notebooks]
+    if path in paths:
+        raise ValueError(f"Notebook at path {path} already exists")
+    obj = dict(path=path, title=title)
+    if description is not None:
+        obj["description"] = description
+    notebooks.append(obj)
+    ck_info["notebooks"] = notebooks
+    with open("calkit.yaml", "w") as f:
+        ryaml.dump(ck_info, f)
+    if commit:
+        repo = git.Repo()
+        repo.git.add("calkit.yaml")
+        repo.git.commit(["-m", f"Add notebook {path}"])
+
+
+@notebooks_app.command("clean")
+def clean_notebook_outputs(path: str):
+    """Clean notebook and place a copy in the cleaned notebooks 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", "cleaned", path)
+    folder = os.path.dirname(fpath_out)
+    os.makedirs(folder, exist_ok=True)
+    subprocess.call(
+        [
+            "jupyter",
+            "nbconvert",
+            path,
+            "--clear-output",
+            "--to",
+            "notebook",
+            "--output",
+            fpath_out,
+        ]
+    )
+
+
+@notebooks_app.command("execute")
+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")
+    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(
+        [
+            "jupyter",
+            "nbconvert",
+            path,
+            "--execute",
+            "--to",
+            to,
+            "--output",
+            fpath_out,
+        ]
+    )
+
+
 @app.command(name="server", help="Run the local server.")
 def run_server():
     import uvicorn

{calkit_python-0.0.4.dist-info → calkit_python-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: calkit-python
-Version: 0.0.4
+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.4.dist-info → calkit_python-0.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
-calkit/__init__.py,sha256=ZhTSlSvcKFHVv921t4q9zBBPNWHaT4h43s3G26KldNo,142
-calkit/cli.py,sha256=FkZGfQNSjWKRjWDX10GMDTh3NM9E7cW9DJch2h_F75Q,7930
+calkit/__init__.py,sha256=MLdE9hjYmVEWkHdbusBCZDUzUC3oiY_AL-IfCGKX8eI,142
+calkit/cli.py,sha256=Ko3ntXUTqYeiLv00PQz68SWRp_vY1hruQgjmgwXnuzc,11788
 calkit/cloud.py,sha256=CnQKms4mBQo4X8jVLIa-70-3jPDl38zRNFyK5TjiaHM,2209
 calkit/config.py,sha256=NPFRk5inn66Wy44pyx8WppyqvIzkW1sO6VjXwIcCacE,2044
 calkit/core.py,sha256=qLNjBwlECzMitL85pMGIHzne4j7FpQAR9-ukYtdIMig,1225
@@ -13,8 +13,8 @@ calkit/server.py,sha256=gq3643ABKTQu1eVR_OqJ-SdQh2dPLHSFsipmmAK5ttA,5959
 calkit/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 calkit/tests/test_core.py,sha256=CdRqvYnq3MidyTknvfIbkmmhMfydpyKtTW9hakAvzsc,167
 calkit/tests/test_jupyter.py,sha256=YTL6zI740UM2KUjskSipzvSKxsyQ8rVPFQIX5cb2tMQ,114
-calkit_python-0.0.4.dist-info/METADATA,sha256=yAlvKleBuX6xFXFH3u7UHZVJILjlC-RIOSeQEXcNx8A,4004
-calkit_python-0.0.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-calkit_python-0.0.4.dist-info/entry_points.txt,sha256=tiPfbDDZNB-YStw5YVO_4Gww0W3Dcdy8Mh6muX_GWnY,42
-calkit_python-0.0.4.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
-calkit_python-0.0.4.dist-info/RECORD,,
+calkit_python-0.0.6.dist-info/METADATA,sha256=kL3dH09fqVyHjPjkKnclC21IAHwmwP8NNdvWgOEEthg,4004
+calkit_python-0.0.6.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+calkit_python-0.0.6.dist-info/entry_points.txt,sha256=tiPfbDDZNB-YStw5YVO_4Gww0W3Dcdy8Mh6muX_GWnY,42
+calkit_python-0.0.6.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
+calkit_python-0.0.6.dist-info/RECORD,,