nextmv 1.6.3.dev0__tar.gz → 1.7.0__tar.gz

{nextmv-1.6.3.dev0 → nextmv-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.6.3.dev0
+Version: 1.7.0
 Summary: The all-purpose Python SDK for Nextmv
 Project-URL: Homepage, https://www.nextmv.io
 Project-URL: Documentation, https://nextmv-py.docs.nextmv.io/en/latest/nextmv/

nextmv-1.7.0/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v1.7.0"

{nextmv-1.6.3.dev0 → nextmv-1.7.0}/nextmv/__init__.py

@@ -5,9 +5,9 @@ from .account import AccountMemberRole as AccountMemberRole
 from .base_model import BaseModel as BaseModel
 from .base_model import from_dict as from_dict
 from .content_format import ContentFormat as ContentFormat
+from .content_format import InputFormat as InputFormat
 from .input import DataFile as DataFile
 from .input import Input as Input
-from .input import InputFormat as InputFormat
 from .input import InputLoader as InputLoader
 from .input import LocalInputLoader as LocalInputLoader
 from .input import csv_data_file as csv_data_file
@@ -27,11 +27,11 @@ from .manifest import ManifestPythonArch as ManifestPythonArch
 from .manifest import ManifestPythonModel as ManifestPythonModel
 from .manifest import ManifestRuntime as ManifestRuntime
 from .manifest import ManifestType as ManifestType
+from .manifest import ModelConfiguration as ModelConfiguration
 from .manifest import default_python_manifest as default_python_manifest
 from .manifest import find_files as find_files
 from .manifest import initialize_manifest as initialize_manifest
 from .model import Model as Model
-from .model import ModelConfiguration as ModelConfiguration
 from .options import Option as Option
 from .options import Options as Options
 from .output import Asset as Asset

{nextmv-1.6.3.dev0 → nextmv-1.7.0}/nextmv/cli/mcp/tools/_helpers.py

@@ -9,7 +9,7 @@ from typing import Any
 from nextmv import local
 from nextmv.cloud import Application, Client
 from nextmv.content_format import ContentFormat
-from nextmv.local.executor import process_run_visuals
+from nextmv.local.executor import _process_run_visuals
 from nextmv.local.local import LOGS_FILE, LOGS_KEY
 from nextmv.logger import log
 from nextmv.output import ASSETS_KEY, METRICS_KEY, OUTPUTS_KEY, SOLUTIONS_KEY, STATISTICS_KEY
@@ -239,9 +239,9 @@ def _extract_cloud_run_outputs(result_dict: dict[str, Any], endpoint: str, run_i
     Mirrors the local run ``outputs/`` directory structure:
 
     * ``outputs/solutions/solution.json`` — the full output dict (matches local)
-    * ``outputs/metrics/metrics.json`` — raw metrics value
-    * ``outputs/statistics/statistics.json`` — wrapped as ``{"statistics": ...}``
-    * ``outputs/assets/assets.json`` — wrapped as ``{"assets": ...}``
+    * ``outputs/metrics.json`` — raw metrics value
+    * ``outputs/statistics.json`` — wrapped as ``{"statistics": ...}``
+    * ``outputs/assets.json`` — wrapped as ``{"assets": ...}``
 
     Skipped when *output* is not a dict with inline data (e.g. csv-archive
     results where the SDK already extracted files via ``output_dir_path``).
@@ -261,15 +261,15 @@ def _extract_cloud_run_outputs(result_dict: dict[str, Any], endpoint: str, run_i
     with open(path, "w") as fh:
         json.dump(output, fh, indent=2)
 
-    # metrics → outputs/metrics/metrics.json (raw, matching local)
+    # metrics → outputs/metrics.json (raw, matching local)
     metrics = output.get(METRICS_KEY)
     if metrics:
-        path = os.path.join(outputs_dir, METRICS_KEY, f"{METRICS_KEY}.json")
+        path = os.path.join(outputs_dir, f"{METRICS_KEY}.json")
         os.makedirs(os.path.dirname(path), exist_ok=True)
         with open(path, "w") as fh:
             json.dump(metrics, fh, indent=2)
 
-    # statistics → outputs/statistics/statistics.json (wrapped, matching local)
+    # statistics → outputs/statistics.json (wrapped, matching local)
     statistics = output.get(STATISTICS_KEY)
     if statistics:
         path = os.path.join(outputs_dir, STATISTICS_KEY, f"{STATISTICS_KEY}.json")
@@ -277,17 +277,17 @@ def _extract_cloud_run_outputs(result_dict: dict[str, Any], endpoint: str, run_i
         with open(path, "w") as fh:
             json.dump({STATISTICS_KEY: statistics}, fh, indent=2)
 
-    # assets → outputs/assets/assets.json (wrapped, matching local)
+    # assets → outputs/assets.json (wrapped, matching local)
     assets = output.get(ASSETS_KEY)
     if assets:
-        path = os.path.join(outputs_dir, ASSETS_KEY, f"{ASSETS_KEY}.json")
+        path = os.path.join(outputs_dir, f"{ASSETS_KEY}.json")
         os.makedirs(os.path.dirname(path), exist_ok=True)
         with open(path, "w") as fh:
             json.dump({ASSETS_KEY: assets}, fh, indent=2)
 
     # Generate visuals from assets (Plotly/GeoJSON → HTML), matching local.
     try:
-        process_run_visuals(run_dir=run_dir, outputs_dir=outputs_dir)
+        _process_run_visuals(run_dir=run_dir, outputs_dir=outputs_dir)
     except Exception as exc:
         log(f"Visual generation failed for run {run_id}: {exc}")
 

{nextmv-1.6.3.dev0 → nextmv-1.7.0}/nextmv/cloud/application/__init__.py

@@ -48,8 +48,8 @@ from nextmv.cloud.application._version import ApplicationVersionMixin
 from nextmv.cloud.client import Client
 from nextmv.cloud.url import UploadURL
 from nextmv.logger import log
-from nextmv.manifest import Manifest
-from nextmv.model import Model, ModelConfiguration
+from nextmv.manifest import Manifest, ModelConfiguration
+from nextmv.model import Model
 from nextmv.safe import safe_id
 
 

{nextmv-1.6.3.dev0 → nextmv-1.7.0}/nextmv/cloud/package.py

@@ -12,8 +12,8 @@ import tempfile
 import rich
 
 from nextmv.logger import log
-from nextmv.manifest import MANIFEST_FILE_NAME, Manifest, ManifestBuild, ManifestType, find_files
-from nextmv.model import Model, ModelConfiguration, _cleanup_python_model
+from nextmv.manifest import MANIFEST_FILE_NAME, Manifest, ManifestBuild, ManifestType, ModelConfiguration, find_files
+from nextmv.model import Model, _cleanup_python_model
 
 _MANDATORY_FILES_PER_TYPE = {
     ManifestType.PYTHON: ["main.py"],

nextmv-1.7.0/nextmv/content_format.py

@@ -0,0 +1,122 @@
+"""
+Module for handling content formats of an app's input and output.
+
+Classes
+-------
+ContentFormat
+    Format of the content of an app's input and output. This is used to specify
+    how the app should read and write data.
+"""
+
+from enum import Enum
+
+
+class ContentFormat(str, Enum):
+    """
+    Format of the content of an app's input and output. This is used to specify
+    how the app should read and write data.
+
+    You can import the `ContentFormat` class directly from `nextmv`:
+
+    ```python
+    from nextmv import ContentFormat
+    ```
+
+    Attributes
+    ----------
+    JSON : str
+        JSON format, utf-8 encoded.
+    MULTI_FILE : str
+        Multi-file format, used for loading multiple files in a single input.
+    """
+
+    JSON = "json"
+    """
+    JSON format, utf-8 encoded. JSON is read from stdin and written to stdout.
+    """
+    MULTI_FILE = "multi-file"
+    """
+    Multi-file format. Read/write one or more files from/to disk (a directory).
+    """
+
+    @property
+    def description(self) -> str:
+        """
+        A human-friendly description of the content format.
+        """
+
+        descriptions = {
+            ContentFormat.JSON: "JSON format, utf-8 encoded. JSON is read from stdin and written to stdout.",
+            ContentFormat.MULTI_FILE: "Multi-file format. Read/write one or more files from/to disk (a directory).",
+        }
+
+        return descriptions[self]
+
+
+class InputFormat(str, Enum):
+    """
+    !!! warning
+        `InputFormat` is deprecated, use `nextmv.ContentFormat` instead.
+
+    Format of an `Input`.
+
+    You can import the `InputFormat` class directly from `nextmv`:
+
+    ```python
+    from nextmv import InputFormat
+    ```
+
+    This enum specifies the supported formats for input data.
+
+    Attributes
+    ----------
+    JSON : str
+        !!! warning
+            `InputFormat.JSON` is deprecated, use `ContentFormat.JSON` instead.
+
+        JSON format, utf-8 encoded.
+    TEXT : str
+        !!! warning
+            `InputFormat.TEXT` is deprecated, use `ContentFormat.MULTI_FILE` instead.
+
+        Text format, utf-8 encoded.
+    CSV_ARCHIVE : str
+        !!! warning
+            `InputFormat.CSV_ARCHIVE` is deprecated, use `ContentFormat.MULTI_FILE` instead.
+
+        CSV archive format: multiple CSV files.
+    MULTI_FILE : str
+        !!! warning
+            `InputFormat.MULTI_FILE` is deprecated, use `ContentFormat.MULTI_FILE` instead.
+
+        Multi-file format, used for loading multiple files in a single input.
+    """
+
+    JSON = "json"
+    """
+    !!! warning
+        `InputFormat.JSON` is deprecated, use `ContentFormat.JSON` instead.
+
+    JSON format, utf-8 encoded.
+    """
+    TEXT = "text"
+    """
+    !!! warning
+        `InputFormat.TEXT` is deprecated, use `ContentFormat.MULTI_FILE` instead.
+
+    Text format, utf-8 encoded.
+    """
+    CSV_ARCHIVE = "csv-archive"
+    """
+    !!! warning
+        `InputFormat.CSV_ARCHIVE` is deprecated, use `ContentFormat.MULTI_FILE` instead.
+
+    CSV archive format: multiple CSV files.
+    """
+    MULTI_FILE = "multi-file"
+    """
+    !!! warning
+        `InputFormat.MULTI_FILE` is deprecated, use `ContentFormat.MULTI_FILE` instead.
+
+    Multi-file format, used for loading multiple files in a single input.
+    """