nextmv 1.0.0.dev5__py3-none-any.whl → 1.0.0.dev7__py3-none-any.whl

nextmv/cli/community/list.py

@@ -2,18 +2,18 @@
 This module defines the community list command for the Nextmv CLI.
 """
 
-from typing import Annotated, Any
+from typing import Annotated
 
-import requests
 import rich
 import typer
-import yaml
 from rich.console import Console
 from rich.table import Table
 
 from nextmv.cli.configuration.config import build_client
 from nextmv.cli.message import error
 from nextmv.cli.options import ProfileOption
+from nextmv.cloud.client import Client
+from nextmv.cloud.community import CommunityApp, list_community_apps
 
 # Set up subcommand application.
 app = typer.Typer()
@@ -62,96 +62,73 @@ def list(
     if app is not None and app == "":
         error("The --app flag cannot be an empty string.")
 
-    manifest = download_manifest(profile=profile)
+    client = build_client(profile)
     if flat and app is None:
-        apps_list(manifest)
+        _apps_list(client)
         raise typer.Exit()
     elif not flat and app is None:
-        apps_table(manifest)
+        _apps_table(client)
         raise typer.Exit()
     elif flat and app is not None and app != "":
-        versions_list(manifest, app)
+        _versions_list(client, app)
         raise typer.Exit()
     elif not flat and app is not None and app != "":
-        versions_table(manifest, app)
+        _versions_table(client, app)
         raise typer.Exit()
 
 
-def download_manifest(profile: str | None = None) -> dict:
+def _apps_table(client: Client) -> None:
     """
-    Downloads and returns the community apps manifest.
+    This function prints a table of community apps.
 
     Parameters
     ----------
-    profile : str | None
-        The profile name to use. If None, the default profile is used.
-
-    Returns
-    -------
-    dict
-        The community apps manifest as a dictionary.
-
-    Raises
-    requests.HTTPError
-        If the response status code is not 2xx.
-    """
-
-    response = download_file(directory="community-apps", file="manifest.yml", profile=profile)
-    manifest = yaml.safe_load(response.text)
-
-    return manifest
-
-
-def apps_table(manifest: dict[str, Any]) -> None:
-    """
-    This function prints a table of community apps from the manifest.
-
-    Parameters
-    ----------
-    manifest : dict[str, Any]
-        The community apps manifest.
+    client : Client
+        The Nextmv Cloud client to use for the request.
     """
 
+    apps = list_community_apps(client)
     table = Table("Name", "Type", "Latest", "Description", border_style="cyan", header_style="cyan")
-    for app in manifest.get("apps", []):
+    for app in apps:
         table.add_row(
-            app.get("name", ""),
-            app.get("type", ""),
-            app.get("latest_app_version", ""),
-            app.get("description", ""),
+            app.name,
+            app.app_type,
+            app.latest_app_version if app.latest_app_version is not None else "",
+            app.description,
         )
 
     console.print(table)
 
 
-def apps_list(manifest: dict[str, Any]) -> None:
+def _apps_list(client: Client) -> None:
     """
-    This function prints a flat list of community app names from the manifest.
+    This function prints a flat list of community app names.
 
     Parameters
     ----------
-    manifest : dict[str, Any]
-        The community apps manifest.
+    client : Client
+        The Nextmv Cloud client to use for the request.
     """
 
-    names = [app.get("name", "") for app in manifest.get("apps", [])]
+    apps = list_community_apps(client)
+    names = [app.name for app in apps]
     print("\n".join(names))
 
 
-def versions_table(manifest: dict[str, Any], app: str) -> None:
+def _versions_table(client: Client, app: str) -> None:
     """
     This function prints a table of versions for a specific community app.
 
     Parameters
     ----------
