mammoth-cli 2.0.90__tar.gz → 2.0.92__tar.gz

{mammoth_cli-2.0.90 → mammoth_cli-2.0.92}/PKG-INFO

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

{mammoth_cli-2.0.90 → mammoth_cli-2.0.92}/mammoth_cli/commands/context.py

@@ -12,8 +12,13 @@ from typing import Any
 import typer
 
 from mammoth_cli.context import profiles
-from mammoth_cli.errors.envelope import CODE_PROFILE_NOT_FOUND, EXIT_USAGE, CliError
-from mammoth_cli.runtime import executor
+from mammoth_cli.errors.envelope import (
+    CODE_PROFILE_NOT_FOUND,
+    EXIT_USAGE,
+    CliError,
+    no_saved_project_error,
+)
+from mammoth_cli.runtime import embedded, executor
 from mammoth_cli.runtime import options as go
 from mammoth_cli.runtime.invocation import Invocation
 
@@ -98,6 +103,8 @@ def context_project_status(
 
 
 def _run_use(invocation: Invocation, *, project_id: int) -> tuple[dict[str, Any], dict[str, Any]]:
+    if embedded.active():
+        raise no_saved_project_error()
     if project_id <= 0:
         raise CliError(
             code="invalid_project_id",
@@ -167,6 +174,8 @@ def context_project_use(
 
 
 def _run_clear(invocation: Invocation) -> tuple[dict[str, Any], dict[str, Any]]:
+    if embedded.active():
+        raise no_saved_project_error()
     profile_name = _profile_name(invocation)
     existing = profiles.get_profile(profile_name)
     if existing is not None and existing.project_id is not None:

{mammoth_cli-2.0.90 → mammoth_cli-2.0.92}/mammoth_cli/commands/dataset.py

@@ -146,43 +146,65 @@ def _require_string_positional(invocation: Invocation, name: str) -> str:
 _MAX_PROJECTS_SEARCHED = 100
 
 
+def _visible_projects(service: Any) -> list[dict[str, Any]]:
+    """The projects the credential can see (at most ``_MAX_PROJECTS_SEARCHED``)."""
+    listing = service.list_projects(limit=_MAX_PROJECTS_SEARCHED)
+    return list(listing.get("projects", [])) if isinstance(listing, dict) else []
+
+
+def _find_in_projects(
+    service: Any, needle: str, projects: list[dict[str, Any]]
+) -> list[dict[str, Any]]:
+    """Datasets whose name contains ``needle`` (case-insensitive), in each of ``projects``."""
+    matches: list[dict[str, Any]] = []
+    for project in projects:
+        project_id = project.get("id")
+        if project_id is None:
+            continue
+        response = service.call("mammoth.api.datasets.DatasetsAPI.list_all", project_id=project_id)
+        datasets = response.get("datasets", []) if isinstance(response, dict) else []
+        for dataset in datasets:
+            name = dataset.get("name") if isinstance(dataset, dict) else None
+            if isinstance(name, str) and needle in name.lower():
+                matches.append(
+                    {
+                        "project_id": project_id,
+                        "project_name": project.get("name"),
+                        "id": dataset.get("id"),
+                        "name": name,
+                    }
+                )
+    return matches
+
+
+def _other_projects(service: Any, project_id: int) -> list[dict[str, Any]]:
+    """Every visible project except ``project_id``."""
+    return [p for p in _visible_projects(service) if p.get("id") != project_id]
+
+
 def dataset_find(invocation: Invocation) -> HandlerResult:
     """Search dataset names for a substring across every visible project.
 
-    Read-only local composite: lists the projects the credential can see (or
-    just the one named by ``--project``), then lists datasets in each and
-    keeps a case-insensitive substring match. Does not require an active
-    project.
+    Read-only local composite: lists the projects the credential can see, then
+    lists datasets in each and keeps a case-insensitive substring match. With
+    ``--project`` that project is searched first, and the rest only when it holds
+    no match: the in-product agent runs every call under the project the user
+    last opened, which is often not the one the named dataset is in. Does not
+    require an active project.
     """
     name_substring = _require_string_positional(invocation, "name substring")
     needle = name_substring.lower()
-    matches: list[dict[str, Any]] = []
     with open_service(invocation) as (service, auth):
         if invocation.project is not None:
             projects: list[dict[str, Any]] = [{"id": invocation.project, "name": None}]
+            matches = _find_in_projects(service, needle, projects)
+            if not matches:
+                others = _other_projects(service, invocation.project)
+                matches = _find_in_projects(service, needle, others)
+                projects += others
         else:
-            listing = service.list_projects(limit=_MAX_PROJECTS_SEARCHED)
-            projects = list(listing.get("projects", [])) if isinstance(listing, dict) else []
-        for project in projects:
-            project_id = project.get("id")
-            if project_id is None:
-                continue
-            project_name = project.get("name")
-            response = service.call(
-                "mammoth.api.datasets.DatasetsAPI.list_all", project_id=project_id
-            )
-            datasets = response.get("datasets", []) if isinstance(response, dict) else []
-            for dataset in datasets:
-                name = dataset.get("name") if isinstance(dataset, dict) else None
-                if isinstance(name, str) and needle in name.lower():
-                    matches.append(
-                        {
-                            "project_id": project_id,
-                            "project_name": project_name,
-                            "id": dataset.get("id"),
-                            "name": name,
-                        }
-                    )
+            projects = _visible_projects(service)
+            matches = _find_in_projects(service, needle, projects)
         meta = {
             "profile": invocation.profile,
             "workspace_id": auth.workspace_id,
@@ -191,9 +213,7 @@ def dataset_find(invocation: Invocation) -> HandlerResult:
     return {
         "matches": matches,
         "projects_searched": len(projects),
-        "projects_truncated": (
-            invocation.project is None and len(projects) >= _MAX_PROJECTS_SEARCHED
-        ),
+        "projects_truncated": len(projects) >= _MAX_PROJECTS_SEARCHED,
     }, meta
 
 
@@ -240,8 +260,18 @@ def _dataset_name_search(
             sort=document.get("sort", "(created_at:desc)"),
             fields=DATASET_LIST_FIELDS,
         )
-    records = data.get("datasets", []) if isinstance(data, dict) else []
-    page = search_page(records, name, int(document.get("offset", 0)), document.get("limit"))
+        records = data.get("datasets", []) if isinstance(data, dict) else []
+        page = search_page(records, name, int(document.get("offset", 0)), document.get("limit"))
+        if page["matched"] == 0:
+            elsewhere = _find_in_projects(
+                service, name.lower(), _other_projects(service, project_id)
+            )
+            if elsewhere:
+                page["in_other_projects"] = elsewhere
+                page["note"] = (
+                    f"No dataset in project {project_id} matches; the ones listed in "
+                    "in_other_projects do. Run the next call with --project <its project_id>."
+                )
     page["name"] = name
     return page, _meta(invocation, auth.workspace_id, project_id)
 

{mammoth_cli-2.0.90 → mammoth_cli-2.0.92}/mammoth_cli/errors/envelope.py

@@ -12,6 +12,7 @@ from dataclasses import dataclass, field
 from typing import Any
 
 from mammoth_cli import SCHEMA_VERSION
+from mammoth_cli.runtime import embedded
 
 # Exit statuses (plan 02).
 EXIT_OK = 0
@@ -41,6 +42,7 @@ CODE_INPUT_FORMAT_REQUIRED = "input_format_required"
 CODE_API_ERROR = "api_error"
 CODE_RESOURCE_NOT_FOUND = "resource_not_found"
 CODE_PROFILE_NOT_FOUND = "profile_not_found"
+CODE_NO_SAVED_PROJECT = "no_saved_project"
 CODE_CONFIRMATION_REQUIRED = "confirmation_required"
 CODE_CONFIRMATION_DECLINED = "confirmation_declined"
 CODE_AUTHENTICATION_FAILED = "authentication_failed"
@@ -135,6 +137,7 @@ ERROR_SUMMARIES: dict[str, str] = {
     "pipeline_changed": "The pipeline was changed by someone else while this step ran.",
     "pipeline_reference_error": "A step in the pipeline refers to something that no longer exists.",
     "profile_not_found": _S_SETUP,
+    "no_saved_project": "This step can't save a project here; each step names its own.",
     "profile_write_failed": _S_SETUP,
     "project_required": "No project has been chosen for this step.",
     "pypi_response_invalid": "An update check didn't return a usable answer.",
@@ -215,6 +218,15 @@ class CliError(Exception):
 
 
 def missing_project_error() -> CliError:
+    if embedded.active():
+        # An embedded call has no profile to save a project in.
+        return CliError(
+            code="project_required",
+            message="No project is set for this command.",
+            exit_status=EXIT_USAGE,
+            hint="Pass --project PROJECT_ID.",
+            recovery_commands=["mammoth project list", "mammoth dataset find SUBSTRING"],
+        )
     return CliError(
         code="project_required",
         message="No project is set for this command.",
@@ -228,6 +240,17 @@ def missing_project_error() -> CliError:
     )
 
 
+def no_saved_project_error() -> CliError:
+    """``context project use``/``clear`` in an embedded call, which has no profile."""
+    return CliError(
+        code=CODE_NO_SAVED_PROJECT,
+        message="This environment keeps no active project.",
+        exit_status=EXIT_USAGE,
+        hint="Pass --project PROJECT_ID on each command.",
+        recovery_commands=["mammoth project list"],
+    )
+
+
 def authorization_required_error(action: str) -> CliError:
     return CliError(
         code="authorization_required",

{mammoth_cli-2.0.90 → mammoth_cli-2.0.92}/pyproject.toml

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