mammoth-cli 2.2.84__tar.gz → 2.2.85__tar.gz

{mammoth_cli-2.2.84 → mammoth_cli-2.2.85}/PKG-INFO

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

{mammoth_cli-2.2.84 → mammoth_cli-2.2.85}/mammoth_cli/commands/automation.py

@@ -165,10 +165,34 @@ def _meta(invocation: Invocation, workspace_id: int, project_id: int | None) ->
     }
 
 
+#: ``status`` values that mean the automation is gone, whatever else the row says.
+_GONE_STATUSES = frozenset({"deleted", "trashed"})
+
+
+def _is_gone(record: Any) -> bool:
+    """True for a listed automation that was deleted or trashed.
+
+    The server never lists these (a permanent delete removes the row, and the trash
+    hook filters ``trashed_at`` out of every list), so this only guards against a
+    record that still carries the marker, which would make a deleted automation look
+    alive in ``automation list``.
+    """
+    if not isinstance(record, dict):
+        return False
+    return record.get("trashed_at") is not None or (
+        str(record.get("status", "")).lower() in _GONE_STATUSES
+    )
+
+
 def automation_list(invocation: Invocation) -> HandlerResult:
-    """List all automations in the active workspace/project."""
+    """List all automations in the active workspace/project.
+
+    Deleted and trashed automations are left out.
+    """
     with open_service(invocation) as (service, auth):
         data = service.call(_symbol(invocation))
+    if isinstance(data, list):
+        data = [record for record in data if not _is_gone(record)]
     return data, _meta(invocation, auth.workspace_id, resolved_project(invocation))
 
 

{mammoth_cli-2.2.84 → mammoth_cli-2.2.85}/mammoth_cli/services/local_files.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import shlex
 from pathlib import Path
 
 from mammoth_cli.errors.envelope import EXIT_CONFLICT, CliError
@@ -19,8 +20,14 @@ def refuse_existing_file(invocation: Invocation, path: str | Path) -> None:
     if invocation.overwrite or not (target.exists() or target.is_symlink()):
         return
     rerun = " ".join([*invocation.command_id.split("."), *invocation.extra_args])
+    # The same scope the user ran it with, or the re-run lands in another project or
+    # profile (a profile only the saved selection supplied is not pinned).
+    if invocation.project is not None:
+        rerun += f" --project {invocation.project}"
+    if invocation.profile and not invocation.profile_is_default:
+        rerun += f" --profile {shlex.quote(invocation.profile)}"
     if invocation.input_file and invocation.input_file != "-":
-        rerun += f" --input {invocation.input_file}"
+        rerun += f" --input {shlex.quote(invocation.input_file)}"
     raise CliError(
         code=CODE_FILE_EXISTS,
         message=f"{target} already exists; the command would replace it.",

{mammoth_cli-2.2.84 → mammoth_cli-2.2.85}/pyproject.toml

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