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

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

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

{mammoth_cli-2.2.65 → mammoth_cli-2.2.67}/mammoth_cli/commands/dataset.py

@@ -395,8 +395,22 @@ def elsewhere_note(dropped: int) -> str:
     if not dropped:
         return ""
     return (
-        f"{dropped} more match(es) in other projects are not listed: "
-        """--input '{"all_projects": true}' lists them."""
+        f"{dropped} more match(es) in other projects are not listed; the match in the "
+        "current project is the answer. They matter only when the user names another "
+        """project: then --input '{"all_projects": true}' lists them."""
+    )
+
+
+def _find_note(
+    matches: list[dict[str, Any]], is_exact: Callable[[dict[str, Any]], bool], needle: str
+) -> str | None:
+    """The ambiguity note, unless exactly one match in the project is the exact name."""
+    own = [m for m in matches if m.get("in_project") and is_exact(m)]
+    if len(own) != 1 or len(matches) < 2:
+        return ambiguity_note(len(matches), needle)
+    return (
+        f"'{own[0]['name']}' is dataset {own[0]['id']} in the current project; the other "
+        f"{len(matches) - 1} match(es) are other datasets or sit in other projects: use this id."
     )
 
 
@@ -431,15 +445,17 @@ def dataset_find(invocation: Invocation) -> HandlerResult:
     name_substring = _require_string_positional(invocation, "name substring")
     needle = name_substring.lower()
     dropped = 0
+
+    def is_exact(m: dict[str, Any]) -> bool:
+        return str(m.get("name", "")).lower() == needle
+
     with open_service(invocation) as (service, auth):
         visible = _visible_projects(service)
         cut = False
         if invocation.project is not None:
             matches, projects, cut = _find_scoped(service, needle, visible, invocation.project)
             if not all_projects_requested(invocation):
-                matches, dropped = narrow_to_project(
-                    matches, lambda m: str(m.get("name", "")).lower() == needle
-                )
+                matches, dropped = narrow_to_project(matches, is_exact)
         else:
             projects = visible
             matches, cut = _find_by_name(service, needle, visible)
@@ -452,7 +468,7 @@ def dataset_find(invocation: Invocation) -> HandlerResult:
         "matches": matches,
         "projects_searched": len(projects),
     }
-    notes = [ambiguity_note(len(matches), name_substring)]
+    notes = [_find_note(matches, is_exact, name_substring)]
     if dropped:
         result["elsewhere"] = dropped
         notes.append(elsewhere_note(dropped))

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

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