-    manifest : dict[str, Any]
-        The community apps manifest.
+    client : Client
+        The Nextmv Cloud client to use for the request.
     app : str
         The name of the community app.
     """
 
-    app_obj = find_app(manifest, app)
-    latest_version = app_obj.get("latest_app_version", "")
+    comm_app = _find_app(client, app)
+    latest_version = comm_app.latest_app_version if comm_app.latest_app_version is not None else ""
 
     # Add the latest version with indicator
     table = Table("Version", "Latest?", border_style="cyan", header_style="cyan")
@@ -159,7 +136,7 @@ def versions_table(manifest: dict[str, Any], app: str) -> None:
     table.add_row("", "")  # Empty row to separate latest from others.
 
     # Add all other versions (excluding the latest)
-    versions = app_obj.get("app_versions", [])
+    versions = comm_app.app_versions if comm_app.app_versions is not None else []
     for version in versions:
         if version != latest_version:
             table.add_row(version, "")
@@ -167,99 +144,52 @@ def versions_table(manifest: dict[str, Any], app: str) -> None:
     console.print(table)
 
 
-def versions_list(manifest: dict[str, Any], app: str) -> None:
+def _versions_list(client: Client, app: str) -> None:
     """
     This function prints a flat list of versions for a specific community app.
 
     Parameters
     ----------
-    manifest : dict[str, Any]
-        The community apps manifest.
+    client : Client
+        The Nextmv Cloud client to use for the request.
     app : str
         The name of the community app.
     """
 
-    app_obj = find_app(manifest, app)
-    versions = app_obj.get("app_versions", [])
+    comm_app = _find_app(client, app)
+    versions = comm_app.app_versions if comm_app.app_versions is not None else []
 
     versions_output = ""
     for version in versions:
         versions_output += f"{version}\n"
 
-    print("\n".join(app_obj.get("app_versions", [])))
-
-
-def download_file(
-    directory: str,
-    file: str,
-    profile: str | None = None,
-) -> requests.Response:
-    """
-    Gets a file from an internal bucket and return it.
-
-    Parameters
-    ----------
-    directory : str
-        The directory in the bucket where the file is located.
-    file : str
-        The name of the file to download.
-    profile : str | None
-        The profile name to use. If None, the default profile is used.
-
-    Returns
-    -------
-    requests.Response
-        The response object containing the file data.
-
-    Raises
-    requests.HTTPError
-        If the response status code is not 2xx.
-    """
-
-    client = build_client(profile)
-
-    # Request the download URL for the file.
-    response = client.request(
-        method="GET",
-        endpoint="v0/internal/tools",
-        headers=client.headers | {"request-source": "cli"},  # Pass `client.headers` to preserve auth.
-        query_params={"file": f"{directory}/{file}"},
-    )
-
-    # Use the URL obtained to download the file.
-    body = response.json()
-    download_response = client.request(
-        method="GET",
-        endpoint=body.get("url"),
-        headers={"Content-Type": "application/json"},
-    )
-
-    return download_response
+    print("\n".join(versions_output))
 
 
-def find_app(manifest: dict[str, Any], app: str) -> dict[str, Any] | None:
+def _find_app(client: Client, app: str) -> CommunityApp | None:
     """
     Finds and returns a community app from the manifest by its name.
 
     Parameters
     ----------
-    manifest : dict[str, Any]
-        The community apps manifest.
+    client : Client
+        The Nextmv Cloud client to use for the request.
     app : str
         The name of the community app to find.
 
     Returns
     -------
