calkit-python 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.8"
+__version__ = "0.0.10"
 
 from .core import *
 from . import git

calkit/cli/list.py

@@ -0,0 +1,70 @@
+"""CLI for listing objects."""
+
+from __future__ import annotations
+
+from typing import Literal
+
+import typer
+
+import calkit
+
+list_app = typer.Typer(no_args_is_help=True)
+
+
+def _list_objects(
+    kind: Literal[
+        "notebooks", "datasets", "figures", "references", "publications"
+    ]
+):
+    """List objects.
+
+    TODO: This should probably just use some library to dump YAML to string.
+    """
+    ck_info = calkit.load_calkit_info()
+    objects = ck_info.get(kind, [])
+    for obj in objects:
+        path = obj.pop("path")
+        typer.echo(f"- path: {path}")
+        for k, v in obj.items():
+            if isinstance(v, dict):
+                typer.echo(f"    {k}:")
+                for k1, v1 in v.items():
+                    typer.echo(f"      {k1}: {v1}")
+            elif isinstance(v, list):
+                typer.echo(f"    {k}:")
+                for item in v:
+                    if isinstance(item, dict):
+                        for n, (k1, v1) in enumerate(item.items()):
+                            if n == 0:
+                                typer.echo(f"      - {k1}: {v1}")
+                            else:
+                                typer.echo(f"        {k1}: {v1}")
+                    else:
+                        typer.echo(f"        - {item}")
+            else:
+                typer.echo(f"  {k}: {v}")
+
+
+@list_app.command(name="notebooks")
+def list_notebooks():
+    _list_objects("notebooks")
+
+
+@list_app.command(name="figures")
+def list_figures():
+    _list_objects("figures")
+
+
+@list_app.command(name="datasets")
+def list_datasets():
+    _list_objects("datasets")
+
+
+@list_app.command(name="publications")
+def list_publications():
+    _list_objects("publications")
+
+
+@list_app.command(name="references")
+def list_references():
+    _list_objects("references")

calkit/cli/main.py

@@ -11,6 +11,7 @@ from typing_extensions import Annotated, Optional
 import calkit
 from calkit.cli import print_sep, run_cmd
 from calkit.cli.config import config_app
+from calkit.cli.list import list_app
 from calkit.cli.new import new_app
 from calkit.cli.notebooks import notebooks_app
 
@@ -25,6 +26,7 @@ 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.add_typer(list_app, name="list", help="List Calkit objects.")
 
 
 @app.callback()
@@ -166,6 +168,50 @@ def commit(
         push()
 
 
+@app.command(name="save")
+def save(
+    paths: Annotated[
+        Optional[list[str]],
+        typer.Argument(
+            help=(
+                "Paths to add and commit. If not provided, will default to "
+                "any changed files that have been added previously."
+            ),
+        ),
+    ] = None,
+    all: Annotated[
+        Optional[bool],
+        typer.Option(
+            "--all", "-a", help="Automatically stage all changed files."
+        ),
+    ] = False,
+    message: Annotated[
+        Optional[str], typer.Option("--message", "-m", help="Commit message.")
+    ] = None,
+    to: Annotated[
+        str,
+        typer.Option(
+            "--to", "-t", help="System with which to add (git or dvc)."
+        ),
+    ] = None,
+    no_push: Annotated[
+        bool,
+        typer.Option(
+            "--no-push", help="Do not push to Git and DVC after committing."
+        ),
+    ] = False,
+):
+    """Save paths by committing and pushing.
+
+    This is essentially git/dvc add, commit, and push in one step.
+    """
+    if paths is not None:
+        add(paths, to=to)
+    commit(all=True if paths is None else False, message=message)
+    if not no_push:
+        push()
+
+
 @app.command(name="pull", help="Pull with both Git and DVC.")
 def pull():
     typer.echo("Git pulling")
@@ -293,11 +339,7 @@ def run_dvc_repro(
                 )
     # Now that we've extracted Calkit objects from stage metadata, we can put
     # them into the calkit.yaml file, overwriting objects with the same path
-    if os.path.isfile("calkit.yaml"):
-        with open("calkit.yaml") as f:
-            ck_info = calkit.ryaml.load(f)
-    else:
-        ck_info = {}
+    ck_info = calkit.load_calkit_info()
     for obj in objects:
         cktype = obj.pop("type")
         cktype_plural = cktype + "s"

calkit/cli/new.py

@@ -8,6 +8,7 @@ import git
 import typer
 from typing_extensions import Annotated
 
+import calkit
 from calkit.core import ryaml
 
 new_app = typer.Typer(no_args_is_help=True)
@@ -21,11 +22,7 @@ def new_figure(
     commit: Annotated[bool, typer.Option("--commit")] = False,
 ):
     """Add a new figure."""
-    if os.path.isfile("calkit.yaml"):
-        with open("calkit.yaml") as f:
-            ck_info = ryaml.load(f)
-    else:
-        ck_info = {}
+    ck_info = calkit.load_calkit_info()
     figures = ck_info.get("figures", [])
     paths = [f.get("path") for f in figures]
     if path in paths:
@@ -49,11 +46,7 @@ def new_question(
     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)
-    else:
-        ck_info = {}
+    ck_info = calkit.load_calkit_info()
     questions = ck_info.get("questions", [])
     if question in questions:
         raise ValueError("Question already exists")
@@ -85,11 +78,7 @@ def new_notebook(
         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 = {}
+    ck_info = calkit.load_calkit_info()
     notebooks = ck_info.get("notebooks", [])
     paths = [f.get("path") for f in notebooks]
     if path in paths:

calkit/core.py

@@ -44,3 +44,10 @@ def find_project_dirs(relative=False, max_depth=3) -> list[str]:
             continue
         final_res.append(path)
     return final_res
+
+
+def load_calkit_info() -> dict:
+    if os.path.isfile("calkit.yaml"):
+        with open("calkit.yaml") as f:
+            return ryaml.load(f)
+    return {}

{calkit_python-0.0.8.dist-info → calkit_python-0.0.10.dist-info}/METADATA

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

{calkit_python-0.0.8.dist-info → calkit_python-0.0.10.dist-info}/RECORD

@@ -1,7 +1,7 @@
-calkit/__init__.py,sha256=IQMt4pG5Q-NtyYJJWLzR88yFOvC8riMn-DQ52wqYi8w,142
+calkit/__init__.py,sha256=8H56oHKSKNSAdidQbL7gtTwIKT0bZQqqZNCRnGcM8zY,143
 calkit/cloud.py,sha256=CnQKms4mBQo4X8jVLIa-70-3jPDl38zRNFyK5TjiaHM,2209
 calkit/config.py,sha256=NPFRk5inn66Wy44pyx8WppyqvIzkW1sO6VjXwIcCacE,2044
-calkit/core.py,sha256=qLNjBwlECzMitL85pMGIHzne4j7FpQAR9-ukYtdIMig,1225
+calkit/core.py,sha256=P9QOEkCIyBr5Xfig_rUeEj02ZZIyBicj3P6K4rad1tU,1383
 calkit/data.py,sha256=DZDkj-BLFWXz56R-A9XZeSKSgXpm3aKtiqD6JstfmnY,1631
 calkit/dvc.py,sha256=tX5172Ahw0mHcuJIrMenz1oGYxCrMzMURJJMHEHenbg,1506
 calkit/git.py,sha256=NLd7A32dPbfVnZLa8xbmviJ-ChGZcdkcd6wcOOnsSKQ,350
@@ -12,14 +12,15 @@ calkit/server.py,sha256=gq3643ABKTQu1eVR_OqJ-SdQh2dPLHSFsipmmAK5ttA,5959
 calkit/cli/__init__.py,sha256=2Id-_5dsHbL29qqScLkRUhWXzTgxsZ_A_lMPs9rf5uY,77
 calkit/cli/config.py,sha256=y-TWv150qWvUtlMfySgCyMyk8n5SNL-8hNRm9NycJ98,1098
 calkit/cli/core.py,sha256=N-I2Yw1STgEMN5xLmfOuVq1od1EJx2oMCyVQtNa8Nwg,424
-calkit/cli/main.py,sha256=_zrl3nYszxDwpvis5rd0Qa5jP78XjLvril1pvn9BnhA,11378
-calkit/cli/new.py,sha256=Kn80X_z47uJ27Nkl8WJVWYqdwXyuaKpIy19_C1A26Q4,3386
+calkit/cli/list.py,sha256=kxQsq1SQIZEDdWHIvakzdcMhayqJlfiCmWkj09dhXuA,1799
+calkit/cli/main.py,sha256=baKlNsHtfWmSLLfpwkf3xxRNE8R6RGtzrpcLqe6YnPo,12561
+calkit/cli/new.py,sha256=WVg9bEfGO8QXJj4fajSrbmQTUJMLAgHsNRTxkFZl8Xo,3088
 calkit/cli/notebooks.py,sha256=GsNmm8pdFkbs_KyZxClfIUThD78GCdu0R5udCXhXc9E,2083
 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.8.dist-info/METADATA,sha256=I1R0dOcHch17Q1K3vbqQ83CWU95Eu0ygri_rWfBsZbc,4004
-calkit_python-0.0.8.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-calkit_python-0.0.8.dist-info/entry_points.txt,sha256=tiPfbDDZNB-YStw5YVO_4Gww0W3Dcdy8Mh6muX_GWnY,42
-calkit_python-0.0.8.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
-calkit_python-0.0.8.dist-info/RECORD,,
+calkit_python-0.0.10.dist-info/METADATA,sha256=0-gOXZLjx62tlDHDnRI1PsHFFsNsLOvTz03yA5ddizs,4005
+calkit_python-0.0.10.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+calkit_python-0.0.10.dist-info/entry_points.txt,sha256=tiPfbDDZNB-YStw5YVO_4Gww0W3Dcdy8Mh6muX_GWnY,42
+calkit_python-0.0.10.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
+calkit_python-0.0.10.dist-info/RECORD,,