nextmv 1.0.0.dev4__py3-none-any.whl → 1.0.0.dev6__py3-none-any.whl

nextmv/cloud/application/__init__.py

@@ -21,7 +21,7 @@ list_application
 import json
 import shutil
 import sys
-from datetime import datetime, timezone
+from datetime import datetime
 from enum import Enum
 from typing import Any
 
@@ -46,9 +46,7 @@ from nextmv.cloud.application._switchback import ApplicationSwitchbackMixin
 from nextmv.cloud.application._utils import _is_not_exist_error
 from nextmv.cloud.application._version import ApplicationVersionMixin
 from nextmv.cloud.client import Client
-from nextmv.cloud.instance import Instance
 from nextmv.cloud.url import UploadURL
-from nextmv.cloud.version import Version
 from nextmv.logger import log
 from nextmv.manifest import Manifest
 from nextmv.model import Model, ModelConfiguration
@@ -407,14 +405,6 @@ class Application(
         model: Model | None = None,
         model_configuration: ModelConfiguration | None = None,
         rich_print: bool = False,
-        auto_create: bool = False,
-        version_id: str | None = None,
-        version_name: str | None = None,
-        version_description: str | None = None,
-        instance_id: str | None = None,
-        instance_name: str | None = None,
-        instance_description: str | None = None,
-        update_default_instance: bool = False,
     ) -> None:
         """
         Push an app to Nextmv Cloud.
@@ -432,17 +422,6 @@ class Application(
         `nextmv.Model`. The model is encoded, some dependencies and
         accompanying files are packaged, and the app is pushed to Nextmv Cloud.
 
-        By default, this function only pushes the app. If you want to
-        automatically create a new version and instance after pushing, set
-        `auto_create=True`. The `version_id`, `version_name`, and
-        `version_description` arguments allow you to customize the new version
-        that is created. If not specified, defaults will be generated (random
-        ID, timestamped name/description). Similarly, `instance_id`,
-        `instance_name`, and `instance_description` can be used to customize
-        the new instance. If `update_default_instance` is True, the
-        application's default instance will be updated to the newly created
-        instance.
-
         Parameters
         ----------
         manifest : Optional[Manifest], default=None
@@ -461,30 +440,6 @@ class Application(
             with `model`.
         rich_print : bool, default=False
             Whether to use rich printing when verbose output is enabled.
-        auto_create : bool, default=False
-            If True, automatically create a new version and instance after
-            pushing the app.
-        version_id : Optional[str], default=None
-            ID of the version to create after pushing the app. If None, a unique
-            ID will be generated.
-        version_name : Optional[str], default=None
-            Name of the version to create after pushing the app. If None, a
-            name will be generated.
-        version_description : Optional[str], default=None
-            Description of the version to create after pushing the app. If None, a
-            generic description with a timestamp will be generated.
-        instance_id : Optional[str], default=None
-            ID of the instance to create after pushing the app. If None, a unique
-            ID will be generated.
-        instance_name : Optional[str], default=None
-            Name of the instance to create after pushing the app. If None, a
-            name will be generated.
-        instance_description : Optional[str], default=None
-            Description of the instance to create after pushing the app. If None,
-            a generic description with a timestamp will be generated.
-        update_default_instance : bool, default=False
-            If True, update the application's default instance to the newly
-            created instance.
 
         Raises
         ------
@@ -588,44 +543,6 @@ class Application(
         except OSError as e:
             raise Exception(f"error deleting output directory: {e}") from e
 
-        if not auto_create:
-            return
-
-        if verbose:
-            if rich_print:
-                rich.print(
-                    f":hourglass_flowing_sand: Push completed for Nextmv application [magenta]{self.id}[/magenta], "
-                    "creating a new version and instance...",
-                    file=sys.stderr,
-                )
-            else:
-                log("⌛️ Push completed for the Nextmv application, creating a new version and instance...")
-
-        now = datetime.now(timezone.utc)
-        version = self.__version_on_push(
-            now=now,
-            version_id=version_id,
-            version_name=version_name,
-            version_description=version_description,
-            verbose=verbose,
-            rich_print=rich_print,
-        )
-        instance = self.__instance_on_push(
-            now=now,
-            version_id=version.id,
-            instance_id=instance_id,
-            instance_name=instance_name,
-            instance_description=instance_description,
-            verbose=verbose,
-            rich_print=rich_print,
-        )
-        self.__update_on_push(
-            instance=instance,
-            update_default_instance=update_default_instance,
-            verbose=verbose,
-            rich_print=rich_print,
-        )
-
     def update(
         self,
         name: str | None = None,
@@ -941,120 +858,6 @@ class Application(
                 log(f'💥️ Successfully pushed to application: "{self.id}".')
                 log(json.dumps(data, indent=2))
 
-    def __version_on_push(
-        self,
-        now: datetime,
-        version_id: str | None = None,
-        version_name: str | None = None,
-        version_description: str | None = None,
-        verbose: bool = False,
-        rich_print: bool = False,
-    ) -> Version:
-        if version_description is None or version_description == "":
-            version_description = f"Version created automatically from push at {now.strftime('%Y-%m-%dT%H:%M:%SZ')}"
-
-        version = self.new_version(
-            id=version_id,
-            name=version_name,
-            description=version_description,
-        )
-        version_dict = version.to_dict()
-
-        if not verbose:
-            return version
-
-        if rich_print:
-            rich.print(
-                f":white_check_mark: Automatically created new version [magenta]{version.id}[/magenta].",
-                file=sys.stderr,
-            )
-            rich.print_json(data=version_dict)
-
-            return version
-
-        log(f'✅ Automatically created new version "{version.id}".')
-        log(json.dumps(version_dict, indent=2))
-
-        return version
-
-    def __instance_on_push(
-        self,
-        now: datetime,
-        version_id: str,
-        instance_id: str | None = None,
-        instance_name: str | None = None,
-        instance_description: str | None = None,
-        verbose: bool = False,
-        rich_print: bool = False,
-    ) -> Instance:
-        if instance_description is None or instance_description == "":
-            instance_description = f"Instance created automatically from push at {now.strftime('%Y-%m-%dT%H:%M:%SZ')}"
-
-        instance = self.new_instance(
-            version_id=version_id,
-            id=instance_id,
-            name=instance_name,
-            description=instance_description,
-        )
-        instance_dict = instance.to_dict()
-
-        if not verbose:
-            return instance
-
-        if rich_print:
-            rich.print(
-                f":white_check_mark: Automatically created new instance [magenta]{instance.id}[/magenta] "
-                f"using version [magenta]{version_id}[/magenta].",
-                file=sys.stderr,
-            )
-            rich.print_json(data=instance_dict)
-
-            return instance
-
-        log(f'✅ Automatically created new instance "{instance.id}" using version "{version_id}".')
-        log(json.dumps(instance_dict, indent=2))
-
-        return instance
-
-    def __update_on_push(
-        self,
-        instance: Instance,
-        update_default_instance: bool = False,
-        verbose: bool = False,
-        rich_print: bool = False,
-    ) -> None:
-        if not update_default_instance:
-            return
-
-        if verbose:
-            if rich_print:
-                rich.print(
-                    f":hourglass_flowing_sand: Updating default instance for app [magenta]{self.id}[/magenta]...",
-                    file=sys.stderr,
-                )
-            else:
-                log("⌛️ Updating default instance for the Nextmv application...")
-
-        updated_app = self.update(default_instance_id=instance.id)
-        if not verbose:
-            return
-
-        if rich_print:
-            rich.print(
-                f":white_check_mark: Updated default instance to "
-                f"[magenta]{updated_app.default_instance_id}[/magenta] for application "
-                f"[magenta]{self.id}[/magenta].",
-                file=sys.stderr,
-            )
-            rich.print_json(data=updated_app.to_dict())
-
-            return
-
-        log(
-            f'✅ Updated default instance to "{updated_app.default_instance_id}" for application "{self.id}".',
-        )
-        log(json.dumps(updated_app.to_dict(), indent=2))
-
 
 def list_applications(client: Client) -> list[Application]:
     """

