mammoth-cli 2.2.66__tar.gz → 2.2.68__tar.gz

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/PKG-INFO

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

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/mammoth_cli/commands/connector.py

@@ -142,7 +142,10 @@ def connector_get(invocation: Invocation) -> HandlerResult:
     connector_key = _require_string_positional_at(invocation, 0, "connector key")
     with open_service(invocation) as (service, auth):
         data = service.call(_symbol(invocation), connector_key=connector_key)
-    return data, _meta(invocation, auth.workspace_id, resolved_project(invocation))
+    return (
+        _with_plan_availability(data),
+        _meta(invocation, auth.workspace_id, resolved_project(invocation)),
+    )
 
 
 #: ``availability`` a connector gets when the server says this workspace's plan
@@ -153,6 +156,13 @@ _NOT_IN_PLAN = "not_in_plan"
 _NOT_IN_PLAN_NOTE = "Not included in this workspace's plan. Mammoth sales can enable it."
 
 
+def _mark_not_in_plan(item: Any) -> Any:
+    """Return ``item`` marked ``not_in_plan`` when the server says it is unavailable."""
+    if isinstance(item, dict) and item.get("is_available") is False:
+        return {**item, "availability": _NOT_IN_PLAN, "availability_note": _NOT_IN_PLAN_NOTE}
+    return item
+
+
 def _with_plan_availability(data: Any) -> Any:
     """Mark each connector the server reports unavailable to this workspace.
 
@@ -161,22 +171,11 @@ def _with_plan_availability(data: Any) -> Any:
     only says a legacy integration row exists, so a premium connector the plan
     does include read as "not enabled". A response without ``is_available`` (an
     older server) is left unmarked. ``ConnectorsAPI.list`` returns a list, which
-    stays a list.
+    stays a list; ``ConnectorsAPI.get`` returns one connector dict.
     """
-    if not isinstance(data, list):
-        return data
-    return [
-        (
-            {
-                **item,
-                "availability": _NOT_IN_PLAN,
-                "availability_note": _NOT_IN_PLAN_NOTE,
-            }
-            if isinstance(item, dict) and item.get("is_available") is False
-            else item
-        )
-        for item in data
-    ]
+    if isinstance(data, list):
+        return [_mark_not_in_plan(item) for item in data]
+    return _mark_not_in_plan(data)
 
 
 def connector_list(invocation: Invocation) -> HandlerResult:
@@ -308,10 +307,26 @@ def connector_connection_get(invocation: Invocation) -> HandlerResult:
     return data, _meta(invocation, auth.workspace_id, project_id)
 
 
+def _require_connector_key_for_connection_list(invocation: Invocation) -> str:
+    """Return the connector key, or raise a usage error that says how to find one."""
+    connector_key = _string_positional_at(invocation, 0, "connector key")
+    if connector_key:
+        return connector_key
+    raise CliError(
+        code=CODE_MISSING_ARGUMENT,
+        message=(
+            "This command requires a connector key argument. "
+            "Run `mammoth connector active` to list the connectors that have saved connections."
+        ),
+        exit_status=EXIT_USAGE,
+        hint="Pass the connector key as a positional argument.",
+    )
+
+
 def connector_connection_list(invocation: Invocation) -> HandlerResult:
-    """List connections for a connector type. The connector key is positional."""
+    """List connections for a connector type; find its key with `mammoth connector active`."""
     project_id = require_project(invocation)
-    connector_key = _require_string_positional_at(invocation, 0, "connector key")
+    connector_key = _require_connector_key_for_connection_list(invocation)
     with open_service(invocation) as (service, auth):
         data = service.call(_symbol(invocation), connector_key=connector_key, project_id=project_id)
     return data, _meta(invocation, auth.workspace_id, project_id)

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/mammoth_cli/commands/help_summaries.json

@@ -136,7 +136,7 @@
   "connector.connection.create": "Create a connection for a connector. '--yes' is always required.",
   "connector.connection.delete": "Delete a connection. Prompt or '--yes' required.",
   "connector.connection.get": "Get one connection's details. Connector and connection keys are positional.",
-  "connector.connection.list": "List connections for a connector type. The connector key is positional.",
+  "connector.connection.list": "List connections for a connector type; find its key with `mammoth connector active`.",
   "connector.connection.update": "Update a connection's credentials. '--yes' is always required.",
   "connector.ds-config.create": "Create a data source configuration. '--yes' is always required.",
   "connector.ds-config.delete": "Delete a data source configuration. Prompt or '--yes' required.",

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/mammoth_cli/commands/view.py

@@ -387,6 +387,8 @@ def _read_meta(
         "row_count": stats.get("row_count") if isinstance(stats, dict) else None,
     }
     meta["view"] = {"id": view_id, "name": view.get("name"), "row_count": view.get("row_count")}
+    # A read that goes async raises before it returns; the executor reads this.
+    object.__setattr__(invocation, "read_meta", meta)
     return meta
 
 

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/mammoth_cli/runtime/executor.py

@@ -265,7 +265,12 @@ def run(
             raise typer.Exit(error.exit_status) from None
         # --return-running: a wait that ran out is not a failure; hand back the
         # handle to resume with.
-        emit_success(command_id, running, output, profile=profile)
+        emit_success(
+            command_id,
+            running,
+            output,
+            **{"profile": profile, **((invocation.read_meta if invocation else None) or {})},
+        )
     except KeyboardInterrupt as exc:
         # Polling can be interrupted after a job handle was observed.  Keep
         # that handle when an SDK exception exposes one; never turn Ctrl-C

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/mammoth_cli/runtime/invocation.py

@@ -85,6 +85,9 @@ class Invocation:
     #: What a dry-run transform predicted it would change; set by its handler,
     #: added to the dry-run report.
     predicted_impact: dict[str, Any] | None = field(default=None, repr=False, compare=False)
+    #: Envelope metadata a read handler computed before its job ran out; the
+    #: executor puts it on the ``--return-running`` envelope.
+    read_meta: dict[str, Any] | None = field(default=None, repr=False, compare=False)
     standing_noop: bool = field(default=False, repr=False, compare=False)
     # Set on the read a write's ``state`` block issues: that read confirms the
     # write, so a command's extra evaluation (a board's numbers) is skipped.

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/mammoth_cli/services/mapping.py

@@ -275,8 +275,8 @@ def _backend_message(body: Any, status: int | None) -> str | None:
     extra = details.get("extra")
     if isinstance(extra, list) and extra:
         text = "\n".join([text, *(_field_error_line(item) for item in extra)])
-    code = body.get("error_code") or body.get("code")
-    return f"{text} [{code}]" if isinstance(code, str) and code else text
+    backend_code = body.get("error_code") or body.get("code")
+    return f"{text} [{backend_code}]" if isinstance(backend_code, str) and backend_code else text
 
 
 def _field_error_line(item: Any) -> str:

{mammoth_cli-2.2.66 → mammoth_cli-2.2.68}/pyproject.toml

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