mammoth-cli 2.2.67__tar.gz → 2.2.69__tar.gz

{mammoth_cli-2.2.67 → mammoth_cli-2.2.69}/PKG-INFO

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

{mammoth_cli-2.2.67 → mammoth_cli-2.2.69}/mammoth_cli/app.py

@@ -222,6 +222,25 @@ def _output_mode_from_argv(argv: Sequence[str] | None) -> str:
     return resolve_output(mode, is_tty=sys.stdout.isatty())
 
 
+def _unknown_flag_in(error: Any, tokens: Sequence[str]) -> str | None:
+    """The first ``--flag`` in ``tokens`` that neither a global option nor the command declares."""
+    known, _valued = _global_option_flags()
+    command = getattr(getattr(error, "ctx", None), "command", None)
+    known = known | {
+        flag
+        for param in getattr(command, "params", [])
+        for flag in (*param.opts, *param.secondary_opts)
+    }
+    return next(
+        (
+            token.split("=", 1)[0]
+            for token in tokens
+            if token.startswith("--") and token.split("=", 1)[0] not in known
+        ),
+        None,
+    )
+
+
 @cache
 def _global_option_flags() -> tuple[frozenset[str], frozenset[str]]:
     """Return every global option spelling, and the subset that takes a value.
@@ -345,6 +364,8 @@ class _LeafGroup(TyperGroup):
     """
 
     def parse_args(self, ctx: Any, args: list[str]) -> list[str]:
+        # Click's parser consumes ``args`` in place; keep the tokens for the second parse.
+        tokens = list(args)
         super().parse_args(ctx, args)
         protected = list(getattr(ctx, "_protected_args", ()) or ())
         if protected and protected[0] not in self.commands:
@@ -353,7 +374,7 @@ class _LeafGroup(TyperGroup):
             # plain command with interspersed options, keeping the bare tokens
             # as the callback's positional arguments.
             ctx.allow_interspersed_args = True
-            ctx.args = _ClickCommand.parse_args(self, ctx, list(args))
+            ctx.args = _ClickCommand.parse_args(self, ctx, tokens)
             # Click's own attribute for the pending subcommand token (Click
             # >= 8.2 made it private); not an SDK member.
             setattr(ctx, "_protected_args", [])  # noqa: B010
@@ -484,6 +505,15 @@ class _EnvelopeGroup(TyperGroup):
             or bool(re.match(r"^Missing argument '[^']+'\.", error_message))
         )
         report = None if is_missing_parameter else _usage_error_report(error, tokens)
+        if is_missing_parameter and (option := _unknown_flag_in(error, tokens)):
+            # A misspelt flag is the first thing to fix, ahead of a missing argument.
+            report = CliError(
+                code="unknown_option",
+                message=f"Unknown option '{option}'.",
+                exit_status=EXIT_USAGE,
+                hint="Check the command schema with 'mammoth schema get'.",
+                details={"option": option},
+            )
         if _output_mode_from_argv(argv) in MACHINE_OUTPUTS:
             if report is None:
                 missing = is_missing_parameter
@@ -513,21 +543,7 @@ class _EnvelopeGroup(TyperGroup):
                     # unknown option token as the positional value. Only
                     # classify an argv flag that is not a known global option;
                     # a known option's malformed value remains usage_error.
-                    known, _valued = _global_option_flags()
-                    command = getattr(getattr(error, "ctx", None), "command", None)
-                    known = known | {
-                        flag
-                        for param in getattr(command, "params", [])
-                        for flag in (*param.opts, *param.secondary_opts)
-                    }
-                    option = next(
-                        (
-                            token.split("=", 1)[0]
-                            for token in tokens
-                            if token.startswith("--") and token.split("=", 1)[0] not in known
-                        ),
-                        None,
-                    )
+                    option = _unknown_flag_in(error, tokens)
                     if option:
                         report = CliError(
                             code="unknown_option",

{mammoth_cli-2.2.67 → mammoth_cli-2.2.69}/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.67 → mammoth_cli-2.2.69}/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.67 → mammoth_cli-2.2.69}/pyproject.toml

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