mammoth-cli 2.2.50__tar.gz → 2.2.52__tar.gz

{mammoth_cli-2.2.50 → mammoth_cli-2.2.52}/PKG-INFO

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

{mammoth_cli-2.2.50 → mammoth_cli-2.2.52}/mammoth_cli/commands/auth.py

@@ -339,17 +339,22 @@ def _run_oauth_login(
         session = oauth.browser_login(
             base_url, client_id=client_id, open_browser=open_browser, say=say
         )
+    # The server-verified workspace wins over the grant's own workspace_id.
     workspace_id = _verify_login(invocation, base_url=base_url, api_token=session.access)
 
     profile_name = invocation.profile or profiles.DEFAULT_PROFILE_NAME
     profiles.validate_profile_name(profile_name)
     existing = profiles.get_profile(profile_name)
+    if session.project_id is not None:
+        project_id = session.project_id
+    else:
+        project_id = existing.project_id if existing is not None else None
     profiles.save_profile(
         profiles.ProfileRecord(
             name=profile_name,
             workspace_id=workspace_id,
             server_prefix=server_prefix,
-            project_id=existing.project_id if existing is not None else None,
+            project_id=project_id,
         ),
         select=True,
     )

{mammoth_cli-2.2.50 → mammoth_cli-2.2.52}/mammoth_cli/context/credentials.py

@@ -140,7 +140,9 @@ class OAuthSession:
     """A browser login's tokens: a short-lived access token and its refresh token.
 
     ``expires_at`` is a Unix timestamp in whole seconds. ``grant_id`` is the
-    server-side connection id, used to revoke it on logout.
+    server-side connection id, used to revoke it on logout. ``workspace_id`` and
+    ``project_id`` are the scope the server pinned the grant to at login; they are
+    adopted into the profile then and are not stored with the credential.
     """
 
     access: str
@@ -148,6 +150,8 @@ class OAuthSession:
     expires_at: int
     client_id: str
     grant_id: int | None = None
+    workspace_id: int | None = None
+    project_id: int | None = None
 
     def document(self) -> dict[str, str | int]:
         document: dict[str, str | int] = {

{mammoth_cli-2.2.50 → mammoth_cli-2.2.52}/mammoth_cli/context/oauth.py

@@ -242,6 +242,8 @@ class TokenGrant:
     access: str
     refresh: str
     expires_in: int
+    workspace_id: int | None = None
+    project_id: int | None = None
 
 
 def _post_token(base_url: str, form: dict[str, str]) -> tuple[int, dict[str, object]]:
@@ -257,12 +259,18 @@ def _post_token(base_url: str, form: dict[str, str]) -> tuple[int, dict[str, obj
     return status, body if isinstance(body, dict) else {}
 
 
+def _optional_id(value: object) -> int | None:
+    return None if value is None else int(str(value))
+
+
 def _parse_grant(body: dict[str, object]) -> TokenGrant:
     try:
         return TokenGrant(
             access=str(body["access_token"]),
             refresh=str(body["refresh_token"]),
             expires_in=int(str(body["expires_in"])),
+            workspace_id=_optional_id(body.get("workspace_id")),
+            project_id=_optional_id(body.get("project_id")),
         )
     except (ValueError, KeyError, TypeError) as exc:
         raise _login_failed("Mammoth's sign-in service returned an unreadable answer.") from exc
@@ -301,6 +309,8 @@ def session_from_grant(grant: TokenGrant, client_id: str, now: float | None = No
         expires_at=issued + grant.expires_in,
         client_id=client_id,
         grant_id=grant_id_from_refresh_token(grant.refresh),
+        workspace_id=grant.workspace_id,
+        project_id=grant.project_id,
     )
 
 

{mammoth_cli-2.2.50 → mammoth_cli-2.2.52}/mammoth_cli/services/mapping.py

@@ -331,7 +331,14 @@ def map_sdk_exception(
             code=CODE_AUTHENTICATION_FAILED,
             message="Mammoth rejected the provided credentials.",
             exit_status=EXIT_AUTH,
-            hint=(EMBEDDED_AUTH_HINT if in_app else "Check the API token."),
+            hint=(
+                EMBEDDED_AUTH_HINT
+                if in_app
+                else (
+                    "Your sign-in may have expired or been revoked: "
+                    "run `mammoth auth login` again, or check the API token."
+                )
+            ),
             details=_metadata(exc),
             request_id=exc.request_id,
             recovery_commands=[] if in_app else ["mammoth auth login"],

{mammoth_cli-2.2.50 → mammoth_cli-2.2.52}/pyproject.toml

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