nextmv 0.31.0__py3-none-any.whl → 0.33.0__py3-none-any.whl

nextmv/local/runner.py

@@ -11,8 +11,6 @@ new_run
     Function to initialize a new run.
 record_input
     Function to write the input to the appropriate location.
-calculate_files_size
-    Function to calculate the total size of files in a directory.
 """
 
 import importlib.util
@@ -24,7 +22,8 @@ import sys
 from datetime import datetime, timezone
 from typing import Any, Optional, Union
 
-from nextmv.input import DEFAULT_INPUT_JSON_FILE, INPUTS_KEY
+from nextmv.input import INPUTS_KEY
+from nextmv.local.local import DEFAULT_INPUT_JSON_FILE, NEXTMV_DIR, RUNS_KEY, calculate_files_size
 from nextmv.manifest import Manifest
 from nextmv.run import Format, FormatInput, Metadata, RunInformation, StatusV2
 from nextmv.safe import safe_id
@@ -176,7 +175,7 @@ def new_run(
     """
 
     # First, ensure the runs directory exists.
-    runs_dir = os.path.join(src, ".nextmv", "runs")
+    runs_dir = os.path.join(src, NEXTMV_DIR, RUNS_KEY)
     os.makedirs(runs_dir, exist_ok=True)
 
     # Create a new run directory.
@@ -273,40 +272,3 @@ def record_input(
 
     # Update the input size in the run information file.
     calculate_files_size(run_dir, run_id, run_inputs_dir, metadata_key="input_size")
-
-
-def calculate_files_size(run_dir: str, run_id: str, dir_path: str, metadata_key: str) -> None:
-    """
-    Calculates the total size of the files in a directory, in bytes.
-
-    The calculated size is stored in the run information metadata under the
-    specified key.
-
-    Parameters
-    ----------
-    run_dir : str
-        The path to the run directory.
-    run_id : str
-        The ID of the run.
-    dir_path : str
-        The path to the directory whose size is to be calculated.
-    metadata_key : str
-        The key under which to store the calculated size in the run information
-        metadata.
-    """
-
-    total_size = 0
-    for dirpath, _, filenames in os.walk(dir_path):
-        for f in filenames:
-            fp = os.path.join(dirpath, f)
-            # Skip if it is a symbolic link
-            if not os.path.islink(fp):
-                total_size += os.path.getsize(fp)
-
-    info_file = os.path.join(run_dir, f"{run_id}.json")
-    with open(info_file, "r+") as f:
-        info = json.load(f)
-        info["metadata"][metadata_key] = total_size
-        f.seek(0)
-        json.dump(info, f, indent=2)
-        f.truncate()

nextmv/manifest.py

@@ -49,7 +49,7 @@ from enum import Enum
 from typing import Any, Optional, Union
 
 import yaml
-from pydantic import AliasChoices, Field
+from pydantic import AliasChoices, Field, field_validator
 
 from nextmv.base_model import BaseModel
 from nextmv.input import InputFormat
@@ -166,6 +166,43 @@ class ManifestRuntime(str, Enum):
     Based on the python runtime, it provisions (pre-installs) the Hexaly solver
     to run Python applications.
     """
+    CUOPT = "ghcr.io/nextmv-io/runtime/cuopt:latest"
+    """
+    A runtime providing the NVIDIA cuOpt solver.
+    """
+
+
+class ManifestPythonArch(str, Enum):
+    """
+    Target architecture for bundling Python apps.
+
+    You can import the `ManifestPythonArch` class directly from `nextmv`:
+
+    ```python
+    from nextmv import ManifestPythonArch
+    ```
+
+    Attributes
+    ----------
+    ARM64 : str
+        ARM 64-bit architecture.
+    AMD64 : str
+        AMD 64-bit architecture.
+
+    Examples
+    --------
+    >>> from nextmv import ManifestPythonArch
+    >>> arch = ManifestPythonArch.ARM64
+    >>> arch
+    <ManifestPythonArch.ARM64: 'arm64'>
+    >>> str(arch)
+    'arm64'
+    """
+
+    ARM64 = "arm64"
+    """ARM 64-bit architecture."""
+    AMD64 = "amd64"
+    """AMD 64-bit architecture."""
 
 
 class ManifestBuild(BaseModel):
@@ -325,6 +362,12 @@ class ManifestPython(BaseModel):
     Contains (additional) Python dependencies that will be bundled with the
     app.
     """
+    arch: Optional[ManifestPythonArch] = None
+    """The architecture this model is meant to run on. One of "arm64" or "amd64". Uses
+    "arm64" if not specified."""
+    version: Optional[Union[str, float]] = None
+    """The Python version this model is meant to run with. Uses "3.11" if not specified.
+    """
     model: Optional[ManifestPythonModel] = None
     """Information about an encoded decision model.
 
@@ -332,6 +375,17 @@ class ManifestPython(BaseModel):
     from the app bundle.
     """
 
+    @field_validator("version", mode="before")
+    @classmethod
+    def validate_version(cls, v: Optional[Union[str, float]]) -> Optional[str]:
+        # We allow the version to be a float in the manifest for convenience, but we want
+        # to store it as a string internally.
+        if v is None:
+            return None
+        if isinstance(v, float):
+            return str(v)
+        return v
+
 
 class ManifestOptionUI(BaseModel):
     """
@@ -1025,7 +1079,12 @@ class Manifest(BaseModel):
 
     def model_post_init(self, __context) -> None:
         if self.entrypoint is None:
-            if self.runtime in (ManifestRuntime.PYTHON, ManifestRuntime.HEXALY, ManifestRuntime.PYOMO):
+            if self.runtime in (
+                ManifestRuntime.PYTHON,
+                ManifestRuntime.HEXALY,
+                ManifestRuntime.PYOMO,
+                ManifestRuntime.CUOPT,
+            ):
                 self.entrypoint = "./main.py"
             elif self.runtime == ManifestRuntime.DEFAULT:
                 self.entrypoint = "./main"

nextmv/output.py

@@ -41,20 +41,16 @@ Functions
 write
     Write the output to the specified destination.
 
-Constants
----------
-ASSETS_KEY
+Attributes
+----------
+ASSETS_KEY : str
     Assets key constant used for identifying assets in the run output.
-STATISTICS_KEY
+STATISTICS_KEY : str
     Statistics key constant used for identifying statistics in the run output.
-SOLUTIONS_KEY
+SOLUTIONS_KEY : str
     Solutions key constant used for identifying solutions in the run output.
-OUTPUTS_KEY
+OUTPUTS_KEY : str
     Outputs key constant used for identifying outputs in the run output.
-LOGS_FILE
-    Constant used for identifying the file used for logging.
-DEFAULT_OUTPUT_JSON_FILE
-    Constant for the default output JSON file name.
 """
 
 import copy
@@ -90,22 +86,6 @@ OUTPUTS_KEY = "outputs"
 """
 Outputs key constant used for identifying outputs in the run output.
 """
-OUTPUT_KEY = "output"
-"""
-Output key constant used for identifying output in the run output.
-"""
-LOGS_KEY = "logs"
-"""
-Logs key constant used for identifying logs in the run output.
-"""
-LOGS_FILE = "stderr.log"
-"""
-Constant used for identifying the file used for logging.
-"""
-DEFAULT_OUTPUT_JSON_FILE = "solution.json"
-"""
-Constant for the default output JSON file name.
-"""
 
 
 class RunStatistics(BaseModel):