mammoth-cli 2.0.12__tar.gz → 2.0.13__tar.gz

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.0.12
+Version: 2.0.13
 Summary: Command-line interface for the Mammoth Analytics platform
 Project-URL: homepage, https://mammoth.io
 Project-URL: repository, https://github.com/EdgeMetric/mammothsdk
@@ -17,7 +17,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.15,>=3.12
 Requires-Dist: jsonschema>=4.20
 Requires-Dist: keyring<26,>=25.7
-Requires-Dist: mammoth-io<0.8,>=0.7.4
+Requires-Dist: mammoth-io<0.8,>=0.7.5
 Requires-Dist: platformdirs<5,>=4.10
 Requires-Dist: pydantic<3,>=2.13
 Requires-Dist: pyyaml<7,>=6

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/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.0.12"
+__version__ = "2.0.13"
 
 # The versioned machine output envelope contract.
 SCHEMA_VERSION = 1

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/mammoth_cli/app.py

@@ -24,6 +24,7 @@ from typing import Annotated, Any
 
 import typer
 from typer._click import exceptions as _typer_click_exceptions
+from typer._click.core import Command as _ClickCommand
 from typer.core import TyperGroup
 
 from mammoth_cli import __version__
@@ -297,6 +298,33 @@ def _usage_error_report(error: Any, tokens: Sequence[str]) -> CliError | None:
     )
 
 