nextmv/cloud/application/_batch_scenario.py

@@ -10,7 +10,6 @@ from nextmv.cloud.batch_experiment import (
     BatchExperimentMetadata,
     BatchExperimentRun,
     ExperimentStatus,
-    to_runs,
 )
 from nextmv.cloud.input_set import InputSet, ManagedInput
 from nextmv.cloud.scenario import Scenario, ScenarioInputType, _option_sets, _scenarios_by_id
@@ -258,7 +257,6 @@ class ApplicationBatchMixin:
         self: "Application",
         name: str | None = None,
         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,
@@ -274,9 +272,6 @@ class ApplicationBatchMixin:
             Name of the batch experiment. If not provided, the ID will be used as the name.
         input_set_id: str | None
             ID of the input set to use for the batch experiment.
-        instance_ids: list[str]
-            This argument is deprecated, use `runs` instead.
-            List of instance IDs to use for the batch experiment.
         description: Optional[str]
             Optional description of the batch experiment.
         id: Optional[str]
@@ -308,7 +303,7 @@ class ApplicationBatchMixin:
             id = safe_id("batch")
 
         # Use ID as name if name not provided
-        if name is None:
+        if name is None or name == "":
             name = id
 
         payload = {
@@ -317,11 +312,6 @@ class ApplicationBatchMixin:
         }
         if input_set_id is not None:
             payload["input_set_id"] = input_set_id
