calkit-python 0.38.3__tar.gz → 0.38.4__tar.gz

{calkit_python-0.38.3 → calkit_python-0.38.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calkit-python
-Version: 0.38.3
+Version: 0.38.4
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues
@@ -26,9 +26,9 @@ Requires-Dist: arithmeval
 Requires-Dist: bibtexparser
 Requires-Dist: checksumdir
 Requires-Dist: docx2pdf
-Requires-Dist: dvc==3.66.1
+Requires-Dist: dvc==3.67.1
 Requires-Dist: fastapi
-Requires-Dist: fsspec>=2026.2.0
+Requires-Dist: fsspec>=2026.4.0
 Requires-Dist: gitpython
 Requires-Dist: json2latex>=0.0.3
 Requires-Dist: jupyterlab>=4.4.5
@@ -45,10 +45,10 @@ Requires-Dist: python-dotenv>=1
 Requires-Dist: pywin32; platform_system == 'Windows'
 Requires-Dist: requests
 Requires-Dist: sqlitedict>=2.1.0
-Requires-Dist: texsoup>=0.3.1
+Requires-Dist: texsoup>=0.3.3
 Requires-Dist: toml>=0.10.2
 Requires-Dist: tqdm>=4.67.1
-Requires-Dist: typer==0.24.1
+Requires-Dist: typer==0.25.1
 Requires-Dist: uvicorn
 Provides-Extra: data
 Requires-Dist: pandas>=2.2.3; extra == 'data'

{calkit_python-0.38.3 → calkit_python-0.38.4}/calkit/cli/core.py

@@ -3,15 +3,34 @@
 from __future__ import annotations
 
 import os
+import re
 import subprocess
 from typing import TYPE_CHECKING
 
 import typer
+from typer.core import TyperGroup
 
 if TYPE_CHECKING:
     import click
 
 
+class AliasGroup(TyperGroup):
+    """TyperGroup that resolves command aliases defined with '|' in the name."""
+
+    _CMD_SPLIT_P = re.compile(r" ?[,|] ?")
+
+    def get_command(self, ctx, cmd_name):
+        cmd_name = self._group_cmd_name(cmd_name)
+        return super().get_command(ctx, cmd_name)
+
+    def _group_cmd_name(self, default_name):
+        for cmd in self.commands.values():
+            name = cmd.name
+            if name and default_name in self._CMD_SPLIT_P.split(name):
+                return name
+        return default_name
+
+
 def complete_stage_names(
     ctx: "click.Context",
     param: "click.Parameter",

{calkit_python-0.38.3 → calkit_python-0.38.4}/calkit/cli/list.py

@@ -7,9 +7,9 @@ from typing import Annotated, Literal
 import typer
 
 import calkit
-from calkit.cli import warn
+from calkit.cli import AliasGroup, warn
 
-list_app = typer.Typer(no_args_is_help=True)
+list_app = typer.Typer(cls=AliasGroup, no_args_is_help=True)
 
 
 def _list_objects(
@@ -50,33 +50,37 @@ def _list_objects(
                 typer.echo(f"  {k}: {v}")
 
 
-@list_app.command(name="notebooks")
+@list_app.command(name="notebooks|nb")
 def list_notebooks():
+    """List notebooks in the project."""
     _list_objects("notebooks")
 
 
-@list_app.command(name="figures")
+@list_app.command(name="figures|figs")
 def list_figures():
+    """List figures in the project."""
     _list_objects("figures")
 
 
 @list_app.command(name="datasets")
 def list_datasets():
+    """List datasets in the project."""
     _list_objects("datasets")
 
 
-@list_app.command(name="publications")
+@list_app.command(name="publications|pubs")
 def list_publications():
+    """List publications in the project."""
     _list_objects("publications")
 
 
-@list_app.command(name="references")
+@list_app.command(name="references|refs")
 def list_references():
+    """List reference collections in the project."""
     _list_objects("references")
 
 
-@list_app.command(name="environments")
-@list_app.command(name="envs")
+@list_app.command(name="environments|envs")
 def list_environments():
     """List environments in the project."""
     envs = calkit.load_calkit_info().get("environments", {})
@@ -88,6 +92,7 @@ def list_environments():
 
 @list_app.command(name="templates")
 def list_templates():
+    """List all available Calkit templates."""
     for kind, tpl_dict in calkit.templates.TEMPLATES.items():
         for name in tpl_dict:
             typer.echo(f"{kind}/{name}")
@@ -95,6 +100,7 @@ def list_templates():
 
 @list_app.command(name="procedures")
 def list_procedures():
+    """List procedures in the current project."""
     ck_info = calkit.load_calkit_info()
     for p in ck_info.get("procedures", {}):
         typer.echo(p)
@@ -134,7 +140,7 @@ def list_stages(
         typer.Option("--kind", "-k", help="Filter stages by kind."),
     ] = None,
 ):
-    """List stages."""
+    """List pipeline stages."""
     stages = calkit.load_calkit_info().get("pipeline", {}).get("stages", {})
     for name, stage in stages.items():
         if kinds is not None and stage.get("kind") not in kinds:

{calkit_python-0.38.3 → calkit_python-0.38.4}/calkit/cli/main/core.py

@@ -31,6 +31,7 @@ from calkit import (
     DVC_SIZE_THRESH_BYTES,
 )
 from calkit.cli import (
+    AliasGroup,
     complete_stage_names,
     print_sep,
     raise_error,
@@ -60,27 +61,25 @@ from calkit.cli.slurm import slurm_app
 from calkit.cli.update import update_app
 
 app = typer.Typer(
+    cls=AliasGroup,
     invoke_without_command=True,
     no_args_is_help=True,
     context_settings=dict(help_option_names=["-h", "--help"]),
     pretty_exceptions_show_locals=False,
 )
 app.add_typer(config_app, name="config", help="Configure Calkit.")
-app.add_typer(new_app, name="new", help="Create a new Calkit object.")
+app.add_typer(new_app, name="new|create", help="Create a new Calkit object.")
 app.add_typer(
-    new_app,
-    name="create",
-    help="Create a new Calkit object (alias for 'new').",
+    notebooks_app, name="notebooks|nb", help="Work with Jupyter notebooks."
 )
-app.add_typer(notebooks_app, name="nb", help="Work with Jupyter notebooks.")
-app.add_typer(list_app, name="list", help="List Calkit objects.")
-app.add_typer(describe_app, name="describe", help="Describe things.")
+app.add_typer(list_app, name="list|ls", help="List Calkit objects.")
+app.add_typer(describe_app, name="describe|desc", help="Describe things.")
 app.add_typer(import_app, name="import", help="Import objects.")
 app.add_typer(office_app, name="office", help="Work with Microsoft Office.")
 app.add_typer(update_app, name="update", help="Update objects.")
 app.add_typer(check_app, name="check", help="Check things.")
-app.add_typer(latex_app, name="latex", help="Work with LaTeX.")
-app.add_typer(overleaf_app, name="overleaf", help="Interact with Overleaf.")
+app.add_typer(latex_app, name="latex|tex", help="Work with LaTeX.")
+app.add_typer(overleaf_app, name="overleaf|ol", help="Interact with Overleaf.")
 app.add_typer(cloud_app, name="cloud", help="Interact with a Calkit Cloud.")
 app.add_typer(slurm_app, name="slurm", help="Work with SLURM.")
 app.add_typer(dev_app, name="dev", help="Developer tools.", hidden=True)
@@ -295,7 +294,7 @@ def _format_dvc_data_status(status: dict, zip_path_map: dict) -> str:
     return "\n".join(lines) + "\n"
 
 
-@app.command(name="status")
+@app.command(name="status|st")
 def get_status(
     targets: Annotated[
         list[str] | None,
@@ -862,7 +861,7 @@ def commit(
         push()
 
 
-@app.command(name="save")
+@app.command(name="save|sv")
 def save(
     paths: Annotated[
         Optional[list[str]],
@@ -1732,12 +1731,7 @@ def manual_step(
 
 
 @app.command(
-    name="runenv",
-    help="Execute a command in an environment (alias for 'xenv').",
-    context_settings={"ignore_unknown_options": True},
-)
-@app.command(
-    name="xenv",
+    name="xenv|runenv",
     help="Execute a command in an environment.",
     context_settings={"ignore_unknown_options": True},
 )
@@ -2247,8 +2241,7 @@ def run_in_env(
         raise_error("Environment kind not supported")
 
 
-@app.command(name="runproc", help="Execute a procedure (alias for 'xproc').")
-@app.command(name="xproc", help="Execute a procedure.")
+@app.command(name="xproc|runproc", help="Execute a procedure.")
 def run_procedure(
     name: Annotated[str, typer.Argument(help="The name of the procedure.")],
     no_commit: Annotated[

{calkit_python-0.38.3 → calkit_python-0.38.4}/calkit/cli/new.py

@@ -13,10 +13,10 @@ import typer
 from typing_extensions import Annotated
 
 import calkit
-from calkit.cli import raise_error, warn
+from calkit.cli import AliasGroup, raise_error, warn
 from calkit.core import ryaml
 
-new_app = typer.Typer(no_args_is_help=True)
+new_app = typer.Typer(cls=AliasGroup, no_args_is_help=True)
 
 
 def _check_path_dir(path: str):
@@ -455,7 +455,7 @@ def new_project(
     typer.echo(success_message)
 
 
-@new_app.command(name="figure")
+@new_app.command(name="figure|fig")
 def new_figure(
     path: str,
     title: Annotated[str, typer.Option("--title")],
@@ -598,7 +598,7 @@ def new_question(
         repo.git.commit(["-m", "Add question"])
 
 
-@new_app.command("notebook")
+@new_app.command("notebook|nb")
 def new_notebook(
     path: Annotated[str, typer.Argument(help="Notebook path (relative)")],
     title: Annotated[str, typer.Option("--title")],
@@ -1028,7 +1028,7 @@ def new_dataset(
             repo.git.commit(["-m", f"Add dataset {path}"])
 
 
-@new_app.command(name="publication", help="Create a new publication.")
+@new_app.command(name="publication|pub", help="Create a new publication.")
 def new_publication(
     path: Annotated[
         str,