nextmv 1.0.0.dev8__tar.gz → 1.0.0.dev9__tar.gz

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.0.0.dev8
+Version: 1.0.0.dev9
 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,8 +229,7 @@ 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: openpyxl>=3.1.5; extra == 'dev'
 Requires-Dist: pandas>=2.2.3; extra == 'dev'
 Requires-Dist: plotly>=6.0.1; extra == 'dev'
@@ -241,7 +240,7 @@ 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

nextmv-1.0.0.dev9/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v1.0.0.dev9"

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/_serialization.py

@@ -90,7 +90,7 @@ def _custom_serial(obj: Any) -> str:
         If the object type is not supported for serialization.
     """
 
-    if isinstance(obj, datetime.datetime | datetime.date):
+    if isinstance(obj, (datetime.datetime, datetime.date)):
         return obj.isoformat()
 
     raise TypeError(f"Type {type(obj)} not serializable")

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/cli/cloud/acceptance/create.py

@@ -45,7 +45,7 @@ app = typer.Typer()
     - Multiple metrics as a [magenta]json[/magenta] array in a single --metrics flag.
 
     Each metric must have the following fields:
-    - [magenta]field[/magenta]: Field of the metric to measure (e.g., "result.custom.unassigned").
+    - [magenta]field[/magenta]: Field of the metric to measure (e.g., "solution.objective").
     - [magenta]metric_type[/magenta]: Type of metric comparison. Allowed values: {enum_values(MetricType)}.
     - [magenta]params[/magenta]: Parameters of the metric comparison.
         - [magenta]operator[/magenta]: Comparison operator. Allowed values: {enum_values(Comparison)}.
@@ -71,8 +71,8 @@ app = typer.Typer()
     [bold][underline]Examples[/underline][/bold]
 
     - Create an acceptance test with a single metric.
-        $ [green]METRIC='{{
-            "field": "result.custom.unassigned",
+        $ [dim]METRIC='{{
+            "field": "solution.objective",
             "metric_type": "direct-comparison",
             "params": {{
                 "operator": "lt",
@@ -85,8 +85,8 @@ app = typer.Typer()
             --metrics "$METRIC" --input-set-id input-set-123[/dim]
 
     - Create with multiple metrics by repeating the flag.
-        $ [green]METRIC1='{{
-            "field": "result.custom.unassigned",
+        $ [dim]METRIC1='{{
+            "field": "solution.objective",
             "metric_type": "direct-comparison",
             "params": {{
                 "operator": "lt",
@@ -95,7 +95,7 @@ app = typer.Typer()
             "statistic": "mean"
         }}'
         METRIC2='{{
-            "field": "run.duration",
+            "field": "statistics.run.duration",
             "metric_type": "direct-comparison",
             "params": {{
                 "operator": "le",
@@ -110,7 +110,7 @@ app = typer.Typer()
     - Create with multiple metrics in a single [magenta]json[/magenta] array.
         $ [dim]METRICS='[
             {{
-                "field": "result.custom.unassigned",
+                "field": "solution.objective",
                 "metric_type": "direct-comparison",
                 "params": {{
                     "operator": "lt",
@@ -119,7 +119,7 @@ app = typer.Typer()
                 "statistic": "mean"
             }},
             {{
-                "field": "run.duration",
+                "field": "statistics.run.duration",
                 "metric_type": "direct-comparison",
                 "params": {{
                     "operator": "le",
@@ -133,8 +133,8 @@ app = typer.Typer()
             --metrics "$METRICS" --input-set-id input-set-123[/dim]
 
     - Create an acceptance test and wait for it to complete.
-        $ [green]METRIC='{{
-            "field": "result.custom.unassigned",
+        $ [dim]METRIC='{{
+            "field": "solution.objective",
             "metric_type": "direct-comparison",
             "params": {{
                 "operator": "lt",
@@ -147,8 +147,8 @@ app = typer.Typer()
             --metrics "$METRIC" --input-set-id input-set-123 --wait[/dim]
 
     - Create an acceptance test and save the results to a file, waiting for completion.
-        $ [green]METRIC='{{
-            "field": "result.custom.unassigned",
+        $ [dim]METRIC='{{
+            "field": "solution.objective",
             "metric_type": "direct-comparison",
             "params": {{
                 "operator": "lt",

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/cli/community/clone.py

@@ -119,7 +119,7 @@ def clone(
     # Extract the tarball to a temporary directory to handle nested structure
     with tempfile.TemporaryDirectory() as temp_dir:
         with tarfile.open(downloaded_object, "r:gz") as tar:
-            tar.extractall(path=temp_dir)
+            tar.extractall(path=temp_dir, filter=None)
 
         # Find the extracted directory (typically the app name)
         extracted_items = os.listdir(temp_dir)
@@ -270,3 +270,4 @@ def download_object(file: str, path: str, output_dir: str, output_file: str, pro
         f.write(response.content)
 
     return file_name
+    return file_name

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/cloud/application/__init__.py

@@ -867,8 +867,6 @@ class Application(
                     output_config = multi_config["output_configuration"] = {}
                     if content.multi_file.output.statistics:
                         output_config["statistics_path"] = content.multi_file.output.statistics
-                    if content.multi_file.output.metrics:
-                        output_config["metrics_path"] = content.multi_file.output.metrics
                     if content.multi_file.output.assets:
                         output_config["assets_path"] = content.multi_file.output.assets
                     if content.multi_file.output.solutions:

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/cloud/application/_run.py

@@ -21,14 +21,7 @@ from nextmv.cloud.url import DownloadURL
 from nextmv.input import Input, InputFormat
 from nextmv.logger import log
 from nextmv.options import Options
-from nextmv.output import (
-    ASSETS_KEY,
-    STATISTICS_KEY,
-    Asset,
-    Output,
-    OutputFormat,
-    Statistics,
-)
+from nextmv.output import ASSETS_KEY, STATISTICS_KEY, Asset, Output, OutputFormat, Statistics
 from nextmv.polling import DEFAULT_POLLING_OPTIONS, PollingOptions, poll
 from nextmv.run import (
     ExternalRunResult,
@@ -642,7 +635,7 @@ class ApplicationRunMixin:
                 temp_tar_path = os.path.join(tmpdirname, f"{run_id}.tar.gz")
                 with open(temp_tar_path, "wb") as f:
                     f.write(download_response.content)
-                shutil.unpack_archive(temp_tar_path, output_dir_path)
+                shutil.unpack_archive(temp_tar_path, output_dir_path, filter=None)
 
             return
 
@@ -1294,7 +1287,7 @@ class ApplicationRunMixin:
                 temp_tar_path = os.path.join(tmpdirname, f"{run_id}.tar.gz")
                 with open(temp_tar_path, "wb") as f:
                     f.write(download_response.content)
-                shutil.unpack_archive(temp_tar_path, output_dir_path)
+                shutil.unpack_archive(temp_tar_path, output_dir_path, filter=None)
         else:
             result.output = download_response.json()
 

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/cloud/client.py

@@ -303,7 +303,7 @@ class Client:
         if data is not None:
             kwargs["data"] = data
         if payload is not None:
-            if isinstance(payload, dict | list):
+            if isinstance(payload, (dict, list)):
                 data = deflated_serialize_json(payload, json_configurations=json_configurations)
                 kwargs["data"] = data
             else:

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/default_app/main.py

@@ -26,10 +26,12 @@ assets = create_visuals(name, input.data["radius"], input.data["distance"])
 output = nextmv.Output(
     options=options,
     solution={"message": message},
-    metrics={
-        "value": 1.23,
-        "custom": {"message": message},
-    },
+    statistics=nextmv.Statistics(
+        result=nextmv.ResultStatistics(
+            value=1.23,
+            custom={"message": message},
+        ),
+    ),
     assets=assets,
 )
 nextmv.write(output)

{nextmv-1.0.0.dev8 → nextmv-1.0.0.dev9}/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-1.0.0.dev8 → nextmv-1.0.0.dev9}/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-1.0.0.dev8 → nextmv-1.0.0.dev9}/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-1.0.0.dev8 → nextmv-1.0.0.dev9}/nextmv/model.py

@@ -84,6 +84,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 +198,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 +237,7 @@ class Model:
         ...     return Output(
         ...         options=input.options,
         ...         solution=result,
-        ...         metrics={"processing_time": 0.5}
+        ...         statistics={"processing_time": 0.5}
         ...     )
         """
 
@@ -288,7 +291,6 @@ class Model:
             ) from e
 
         finally:
-            from mlflow.models import infer_signature
             from mlflow.pyfunc import PythonModel, save_model
 
         class MLFlowModel(PythonModel):
@@ -342,12 +344,13 @@ 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,
-            )
+        # 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 +359,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,  # Allows us to work with our own `Options` class.
         )
 
         # Create an auxiliary requirements file with the model dependencies.
@@ -415,9 +418,9 @@ 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)
+    mlflow_db_path = os.path.join(model_dir, "mlflow.db")
+    if os.path.exists(mlflow_db_path):
+        os.remove(mlflow_db_path)
 
     requirements_file = os.path.join(model_dir, _REQUIREMENTS_FILE)
     if os.path.exists(requirements_file):