nextmv 1.0.0.dev8__py3-none-any.whl → 1.0.0.dev10__py3-none-any.whl

nextmv/local/executor.py

@@ -22,8 +22,6 @@ process_run_information
     Function to update run metadata including duration and status.
 process_run_logs
     Function to process and save run logs.
-process_run_metrics
-    Function to process and save run metrics.
 process_run_statistics
     Function to process and save run statistics.
 process_run_assets
@@ -59,16 +57,7 @@ from nextmv.local.local import (
 )
 from nextmv.local.plotly_handler import handle_plotly_visual
 from nextmv.manifest import Manifest, ManifestType
-from nextmv.output import (
-    ASSETS_KEY,
-    METRICS_KEY,
-    OUTPUTS_KEY,
-    SOLUTIONS_KEY,
-    STATISTICS_KEY,
-    Asset,
-    OutputFormat,
-    VisualSchema,
-)
+from nextmv.output import ASSETS_KEY, OUTPUTS_KEY, SOLUTIONS_KEY, STATISTICS_KEY, Asset, OutputFormat, VisualSchema
 from nextmv.status import StatusV2
 
 
@@ -316,7 +305,7 @@ def process_run_output(
 ) -> None:
     """
     Processes the result of the subprocess run. This function is in charge of
-    handling the run results, including solutions, statistics, metrics, logs, assets,
+    handling the run results, including solutions, statistics, logs, assets,
     and visuals.
 
     Parameters
@@ -358,13 +347,6 @@ def process_run_output(
         result=result,
         stdout_output=stdout_output,
     )
-    process_run_metrics(
-        temp_run_outputs_dir=temp_run_outputs_dir,
-        outputs_dir=outputs_dir,
-        stdout_output=stdout_output,
-        temp_src=temp_src,
-        manifest=manifest,
-    )
     process_run_statistics(
         temp_run_outputs_dir=temp_run_outputs_dir,
         outputs_dir=outputs_dir,
@@ -517,65 +499,6 @@ def process_run_logs(
 
         f.write(std_err)
 
-def process_run_metrics(
-    temp_run_outputs_dir: str,
-    outputs_dir: str,
-    stdout_output: str | dict[str, Any],
-    temp_src: str,
-    manifest: Manifest,
-) -> None:
-    """
-    Processes the metrics of the run. Checks for an outputs/metrics folder
-    or custom metrics file location from manifest. If found, copies to run
-    directory. Otherwise, attempts to extract metrics from stdout.
-
-    Parameters
-    ----------
-    temp_run_outputs_dir : str
-        The path to the temporary outputs directory.
-    outputs_dir : str
-        The path to the outputs directory in the run directory.
-    stdout_output : Union[str, dict[str, Any]]
-        The stdout output of the run, either as raw string or parsed dictionary.
-    temp_src : str
-        The path to the temporary source directory.
-    manifest : Manifest
-        The application manifest containing configuration and custom paths.
-    """
-
-    metrics_dst = os.path.join(outputs_dir, METRICS_KEY)
-    os.makedirs(metrics_dst, exist_ok=True)
-    metrics_file = f"{METRICS_KEY}.json"
-
-    # Check for custom location in manifest and override metrics_src if needed.
-    if (
-        manifest.configuration is not None
-        and manifest.configuration.content is not None
-        and manifest.configuration.content.format == OutputFormat.MULTI_FILE
-        and manifest.configuration.content.multi_file is not None
-    ):
-        metrics_src_file = os.path.join(temp_src, manifest.configuration.content.multi_file.output.metrics)
-
-        # If the custom metrics file exists, copy it to the metrics destination
-        if os.path.exists(metrics_src_file) and os.path.isfile(metrics_src_file):
-            metrics_dst_file = os.path.join(metrics_dst, metrics_file)
-            shutil.copy2(metrics_src_file, metrics_dst_file)
-            return
-
-    metrics_src = os.path.join(temp_run_outputs_dir, METRICS_KEY)
-    if os.path.exists(metrics_src) and os.path.isdir(metrics_src):
-        shutil.copytree(metrics_src, metrics_dst, dirs_exist_ok=True)
-        return
-
-    if not isinstance(stdout_output, dict):
-        return
-
-    if METRICS_KEY not in stdout_output:
-        return
-
-    with open(os.path.join(metrics_dst, metrics_file), "w") as f:
-        metrics = {METRICS_KEY: stdout_output[METRICS_KEY]}
-        json.dump(metrics, f, indent=2)
 
 def process_run_statistics(
     temp_run_outputs_dir: str,
@@ -585,9 +508,6 @@ def process_run_statistics(
     manifest: Manifest,
 ) -> None:
     """
