nextmv 0.35.0.dev1__py3-none-any.whl → 0.35.1__py3-none-any.whl

nextmv/__about__.py

@@ -1 +1 @@
-__version__ = "v0.35.0.dev1"
+__version__ = "v0.35.1"

nextmv/__init__.py

@@ -19,6 +19,7 @@ from .logger import reset_stdout as reset_stdout
 from .manifest import MANIFEST_FILE_NAME as MANIFEST_FILE_NAME
 from .manifest import Manifest as Manifest
 from .manifest import ManifestBuild as ManifestBuild
+from .manifest import ManifestExecution as ManifestExecution
 from .manifest import ManifestOption as ManifestOption
 from .manifest import ManifestPython as ManifestPython
 from .manifest import ManifestPythonArch as ManifestPythonArch

nextmv/_serialization.py

@@ -1,9 +1,9 @@
 import datetime
 import json
-from typing import Any, Union
+from typing import Any
 
 
-def deflated_serialize_json(obj: Union[dict, list], json_configurations: dict[str, Any] = None) -> str:
+def deflated_serialize_json(obj: dict | list, json_configurations: dict[str, Any] = None) -> str:
     """
     Serialize a Python object (dict or list) to a JSON string with default configuration for a deflated format.
 
@@ -35,7 +35,7 @@ def deflated_serialize_json(obj: Union[dict, list], json_configurations: dict[st
     )
 
 
-def serialize_json(obj: Union[dict, list], json_configurations: dict[str, Any] = None) -> str:
+def serialize_json(obj: dict | list, json_configurations: dict[str, Any] = None) -> str:
     """
     Serialize a Python object (dict or list) to a JSON string.
 

nextmv/base_model.py

@@ -18,7 +18,7 @@ from_dict:
 """
 
 from importlib import import_module
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel as PydanticBaseModel
 
@@ -32,7 +32,7 @@ class BaseModel(PydanticBaseModel):
     """
 
     @classmethod
-    def from_dict(cls, data: Optional[dict[str, Any]] = None):
+    def from_dict(cls, data: dict[str, Any] | None = None):
         """
         Instantiate the class from a dictionary.
 

nextmv/cloud/acceptance_test.py

@@ -43,7 +43,6 @@ AcceptanceTest : BaseModel
 
 from datetime import datetime
 from enum import Enum
-from typing import Optional
 
 from nextmv.base_model import BaseModel
 from nextmv.cloud.batch_experiment import ExperimentStatus
@@ -861,9 +860,9 @@ class AcceptanceTestResults(BaseModel):
 
     passed: bool
     """Whether the acceptance test passed (or not)."""
-    metric_results: Optional[list[MetricResult]] = None
+    metric_results: list[MetricResult] | None = None
     """Results of the metrics."""
-    error: Optional[str] = None
+    error: str | None = None
     """Error message if the acceptance test failed."""
 
 
@@ -957,7 +956,7 @@ class AcceptanceTest(BaseModel):
     """Creation date of the acceptance test."""
     updated_at: datetime
     """Last update date of the acceptance test."""
-    status: Optional[ExperimentStatus] = ExperimentStatus.UNKNOWN
+    status: ExperimentStatus | None = ExperimentStatus.UNKNOWN
     """Status of the acceptance test."""
-    results: Optional[AcceptanceTestResults] = None
+    results: AcceptanceTestResults | None = None
     """Results of the acceptance test."""

nextmv/cloud/application.py

@@ -29,7 +29,7 @@ import tarfile
 import tempfile
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Optional, Union
+from typing import Any
 
 import requests
 
@@ -148,9 +148,9 @@ class Application:
         cls,
         client: Client,
         name: str,
-        id: Optional[str] = None,
-        description: Optional[str] = None,
-        is_workflow: Optional[bool] = None,
+        id: str | None = None,
+        description: str | None = None,
+        is_workflow: bool | None = None,
         exist_ok: bool = False,
     ) -> "Application":
         """
@@ -1063,10 +1063,10 @@ class Application:
         candidate_instance_id: str,
         baseline_instance_id: str,
         id: str,
-        metrics: list[Union[Metric, dict[str, Any]]],
+        metrics: list[Metric | dict[str, Any]],
         name: str,
