mammoth-cli 2.2.40__tar.gz → 2.2.42__tar.gz

{mammoth_cli-2.2.40 → mammoth_cli-2.2.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.2.40
+Version: 2.2.42
 Summary: Command-line interface for the Mammoth Analytics platform
 Project-URL: homepage, https://mammoth.io
 Project-URL: repository, https://github.com/EdgeMetric/mammothsdk

{mammoth_cli-2.2.40 → mammoth_cli-2.2.42}/mammoth_cli/__init__.py

@@ -6,7 +6,7 @@ not implement a second HTTP client and does not call private SDK members.
 
 from __future__ import annotations
 
-__version__ = "2.2.40"
+__version__ = "2.2.42"
 
 # The versioned machine output envelope contract.
 SCHEMA_VERSION = 1

{mammoth_cli-2.2.40 → mammoth_cli-2.2.42}/mammoth_cli/context/oauth.py

@@ -39,6 +39,7 @@ from mammoth_cli.errors.envelope import EXIT_AUTH, EXIT_USAGE, CliError
 #: configurable at run time. An environment absent here has no CLI client yet.
 OAUTH_CLIENT_IDS: dict[str, str] = {
     "challenger": "oc_aea5c2ce829da3f8",
+    "koyal": "oc_f2566336e235795c",
 }
 
 #: Refresh when the access token has less than this long to live.

{mammoth_cli-2.2.40 → mammoth_cli-2.2.42}/mammoth_cli/errors/envelope.py

@@ -88,6 +88,7 @@ ERROR_SUMMARIES: dict[str, str] = {
     "authentication_failed": "Mammoth didn't accept the sign-in for this step.",
     "authorization_required": "You don't have permission to do this.",
     "capability_not_found": "The assistant tried something Mammoth doesn't support.",
+    "cli_keys_need_browser_sign_in": "Managing API keys needs a browser sign-in, not an API token.",
     "cli_keys_not_allowed": "This server doesn't let a browser sign-in create API keys.",
     "confirmation_declined": "This step was not confirmed, so nothing was changed.",
     "confirmation_required": "This step needs your confirmation before it can go ahead.",

{mammoth_cli-2.2.40 → mammoth_cli-2.2.42}/mammoth_cli/services/mapping.py

@@ -19,6 +19,7 @@ from mammoth.exceptions import (
     safe_response_body,
 )
 
+from mammoth_cli.context import credentials, profiles
 from mammoth_cli.errors.envelope import (
     CODE_API_ERROR,
     CODE_AUTHENTICATION_FAILED,
@@ -233,6 +234,7 @@ def running_handle(error: CliError, command_id: str) -> dict[str, Any] | None:
 
 
 CODE_CLI_KEYS_NOT_ALLOWED = "cli_keys_not_allowed"
+CODE_CLI_KEYS_NEED_BROWSER_SIGN_IN = "cli_keys_need_browser_sign_in"
 _TOKEN_REFUSED_NAME = "INVALID_TOKEN_FOR_CLIENT_APPS"  # noqa: S105 - an error name
 
 
@@ -242,6 +244,12 @@ def _is_cli_keys_refused(exc: BaseException) -> bool:
     return isinstance(body, dict) and body.get("name") == _TOKEN_REFUSED_NAME
 
 
+def _stored_credential_kind(profile: str | None) -> str | None:
+    """The stored credential kind of ``profile`` (the selected one when None)."""
+    credential = credentials.load_credential(profile or profiles.get_selected())
+    return credential.kind if credential is not None else None
+
+
 def map_sdk_exception(
     exc: BaseException,
     *,
@@ -467,6 +475,24 @@ def map_sdk_exception(
                 request_id=request_id,
                 authorization_required=True,
             )
+        if (
+            status == 403
+            and _is_cli_keys_refused(exc)
+            and _stored_credential_kind(profile) == "token"
+        ):
+            return CliError(
+                code=CODE_CLI_KEYS_NEED_BROWSER_SIGN_IN,
+                message=(
+                    "This call used an API token, and the server refuses API tokens when "
+                    "creating or listing API keys; run `mammoth auth login` (browser "
+                    "sign-in) and try again."
+                ),
+                exit_status=EXIT_AUTH,
+                hint="Sign in with the browser, not an API token, to manage API keys.",
+                details=details,
+                request_id=request_id,
+                recovery_commands=["mammoth auth login"],
+            )
         if status == 403 and _is_cli_keys_refused(exc):
             return CliError(
                 code=CODE_CLI_KEYS_NOT_ALLOWED,

{mammoth_cli-2.2.40 → mammoth_cli-2.2.42}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mammoth-cli"
-version = "2.2.40"
+version = "2.2.42"
 description = "Command-line interface for the Mammoth Analytics platform"
 authors = [{name = "Mammoth Analytics", email = "support@mammoth.io"}]
 readme = "README.md"