divbase-cli 0.1.0a5__tar.gz → 0.1.0a11__tar.gz

{divbase_cli-0.1.0a5 → divbase_cli-0.1.0a11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: divbase-cli
-Version: 0.1.0a5
+Version: 0.1.0a11
 Summary: Command Line Interface for Divbase
 Project-URL: Homepage, https://divbase.scilifelab-2-prod.sys.kth.se
 Project-URL: Documentation, https://scilifelabdatacentre.github.io/divbase
@@ -18,9 +18,9 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.12
-Requires-Dist: divbase-lib==0.1.0a5
+Requires-Dist: divbase-lib==0.1.0a11
 Requires-Dist: keyring>=25.7.0
-Requires-Dist: typer==0.24.1
+Requires-Dist: typer==0.26.7
 Description-Content-Type: text/markdown
 
 # divbase-cli

{divbase_cli-0.1.0a5 → divbase_cli-0.1.0a11}/pyproject.toml

@@ -8,9 +8,9 @@ authors = [
 ]
 requires-python = ">=3.12"
 dependencies = [
-    "typer==0.24.1",
+    "typer==0.26.7",
     "keyring>=25.7.0",
-    "divbase-lib==0.1.0a5",
+    "divbase-lib==0.1.0a11",
 ]
 dynamic = ["version"]
 

divbase_cli-0.1.0a11/src/divbase_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.0a11"

{divbase_cli-0.1.0a5 → divbase_cli-0.1.0a11}/src/divbase_cli/cli_commands/auth_cli.py

@@ -11,7 +11,12 @@ from pydantic import SecretStr
 from rich import print
 
 from divbase_cli.cli_config import cli_settings
-from divbase_cli.cli_exceptions import DivBaseAPIConnectionError, DivBaseAPIError
+from divbase_cli.cli_exceptions import (
+    DivBaseAPIConnectionError,
+    DivBaseAPIError,
+    InvalidPersonalAccessTokenError,
+    PersonalAccessTokenAlreadyExistsError,
+)
 from divbase_cli.config_resolver import resolve_url_for_non_project_specific_commands
 from divbase_cli.services.announcements import get_and_display_announcements
 from divbase_cli.user_auth import (
@@ -109,27 +114,26 @@ def add_pat(
     """
     existing = load_stored_user_pat()
     if existing and not overwrite_existing:
-        print(
+        raise PersonalAccessTokenAlreadyExistsError(
             f"A personal access token named '{existing.name}' is already stored on your device \n"
             f"It is due to expire on: {existing.pat_expiry_formatted()} \n"
             "Append the flag --overwrite-existing (-o) to this command if you want to replace it. \n"
             "You can only store one PAT at a time."
         )
-        raise typer.Exit(code=1)
 
     if expires_unix_timestamp and expires_unix_timestamp < time.time():
-        print("The expiry time you entered is in the past. Please enter a valid expiry time for the PAT.")
-        raise typer.Exit(code=1)
+        raise InvalidPersonalAccessTokenError(
+            "The expiry time you entered is in the past. Please enter a valid expiry time for the PAT."
+        )
 
     pat = SecretStr(
         typer.prompt("please paste your personal access token now", hide_input=True, confirmation_prompt=False)
     )
     if not pat.get_secret_value().startswith(PAT_TOKEN_PREFIX):
-        print(
+        raise InvalidPersonalAccessTokenError(
             "It looks like the token you entered is not a valid personal access token. "
             f"Please make sure you copied the entire token, including the '{PAT_TOKEN_PREFIX}' prefix."
         )
-        raise typer.Exit(code=1)
 
     pat_data = PATData(name=name, pat=pat, pat_expires_at=expires_unix_timestamp)
     pat_data.dump_pat_data()

{divbase_cli-0.1.0a5 → divbase_cli-0.1.0a11}/src/divbase_cli/cli_commands/dimensions_cli.py

@@ -102,11 +102,8 @@ def show_dimensions_index(
     project_config = resolve_project(project_name=project)
     logged_in_url = ensure_logged_in(desired_url=project_config.divbase_url)
 
-    # These two options are mutually exclusive. But due to how typer handles options, this error will only be raised if --sample-names-output has an input value (i.e. path).
-    # If the path is missing, it will raise an error about the missing path argument instead...
     if sample_names_output and sample_names_stdout:
-        typer.echo("Use only one of --sample-names-output or --sample-names-stdout.", err=True)
-        raise typer.Exit(code=1)
+        raise typer.BadParameter("Use only one of --sample-names-output or --sample-names-stdout.")
 
     if unique_samples:
         response = make_authenticated_request(