-        if instance_ids is not None:
-            input_set = self.input_set(input_set_id)
-            runs = to_runs(instance_ids, input_set)
-            payload_runs = [run.to_dict() for run in runs]
-            payload["runs"] = payload_runs
         if description is not None:
             payload["description"] = description
         if option_sets is not None:
@@ -346,7 +336,6 @@ class ApplicationBatchMixin:
         self: "Application",
         name: str | None = None,
         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,
@@ -368,9 +357,6 @@ class ApplicationBatchMixin:
             Name of the batch experiment. If not provided, the ID will be used as the name.
         input_set_id: str
             ID of the input set to use for the batch experiment.
-        instance_ids: list[str]
-            List of instance IDs to use for the batch experiment. This argument
-            is deprecated, use `runs` instead.
         description: Optional[str]
             Optional description of the batch experiment.
         id: Optional[str]
@@ -402,7 +388,6 @@ class ApplicationBatchMixin:
         batch_id = self.new_batch_experiment(
             name=name,
             input_set_id=input_set_id,
-            instance_ids=instance_ids,
             description=description,
             id=id,
             option_sets=option_sets,
@@ -485,7 +470,7 @@ class ApplicationBatchMixin:
             id = safe_id("scenario")
 
         # Use ID as name if name not provided
-        if name is None:
+        if name is None or name == "":
             name = id
 
         scenarios_by_id = _scenarios_by_id(scenarios)

nextmv/cloud/application/_input_set.py

@@ -6,6 +6,7 @@ from datetime import datetime
 from typing import TYPE_CHECKING
 
 from nextmv.cloud.input_set import InputSet, ManagedInput
+from nextmv.safe import safe_id
 
 if TYPE_CHECKING:
     from . import Application
@@ -16,6 +17,32 @@ class ApplicationInputSetMixin:
     Mixin class for managing app input sets within an application.
     """
 
+    def delete_input_set(self: "Application", input_set_id: str) -> None:
+        """
+        Delete an input set.
+
+        Deletes an input set along with all the associated information.
+
+        Parameters
+        ----------
+        input_set_id : str
+            ID of the input set to delete.
+
+        Raises
+        ------
+        requests.HTTPError
+            If the response status code is not 2xx.
+
+        Examples
+        --------
+        >>> app.delete_input_set("input-set-123")
+        """
+
+        _ = self.client.request(
+            method="DELETE",
+            endpoint=f"{self.experiments_endpoint}/inputsets/{input_set_id}",
+        )
+
     def input_set(self: "Application", input_set_id: str) -> InputSet:
         """
         Get an input set.
@@ -81,8 +108,8 @@ class ApplicationInputSetMixin:
 
     def new_input_set(
         self: "Application",
-        id: str,
-        name: str,
+        id: str | None = None,
+        name: str | None = None,
         description: str | None = None,
         end_time: datetime | None = None,
         instance_id: str | None = None,
@@ -107,10 +134,11 @@ class ApplicationInputSetMixin:
 
         Parameters
         ----------
-        id: str
-            ID of the input set
-        name: str
-            Name of the input set.
+        id: str | None = None
+            ID of the input set, will be generated if not provided.
+        name: str | None = None
+            Name of the input set. If not provided, the ID will be used as
+            the name.
         description: Optional[str]
             Optional description of the input set.
         end_time: Optional[datetime]
@@ -145,6 +173,14 @@ class ApplicationInputSetMixin:
             If the response status code is not 2xx.
         """
 
+        # Generate ID if not provided
+        if id is None or id == "":
+            id = safe_id("input-set")
+
+        # Use ID as name if name not provided
+        if name is None or name == "":
+            name = id
+
         payload = {
             "id": id,
             "name": name,

nextmv/cloud/application/_instance.py

@@ -202,7 +202,7 @@ class ApplicationInstanceMixin:
 
         if id is None or id == "":
             id = safe_id(prefix="instance")
-        if name is None:
+        if name is None or name == "":
             name = id
 
         payload = {

nextmv/cloud/application/_managed_input.py

@@ -149,7 +149,7 @@ class ApplicationManagedInputMixin:
 
         if id is None or id == "":
             id = safe_id(prefix="managed-input")
-        if name is None:
+        if name is None or name == "":
             name = id
 
         payload = {

nextmv/cloud/application/_shadow.py

@@ -4,7 +4,7 @@ Application mixin for managing shadow tests.
 
 from typing import TYPE_CHECKING
 
-from nextmv.cloud.shadow import ShadowTest, ShadowTestMetadata, StartEvents, TerminationEvents
+from nextmv.cloud.shadow import ShadowTest, ShadowTestMetadata, StartEvents, StopIntent, TerminationEvents
 from nextmv.run import Run
 from nextmv.safe import safe_id
 
@@ -204,7 +204,7 @@ class ApplicationShadowMixin:
             shadow_test_id = safe_id("shadow")
 
         # Use ID as name if name not provided
-        if name is None:
+        if name is None or name == "":
             name = shadow_test_id
 
         payload = {
@@ -248,7 +248,7 @@ class ApplicationShadowMixin:
             endpoint=f"{self.experiments_endpoint}/shadow/{shadow_test_id}/start",
         )
 
-    def stop_shadow_test(self: "Application", shadow_test_id: str) -> None:
+    def stop_shadow_test(self: "Application", shadow_test_id: str, intent: StopIntent) -> None:
         """
         Stop a shadow test. The test should already have started before using
         this method.
@@ -257,16 +257,22 @@ class ApplicationShadowMixin:
         ----------
         shadow_test_id : str
             ID of the shadow test to stop.
-
+        intent : StopIntent
+            Intent for stopping the shadow test.
         Raises
         ------
         requests.HTTPError
             If the response status code is not 2xx.
         """
 
+        payload = {
+            "intent": intent.value,
+        }
+
         _ = self.client.request(
             method="PUT",
             endpoint=f"{self.experiments_endpoint}/shadow/{shadow_test_id}/stop",
+            payload=payload,
         )
 
     def update_shadow_test(

nextmv/cloud/application/_switchback.py

@@ -5,6 +5,7 @@ Application mixin for managing switchback tests.
 from datetime import datetime
 from typing import TYPE_CHECKING
 
+from nextmv.cloud.shadow import StopIntent
 from nextmv.cloud.switchback import SwitchbackTest, SwitchbackTestMetadata, TestComparisonSingle
 from nextmv.run import Run
 from nextmv.safe import safe_id
@@ -210,7 +211,7 @@ class ApplicationSwitchbackMixin:
             switchback_test_id = safe_id("switchback")
 
         # Use ID as name if name not provided
-        if name is None:
+        if name is None or name == "":
             name = switchback_test_id
 
         payload = {
@@ -257,7 +258,7 @@ class ApplicationSwitchbackMixin:
             endpoint=f"{self.experiments_endpoint}/switchback/{switchback_test_id}/start",
         )
 
-    def stop_switchback_test(self: "Application", switchback_test_id: str) -> None:
+    def stop_switchback_test(self: "Application", switchback_test_id: str, intent: StopIntent) -> None:
         """
         Stop a switchback test. The test should already have started before using
         this method.
@@ -267,15 +268,23 @@ class ApplicationSwitchbackMixin:
         switchback_test_id : str
             ID of the switchback test to stop.
 
+        intent : StopIntent
+            Intent for stopping the switchback test.
+
         Raises
         ------
         requests.HTTPError
             If the response status code is not 2xx.
         """
 
+        payload = {
+            "intent": intent.value,
+        }
+
         _ = self.client.request(
             method="PUT",
             endpoint=f"{self.experiments_endpoint}/switchback/{switchback_test_id}/stop",
+            payload=payload,
         )
 
     def update_switchback_test(

nextmv/cloud/application/_version.py

@@ -141,7 +141,7 @@ class ApplicationVersionMixin:
         if id is None or id == "":
             id = safe_id(prefix="version")
 
-        if name is None:
+        if name is None or name == "":
             name = id
 
         payload = {

nextmv/cloud/batch_experiment.py

@@ -30,7 +30,9 @@ class ExperimentStatus(str, Enum):
 
     You can import the `ExperimentStatus` class directly from `cloud`:
 
-    ```python from nextmv.cloud import ExperimentStatus ```
+    ```python
+    from nextmv.cloud import ExperimentStatus
+    ```
 
     This enum represents the comprehensive set of possible states for an
     experiment in Nextmv Cloud.