mammoth-cli 2.0.32__tar.gz → 2.0.34__tar.gz

{mammoth_cli-2.0.32 → mammoth_cli-2.0.34}/PKG-INFO

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

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

{mammoth_cli-2.0.32 → mammoth_cli-2.0.34}/mammoth_cli/bundled_skill/mammoth-cli/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: mammoth-cli
-version: 2.0.32
+version: 2.0.34
 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.32 → mammoth_cli-2.0.34}/mammoth_cli/bundled_skill/mammoth-cli/references/recipes/transforms.md

@@ -57,6 +57,9 @@ mammoth view transform math VIEW_ID --project PROJECT_ID \
   --input '{"dataset_id":DATASET_ID,"expression":"GDP / Population","new_column":"GDP per capita"}'
 ```
 
+In a math `expression`, write a multi-word display name bare (`Quantity * Unit
+Price`) or quoted (`Quantity * \"Unit Price\"` inside the JSON string).
+
 The released catalog exposes typed dedupe through `schema find duplicate` as
 `view.transform.discard-duplicates`. Inspect its optional `ignore_columns`
 field before submitting. For a join, verify both schemas and

{mammoth_cli-2.0.32 → mammoth_cli-2.0.34}/mammoth_cli/commands/upgrade.py

@@ -111,7 +111,7 @@ def detect_manager() -> str:
     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"])):
+        if _runs_under(_tool_root([uv_executable(), "tool", "dir"])):
             return MANAGER_UV
         if _runs_under(_tool_root(["pipx", "environment", "--value", "PIPX_LOCAL_VENVS"])):
             return MANAGER_PIPX
@@ -158,6 +158,60 @@ def latest_version() -> str | None:
     return str(version) if version else None
 
 
+def _installer_uv_candidates() -> list[str]:
+    """Return the uv binaries ``mammoth-install.sh``/``.ps1`` keep off PATH, newest first."""
+    if os.name == "nt":
+        base = os.environ.get("LOCALAPPDATA", "")
+        names = ("uv.exe", os.path.join("bin", "uv.exe"))
+    else:
+        base = os.environ.get("XDG_DATA_HOME") or os.path.join(
+            os.path.expanduser("~"), ".local", "share"
+        )
+        names = ("uv", os.path.join("bin", "uv"))
+    root = os.path.join(base, "mammoth-cli")
+    try:
+        entries = [entry for entry in os.listdir(root) if entry.startswith("uv-")]
+    except OSError:
+        return []
+
+    def _key(entry: str) -> tuple[int, ...]:
+        fields = entry[3:].split(".")
+        return tuple(int(field) if field.isdigit() else -1 for field in fields)
+
+    found = []
+    for entry in sorted(entries, key=_key, reverse=True):
+        for name in names:
+            candidate = os.path.join(root, entry, name)
+            if os.path.isfile(candidate) and os.access(candidate, os.X_OK):
+                found.append(candidate)
+                break
+    return found
+
+
+def uv_executable() -> str:
+    """Return the uv to run: the one on PATH, else the installer's own, else ``"uv"``.
+
+    The one-line installer puts a pinned uv in the user data directory and
+    leaves PATH alone, so on a fresh macOS or Linux host ``uv`` is often not
+    on PATH even though uv manages this CLI.
+    """
+    if shutil.which("uv"):
+        return "uv"
+    candidates = _installer_uv_candidates()
+    return candidates[0] if candidates else "uv"
+
+
+def running_base_python() -> str | None:
+    """Return the base interpreter this CLI runs on, when it can be found.
+
+    A uv upgrade re-creates the tool environment; passing the interpreter the
+    CLI already runs on keeps a known-good Python instead of letting uv pick
+    another one (a system python3 can be a debug or pre-release build).
+    """
+    base = getattr(sys, "_base_executable", "") or ""
+    return base if base and os.path.isfile(base) else None
+
+
 def build_upgrade_command(manager: str, target_version: str | None) -> list[str]:
     """Build the argv that upgrades (or pins) the CLI for a given manager.
 
@@ -172,9 +226,26 @@ def build_upgrade_command(manager: str, target_version: str | None) -> list[str]
     """
     spec = f"{PACKAGE_NAME}=={target_version}" if target_version else PACKAGE_NAME
     if manager == MANAGER_UV:
+        uv = uv_executable()
+        python = running_base_python()
+        keep_python = ["--python", python] if python else []
         if target_version:
-            return ["uv", "tool", "install", "--force", spec]
-        return ["uv", "tool", "upgrade", PACKAGE_NAME]
+            return [uv, "tool", "install", "--force", *keep_python, spec]
+        # Not `uv tool upgrade`: it keeps an install pinned with ==X.Y.Z on
+        # that version. The refresh skips uv's cached index pages.
+        return [
+            uv,
+            "tool",
+            "install",
+            "--force",
+            "--upgrade",
+            *keep_python,
+            "--refresh-package",
+            PACKAGE_NAME,
+            "--refresh-package",
+            "mammoth-io",
+            PACKAGE_NAME,
+        ]
     if manager == MANAGER_PIPX:
         if target_version:
             return ["pipx", "install", "--force", spec]

{mammoth_cli-2.0.32 → mammoth_cli-2.0.34}/pyproject.toml

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