calkit-python 0.8.0__tar.gz → 0.8.2__tar.gz

{calkit_python-0.8.0 → calkit_python-0.8.2}/PKG-INFO

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

{calkit_python-0.8.0 → calkit_python-0.8.2}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.8.0"
+__version__ = "0.8.2"
 
 from .core import *
 from . import git

{calkit_python-0.8.0 → calkit_python-0.8.2}/calkit/cli/config.py

@@ -5,13 +5,14 @@ from __future__ import annotations
 import typer
 
 from calkit import config
-from calkit.dvc import configure_remote, set_remote_auth
+from calkit.dvc import configure_remote, get_remotes, set_remote_auth
 
 config_app = typer.Typer(no_args_is_help=True)
 
 
 @config_app.command(name="set")
 def set_config_value(key: str, value: str):
+    """Set a value in the config."""
     try:
         cfg = config.read()
         cfg = config.Settings.model_validate(cfg.model_dump() | {key: value})
@@ -28,6 +29,7 @@ def set_config_value(key: str, value: str):
 
 @config_app.command(name="get")
 def get_config_value(key: str) -> None:
+    """Get and print a value from the config."""
     cfg = config.read()
     val = getattr(cfg, key)
     if val is not None:
@@ -38,5 +40,20 @@ def get_config_value(key: str) -> None:
 
 @config_app.command(name="setup-remote")
 def setup_remote():
+    """Setup the Calkit cloud as the default DVC remote and store a token in
+    the local config.
+    """
     configure_remote()
     set_remote_auth()
+
+
+@config_app.command(name="setup-remote-auth")
+def setup_remote_auth():
+    """Store a Calkit cloud token in the local DVC config for all Calkit
+    remotes.
+    """
+    remotes = get_remotes()
+    for name, url in remotes.items():
+        if name == "calkit" or name.startswith("calkit:"):
+            typer.echo(f"Setting up authentication for DVC remote: {name}")
+            set_remote_auth(remote_name=name)

{calkit_python-0.8.0 → calkit_python-0.8.2}/calkit/cli/main.py

@@ -9,7 +9,6 @@ import os
 import subprocess
 import sys
 import time
-from datetime import UTC, datetime, timedelta
 
 import git
 import typer
@@ -75,12 +74,17 @@ def clone(
     no_dvc_pull: Annotated[
         bool, typer.Option("--no-dvc-pull", help="Do not pull DVC objects.")
     ] = False,
+    recursive: Annotated[
+        bool, typer.Option("--recursive", help="Recursively clone submodules.")
+    ] = False,
 ):
     """Clone a Git repo and by default configure and pull from the DVC
     remote.
     """
     # Git clone
     cmd = ["git", "clone", url]
+    if recursive:
+        cmd.append("--recursive")
     if location is not None:
         cmd.append(location)
     try:

{calkit_python-0.8.0 → calkit_python-0.8.2}/calkit/conda.py

@@ -45,7 +45,7 @@ def check_env(
     if env_name not in existing_env_names:
         log_func(f"Environment {env_name} doesn't exist; creating")
         # Environment doesn't exist, so create it
-        subprocess.check_call([conda, "env", "create", "-f", env_fpath])
+        subprocess.check_call([conda, "env", "create", "-y", "-f", env_fpath])
         env_needs_rebuild = False
         env_needs_export = True
     else:

{calkit_python-0.8.0 → calkit_python-0.8.2}/calkit/core.py

@@ -7,7 +7,16 @@ import json
 import logging
 import os
 import pickle
-from datetime import UTC, datetime
+
+try:
+    from datetime import UTC
+except ImportError:
+    from datetime import timezone as _timezone
+
+    UTC = _timezone.utc
+
+from datetime import datetime
+
 from typing import Literal
 
 import ruamel.yaml

{calkit_python-0.8.0 → calkit_python-0.8.2}/calkit/magics.py

@@ -10,12 +10,24 @@ from IPython.core.magic import Magics, cell_magic, magics_class
 import calkit
 
 
+def _parse_string_arg(val: str):
+    try:
+        return ast.literal_eval(val)
+    except (ValueError, SyntaxError):
+        return val
+    return val
+
+
 @magics_class
 class Calkit(Magics):
 
     @magic_arguments.magic_arguments()
     @magic_arguments.argument(
-        "-n", "--name", help="Stage name.", required=True
+        "-n",
+        "--name",
+        help="Stage name.",
+        required=True,
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
         "--dep",
@@ -28,6 +40,7 @@ class Calkit(Magics):
             "'my-stage:df:parquet:pandas'."
         ),
         nargs="+",
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
         "--out",
@@ -39,6 +52,7 @@ class Calkit(Magics):
             "specified like 'df:parquet:polars'."
         ),
         nargs="+",
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
         "--dep-path",
@@ -48,6 +62,7 @@ class Calkit(Magics):
             "the stage will be rerun."
         ),
         nargs="+",
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
         "--out-path",
@@ -57,6 +72,7 @@ class Calkit(Magics):
             "if a figure is saved to a file."
         ),
         nargs="+",
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
         "--out-type",
@@ -68,12 +84,17 @@ class Calkit(Magics):
             "path will be set as the output variable path. "
             "Note that there must only be one output to use this option."
         ),
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
-        "--out-title", help="Title for Calkit output object."
+        "--out-title",
+        help="Title for Calkit output object.",
+        type=_parse_string_arg,
     )
     @magic_arguments.argument(
-        "--out-desc", help="Description for Calkit output object."
+        "--out-desc",
+        help="Description for Calkit output object.",
+        type=_parse_string_arg,
     )
     @cell_magic
     def stage(self, line, cell):
@@ -102,9 +123,9 @@ class Calkit(Magics):
             # Parse calkit object parameters
             out_params = {}
             if args.out_title:
-                out_params["title"] = ast.literal_eval(args.out_title)
+                out_params["title"] = args.out_title
             if args.out_desc:
-                out_params["description"] = ast.literal_eval(args.out_desc)
+                out_params["description"] = args.out_desc
             # Ensure we have required keys
             # TODO: Use Pydantic here
             if "title" not in out_params:
@@ -204,7 +225,7 @@ class Calkit(Magics):
                 ]
         if args.dep_path:
             for dep in args.dep_path:
-                cmd += ["-d", f"'{dep}'"]
+                cmd += ["-d", dep]
         if args.out:
             for out in args.out:
                 out_split = out.split(":")
@@ -218,7 +239,7 @@ class Calkit(Magics):
                 ]
         if args.out_path:
             for path in args.out_path:
-                cmd += ["-o", f"{path}"]
+                cmd += ["-o", path]
         cmd.append(f"python '{script_fpath}'")
         try:
             subprocess.run(cmd, check=True, capture_output=True, text=True)