-    dict[str, Any] | None
-        The community app dictionary if found, otherwise None.
+    CommunityApp | None
+        The community app if found, otherwise None.
     """
 
-    for manifest_app in manifest.get("apps", []):
-        if manifest_app.get("name", "") == app:
-            return manifest_app
+    comm_apps = list_community_apps(client)
+    for comm_app in comm_apps:
+        if comm_app.name == app:
+            return comm_app
 
     # We don't use error() here to allow printing something before exiting.
     rich.print(f"[red]Error:[/red] Community app [magenta]{app}[/magenta] was not found. Here are the available apps:")
-    apps_table(manifest)
+    _apps_table(client)
 
     raise typer.Exit(code=1)

nextmv/cloud/__init__.py

@@ -30,6 +30,9 @@ from .batch_experiment import BatchExperimentRun as BatchExperimentRun
 from .batch_experiment import ExperimentStatus as ExperimentStatus
 from .client import Client as Client
 from .client import get_size as get_size
+from .community import CommunityApp as CommunityApp
+from .community import clone_community_app as clone_community_app
+from .community import list_community_apps as list_community_apps
 from .ensemble import EnsembleDefinition as EnsembleDefinition
 from .ensemble import EvaluationRule as EvaluationRule
 from .ensemble import RuleObjective as RuleObjective
@@ -55,6 +58,7 @@ from .secrets import SecretType as SecretType
 from .shadow import ShadowTest as ShadowTest
 from .shadow import ShadowTestMetadata as ShadowTestMetadata
 from .shadow import StartEvents as StartEvents
+from .shadow import StopIntent as StopIntent
 from .shadow import TerminationEvents as TerminationEvents
 from .shadow import TestComparison as TestComparison
 from .switchback import SwitchbackPlan as SwitchbackPlan

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,
@@ -867,8 +784,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:
@@ -943,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/_acceptance.py

@@ -9,6 +9,7 @@ import requests
 from nextmv.cloud.acceptance_test import AcceptanceTest, Metric
 from nextmv.cloud.batch_experiment import BatchExperimentRun, ExperimentStatus
 from nextmv.polling import DEFAULT_POLLING_OPTIONS, PollingOptions, poll
+from nextmv.safe import safe_id
 
 if TYPE_CHECKING:
     from . import Application
@@ -163,8 +164,8 @@ class ApplicationAcceptanceMixin:
         self: "Application",
         candidate_instance_id: str,
         baseline_instance_id: str,
-        id: str,
         metrics: list[Metric | dict[str, Any]],
+        id: str | None = None,
         name: str | None = None,
         input_set_id: str | None = None,
         description: str | None = None,
@@ -185,8 +186,8 @@ class ApplicationAcceptanceMixin:
             ID of the candidate instance.
         baseline_instance_id : str
             ID of the baseline instance.
-        id : str
-            ID of the acceptance test.
+        id : str | None, default=None
+            ID of the acceptance test. Will be generated if not provided.
         metrics : list[Union[Metric, dict[str, Any]]]
             List of metrics to use for the acceptance test.
         name : Optional[str], default=None
@@ -210,6 +211,11 @@ class ApplicationAcceptanceMixin:
             If the batch experiment ID does not match the acceptance test ID.
         """
 
+        # Generate ID if not provided
+        if id is None or id == "":
+            id = safe_id("acceptance")
+
+        # Use ID as name if name not provided
         if name is None or name == "":
             name = id
 
@@ -265,11 +271,10 @@ class ApplicationAcceptanceMixin:
             "metrics": payload_metrics,
             "experiment_id": batch_experiment_id,
             "name": name,
+            "id": id,
         }
         if description is not None:
             payload["description"] = description
-        if id is not None:
-            payload["id"] = id
 
         response = self.client.request(
             method="POST",
@@ -283,8 +288,8 @@ class ApplicationAcceptanceMixin:
         self: "Application",
         candidate_instance_id: str,
         baseline_instance_id: str,
-        id: str,
         metrics: list[Metric | dict[str, Any]],
+        id: str | None = None,
         name: str | None = None,
         input_set_id: str | None = None,
         description: str | None = None,
@@ -302,8 +307,8 @@ class ApplicationAcceptanceMixin:
             ID of the candidate instance.
         baseline_instance_id : str
             ID of the baseline instance.
-        id : str
-            ID of the acceptance test.
+        id : str | None, default=None
+            ID of the acceptance test. Will be generated if not provided.
         metrics : list[Union[Metric, dict[str, Any]]]
             List of metrics to use for the acceptance test.
         name : Optional[str], default=None