+class _LeafGroup(TyperGroup):
+    """Group for a node that is also an invocable command with positionals.
+
+    Click resolves the first bare token after a group as a subcommand name, so
+    ``mammoth project resource-dependencies 3`` failed with ``No such command
+    '3'`` even though the manifest (and every printed example) takes the
+    project id positionally. When the leading token is not a registered
+    subcommand, keep every token as an argument for the group callback instead;
+    genuine subcommands (``... resource-dependencies update 3``) are unaffected.
+    """
+
+    def parse_args(self, ctx: Any, args: list[str]) -> list[str]:
+        super().parse_args(ctx, args)
+        protected = list(getattr(ctx, "_protected_args", ()) or ())
+        if protected and protected[0] not in self.commands:
+            # Leaf invocation. A group parser stops at the first bare token, so
+            # options after the positional were left unparsed; parse again as a
+            # 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))
+            # 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
+        return list(ctx.args)
+
+
 class _EnvelopeGroup(TyperGroup):
     """Root group that renders Click usage errors as the machine error envelope.
 
@@ -358,10 +386,10 @@ class _EnvelopeGroup(TyperGroup):
         # group-level classifier (schema get and nested commands rely on the
         # stable missing_argument envelope).
         error_message = error.format_message()
-        is_missing_parameter = isinstance(
-            error, _typer_click_exceptions.MissingParameter
-        ) or error.__class__.__name__ == "MissingParameter" or bool(
-            re.match(r"^Missing argument '[^']+'\.", error_message)
+        is_missing_parameter = (
+            isinstance(error, _typer_click_exceptions.MissingParameter)
+            or error.__class__.__name__ == "MissingParameter"
+            or bool(re.match(r"^Missing argument '[^']+'\.", error_message))
         )
         report = None if is_missing_parameter else _usage_error_report(error, tokens)
         if _output_mode_from_argv(argv) in MACHINE_OUTPUTS:
@@ -393,8 +421,7 @@ class _EnvelopeGroup(TyperGroup):
                         (
                             token.split("=", 1)[0]
                             for token in tokens
-                            if token.startswith("--")
-                            and token.split("=", 1)[0] not in known
+                            if token.startswith("--") and token.split("=", 1)[0] not in known
                         ),
                         None,
                     )
@@ -829,6 +856,7 @@ def build_app() -> typer.Typer:
         if command_id is not None:
             # This node is both a group and an invocable command.
             sub = typer.Typer(
+                cls=_LeafGroup,
                 no_args_is_help=False,
                 invoke_without_command=True,
                 context_settings={"allow_extra_args": True, "ignore_unknown_options": True},

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/mammoth_cli/bundled_skill/mammoth-cli/references/commands/project.md

@@ -84,7 +84,7 @@ Expected success: `ProjectPublishCredentialsResult` in the standard JSON envelop
 
 Run: `mammoth project resource-dependencies`. Exact input fields: `mammoth schema get project.resource-dependencies --output json --no-input`.
 
-Example: `mammoth project resource-dependencies 123 --input '{"resource_ids": ["resource-123"]}' --output json --no-input`. Runnable only after resolving schema-required IDs and input from observed reads.
+Example: `mammoth project resource-dependencies 123 --input '{"resource_ids": [456]}' --output json --no-input`. Runnable only after resolving schema-required IDs and input from observed reads.
 
 Expected success: `ProjectResourceDependenciesResult` in the standard JSON envelope; mutation `read`, confirmation `none`, wait policy `not_async`. On nonzero exit, inspect the JSON error envelope and its `recovery_commands`; do not guess request fields. See [representative envelopes](../machine-output.md) for concrete success/error shapes.
 

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/mammoth_cli/commands/view.py

@@ -1214,13 +1214,25 @@ def view_pipeline_items(invocation: Invocation) -> HandlerResult:
 def view_pipeline_items_all(invocation: Invocation) -> HandlerResult:
     """Read all pipeline items through bounded, exact-parent pagination."""
     dataview_id = _require_int_positional_at(invocation, 0, "dataview id")
-    document = invocation.load_input() or {}
+    document = dict(invocation.load_input() or {})
+    # The schema advertises an optional trailing DATASET_ID positional that
+    # falls back to the input field; honour both, and reject a disagreement.
+    positional_parent = _int_positional_at(invocation, 1, "dataset id")
+    if positional_parent is not None:
+        if document.get("dataset_id") not in (None, positional_parent):
+            raise CliError(
+                code="ambiguous_resource_identity",
+                message="Conflicting dataset ids identify different parent resources.",
+                exit_status=EXIT_USAGE,
+                hint="Pass one exact dataset id matching the target view.",
+            )
+        document["dataset_id"] = positional_parent
     if "dataset_id" not in document:
         raise CliError(
             code=CODE_MISSING_FIELD,
-            message="This command requires the 'dataset_id' input field.",
+            message="This command requires the exact parent dataset id.",
             exit_status=EXIT_USAGE,
-            hint="Pass the exact parent dataset_id via --input.",
+            hint="Pass it as the trailing DATASET_ID positional or the 'dataset_id' input field.",
         )
     dataset_id = document["dataset_id"]
     if isinstance(dataset_id, bool) or not isinstance(dataset_id, int) or dataset_id <= 0:

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/mammoth_cli/services/input_fields.py

@@ -39,6 +39,9 @@ _CLOSED_ZERO_INPUT_COMMANDS = frozenset({"config.get"})
 #: value here is a genuine, accepted --input field so the documented example both
 #: validates against the input schema and works when run.
 _EXAMPLE_INPUT_HINTS: dict[str, dict[str, Any]] = {
+    # The backend requires integer resource ids ("resource_ids must be
+    # comma-separated integers"); the SDK annotation is a plain list[str].
+    "project.resource-dependencies": {"resource_ids": [456]},
     "view.export.azure-blob": {
         "storage_account_name": "storage-account",
         "tenant_id": "tenant-id",

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "mammoth-cli"
-version = "2.0.12"
+version = "2.0.13"
 description = "Command-line interface for the Mammoth Analytics platform"
 authors = [{name = "Mammoth Analytics", email = "support@mammoth.io"}]
 readme = "README.md"
 license = "LicenseRef-Proprietary"
 requires-python = ">=3.12,<3.15"
 dependencies = [
-    "mammoth-io (>=0.7.4,<0.8)",
+    "mammoth-io (>=0.7.5,<0.8)",
     "typer (>=0.27,<0.28)",
     "rich (>=15,<16)",
     "platformdirs (>=4.10,<5)",

{mammoth_cli-2.0.12 → mammoth_cli-2.0.13}/spec/manifests/commands/project.yaml

@@ -413,8 +413,7 @@ commands:
   required_fixture_guard: null
   secret_fields: []
   human_example: mammoth project resource-dependencies --help
-  agent_example: 'mammoth project resource-dependencies 123 --input ''{"resource_ids": ["resource-123"]}''
-    --output json --no-input'
+  agent_example: 'mammoth project resource-dependencies 123 --input ''{"resource_ids": [456]}'' --output json --no-input'
   unit_tests:
   - UT-PROJECT-RESOURCE-DEPENDENCIES
   contract_tests: