nextmv 1.0.0.dev4__py3-none-any.whl → 1.0.0.dev6__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/cli/confirm.py

@@ -3,7 +3,7 @@ import sys
 from rich.prompt import Confirm
 
 
-def get_confirmation(msg: str) -> bool:
+def get_confirmation(msg: str, default: bool = False) -> bool:
     """
     Method to get a yes/no confirmation from the user.
 
@@ -11,6 +11,8 @@ def get_confirmation(msg: str) -> bool:
     ----------
     msg : str
         The message to display to the user.
+    default : bool, optional
+        The default value if the user just presses Enter. Default is False.
 
     Returns
     -------
@@ -21,11 +23,11 @@ def get_confirmation(msg: str) -> bool:
     # If this is not an interactive terminal, do not ask for confirmation, to
     # avoid hanging indefinitely waiting for a user response.
     if not sys.stdin.isatty():
-        return False
+        return default
 
     return Confirm.ask(
         msg,
-        default=False,
+        default=default,
         case_sensitive=False,
         show_default=True,
         show_choices=True,

nextmv/cloud/__init__.py

@@ -1,42 +1,5 @@
 """Functionality for interacting with the Nextmv Cloud."""
 
-# These imports are kept for backwards compatibility but the preferred import path is
-# from nextmv directly. These imports will be removed in a future release.
-from nextmv.manifest import MANIFEST_FILE_NAME as MANIFEST_FILE_NAME
-from nextmv.manifest import Manifest as Manifest
-from nextmv.manifest import ManifestBuild as ManifestBuild
-from nextmv.manifest import ManifestContent as ManifestContent
-from nextmv.manifest import ManifestContentMultiFile as ManifestContentMultiFile
-from nextmv.manifest import ManifestContentMultiFileInput as ManifestContentMultiFileInput
-from nextmv.manifest import ManifestContentMultiFileOutput as ManifestContentMultiFileOutput
-from nextmv.manifest import ManifestOption as ManifestOption
-from nextmv.manifest import ManifestPython as ManifestPython
-from nextmv.manifest import ManifestPythonModel as ManifestPythonModel
-from nextmv.manifest import ManifestRuntime as ManifestRuntime
-from nextmv.manifest import ManifestType as ManifestType
-from nextmv.polling import PollingOptions as PollingOptions
-from nextmv.polling import poll as poll
-from nextmv.run import ErrorLog as ErrorLog
-from nextmv.run import ExternalRunResult as ExternalRunResult
-from nextmv.run import Format as Format
-from nextmv.run import FormatInput as FormatInput
-from nextmv.run import FormatOutput as FormatOutput
-from nextmv.run import Metadata as Metadata
-from nextmv.run import RunConfiguration as RunConfiguration
-from nextmv.run import RunInformation as RunInformation
-from nextmv.run import RunLog as RunLog
-from nextmv.run import RunQueuing as RunQueuing
-from nextmv.run import RunResult as RunResult
-from nextmv.run import RunType as RunType
-from nextmv.run import RunTypeConfiguration as RunTypeConfiguration
-from nextmv.run import TrackedRun as TrackedRun
-from nextmv.run import TrackedRunStatus as TrackedRunStatus
-from nextmv.run import run_duration as run_duration
-from nextmv.safe import safe_id as safe_id
-from nextmv.safe import safe_name_and_id as safe_name_and_id
-from nextmv.status import Status as Status
-from nextmv.status import StatusV2 as StatusV2
-
 from .acceptance_test import AcceptanceTest as AcceptanceTest
 from .acceptance_test import AcceptanceTestResults as AcceptanceTestResults
 from .acceptance_test import Comparison as Comparison
@@ -52,7 +15,6 @@ from .acceptance_test import MetricToleranceType as MetricToleranceType
 from .acceptance_test import MetricType as MetricType
 from .acceptance_test import ResultStatistics as ResultStatistics
 from .acceptance_test import StatisticType as StatisticType
-from .acceptance_test import ToleranceType as ToleranceType
 from .account import Account as Account
 from .account import AccountMember as AccountMember
 from .account import Queue as Queue
@@ -68,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
@@ -93,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/acceptance_test.py

@@ -13,7 +13,7 @@ StatisticType : Enum
     Type of statistical process for collapsing multiple values of a metric.
 Comparison : Enum
     Comparison operators to use for comparing two metrics.
-ToleranceType : Enum
+MetricToleranceType : Enum
     Type of tolerance used for a metric.
 ExperimentStatus : Enum
     Status of an acceptance test experiment.
@@ -46,7 +46,6 @@ from enum import Enum
 
 from nextmv.base_model import BaseModel
 from nextmv.cloud.batch_experiment import ExperimentStatus
-from nextmv.deprecated import deprecated
 
 
 class MetricType(str, Enum):
@@ -212,69 +211,6 @@ class Comparison(str, Enum):
     """Not equal to metric type."""
 
 
-class ToleranceType(str, Enum):
-    """
-    !!! warning
-        `ToleranceType` is deprecated, use `MetricToleranceType` instead.
-
-    Type of tolerance used for a metric.
-
-    You can import the `ToleranceType` class directly from `cloud`:
-
-    ```python
-    from nextmv.cloud import ToleranceType
-    ```
-
-    This enumeration defines the different types of tolerances that can be used
-    when comparing metrics in acceptance tests.
-
-    Attributes
-    ----------
-    undefined : str
-        Undefined tolerance type (empty string).
-    absolute : str
-        Absolute tolerance type, using a fixed value.
-    relative : str
-        Relative tolerance type, using a percentage.
-
-    Examples
-    --------
-    >>> from nextmv.cloud import ToleranceType
-    >>> tol_type = ToleranceType.absolute
-    >>> tol_type
-    <ToleranceType.absolute: 'absolute'>
-    """
-
-    undefined = ""
-    """ToleranceType is deprecated, please use MetricToleranceType instead.
-    Undefined tolerance type."""
-    absolute = "absolute"
-    """ToleranceType is deprecated, please use MetricToleranceType instead.
-    Absolute tolerance type."""
-    relative = "relative"
-    """ToleranceType is deprecated, please use MetricToleranceType instead.
-    Relative tolerance type."""
-
-
-# Override __getattribute__ to emit deprecation warnings when enum values are accessed
-_original_getattribute = ToleranceType.__class__.__getattribute__
-
-
-def _deprecated_getattribute(cls, name: str):
-    # Only emit deprecation warning if this is specifically the ToleranceType class
-    if cls is ToleranceType and name in ("undefined", "absolute", "relative"):
-        deprecated(
-            f"ToleranceType.{name}",
-            "ToleranceType is deprecated and will be removed in a future version. "
-            "Please use MetricToleranceType instead",
-        )
-
-    return _original_getattribute(cls, name)
-
-
-ToleranceType.__class__.__getattribute__ = _deprecated_getattribute
-
-
 class MetricToleranceType(str, Enum):
     """
     Type of tolerance used for a metric.

nextmv/cloud/account.py

@@ -21,7 +21,7 @@ from pydantic import AliasChoices, Field
 
 from nextmv.base_model import BaseModel
 from nextmv.cloud.client import Client
-from nextmv.status import Status, StatusV2
+from nextmv.status import StatusV2
 
 
 class QueuedRun(BaseModel):
@@ -57,8 +57,6 @@ class QueuedRun(BaseModel):
         ID of the application version used for the run.
     execution_class : str
         Execution class used for the run.
-    status : Status
-        Deprecated: use status_v2.
     status_v2 : StatusV2
         Status of the run.
 
@@ -74,7 +72,6 @@ class QueuedRun(BaseModel):
     ...     "application_instance_id": "appins-123456",
     ...     "application_version_id": "appver-123456",
     ...     "execution_class": "standard",
-    ...     "status": "RUNNING",
     ...     "status_v2": "RUNNING"
     ... })
     >>> print(queued_run.name)
@@ -99,8 +96,6 @@ class QueuedRun(BaseModel):
     """ID of the application version used for the run."""
     execution_class: str
     """Execution class used for the run."""
-    status: Status
-    """Deprecated: use status_v2."""
     status_v2: StatusV2
     """Status of the run."""