calkit-python 0.11.1__tar.gz → 0.11.2__tar.gz

{calkit_python-0.11.1 → calkit_python-0.11.2}/PKG-INFO

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

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.11.1"
+__version__ = "0.11.2"
 
 from .core import *
 from . import git

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/cli/main.py

@@ -93,9 +93,9 @@ def clone(
     if location is not None:
         cmd.append(location)
     try:
-        subprocess.call(cmd)
-    except Exception as e:
-        raise_error(str(e))
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError:
+        raise_error("Failed to clone with Git")
     if location is None:
         location = url.split("/")[-1].removesuffix(".git")
     typer.echo(f"Moving into repo dir: {location}")
@@ -109,7 +109,10 @@ def clone(
                 calkit.dvc.set_remote_auth(remote_name=name)
     # DVC pull
     if not no_dvc_pull:
-        subprocess.call(["dvc", "pull"])
+        try:
+            subprocess.check_call(["dvc", "pull"])
+        except subprocess.CalledProcessError:
+            raise_error("Failed to pull from DVC remote(s)")
 
 
 @app.command(name="status")

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/cli/new.py

@@ -827,7 +827,7 @@ def new_publication(
     else:
         template_type = None
     # Check all of our inputs
-    if template_type not in ["latex"]:
+    if template_type is not None and template_type not in ["latex"]:
         raise_error(f"Unknown template type '{template_type}'")
     if env_name is not None and template_type != "latex":
         raise_error("Environments can only be created for latex templates")

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/cloud.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import os
+import warnings
 from functools import partial
 from typing import Literal
 
@@ -35,6 +35,7 @@ def get_token() -> str:
         _tokens[get_base_url()] = token
     # TODO: Check for expiration
     if token is None:
+        warnings.warn("No token found; attempting email+password auth")
         return auth()
     return token
 
@@ -50,10 +51,12 @@ def get_headers(headers: dict | None = None) -> dict:
 def auth() -> str:
     """Authenticate with the server and save a token."""
     cfg = config.read()
+    if cfg.email is None or cfg.password is None:
+        raise ValueError("Config is missing email or password")
     base_url = get_base_url()
     resp = requests.post(
         base_url + "/login/access-token",
-        data=dict(username=cfg.username, password=cfg.password),
+        data=dict(username=cfg.email, password=cfg.password),
     )
     token = resp.json()["access_token"]
     _tokens[base_url] = token

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/config.py

@@ -48,6 +48,7 @@ class Settings(BaseSettings):
         env_prefix="CALKIT" + get_env_suffix(sep="_") + "_",
     )
     username: str | None = None
+    email: str | None = None
     token: str | None = None
     dvc_token: str | None = None
     dataframe_engine: Literal["pandas", "polars"] = "pandas"

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/core.py

@@ -16,13 +16,14 @@ except ImportError:
     UTC = _timezone.utc
 
 from datetime import datetime
-
 from typing import Literal
 
 import ruamel.yaml
 from git import Repo
 from git.exc import InvalidGitRepositoryError
 
+from calkit.models import ProjectInfo
+
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__package__)
 
@@ -60,7 +61,9 @@ def find_project_dirs(relative=False, max_depth=3) -> list[str]:
 
 
 def load_calkit_info(
-    wdir=None, process_includes: bool | str | list[str] = False
+    wdir=None,
+    process_includes: bool | str | list[str] = False,
+    as_pydantic: bool = False,
 ) -> dict:
     """Load Calkit project information.
 
@@ -99,6 +102,8 @@ def load_calkit_info(
                         with open(include_fpath) as f:
                             include_data = ryaml.load(f)
                         info[kind][obj_name] |= include_data
+    if as_pydantic:
+        return ProjectInfo.model_validate(info)
     return info
 
 

{calkit_python-0.11.1 → calkit_python-0.11.2}/calkit/models.py

@@ -42,6 +42,7 @@ class Publication(_CalkitObject):
         "journal-article",
         "conference-paper",
         "presentation",
+        "proposal",
         "poster",
         "report",
         "blog",
@@ -106,6 +107,7 @@ class ProcedureInput(BaseModel):
     description : str
         Optional longer description of the input.
     """
+
     name: str | None = None
     dtype: Literal["int", "bool", "str", "float"] = None
     units: str | None = None
@@ -143,6 +145,32 @@ class Procedure(BaseModel):
     imported_from: str | None = None
 
 
+class Release(BaseModel):
+    kind: Literal["project", "publication", "dataset", "model", "figure"]
+    url: str | None = None
+    doi: str | None = None
+    has_suffix: bool = False
+
+
+class ProjectRelease(Release):
+    kind: Literal["project"]
+
+
+class PublicationRelease(Release):
+    kind: Literal["publication"]
+    path: str
+
+
+class DatasetRelease(Release):
+    kind: Literal["dataset"]
+    path: str
+
+
+class ModelRelease(Release):
+    kind: Literal["model"]
+    path: str
+
+
 class ProjectInfo(BaseModel):
     """All of the project's information or metadata, written to the
     ``calkit.yaml`` file.
@@ -178,3 +206,7 @@ class ProjectInfo(BaseModel):
     software: list[Software] = []
     notebooks: list[Notebook] = []
     procedures: dict[str, Procedure] = {}
+    releases: dict[
+        str,
+        ProjectRelease | PublicationRelease | DatasetRelease | ModelRelease,
+    ] = {}