mammoth-cli 2.2.36__tar.gz → 2.2.38__tar.gz

{mammoth_cli-2.2.36 → mammoth_cli-2.2.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.2.36
+Version: 2.2.38
 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.9,>=0.8.19
+Requires-Dist: mammoth-io<0.9,>=0.8.20
 Requires-Dist: platformdirs<5,>=4.10
 Requires-Dist: pydantic<3,>=2.12.5
 Requires-Dist: pyyaml<7,>=6

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

{mammoth_cli-2.2.36 → mammoth_cli-2.2.38}/mammoth_cli/commands/file.py

@@ -22,6 +22,7 @@ from mammoth_cli.errors.envelope import (
     CODE_MISSING_ARGUMENT,
     CODE_MISSING_FIELD,
     CODE_SDK_SYMBOL_UNRESOLVED,
+    CODE_UPLOAD_REFUSED,
     EXIT_USAGE,
     CliError,
 )
@@ -226,16 +227,25 @@ def file_upload(invocation: Invocation) -> HandlerResult:
             hint="Pass the file(s) as positional arguments or a 'files' input field.",
         )
     with open_service(invocation) as (service, auth):
-        data = service.call(_symbol(invocation), **kwargs)
-        # The SDK waits for the upload job and returns the created dataset
-        # id(s) as a bare int/list. When the caller opts out of waiting
-        # (``wait_for_completion: false``) the bare job id is returned unchanged.
+        # When the caller opts out of waiting (``wait_for_completion: false``)
+        # the bare job id is returned unchanged.
         if not document.get("wait_for_completion", True):
+            data = service.call(_symbol(invocation), **kwargs)
             return data, _meta(invocation, auth.workspace_id, resolved_project(invocation))
+        # The SDK waits for the upload job; ``upload_result`` also returns the
+        # files the server refused, which the bare id list of ``upload`` drops.
+        outcome = service.call(_UPLOAD_RESULT_SYMBOL, **kwargs)
+        data = outcome["dataset_ids"]
+        refused = _refused_files(outcome.get("errors"))
+        if outcome.get("errors") and not data:
+            raise _upload_refused_error(outcome["errors"], refused)
         # A finished upload job does not mean a usable dataset: a CSV with an
         # ambiguous date column lands in ``need_action`` with no view. Report
         # the status the platform holds for each dataset, not an assumed one.
         result = _upload_result(data, lambda dataset_id: _dataset_status(service, dataset_id))
+        if refused:
+            result["warnings"] = [_upload_refused_message(outcome["errors"], refused)]
+            result["refused_files"] = refused
         project_id = resolved_project(invocation)
         previewed = 0
         for entry in result["datasets"]:
@@ -290,6 +300,45 @@ def _require_local_files(files: Any) -> None:
             )
 
 
+_UPLOAD_RESULT_SYMBOL = "mammoth.api.files.FilesAPI.upload_result"
+
+#: Workbook files that cannot become datasets; ``dashboard pbix-intent`` reads them.
+_WORKBOOK_SUFFIXES = (".pbix", ".twb", ".twbx")
+_WORKBOOK_HINT = (
+    "Power BI and Tableau workbooks are not datasets: attach the workbook in the chat "
+    "and use `dashboard pbix-intent` to read it."
+)
+
+
+def _refused_files(errors: Any) -> list[str]:
+    """File names the upload job refused, flattened from its ``errors`` map."""
+    if not isinstance(errors, dict):
+        return []
+    names: list[str] = []
+    for value in errors.values():
+        for item in value if isinstance(value, list) else [value]:
+            if isinstance(item, str) and item not in names:
+                names.append(item)
+    return names
+
+
+def _upload_refused_message(errors: dict[str, Any], refused: list[str]) -> str:
+    reasons = ", ".join(sorted(errors))
+    return f"The server refused {', '.join(refused) or 'the upload'} ({reasons})."
+
+
+def _upload_refused_error(errors: dict[str, Any], refused: list[str]) -> CliError:
+    """The error for an upload whose files were all refused (no dataset made)."""
+    workbook = any(name.lower().endswith(_WORKBOOK_SUFFIXES) for name in refused)
+    return CliError(
+        code=CODE_UPLOAD_REFUSED,
+        message=_upload_refused_message(errors, refused) + " No dataset was created.",
+        exit_status=EXIT_USAGE,
+        hint=_WORKBOOK_HINT if workbook else "Upload a supported file type (CSV, Excel, JSON).",
+        details={"errors": errors, "refused_files": refused},
+    )
+
+
 _DATASET_GET_SYMBOL = "mammoth.api.datasets.DatasetsAPI.get"
 
 

{mammoth_cli-2.2.36 → mammoth_cli-2.2.38}/mammoth_cli/errors/envelope.py

@@ -32,6 +32,7 @@ CODE_MISSING_ARGUMENT = "missing_argument"
 CODE_MISSING_FIELD = "missing_field"
 CODE_SDK_SYMBOL_UNRESOLVED = "sdk_symbol_unresolved"
 CODE_INVALID_ARGUMENT = "invalid_argument"
+CODE_UPLOAD_REFUSED = "upload_refused"
 CODE_INVALID_ARGUMENTS = "invalid_arguments"
 CODE_INVALID_CONFIG_VALUE = "invalid_config_value"
 CODE_INVALID_INPUT_DOCUMENT = "invalid_input_document"
@@ -180,6 +181,7 @@ ERROR_SUMMARIES: dict[str, str] = {
     "unsupported_contract": _S_UNAVAILABLE,
     "unsupported_profile_base_url": _S_SETUP,
     "unsupported_shell": _S_UNAVAILABLE,
+    "upload_refused": "Mammoth doesn't accept this kind of file, so nothing was uploaded.",
     "upgrade_failed": "The update didn't complete.",
     "usage_error": _S_BAD_REQUEST,
     "view_in_draft": "This view is still a draft and can't be used yet.",

{mammoth_cli-2.2.36 → mammoth_cli-2.2.38}/mammoth_cli/runtime/verify.py

@@ -241,6 +241,8 @@ def _verify_and_reason(
         return False, _pipeline_error_reason(pipeline_error)
     if data.get("has_error"):
         return False, "the operation reported an error"
+    if data.get("refused_files"):
+        return False, "the server refused some of the files"
     for status in (data.get("status"), _job_status(data)):
         if isinstance(status, str) and status.lower() in _FAILURE_STATUSES:
             return False, "the operation failed"

{mammoth_cli-2.2.36 → mammoth_cli-2.2.38}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "mammoth-cli"
-version = "2.2.36"
+version = "2.2.38"
 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.8.19,<0.9)",
+    "mammoth-io (>=0.8.20,<0.9)",
     "typer (>=0.27,<0.28)",
     "rich (>=15,<16)",
     "platformdirs (>=4.10,<5)",