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

nextmv/cli/cloud/app/create.py

@@ -17,15 +17,6 @@ app = typer.Typer()
 
 @app.command()
 def create(
-    name: Annotated[
-        str,
-        typer.Option(
-            "--name",
-            "-n",
-            help="A name for the application.",
-            metavar="NAME",
-        ),
-    ],
     app_id: Annotated[
         str | None,
         typer.Option(
@@ -79,47 +70,55 @@ def create(
             help="Whether the application is a workflow.",
         ),
     ] = False,
+    name: Annotated[
+        str | None,
+        typer.Option(
+            "--name",
+            "-n",
+            help="An optional name for the application. If not provided, the application ID will be used as the name.",
+            metavar="NAME",
+        ),
+    ] = None,
     profile: ProfileOption = None,
 ) -> None:
     """
     Create a new Nextmv Cloud application.
 
-    Use the [code]--exist-ok[/code] flag to avoid errors when creating an
-    application with an ID that already exists. This is useful for scripts that
-    need to ensure an application exists without worrying about whether it was
-    created previously.
+    Use the --exist-ok flag to avoid errors when creating an application with
+    an ID that already exists. This is useful for scripts that need to ensure
+    an application exists without worrying about whether it was created
+    previously.
 
-    An application can be marked as a workflow using the
-    [code]--is-workflow[/code] flag. Workflows allow for more complex
-    decision-making processes by leveraging
+    An application can be marked as a workflow using the --is-workflow flag.
+    Workflows allow for more complex decision-making processes by leveraging
     [link=https://github.com/nextmv-io/nextpipe][bold]Nextpipe[/bold][/link] to
     orchestrate multiple decision models.
 
     [bold][underline]Examples[/underline][/bold]
 
     - Create an application with the name [magenta]Hare App[/magenta]. A random ID will be generated.
-        $ [green]nextmv cloud app create --name "Hare App"[/green]
+        $ [dim]nextmv cloud app create --name "Hare App"[/dim]
 
     - Create an application with the specific ID [magenta]hare-app[/magenta].
-        $ [green]nextmv cloud app create --name "Hare App" --app-id hare-app[/green]
+        $ [dim]nextmv cloud app create --name "Hare App" --app-id hare-app[/dim]
 
     - Create an application with an ID and description.
-        $ [green]nextmv cloud app create --name "Hare App" --app-id hare-app \\
-            --description "An application for routing hares"[/green]
+        $ [dim]nextmv cloud app create --name "Hare App" --app-id hare-app \\
+            --description "An application for routing hares"[/dim]
 
     - Create an application, or get it if it already exists.
-        $ [green]nextmv cloud app create --name "Hare App" --app-id hare-app --exist-ok[/green]
+        $ [dim]nextmv cloud app create --name "Hare App" --app-id hare-app --exist-ok[/dim]
 
     - Create a workflow application.
-        $ [green]nextmv cloud app create --name "Hare Workflow" --app-id hare-workflow --is-workflow[/green]
+        $ [dim]nextmv cloud app create --name "Hare Workflow" --app-id hare-workflow --is-workflow[/dim]
 
     - Create an application with a default instance ID.
-        $ [green]nextmv cloud app create --name "Hare App" --app-id hare-app \\
-            --default-instance-id burrow[/green]
+        $ [dim]nextmv cloud app create --name "Hare App" --app-id hare-app \\
+            --default-instance-id burrow[/dim]
 
     - Create an application with a default experiment instance.
-        $ [green]nextmv cloud app create --name "Hare App" --app-id hare-app \\
-            --default-experiment-instance experiment-v1[/green]
+        $ [dim]nextmv cloud app create --name "Hare App" --app-id hare-app \\
+            --default-experiment-instance experiment-v1[/dim]
     """
 
     client = build_client(profile)

nextmv/cli/cloud/app/delete.py

@@ -5,9 +5,9 @@ This module defines the cloud app delete command for the Nextmv CLI.
 from typing import Annotated
 
 import typer
-from rich.prompt import Confirm
 
 from nextmv.cli.configuration.config import build_app
+from nextmv.cli.confirm import get_confirmation
 from nextmv.cli.message import info, success
 from nextmv.cli.options import AppIDOption, ProfileOption
 
@@ -31,22 +31,21 @@ def delete(
     """
     Deletes a Nextmv Cloud application.
 
-    This action is permanent and cannot be undone. Use the [code]--yes[/code]
+    This action is permanent and cannot be undone. Use the --yes
     flag to skip the confirmation prompt.
 
     [bold][underline]Examples[/underline][/bold]
 
     - Delete the application with the ID [magenta]hare-app[/magenta].
-        $ [green]nextmv cloud app delete --app-id hare-app[/green]
+        $ [dim]nextmv cloud app delete --app-id hare-app[/dim]
 
     - Delete the application with the ID [magenta]hare-app[/magenta] without confirmation prompt.
-        $ [green]nextmv cloud app delete --app-id hare-app --yes[/green]
+        $ [dim]nextmv cloud app delete --app-id hare-app --yes[/dim]
     """
 
     if not yes:
-        confirm = Confirm.ask(
+        confirm = get_confirmation(
             f"Are you sure you want to delete application [magenta]{app_id}[/magenta]? This action cannot be undone.",
-            default=False,
         )
 
         if not confirm:

nextmv/cli/cloud/app/exists.py

@@ -27,11 +27,11 @@ def exists(
     [bold][underline]Examples[/underline][/bold]
 
     - Check if the application with the ID [magenta]hare-app[/magenta] exists.
-        $ [green]nextmv cloud app exists --app-id hare-app[/green]
+        $ [dim]nextmv cloud app exists --app-id hare-app[/dim]
 
     - Check if the application with the ID [magenta]hare-app[/magenta] exists.
       Use the profile named [magenta]hare[/magenta].
-        $ [green]nextmv cloud app exists --app-id hare-app --profile hare[/green]
+        $ [dim]nextmv cloud app exists --app-id hare-app --profile hare[/dim]
     """
 
     client = build_client(profile)

nextmv/cli/cloud/app/get.py

@@ -39,11 +39,11 @@ def get(
     [bold][underline]Examples[/underline][/bold]
 
     - Get the application with the ID [magenta]hare-app[/magenta].
-        $ [green]nextmv cloud app get --app-id hare-app[/green]
+        $ [dim]nextmv cloud app get --app-id hare-app[/dim]
 
     - Get the application with the ID [magenta]hare-app[/magenta] and save the information to an
       [magenta]app.json[/magenta] file.
-        $ [green]nextmv cloud app get --app-id hare-app --output app.json[/green]
+        $ [dim]nextmv cloud app get --app-id hare-app --output app.json[/dim]
     """
 
     client = build_client(profile)

nextmv/cli/cloud/app/list.py

@@ -35,13 +35,13 @@ def list(
     [bold][underline]Examples[/underline][/bold]
 
     - List all applications.
-        $ [green]nextmv cloud app list[/green]
+        $ [dim]nextmv cloud app list[/dim]
 
     - List all applications using the profile named [magenta]hare[/magenta].
-        $ [green]nextmv cloud app list --profile hare[/green]
+        $ [dim]nextmv cloud app list --profile hare[/dim]
 
     - List all applications and save the information to an [magenta]apps.json[/magenta] file.
-        $ [green]nextmv cloud app list --output apps.json[/green]
+        $ [dim]nextmv cloud app list --output apps.json[/dim]
     """
 
     client = build_client(profile)

nextmv/cli/cloud/app/push.py

@@ -2,12 +2,17 @@
 This module defines the cloud app push command for the Nextmv CLI.
 """
 
+from datetime import datetime, timezone
 from typing import Annotated
 
 import typer
 
 from nextmv.cli.configuration.config import build_app
+from nextmv.cli.confirm import get_confirmation
+from nextmv.cli.message import error, in_progress, info, success
 from nextmv.cli.options import AppIDOption, ProfileOption
+from nextmv.cloud.application import Application
+from nextmv.cloud.instance import Instance
 from nextmv.manifest import Manifest
 
 # Set up subcommand application.
@@ -35,44 +40,109 @@ def push(
             metavar="MANIFEST_PATH",
         ),
     ] = None,
-    no_version: Annotated[
+    # Options for unsupervised prompts.
+    auto_create_yes: Annotated[
         bool,
         typer.Option(
-            "--no-version",
-            "-n",
-            help="The application will be pushed without creating a new version. "
-            "Default is to create a new version on each push.",
-            rich_help_panel="Versioning control",
+            "--auto-create-yes",
+            "-cy",
+            help="Create a new version and instance after push. "
+            "Skips confirmation prompt with [magenta]yes[/magenta]. Useful for non-interactive sessions.",
+            rich_help_panel="Automatic creation and updating",
         ),
     ] = False,
+    auto_create_no: Annotated[
+        bool,
+        typer.Option(
+            "--auto-create-no",
+            "-cn",
+            help="Do not create a new version and instance after push. "
+            "Skips confirmation prompt with [magenta]no[/magenta]. Useful for non-interactive sessions.",
+            rich_help_panel="Automatic creation and updating",
+        ),
+    ] = False,
+    update_default_instance_yes: Annotated[
+        bool,
+        typer.Option(
+            "--update-default-instance-yes",
+            "-uy",
+            help="Update the default instance of the app after version/instance creation. "
+            "Skips confirmation prompt with [magenta]yes[/magenta]. "
+            "Useful for non-interactive sessions. Activates --auto-create-yes.",
+            rich_help_panel="Automatic creation and updating",
+        ),
+    ] = False,
+    update_default_instance_no: Annotated[
+        bool,
+        typer.Option(
+            "--update-default-instance-no",
+            "-un",
+            help="Do not update the default instance of the app after version/instance creation. "
+            "Skips confirmation prompt with [magenta]no[/magenta]. "
+            "Useful for non-interactive sessions. Activates --auto-create-yes.",
+            rich_help_panel="Automatic creation and updating",
+        ),
+    ] = False,
+    # Options for version creation.
     version_id: Annotated[
         str | None,
         typer.Option(
             "--version-id",
-            "-v",
-            help="Custom version ID when pushing the application. Automatically generated if not provided.",
-            rich_help_panel="Versioning control",
+            help="Custom version ID when pushing the application. Automatically generated if not provided. "
+            "Activates --auto-create-yes.",
+            rich_help_panel="Version control",
             metavar="VERSION_ID",
         ),
     ] = None,
+    version_description: Annotated[
+        str | None,
+        typer.Option(
+            "--version-description",
+            help="Custom version description when pushing the application. Automatically generated if not provided. "
+            "Activates --auto-create-yes.",
+            rich_help_panel="Version control",
+            metavar="VERSION_DESCRIPTION",
+        ),
+    ] = None,
     version_name: Annotated[
         str | None,
         typer.Option(
             "--version-name",
-            "-e",
-            help="Custom version name when pushing the application. Automatically generated if not provided.",
-            rich_help_panel="Versioning control",
+            help="Custom version name when pushing the application. Automatically generated if not provided. "
+            "Activates --auto-create-yes.",
+            rich_help_panel="Version control",
             metavar="VERSION_NAME",
         ),
     ] = None,
-    version_description: Annotated[
+    # Options for instance creation.
+    instance_id: Annotated[
         str | None,
         typer.Option(
-            "--version-description",
-            "-r",
-            help="Custom version description when pushing the application. Automatically generated if not provided.",
-            rich_help_panel="Versioning control",
-            metavar="VERSION_DESCRIPTION",
+            "--instance-id",
+            help="Custom instance ID when pushing the application. Automatically generated if not provided. "
+            "Activates --auto-create-yes.",
+            rich_help_panel="Instance control",
+            metavar="INSTANCE_ID",
+        ),
+    ] = None,
+    instance_description: Annotated[
+        str | None,
+        typer.Option(
+            "--instance-description",
+            help="Custom instance description when pushing the application. Automatically generated if not provided. "
+            "Activates --auto-create-yes.",
+            rich_help_panel="Instance control",
+            metavar="INSTANCE_DESCRIPTION",
+        ),
+    ] = None,
+    instance_name: Annotated[
+        str | None,
+        typer.Option(
+            "--instance-name",
+            help="Custom instance name when pushing the application. Automatically generated if not provided. "
+            "Activates --auto-create-yes.",
+            rich_help_panel="Instance control",
+            metavar="INSTANCE_NAME",
         ),
     ] = None,
     profile: ProfileOption = None,
@@ -80,49 +150,75 @@ def push(
     """
     Push (deploy) a Nextmv application to Nextmv Cloud.
 
-    Use the [code]--app-dir[/code] option to specify the path to your
-    application's root directory. By default, the current working directory is
-    used.
+    Use the --app-dir option to specify the path to your application's root
+    directory. By default, the current working directory is used.
+
+    You can also provide a custom manifest file using the --manifest option. If
+    not provided, the CLI will look for a file named
+    [magenta]app.yaml[/magenta] in the application's root.
+
 
-    You can also provide a custom manifest file using the [code]--manifest[/code]
-    option. If not provided, the CLI will look for a file named [magenta]app.yaml[/magenta]
-    in the application's root.
+    By default, this command only pushes the app. After the push, you will be
+    prompted to create a new version and instance. Use --auto-create-yes to
+    automatically create a new version and instance (skipping the prompt), or
+    --auto-create-no to skip creation.
 
-    The default behavior of this command is to create a new application version
-    [italic]after[/italic] the app has been pushed. You can use the
-    [code]--no-version[/code] option to skip this step. The
-    [code]--version-...[/code] options allow you to customize the attributes of
-    the version that is created. If any of these options are not provided,
-    automatically generated values will be used.
+    The --version-id, --version-name, and --version-description options allow
+    you to customize the new version. The --instance-id, --instance-name, and
+    --instance-description options allow you to customize the new instance. If
+    any of these options are provided, --auto-create-yes is automatically
+    activated.
+
+    After version/instance creation, you will be prompted to set the new
+    instance as the default. Use --update-default-instance-yes to automatically
+    update the default instance (skipping the prompt), or
+    --update-default-instance-no to skip updating. Providing either of these
+    options automatically activates --auto-create-yes.
 
     [bold][underline]Examples[/underline][/bold]
 
     - Push an application, with ID [magenta]hare-app[/magenta], from the current directory.
-        $ [green]nextmv cloud app push --app-id hare-app[/green]
+        $ [dim]nextmv cloud app push --app-id hare-app[/dim]
 
     - Push an application, with ID [magenta]hare-app[/magenta], from the [magenta]./my-app[/magenta] directory.
-        $ [green]nextmv cloud app push --app-id hare-app --app-dir ./my-app[/green]
+        $ [dim]nextmv cloud app push --app-id hare-app --app-dir ./my-app[/dim]
 
     - Push an application, with ID [magenta]hare-app[/magenta], using a custom manifest file.
-        $ [green]nextmv cloud app push --app-id hare-app --manifest ./custom-manifest.yaml[/green]
+        $ [dim]nextmv cloud app push --app-id hare-app --manifest ./custom-manifest.yaml[/dim]
+
+    - Push an application, with ID [magenta]hare-app[/magenta], from a specific [magenta]./my-app[/magenta] directory
+      with a custom manifest.
+        $ [dim]nextmv cloud app push --app-id hare-app --app-dir ./my-app --manifest ./custom-manifest.yaml[/dim]
 
-    - Push an application, with ID [magenta]hare-app[/magenta], from a specific
-      [magenta]./my-app[/magenta] directory with a custom manifest under [magenta]./custom-manifest.yaml[/magenta].
-        $ [green]nextmv cloud app push --app-id hare-app --app-dir ./my-app \\
-            --manifest ./custom-manifest.yaml[/green]
+    - Push and automatically create a new version and instance (no prompt).
+        $ [dim]nextmv cloud app push --app-id hare-app --auto-create-yes[/dim]
 
-    - Push an application without creating a new version.
-        $ [green]nextmv cloud app push --app-id hare-app --no-version[/green]
+    - Push and skip version/instance creation (no prompt).
+        $ [dim]nextmv cloud app push --app-id hare-app --auto-create-no[/dim]
 
-    - Push an application with a custom version ID.
-        $ [green]nextmv cloud app push --app-id hare-app --version-id v1.0.0[/green]
+    - Push and automatically create a new version and instance, then set the new instance as default (no prompts).
+        $ [dim]nextmv cloud app push --app-id hare-app --auto-create-yes --update-default-instance-yes[/dim]
 
-    - Push an application with custom version ID, name, and description.
-        $ [green]nextmv cloud app push --app-id hare-app --version-id v1.0.0 \\
+    - Push and create a new version with a custom version ID (auto-create is activated).
+        $ [dim]nextmv cloud app push --app-id hare-app --version-id v1.0.0[/dim]
+
+    - Push with custom version and instance attributes, and set the new instance as default (all prompts skipped).
+        $ [dim]nextmv cloud app push --app-id hare-app \\
+            --version-id v1.0.0 \\
             --version-name "Release 1.0.0" \\
-            --version-description "First stable release"[/green]
+            --version-description "First stable release" \\
+            --instance-id inst-1 \\
+            --instance-name "Production Instance" \\
+            --instance-description "Main deployment" \\
+            --update-default-instance-yes[/dim]
     """
 
+    if auto_create_yes and auto_create_no:
+        error("Cannot specify both --auto-create-yes and --auto-create-no.")
+
+    if update_default_instance_yes and update_default_instance_no:
+        error("Cannot specify both --update-default-instance-yes and --update-default-instance-no.")
+
     cloud_app = build_app(app_id=app_id, profile=profile)
     loaded_manifest = Manifest.from_yaml(dirpath=manifest) if manifest is not None and manifest != "" else None
     cloud_app.push(
@@ -130,8 +226,136 @@ def push(
         app_dir=app_dir,
         verbose=True,
         rich_print=True,
-        no_version=no_version,
+    )
+
+    instance, should_update = _handle_version_instance_creation(
+        cloud_app=cloud_app,
+        app_id=app_id,
+        auto_create_yes=auto_create_yes,
+        auto_create_no=auto_create_no,
+        update_default_instance_yes=update_default_instance_yes,
+        update_default_instance_no=update_default_instance_no,
         version_id=version_id,
         version_name=version_name,
         version_description=version_description,
+        instance_id=instance_id,
+        instance_name=instance_name,
+        instance_description=instance_description,
+    )
+    _handle_instance_update(
+        cloud_app=cloud_app,
+        app_id=app_id,
+        instance=instance,
+        should_update=should_update,
+        update_default_instance_yes=update_default_instance_yes,
+        update_default_instance_no=update_default_instance_no,
+    )
+
+
+def _handle_version_instance_creation(
+    cloud_app: Application,
+    app_id: str,
+    auto_create_yes: bool,
+    auto_create_no: bool,
+    update_default_instance_yes: bool,
+    update_default_instance_no: bool,
+    version_id: str | None,
+    version_name: str | None,
+    version_description: str | None,
+    instance_id: str | None,
+    instance_name: str | None,
+    instance_description: str | None,
+) -> tuple[Instance, bool]:
+    if auto_create_no:
+        info(
+            msg="--auto-create-no activated, will not create a new version and instance.",
+            emoji=":bulb:",
+        )
+        return None, False
+
+    # Determine if we need to create a new version and instance based on the options provided.
+    version_provided = version_id is not None or version_name is not None or version_description is not None
+    instance_provided = instance_id is not None or instance_name is not None or instance_description is not None
+    if version_provided or instance_provided or update_default_instance_yes or update_default_instance_no:
+        auto_create_yes = True
+
+    if not auto_create_yes:
+        should_create = get_confirmation(
+            f"Do you want to create a new version and instance for application [magenta]{app_id}[/magenta] now?"
+        )
+
+        if not should_create:
+            info(
+                msg="Will not create a new version and instance.",
+                emoji=":bulb:",
+            )
+            return None, False
+
+    in_progress("Creating a new version and instance...")
+    now = datetime.now(timezone.utc)
+
+    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 = cloud_app.new_version(
+        id=version_id,
+        name=version_name,
+        description=version_description,
+    )
+    success(f"New version [magenta]{version.id}[/magenta] created for application [magenta]{app_id}[/magenta].")
+
+    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 = cloud_app.new_instance(
+        version_id=version.id,
+        id=instance_id,
+        name=instance_name,
+        description=instance_description,
+    )
+    success(
+        f"New instance [magenta]{instance.id}[/magenta] created using version [magenta]{version.id}[/magenta] "
+        f"for application [magenta]{app_id}[/magenta]."
+    )
+
+    return instance, True
+
+
+def _handle_instance_update(
+    cloud_app: Application,
+    app_id: str,
+    instance: Instance,
+    should_update: bool,
+    update_default_instance_yes: bool,
+    update_default_instance_no: bool,
+) -> None:
+    if instance is None or not should_update:
+        return
+
+    if update_default_instance_no:
+        info(
+            msg="--update-default-instance-no activated, will not update the default instance.",
+            emoji=":bulb:",
+        )
+        return
+
+    if not update_default_instance_yes:
+        should_update = get_confirmation(
+            f"Do you want to set instance [magenta]{instance.id}[/magenta] as the default instance for "
+            f"application [magenta]{app_id}[/magenta]?"
+        )
+
+        if not should_update:
+            info(
+                msg=f"Default instance for application [magenta]{app_id}[/magenta] not updated.",
+                emoji=":bulb:",
+            )
+            return
+
+    in_progress(
+        f"Updating default instance for application [magenta]{app_id}[/magenta] to [magenta]{instance.id}[/magenta]..."
+    )
+    cloud_app.update(default_instance_id=instance.id)
+    success(
+        f"Default instance for application [magenta]{app_id}[/magenta] updated to [magenta]{instance.id}[/magenta].",
     )

nextmv/cli/cloud/app/update.py

@@ -74,33 +74,33 @@ def update(
     [bold][underline]Examples[/underline][/bold]
 
     - Update an application's name.
-        $ [green]nextmv cloud app update --app-id hare-app --name "New Hare App"[/green]
+        $ [dim]nextmv cloud app update --app-id hare-app --name "New Hare App"[/dim]
 
     - Update an application's description.
-        $ [green]nextmv cloud app update --app-id hare-app --name "Hare App" \\
-            --description "An updated description for routing hares"[/green]
+        $ [dim]nextmv cloud app update --app-id hare-app --name "Hare App" \\
+            --description "An updated description for routing hares"[/dim]
 
     - Update an application's default instance ID.
-        $ [green]nextmv cloud app update --app-id hare-app --name "Hare App" \\
-            --default-instance-id burrow[/green]
+        $ [dim]nextmv cloud app update --app-id hare-app --name "Hare App" \\
+            --default-instance-id burrow[/dim]
 
     - Update an application's default experiment instance.
-        $ [green]nextmv cloud app update --app-id hare-app --name "Hare App" \\
-            --default-experiment-instance experiment-v1[/green]
+        $ [dim]nextmv cloud app update --app-id hare-app --name "Hare App" \\
+            --default-experiment-instance experiment-v1[/dim]
 
     - Update multiple application properties at once.
-        $ [green]nextmv cloud app update --app-id hare-app --name "Hare App" \\
+        $ [dim]nextmv cloud app update --app-id hare-app --name "Hare App" \\
             --description "Updated description" --default-instance-id burrow \\
-            --default-experiment-instance experiment-v1[/green]
+            --default-experiment-instance experiment-v1[/dim]
 
     - Update an application and save the updated information to an [magenta]updated_app.json[/magenta] file.
-        $ [green]nextmv cloud app update --app-id hare-app --name "New Hare App" --output updated_app.json[/green]
+        $ [dim]nextmv cloud app update --app-id hare-app --name "New Hare App" --output updated_app.json[/dim]
     """
 
     if name is None and description is None and default_instance_id is None and default_experiment_instance is None:
         error(
-            "Provide at least one option to update: [code]--name[/code], [code]--description[/code], "
-            "[code]--default-instance-id[/code], or [code]--default-experiment-instance[/code]."
+            "Provide at least one option to update: --name, --description, "
+            "--default-instance-id, or --default-experiment-instance."
         )
 
     cloud_app = build_app(app_id=app_id, profile=profile)