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

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

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

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

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