-        input_set_id: Optional[str] = None,
-        description: Optional[str] = None,
+        input_set_id: str | None = None,
+        description: str | None = None,
     ) -> AcceptanceTest:
         """
         Create a new acceptance test.
@@ -1180,10 +1180,10 @@ class Application:
         candidate_instance_id: str,
         baseline_instance_id: str,
         id: str,
-        metrics: list[Union[Metric, dict[str, Any]]],
+        metrics: list[Metric | dict[str, Any]],
         name: str,
-        input_set_id: Optional[str] = None,
-        description: Optional[str] = None,
+        input_set_id: str | None = None,
+        description: str | None = None,
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
     ) -> AcceptanceTest:
         """
@@ -1260,13 +1260,13 @@ class Application:
     def new_batch_experiment(
         self,
         name: str,
-        input_set_id: Optional[str] = None,
-        instance_ids: Optional[list[str]] = None,
-        description: Optional[str] = None,
-        id: Optional[str] = None,
-        option_sets: Optional[dict[str, dict[str, str]]] = None,
-        runs: Optional[list[Union[BatchExperimentRun, dict[str, Any]]]] = None,
-        type: Optional[str] = "batch",
+        input_set_id: str | None = None,
+        instance_ids: list[str] | None = None,
+        description: str | None = None,
+        id: str | None = None,
+        option_sets: dict[str, dict[str, str]] | None = None,
+        runs: list[BatchExperimentRun | dict[str, Any]] | None = None,
+        type: str | None = "batch",
     ) -> str:
         """
         Create a new batch experiment.
@@ -1341,13 +1341,13 @@ class Application:
     def new_batch_experiment_with_result(
         self,
         name: str,
-        input_set_id: Optional[str] = None,
-        instance_ids: Optional[list[str]] = None,
-        description: Optional[str] = None,
-        id: Optional[str] = None,
-        option_sets: Optional[dict[str, dict[str, str]]] = None,
-        runs: Optional[list[Union[BatchExperimentRun, dict[str, Any]]]] = None,
-        type: Optional[str] = "batch",
+        input_set_id: str | None = None,
+        instance_ids: list[str] | None = None,
+        description: str | None = None,
+        id: str | None = None,
+        option_sets: dict[str, dict[str, str]] | None = None,
+        runs: list[BatchExperimentRun | dict[str, Any]] | None = None,
+        type: str | None = "batch",
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
     ) -> BatchExperiment:
         """
@@ -1413,8 +1413,8 @@ class Application:
         id: str,
         run_groups: list[RunGroup],
         rules: list[EvaluationRule],
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
     ) -> EnsembleDefinition:
         """
         Create a new ensemble definition.
@@ -1459,13 +1459,13 @@ class Application:
         self,
         id: str,
         name: str,
-        description: Optional[str] = None,
-        end_time: Optional[datetime] = None,
-        instance_id: Optional[str] = None,
-        maximum_runs: Optional[int] = None,
-        run_ids: Optional[list[str]] = None,
-        start_time: Optional[datetime] = None,
-        inputs: Optional[list[ManagedInput]] = None,
+        description: str | None = None,
+        end_time: datetime | None = None,
+        instance_id: str | None = None,
+        maximum_runs: int | None = None,
+        run_ids: list[str] | None = None,
+        start_time: datetime | None = None,
+        inputs: list[ManagedInput] | None = None,
     ) -> InputSet:
         """
         Create a new input set. You can create an input set from three
@@ -1553,8 +1553,8 @@ class Application:
         version_id: str,
         id: str,
         name: str,
-        description: Optional[str] = None,
-        configuration: Optional[InstanceConfiguration] = None,
+        description: str | None = None,
+        configuration: InstanceConfiguration | None = None,
         exist_ok: bool = False,
     ) -> Instance:
         """
@@ -1636,10 +1636,10 @@ class Application:
         self,
         id: str,
         name: str,
-        description: Optional[str] = None,
-        upload_id: Optional[str] = None,
-        run_id: Optional[str] = None,
-        format: Optional[Union[Format, dict[str, Any]]] = None,
+        description: str | None = None,
+        upload_id: str | None = None,
+        run_id: str | None = None,
+        format: Format | dict[str, Any] | None = None,
     ) -> ManagedInput:
         """
         Create a new managed input. There are two methods for creating a
