mammoth-cli 2.2.71__tar.gz → 2.2.72__tar.gz

{mammoth_cli-2.2.71 → mammoth_cli-2.2.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.2.71
+Version: 2.2.72
 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.71 → mammoth_cli-2.2.72}/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.71"
+__version__ = "2.2.72"
 
 # The versioned machine output envelope contract.
 SCHEMA_VERSION = 1

{mammoth_cli-2.2.71 → mammoth_cli-2.2.72}/mammoth_cli/commands/auth.py

@@ -23,7 +23,7 @@ import typer
 from pydantic import ValidationError
 
 from mammoth_cli.context import credentials, oauth, profiles, resolver
-from mammoth_cli.context.endpoint import DEFAULT_SERVER_PREFIX, resolve_base_url
+from mammoth_cli.context.endpoint import resolve_base_url
 from mammoth_cli.context.resolver import ResolvedAuth, resolve_auth
 from mammoth_cli.contracts.auth import LoginRequest
 from mammoth_cli.errors.envelope import (
@@ -306,13 +306,9 @@ def _choose_method(
         return method
     if invocation.input_file is not None or blockers:
         return "token"
-    available = oauth.has_client_id(server_prefix)
-    prefix = server_prefix if server_prefix is not None else DEFAULT_SERVER_PREFIX
-    browser_note = "recommended" if available else f"(not yet available on {prefix})"
-    device_note = "no browser on this machine" if available else browser_note
     typer.echo("How do you want to sign in?", err=True)
-    typer.echo(f"  1) Browser (OAuth)      {browser_note}", err=True)
-    typer.echo(f"  2) Device code          {device_note}", err=True)
+    typer.echo("  1) Browser (OAuth)      recommended", err=True)
+    typer.echo("  2) Device code          no browser on this machine", err=True)
     typer.echo("  3) Paste an API token   for CI and scripts", err=True)
     if sys.stdin.isatty():
         return _choose_by_keypress()

{mammoth_cli-2.2.71 → mammoth_cli-2.2.72}/mammoth_cli/context/oauth.py

@@ -37,19 +37,12 @@ from mammoth_cli.context import credentials
 from mammoth_cli.context.credentials import OAuthSession
 from mammoth_cli.context.endpoint import DEFAULT_SERVER_PREFIX, resolve_base_url
 from mammoth_cli.context.profiles import config_dir
-from mammoth_cli.errors.envelope import EXIT_AUTH, EXIT_USAGE, CliError
-
-#: The first-party CLI's OAuth client id, one constant per environment (the
-#: server prefix). The server allow-lists these ids, so they are not
-#: configurable at run time. An environment absent here has no CLI client yet.
-#: This table is the fallback for servers that do not publish
-#: ``mammoth_cli_client_id`` in their OAuth metadata (see
-#: :func:`published_client_id`); it is removed once every server publishes it.
-OAUTH_CLIENT_IDS: dict[str, str] = {
-    "challenger": "oc_aea5c2ce829da3f8",
-    "koyal": "oc_f2566336e235795c",
-    "app": "oc_b559f85cfb4de34c",
-}
+from mammoth_cli.errors.envelope import EXIT_AUTH, CliError
+
+#: The first-party CLI's OAuth client id: the same in every environment. The
+#: server publishes it in its OAuth metadata (see :func:`published_client_id`);
+#: this is the id used when it publishes nothing.
+BUILTIN_CLIENT_ID = "mammoth-cli"
 
 #: Refresh when the access token has less than this long to live.
 REFRESH_MARGIN_SECONDS = 120
@@ -59,7 +52,6 @@ _LOCK_POLL_SECONDS = 0.1
 _LOCK_WAIT_SECONDS = 60.0
 
 CODE_LOGIN_EXPIRED = "login_expired"
-CODE_OAUTH_UNAVAILABLE = "oauth_unavailable"
 CODE_OAUTH_LOGIN_FAILED = "oauth_login_failed"
 CODE_DEVICE_LOGIN_EXPIRED = "device_login_expired"
 
@@ -92,7 +84,7 @@ def published_client_id(prefix: str) -> str | None:
 
     One GET per environment per process. None when the field is absent, the
     server cannot be reached, or it answers anything but metadata: the caller
-    then falls back to :data:`OAUTH_CLIENT_IDS`.
+    then uses :data:`BUILTIN_CLIENT_ID`.
     """
     from mammoth import oauth as sdk_oauth
 
@@ -108,36 +100,10 @@ def published_client_id(prefix: str) -> str | None:
     return value if isinstance(value, str) and value else None
 
 
-def _resolve_client_id(server_prefix: str | None) -> str | None:
-    prefix = server_prefix if server_prefix is not None else DEFAULT_SERVER_PREFIX
-    return published_client_id(prefix) or OAUTH_CLIENT_IDS.get(prefix)
-
-
-def has_client_id(server_prefix: str | None) -> bool:
-    """Whether the CLI has an OAuth client for this environment.
-
-    Makes a network call (cached per process): call it only on login paths.
-    """
-    return _resolve_client_id(server_prefix) is not None
-
-
 def client_id_for(server_prefix: str | None) -> str:
-    """Return the CLI's OAuth client id for one environment.
-
-    Raises:
-        CliError: ``oauth_unavailable`` when the environment has no CLI client.
-    """
-    client_id = _resolve_client_id(server_prefix)
-    if client_id is not None:
-        return client_id
+    """Return the CLI's OAuth client id: the published one, else the built-in one."""
     prefix = server_prefix if server_prefix is not None else DEFAULT_SERVER_PREFIX
-    raise CliError(
-        code=CODE_OAUTH_UNAVAILABLE,
-        message=f"Browser sign-in is not available on '{prefix}' yet.",
-        exit_status=EXIT_USAGE,
-        hint="Pick option 3 (paste an API token) or run: mammoth auth login --method token",
-        recovery_commands=["mammoth auth login --method token"],
-    )
+    return published_client_id(prefix) or BUILTIN_CLIENT_ID
 
 
 # --- PKCE ---------------------------------------------------------------------

{mammoth_cli-2.2.71 → mammoth_cli-2.2.72}/mammoth_cli/errors/envelope.py

@@ -161,7 +161,6 @@ ERROR_SUMMARIES: dict[str, str] = {
     "not_authenticated": _S_SIGN_IN,
     "not_implemented": _S_UNAVAILABLE,
     "oauth_login_failed": "The browser sign-in didn't complete.",
-    "oauth_unavailable": "Browser sign-in isn't available on this server.",
     "oauth_grant_revoke_failed": "The server did not revoke this sign-in grant.",
     "outcome_unknown": "It isn't clear whether this step went through. Check before trying again.",
     "pipeline_changed": "The pipeline was changed by someone else while this step ran.",

{mammoth_cli-2.2.71 → mammoth_cli-2.2.72}/pyproject.toml

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