mammoth-cli 2.0.25__tar.gz → 2.0.26__tar.gz

{mammoth_cli-2.0.25 → mammoth_cli-2.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.0.25
+Version: 2.0.26
 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.11
+Requires-Dist: mammoth-io<0.8,>=0.7.12
 Requires-Dist: platformdirs<5,>=4.10
 Requires-Dist: pydantic<3,>=2.13
 Requires-Dist: pyyaml<7,>=6

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

{mammoth_cli-2.0.25 → mammoth_cli-2.0.26}/mammoth_cli/bundled_skill/mammoth-cli/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: mammoth-cli
-version: 2.0.25
+version: 2.0.26
 description: "Use Mammoth Analytics from a terminal: install or authenticate the CLI, discover its live command contract, and safely manage projects, data, views, pipelines, dashboards, exports, and handoffs."
 ---
 

{mammoth_cli-2.0.25 → mammoth_cli-2.0.26}/mammoth_cli/commands/upgrade.py

@@ -19,6 +19,7 @@ real subprocess.
 from __future__ import annotations
 
 import json
+import os
 import shutil
 import subprocess
 import sys
@@ -54,37 +55,50 @@ ACTION_ALREADY_CURRENT = "already_current"
 ACTION_WOULD_UPGRADE = "would_upgrade"
 
 
-def _uv_tool_lists_package() -> bool:
-    """Whether ``uv tool list`` reports this package as a uv-managed tool.
+def _tool_root(argv: list[str]) -> str | None:
+    """Return the directory a tool manager keeps its venvs in, or None.
 
-    Returns False (rather than raising) when ``uv`` is absent or the listing
-    fails, so detection can fall through to the next manager.
+    ``uv tool dir`` / ``pipx environment --value PIPX_LOCAL_VENVS`` answer
+    with one path. Returns None (rather than raising) when the manager is
+    absent or the query fails, so detection can fall through.
     """
-    uv = shutil.which("uv")
-    if not uv:
-        return False
+    binary = shutil.which(argv[0])
+    if not binary:
+        return None
     try:
-        result = subprocess.run(  # noqa: S603 - fixed argv, no shell, trusted uv path
-            [uv, "tool", "list"],
+        result = subprocess.run(  # noqa: S603 - fixed argv, no shell, trusted path
+            [binary, *argv[1:]],
             capture_output=True,
             text=True,
             timeout=30,
             check=False,
         )
     except (OSError, subprocess.SubprocessError):
-        return False
+        return None
     if result.returncode != 0:
+        return None
+    root = result.stdout.strip().splitlines()
+    return root[0].strip() if root else None
+
+
+def _runs_under(root: str | None) -> bool:
+    """Whether the running interpreter's environment lives under ``root``."""
+    if not root:
         return False
-    return PACKAGE_NAME in result.stdout
+    prefix = os.path.realpath(sys.prefix)
+    return prefix.startswith(os.path.realpath(root).rstrip("/\\") + os.sep)
 
 
 def detect_manager() -> str:
     """Detect which tool manages this CLI install.
 
-    Detection order is ``uv tool`` (the running executable lives under a uv
-    tools directory, or ``uv tool list`` reports the package), then ``pipx``
-    (the executable lives under a pipx venvs directory), then a ``pip``
-    fallback.
+    The decision is about the *running* environment, never about what else
+    is installed on the machine: a plain venv on a host that also has a
+    ``uv tool`` install must be upgraded with pip in that venv, or the
+    upgrade lands somewhere else and the caller keeps the old version.
+    Detection order is ``uv tool`` (``sys.executable`` under a uv tools
+    directory, or ``sys.prefix`` under ``uv tool dir``), then ``pipx`` (the
+    same for its venvs directory), then the ``pip`` of the running interpreter.
 
     Returns:
         One of :data:`MANAGER_UV`, :data:`MANAGER_PIPX`, or :data:`MANAGER_PIP`.
@@ -94,8 +108,13 @@ def detect_manager() -> str:
         return MANAGER_UV
     if "/pipx/venvs/" in location or "/pipx/venv/" in location:
         return MANAGER_PIPX
-    if _uv_tool_lists_package():
-        return MANAGER_UV
+    if sys.prefix != sys.base_prefix:
+        # Inside some virtual environment: only a manager that owns *this*
+        # environment may upgrade it.
+        if _runs_under(_tool_root(["uv", "tool", "dir"])):
+            return MANAGER_UV
+        if _runs_under(_tool_root(["pipx", "environment", "--value", "PIPX_LOCAL_VENVS"])):
+            return MANAGER_PIPX
     return MANAGER_PIP
 
 

{mammoth_cli-2.0.25 → mammoth_cli-2.0.26}/mammoth_cli/commands/view_ops.py

@@ -251,11 +251,17 @@ def _dispatch_view(
     with open_service(invocation) as (service, auth):
         if dataset_id is None:
             dataset_id = parents.lookup(_profile_name(invocation), auth.workspace_id, view_id)
-        if dataset_id is None:
-            _require_discovery_allowed(invocation, view_id)
-            data = service.call_view(view_id, method, **kwargs)
-        else:
-            data = service.call_view(view_id, method, dataset_id=int(dataset_id), **kwargs)
+        try:
+            if dataset_id is None:
+                _require_discovery_allowed(invocation, view_id)
+                data = service.call_view(view_id, method, **kwargs)
+            else:
+                data = service.call_view(view_id, method, dataset_id=int(dataset_id), **kwargs)
+        except CliError as exc:
+            # SDK >= 0.7.12 raises on the same job result; enrich it the same way.
+            response = exc.details.get("response") if isinstance(exc.details, dict) else None
+            reject_pipeline_reference_errors(service, view_id, dataset_id, response)
+            raise
         reject_pipeline_reference_errors(service, view_id, dataset_id, data)
     return data, _meta(invocation, auth.workspace_id)
 

{mammoth_cli-2.0.25 → mammoth_cli-2.0.26}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "mammoth-cli"
-version = "2.0.25"
+version = "2.0.26"
 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.11,<0.8)",
+    "mammoth-io (>=0.7.12,<0.8)",
     "typer (>=0.27,<0.28)",
     "rich (>=15,<16)",
     "platformdirs (>=4.10,<5)",