@@ -1715,17 +1715,17 @@ class Application:
 
     def new_run(  # noqa: C901 # Refactor this function at some point.
         self,
-        input: Union[Input, dict[str, Any], BaseModel, str] = None,
-        instance_id: Optional[str] = None,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        upload_id: Optional[str] = None,
-        options: Optional[Union[Options, dict[str, str]]] = None,
-        configuration: Optional[Union[RunConfiguration, dict[str, Any]]] = None,
-        batch_experiment_id: Optional[str] = None,
-        external_result: Optional[Union[ExternalRunResult, dict[str, Any]]] = None,
-        json_configurations: Optional[dict[str, Any]] = None,
-        input_dir_path: Optional[str] = None,
+        input: Input | dict[str, Any] | BaseModel | str = None,
+        instance_id: str | None = None,
+        name: str | None = None,
+        description: str | None = None,
+        upload_id: str | None = None,
+        options: Options | dict[str, str] | None = None,
+        configuration: RunConfiguration | dict[str, Any] | None = None,
+        batch_experiment_id: str | None = None,
+        external_result: ExternalRunResult | dict[str, Any] | None = None,
+        json_configurations: dict[str, Any] | None = None,
+        input_dir_path: str | None = None,
     ) -> str:
         """
         Submit an input to start a new run of the application. Returns the
@@ -1893,19 +1893,19 @@ class Application:
 
     def new_run_with_result(
         self,
-        input: Union[Input, dict[str, Any], BaseModel, str] = None,
-        instance_id: Optional[str] = None,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        upload_id: Optional[str] = None,
-        run_options: Optional[Union[Options, dict[str, str]]] = None,
+        input: Input | dict[str, Any] | BaseModel | str = None,
+        instance_id: str | None = None,
+        name: str | None = None,
+        description: str | None = None,
+        upload_id: str | None = None,
+        run_options: Options | dict[str, str] | None = None,
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
-        configuration: Optional[Union[RunConfiguration, dict[str, Any]]] = None,
-        batch_experiment_id: Optional[str] = None,
-        external_result: Optional[Union[ExternalRunResult, dict[str, Any]]] = None,
-        json_configurations: Optional[dict[str, Any]] = None,
-        input_dir_path: Optional[str] = None,
-        output_dir_path: Optional[str] = ".",
+        configuration: RunConfiguration | dict[str, Any] | None = None,
+        batch_experiment_id: str | None = None,
+        external_result: ExternalRunResult | dict[str, Any] | None = None,
+        json_configurations: dict[str, Any] | None = None,
+        input_dir_path: str | None = None,
+        output_dir_path: str | None = ".",
     ) -> RunResult:
         """
         Submit an input to start a new run of the application and poll for the
@@ -2045,8 +2045,8 @@ class Application:
         id: str,
         name: str,
         scenarios: list[Scenario],
-        description: Optional[str] = None,
-        repetitions: Optional[int] = 0,
+        description: str | None = None,
+        repetitions: int | None = 0,
     ) -> str:
         """
         Create a new scenario test. The test is based on `scenarios` and you
@@ -2166,8 +2166,8 @@ class Application:
         id: str,
         name: str,
         scenarios: list[Scenario],
-        description: Optional[str] = None,
-        repetitions: Optional[int] = 0,
+        description: str | None = None,
+        repetitions: int | None = 0,
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
     ) -> BatchExperiment:
         """
@@ -2229,7 +2229,7 @@ class Application:
         secrets: list[Secret],
         id: str,
         name: str,
-        description: Optional[str] = None,
+        description: str | None = None,
     ) -> SecretsCollectionSummary:
         """
         Create a new secrets collection.
@@ -2313,9 +2313,9 @@ class Application:
 
     def new_version(
         self,
-        id: Optional[str] = None,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        id: str | None = None,
+        name: str | None = None,
+        description: str | None = None,
         exist_ok: bool = False,
     ) -> Version:
         """
@@ -2397,11 +2397,11 @@ class Application:
 
     def push(
         self,
-        manifest: Optional[Manifest] = None,
-        app_dir: Optional[str] = None,
+        manifest: Manifest | None = None,
+        app_dir: str | None = None,
         verbose: bool = False,
-        model: Optional[Model] = None,
-        model_configuration: Optional[ModelConfiguration] = None,
+        model: Model | None = None,
+        model_configuration: ModelConfiguration | None = None,
     ) -> None:
         """
         Push an app to Nextmv Cloud.
@@ -2664,7 +2664,7 @@ class Application:
         )
         return RunLog.from_dict(response.json())
 
-    def run_result(self, run_id: str, output_dir_path: Optional[str] = ".") -> RunResult:
+    def run_result(self, run_id: str, output_dir_path: str | None = ".") -> RunResult:
         """
         Get the result of a run.
 