-    !!! warning
-    `process_run_statistics` is deprecated, use `process_run_metrics` instead.
-
     Processes the statistics of the run. Checks for an outputs/statistics folder
     or custom statistics file location from manifest. If found, copies to run
     directory. Otherwise, attempts to extract statistics from stdout.
@@ -928,7 +848,7 @@ def _copy_new_or_modified_files(  # noqa: C901
     This function identifies files that are either new (not present in the original
     source) or have been modified (different content, checksum, or modification time)
     compared to the original source. It excludes files that exist in specified
-    exclusion directories to avoid copying input data, statistics, metrics, or assets as
+    exclusion directories to avoid copying input data, statistics, or assets as
     solution outputs.
 
     Parameters

nextmv/local/geojson_handler.py

@@ -111,7 +111,7 @@ def extract_coordinates(coords, all_coords) -> None:
       like Polygons and MultiPolygons
     """
     if isinstance(coords, list):
-        if len(coords) == 2 and isinstance(coords[0], int | float) and isinstance(coords[1], int | float):
+        if len(coords) == 2 and isinstance(coords[0], (int, float)) and isinstance(coords[1], (int, float)):
             # This is a coordinate pair [lon, lat]
             all_coords.append(coords)
         else:

nextmv/manifest.py

@@ -829,9 +829,7 @@ class ManifestContentMultiFileOutput(BaseModel):
     Parameters
     ----------
     statistics : Optional[str], default=""
-        Deprecated: Use `metrics` instead. The path to the statistics file.
-    metrics : Optional[str], default=""
-        The path to the metrics file.
+        The path to the statistics file.
     assets : Optional[str], default=""
         The path to the assets file.
     solutions : Optional[str], default=""
@@ -841,18 +839,16 @@ class ManifestContentMultiFileOutput(BaseModel):
     --------
     >>> from nextmv import ManifestContentMultiFileOutput
     >>> output_config = ManifestContentMultiFileOutput(
-    ...     metrics="my-outputs/metrics.json",
+    ...     statistics="my-outputs/statistics.json",
     ...     assets="my-outputs/assets.json",
     ...     solutions="my-outputs/solutions/"
     ... )
-    >>> output_config.metrics
-    'my-outputs/metrics.json'
+    >>> output_config.statistics
+    'my-outputs/statistics.json'
     """
 
     statistics: str | None = ""
-    """Deprecated: Use `metrics` instead. The path to the statistics file."""
-    metrics: str | None = ""
-    """The path to the metrics file."""
+    """The path to the statistics file."""
     assets: str | None = ""
     """The path to the assets file."""
     solutions: str | None = ""
@@ -882,7 +878,7 @@ class ManifestContentMultiFile(BaseModel):
     >>> multi_file_config = ManifestContentMultiFile(
     ...     input=ManifestContentMultiFileInput(path="data/input/"),
     ...     output=ManifestContentMultiFileOutput(
-    ...         metrics="my-outputs/metrics.json",
+    ...         statistics="my-outputs/statistics.json",
     ...         assets="my-outputs/assets.json",
     ...         solutions="my-outputs/solutions/"
     ...     )
@@ -923,7 +919,7 @@ class ManifestContent(BaseModel):
     ...     multi_file=ManifestContentMultiFile(
     ...         input=ManifestContentMultiFileInput(path="data/input/"),
     ...         output=ManifestContentMultiFileOutput(
-    ...             metrics="my-outputs/metrics.json",
+    ...             statistics="my-outputs/statistics.json",
     ...             assets="my-outputs/assets.json",
     ...             solutions="my-outputs/solutions/"
     ...         )

nextmv/model.py

@@ -18,6 +18,8 @@ deployed to Nextmv Cloud for execution.
 import logging
 import os
 import shutil
+import sqlite3
+import time
 import warnings
 from dataclasses import dataclass
 from typing import Any
@@ -84,6 +86,9 @@ def _custom_showwarning(message, category, filename, lineno, file=None, line=Non
     if "mlflow/pyfunc/__init__.py" in filename:
         return
 
+    if "/mlflow/tracing/provider.py" in filename:
+        return
+
     _original_showwarning(message, category, filename, lineno, file, line)
 
 
@@ -195,7 +200,7 @@ class Model:
     ...         return nextmv.Output(
     ...             options=input.options,
     ...             solution=nextroute_output.solutions[0].to_dict(),
-    ...             metrics=nextroute_output.metrics.to_dict(),
+    ...             statistics=nextroute_output.statistics.to_dict(),
     ...         )
     """
 
@@ -234,7 +239,7 @@ class Model:
         ...     return Output(
         ...         options=input.options,
         ...         solution=result,
-        ...         metrics={"processing_time": 0.5}
+        ...         statistics={"processing_time": 0.5}
         ...     )
         """
 
@@ -288,7 +293,6 @@ class Model:
             ) from e
 
         finally:
-            from mlflow.models import infer_signature
             from mlflow.pyfunc import PythonModel, save_model
 
         class MLFlowModel(PythonModel):
@@ -342,12 +346,16 @@ class Model:
 
         _cleanup_python_model(model_dir, configuration, verbose=False)
 
-        signature = None
-        if configuration.options is not None:
-            options_dict = configuration.options.to_dict()
-            signature = infer_signature(
-                params=options_dict,
-            )
+        # Removing this seems to make the "apps from models" experience once
+        # again. I am not removing it entirely because we might want to
+        # re-introduce it later on.
+        # signature = None
+        # if configuration.options is not None:
+        #     options_dict = configuration.options.to_dict()
+        #     signature = infer_signature(
+        #         model_input={},
+        #         params=options_dict,
+        #     )
 
         # We use mlflow to save the model to the local filesystem, to be able to
         # load it later on.
@@ -356,7 +364,7 @@ class Model:
             path=model_path,  # Customize the name of the model location.
             infer_code_paths=True,  # Makes the imports portable.
             python_model=MLFlowModel(),
-            signature=signature,  # Allows us to work with our own `Options` class.
+            # signature=signature,  # Please see comment above about keeping this in case we need to go back.
         )
 
         # Create an auxiliary requirements file with the model dependencies.
@@ -415,9 +423,7 @@ def _cleanup_python_model(
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
 
-    mlruns_path = os.path.join(model_dir, "mlruns")
-    if os.path.exists(mlruns_path):
-        shutil.rmtree(mlruns_path)
+    _cleanup_mlflow_db(model_dir)
 
     requirements_file = os.path.join(model_dir, _REQUIREMENTS_FILE)
     if os.path.exists(requirements_file):
@@ -429,3 +435,36 @@ def _cleanup_python_model(
 
     if verbose:
         log("🧹 Cleaned up Python model artifacts.")
+
+
+def _cleanup_mlflow_db(model_dir: str) -> None:
+    """
+    Clean up the mlflow.db file created during model packaging.
+
+    Parameters
+    ----------
+    model_dir : str
+        The directory where the model was saved.
+    """
+    mlflow_db_path = os.path.join(model_dir, "mlflow.db")
+    if not os.path.exists(mlflow_db_path):
+        return
+
+    # Try to close any open SQLite connections and retry deletion
+    max_retries = 5
+    for attempt in range(max_retries):
+        try:
+            # Attempt to connect and close to release any locks
+            try:
+                conn = sqlite3.connect(mlflow_db_path)
+                conn.close()
+            except Exception:
+                pass
+            os.remove(mlflow_db_path)
+            break
+        except PermissionError:
+            if attempt < max_retries - 1:
+                time.sleep(0.5)
+            else:
+                log(f"Could not delete {mlflow_db_path} after {max_retries} retries due to file lock.")
+                break

nextmv/options.py

@@ -695,7 +695,7 @@ class Options:
             help=argparse.SUPPRESS,
             default="1",
         )
-        args = parser.parse_args()
+        args, _ = parser.parse_known_args()
 
         for arg in vars(args):
             if arg == "fff" or arg == "f":

nextmv/output.py

@@ -8,9 +8,9 @@ destinations.
 Classes
 -------
 RunStatistics
-    Deprecated: Statistics about a general run.
+    Statistics about a general run.
 ResultStatistics
-    Deprecated: Statistics about a specific result.
+    Statistics about a specific result.
 DataPoint
     A data point representing a 2D coordinate.
 Series
@@ -18,10 +18,7 @@ Series
 SeriesData
     Data container for multiple series of data points.
 Statistics
-    Deprecated: Use metrics instead. Complete statistics container for a
-    solution, including run metrics and result data.
-Metrics
-    Metrics container for a solution.
+    Complete statistics container for a solution, including run metrics and result data.
 OutputFormat
     Enumeration of supported output formats.
 SolutionFile
@@ -49,9 +46,7 @@ Attributes
 ASSETS_KEY : str
     Assets key constant used for identifying assets in the run output.
 STATISTICS_KEY : str
-    Deprecated: Use METRICS_KEY instead. Statistics key constant used for identifying statistics in the run output.
-METRICS_KEY : str
-    Metrics key constant used for identifying metrics in the run output.
+    Statistics key constant used for identifying statistics in the run output.
 SOLUTIONS_KEY : str
     Solutions key constant used for identifying solutions in the run output.
 OUTPUTS_KEY : str
@@ -80,11 +75,7 @@ Assets key constant used for identifying assets in the run output.
 """
 STATISTICS_KEY = "statistics"
 """
-Deprecated: Use METRICS_KEY instead. Statistics key constant used for identifying statistics in the run output.
-"""
-METRICS_KEY = "metrics"
-"""
-Metrics key constant used for identifying metrics in the run output.
+Statistics key constant used for identifying statistics in the run output.
 """
 SOLUTIONS_KEY = "solutions"
 """
@@ -98,7 +89,7 @@ Outputs key constant used for identifying outputs in the run output.
 
 class RunStatistics(BaseModel):
     """
-    Deprecated: Statistics about a general run.
+    Statistics about a general run.
 
     You can import the `RunStatistics` class directly from `nextmv`:
 
@@ -138,7 +129,7 @@ class RunStatistics(BaseModel):
 
 class ResultStatistics(BaseModel):
     """
-    Deprecated: Statistics about a specific result.
+    Statistics about a specific result.
 
     You can import the `ResultStatistics` class directly from `nextmv`:
 
@@ -178,7 +169,7 @@ class ResultStatistics(BaseModel):
 
 class DataPoint(BaseModel):
     """
-    Deprecated: A data point representing a 2D coordinate.
+    A data point representing a 2D coordinate.
 
     You can import the `DataPoint` class directly from `nextmv`:
 
@@ -211,7 +202,7 @@ class DataPoint(BaseModel):
 
 class Series(BaseModel):
     """
-    Deprecated: A series of data points for visualization or analysis.
+    A series of data points for visualization or analysis.
 
     You can import the `Series` class directly from `nextmv`:
 
@@ -245,7 +236,7 @@ class Series(BaseModel):
 
 class SeriesData(BaseModel):
     """
-    Deprecated: Data container for multiple series of data points.
+    Data container for multiple series of data points.
 
     You can import the `SeriesData` class directly from `nextmv`:
 
@@ -280,9 +271,6 @@ class SeriesData(BaseModel):
 
 class Statistics(BaseModel):
     """
-    !!! warning
-    `Statistics` is deprecated, use `Metrics` instead.
-
     Complete statistics container for a solution, including run metrics and
     result data.
 
@@ -889,9 +877,7 @@ class Output:
         The solution to the decision problem. The type must match the
         `output_format`. Default is None.
     statistics : Optional[Union[Statistics, dict[str, Any]]], optional
-        Deprecated: Use Metrics instead. Statistics of the solution. Default is None.
-    metrics : Optional[dict[str, Any]], optional
-        Metrics of the solution. Default is None.
+        Statistics of the solution. Default is None.
     csv_configurations : Optional[dict[str, Any]], optional
         Configuration for writing CSV files. Default is None.
     json_configurations : Optional[dict[str, Any]], optional
@@ -930,16 +916,17 @@ class Output:
     Examples
     --------
     >>> from nextmv.output import Output, OutputFormat, Statistics, RunStatistics
-    >>> metrics = {"duration": 30.0, "iterations": 100}
+    >>> run_stats = RunStatistics(duration=30.0, iterations=100)
+    >>> stats = Statistics(run=run_stats)
     >>> solution = {"routes": [{"vehicle": 1, "stops": [1, 2, 3]}, {"vehicle": 2, "stops": [4, 5]}]}
     >>> output = Output(
     ...     output_format=OutputFormat.JSON,
     ...     solution=solution,
-    ...     metrics=metrics,
+    ...     statistics=stats,
     ...     json_configurations={"indent": 4}
     ... )
     >>> output_dict = output.to_dict()
-    >>> "solution" in output_dict and "metrics" in output_dict
+    >>> "solution" in output_dict and "statistics" in output_dict
     True
     """
 
@@ -982,16 +969,11 @@ class Output:
     """
     statistics: Statistics | dict[str, Any] | None = None
     """
-    Deprecated: Use Metrics instead.
     Statistics of the solution. These statistics can be of type `Statistics` or a
     simple dictionary. If the statistics are of type `Statistics`, they will be
     serialized to a dictionary using the `to_dict` method. If they are a
-    dictionary, they will be used as is.
-    """
-    metrics: dict[str, Any] | None = None
-    """
-    Metrics of the solution. These metrics should be provided as a simple or
-    nested dictionary.
+    dictionary, they will be used as is. If the statistics are not provided, an
+    empty dictionary will be used.
     """
     csv_configurations: dict[str, Any] | None = None
     """
@@ -1106,7 +1088,7 @@ class Output:
         # Statistics need to end up as a dict, so we achieve that based on the
         # type of statistics that were used to create the class.
         if self.statistics is None:
-            statistics = None
+            statistics = {}
         elif isinstance(self.statistics, Statistics):
             statistics = self.statistics.to_dict()
         elif isinstance(self.statistics, dict):
@@ -1116,18 +1098,6 @@ class Output:
                 f"unsupported statistics type: {type(self.statistics)}, supported types are `Statistics` or `dict`"
             )
 
-        if self.metrics is None:
-            metrics = None
-        elif isinstance(self.metrics, dict):
-            metrics = self.metrics
-        else:
-            raise TypeError(f"unsupported metrics type: {type(self.metrics)}, supported type is `dict`")
-
-        # if both metrics and statistics are None, set statistics to an
-        # empty dict for backward compatibility
-        if statistics is None and metrics is None:
-            statistics = {}
-
         # Assets need to end up as a list of dicts, so we achieve that based on
         # the type of each asset in the list.
         assets = []
@@ -1147,16 +1117,10 @@ class Output:
         output_dict = {
             "options": options,
             "solution": self.solution if self.solution is not None else {},
+            STATISTICS_KEY: statistics,
             ASSETS_KEY: assets,
         }
 
-        # Only include statistics in output if it's not None
-        if statistics is not None:
-            output_dict[STATISTICS_KEY] = statistics
-
-        if metrics is not None:
-            output_dict[METRICS_KEY] = metrics
-
         # Add the auxiliary configurations to the output dictionary if they are
         # defined and not empty.
         if (
@@ -1229,9 +1193,9 @@ class LocalOutputWriter(OutputWriter):
 
     Examples
     --------
-    >>> from nextmv.output import LocalOutputWriter, Output, Metrics
+    >>> from nextmv.output import LocalOutputWriter, Output, Statistics
     >>> writer = LocalOutputWriter()
-    >>> output = Output(solution={"result": 42}, metrics={"time": 1.23})
+    >>> output = Output(solution={"result": 42}, statistics=Statistics())
     >>> # Write to stdout
     >>> writer.write(output, path=None)
     >>> # Write to a file

nextmv/run.py

@@ -434,9 +434,6 @@ class RunInfoStatistics(BaseModel):
     """List of statistics indicators."""
 
 
-RunInfoMetrics = RunInfoStatistics
-
-
 class OptionsSummaryItem(BaseModel):
     """
     Summary item for options used in a run.
@@ -532,9 +529,7 @@ class Run(BaseModel):
     experiment_id : str, optional
         ID of the experiment associated with the run. Defaults to None.
     statistics : RunInfoStatistics, optional
-        Deprecated: Statistics of the run. Defaults to None.
-    metrics: RunInfoMetrics, optional
-        Metrics of the run. Defaults to None.
+        Statistics of the run. Defaults to None.
     input_id : str, optional
         ID of the input associated with the run. Defaults to None.
     option_set : str, optional
@@ -608,9 +603,7 @@ class Run(BaseModel):
     experiment_id: str | None = None
     """ID of the experiment associated with the run."""
     statistics: RunInfoStatistics | None = None
-    """Deprecated: Statistics of the run."""
-    metrics: RunInfoMetrics | None = None
-    """Metrics of the run."""
+    """Statistics of the run."""
     input_id: str | None = None
     """ID of the input associated with the run."""
     option_set: str | None = None
@@ -684,9 +677,7 @@ class Metadata(BaseModel):
     status_v2: StatusV2
     """Status of the run."""
     statistics: dict[str, Any] | None = None
-    """Deprecated: User defined statistics of the run."""
-    metrics: dict[str, Any] | None = None
-    """User defined metrics of the run."""
+    """User defined statistics of the run."""
 
     def run_is_finalized(self) -> bool:
         """

{nextmv-1.0.0.dev8.dist-info → nextmv-1.0.0.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.0.0.dev8
+Version: 1.0.0.dev10
 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/
@@ -229,19 +229,20 @@ Requires-Dist: plotly>=6.0.1; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: build>=1.0.3; extra == 'dev'
 Requires-Dist: folium>=0.20.0; extra == 'dev'
-Requires-Dist: mlflow>=2.19.0; extra == 'dev'
-Requires-Dist: nextroute>=1.11.1; extra == 'dev'
+Requires-Dist: mlflow>=3.9.0; extra == 'dev'
+Requires-Dist: nextpipe>=0.6.0; extra == 'dev'
 Requires-Dist: openpyxl>=3.1.5; extra == 'dev'
 Requires-Dist: pandas>=2.2.3; extra == 'dev'
 Requires-Dist: plotly>=6.0.1; extra == 'dev'
 Requires-Dist: pydantic>=2.5.2; extra == 'dev'
+Requires-Dist: pytest>=9.0.2; extra == 'dev'
 Requires-Dist: pyyaml>=6.0.1; extra == 'dev'
 Requires-Dist: requests>=2.31.0; extra == 'dev'
 Requires-Dist: ruff>=0.1.7; extra == 'dev'
 Requires-Dist: twine>=4.0.2; extra == 'dev'
 Requires-Dist: urllib3>=2.1.0; extra == 'dev'
 Provides-Extra: notebook
-Requires-Dist: mlflow>=2.19.0; extra == 'notebook'
+Requires-Dist: mlflow>=3.9.0; extra == 'notebook'
 Description-Content-Type: text/markdown
 
 # Nextmv Python SDK