@@ -2708,7 +2708,7 @@ class Application:
         self,
         run_id: str,
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
-        output_dir_path: Optional[str] = ".",
+        output_dir_path: str | None = ".",
     ) -> RunResult:
         """
         Get the result of a run with polling.
@@ -2887,8 +2887,8 @@ class Application:
     def track_run(  # noqa: C901
         self,
         tracked_run: TrackedRun,
-        instance_id: Optional[str] = None,
-        configuration: Optional[Union[RunConfiguration, dict[str, Any]]] = None,
+        instance_id: str | None = None,
+        configuration: RunConfiguration | dict[str, Any] | None = None,
     ) -> str:
         """
         Track an external run.
@@ -3058,9 +3058,9 @@ class Application:
         self,
         tracked_run: TrackedRun,
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
-        instance_id: Optional[str] = None,
-        output_dir_path: Optional[str] = ".",
-        configuration: Optional[Union[RunConfiguration, dict[str, Any]]] = None,
+        instance_id: str | None = None,
+        output_dir_path: str | None = ".",
+        configuration: RunConfiguration | dict[str, Any] | None = None,
     ) -> RunResult:
         """
         Track an external run and poll for the result. This is a convenience
@@ -3120,8 +3120,8 @@ class Application:
     def update_batch_experiment(
         self,
         batch_experiment_id: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
     ) -> BatchExperimentInformation:
         """
         Update a batch experiment.
@@ -3164,8 +3164,8 @@ class Application:
     def update_ensemble_definition(
         self,
         id: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
     ) -> EnsembleDefinition:
         """
         Update an ensemble definition.
@@ -3212,10 +3212,10 @@ class Application:
     def update_instance(
         self,
         id: str,
-        name: Optional[str] = None,
-        version_id: Optional[str] = None,
-        description: Optional[str] = None,
-        configuration: Optional[InstanceConfiguration] = None,
+        name: str | None = None,
+        version_id: str | None = None,
+        description: str | None = None,
+        configuration: InstanceConfiguration | None = None,
     ) -> Instance:
         """
         Update an instance.
@@ -3275,8 +3275,8 @@ class Application:
     def update_managed_input(
         self,
         managed_input_id: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
     ) -> ManagedInput:
         """
         Update a managed input.
@@ -3325,8 +3325,8 @@ class Application:
     def update_scenario_test(
         self,
         scenario_test_id: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
     ) -> BatchExperimentInformation:
         """
         Update a scenario test.
@@ -3374,9 +3374,9 @@ class Application:
     def update_secrets_collection(
         self,
         secrets_collection_id: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        secrets: Optional[list[Secret]] = None,
+        name: str | None = None,
+        description: str | None = None,
+        secrets: list[Secret] | None = None,
     ) -> SecretsCollectionSummary:
         """
         Update a secrets collection.
@@ -3453,10 +3453,10 @@ class Application:
 
     def upload_large_input(
         self,
-        input: Optional[Union[dict[str, Any], str]],
+        input: dict[str, Any] | str | None,
         upload_url: UploadURL,
-        json_configurations: Optional[dict[str, Any]] = None,
-        tar_file: Optional[str] = None,
+        json_configurations: dict[str, Any] | None = None,
+        tar_file: str | None = None,
     ) -> None:
         """
         Upload large input data to the provided upload URL.
@@ -3676,7 +3676,7 @@ class Application:
         self,
         run_id: str,
         run_information: RunInformation,
-        output_dir_path: Optional[str] = ".",
+        output_dir_path: str | None = ".",
     ) -> RunResult:
         """
         Get the result of a run.
@@ -3764,7 +3764,7 @@ class Application:
         return result
 
     @staticmethod
-    def __convert_manifest_to_payload(manifest: Manifest) -> dict[str, Any]:
+    def __convert_manifest_to_payload(manifest: Manifest) -> dict[str, Any]:  # noqa: C901
         """Converts a manifest to a payload dictionary for the API."""
 
         activation_request = {
@@ -3802,6 +3802,13 @@ class Application:
                     "template": options["format"],
                 }
             activation_request["requirements"]["options"] = options
+
+        if manifest.execution is not None:
+            if manifest.execution.entrypoint:
+                activation_request["requirements"]["entrypoint"] = manifest.execution.entrypoint
+            if manifest.execution.cwd:
+                activation_request["requirements"]["working_directory"] = manifest.execution.cwd
+
         return activation_request
 
     def __update_app_binary(
@@ -3943,7 +3950,7 @@ class Application:
         upload_id_used: bool,
         input_size: int,
         tar_file: str,
-        input: Union[Input, dict[str, Any], BaseModel, str] = None,
+        input: Input | dict[str, Any] | BaseModel | str = None,
     ) -> bool:
         """
         Auxiliary function to determine if an upload URL is required
@@ -3967,8 +3974,8 @@ class Application:
 
     def __extract_input_data(
         self,
-        input: Union[Input, dict[str, Any], BaseModel, str] = None,
-    ) -> Optional[Union[dict[str, Any], str]]:
+        input: Input | dict[str, Any] | BaseModel | str = None,
+    ) -> dict[str, Any] | str | None:
         """
         Auxiliary function to extract the input data from the input, based on
         its type.
@@ -3986,8 +3993,8 @@ class Application:
 
     def __extract_options_dict(
         self,
-        options: Optional[Union[Options, dict[str, str]]] = None,
-        json_configurations: Optional[dict[str, Any]] = None,
+        options: Options | dict[str, str] | None = None,
+        json_configurations: dict[str, Any] | None = None,
     ) -> dict[str, str]:
         """
         Auxiliary function to extract the options that will be sent to the
@@ -4011,9 +4018,9 @@ class Application:
 
     def __extract_run_config(
         self,
-        input: Union[Input, dict[str, Any], BaseModel, str] = None,
-        configuration: Optional[Union[RunConfiguration, dict[str, Any]]] = None,
-        dir_path: Optional[str] = None,
+        input: Input | dict[str, Any] | BaseModel | str = None,
+        configuration: RunConfiguration | dict[str, Any] | None = None,
+        dir_path: str | None = None,
     ) -> dict[str, Any]:
         """
         Auxiliary function to extract the run configuration that will be sent

nextmv/cloud/batch_experiment.py

@@ -17,7 +17,7 @@ BatchExperimentMetadata
 
 from datetime import datetime
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 from nextmv.base_model import BaseModel
 from nextmv.cloud.input_set import InputSet
@@ -156,19 +156,19 @@ class BatchExperimentInformation(BaseModel):
     updated_at: datetime
     """Last update date of the batch experiment."""
 
-    status: Optional[ExperimentStatus] = None
+    status: ExperimentStatus | None = None
     """Status of the batch experiment."""
-    description: Optional[str] = None
+    description: str | None = None
     """Description of the batch experiment."""
-    number_of_requested_runs: Optional[int] = None
+    number_of_requested_runs: int | None = None
     """Number of runs requested for the batch experiment."""
-    number_of_runs: Optional[int] = None
+    number_of_runs: int | None = None
     """Number of runs in the batch experiment."""
-    number_of_completed_runs: Optional[int] = None
+    number_of_completed_runs: int | None = None
     """Number of completed runs in the batch experiment."""
-    type: Optional[str] = None
+    type: str | None = None
     """Type of the batch experiment."""
-    option_sets: Optional[dict[str, dict[str, str]]] = None
+    option_sets: dict[str, dict[str, str]] | None = None
     """Option sets used for the experiment."""
 
 
@@ -202,9 +202,9 @@ class BatchExperiment(BatchExperimentInformation):
     """ID of the input set used for the experiment."""
     instance_ids: list[str]
     """List of instance IDs used for the experiment."""
-    grouped_distributional_summaries: Optional[list[dict[str, Any]]] = None
+    grouped_distributional_summaries: list[dict[str, Any]] | None = None
     """Grouped distributional summaries of the batch experiment."""
-    runs: Optional[list[Run]] = None
+    runs: list[Run] | None = None
     """List of runs in the batch experiment."""
 
 
@@ -244,17 +244,17 @@ class BatchExperimentRun(BaseModel):
     input_id: str
     """ID of the input used for the experiment."""
 
-    option_set: Optional[str] = None
+    option_set: str | None = None
     """Option set used for the experiment."""
-    instance_id: Optional[str] = None
+    instance_id: str | None = None
     """ID of the instance used for the experiment."""
-    version_id: Optional[str] = None
+    version_id: str | None = None
     """ID of the version used for the experiment."""
-    input_set_id: Optional[str] = None
+    input_set_id: str | None = None
     """ID of the input set used for the experiment."""
-    scenario_id: Optional[str] = None
+    scenario_id: str | None = None
     """If the batch experiment is a scenario test, this is the ID of that test."""
-    repetition: Optional[int] = None
+    repetition: int | None = None
     """Repetition number of the experiment."""
 
     def __post_init_post_parse__(self):
@@ -290,7 +290,7 @@ class BatchExperimentMetadata(BatchExperimentInformation):
         ID of the application used for the batch experiment. Defaults to None.
     """
 
-    app_id: Optional[str] = None
+    app_id: str | None = None
     """ID of the application used for the batch experiment."""