nextmv 1.0.0.dev9__py3-none-any.whl → 1.0.0.dev10__py3-none-any.whl

nextmv/cli/community/clone.py

@@ -2,19 +2,14 @@
 This module defines the community clone command for the Nextmv CLI.
 """
 
-import os
-import shutil
-import tarfile
-import tempfile
-from collections.abc import Callable
 from typing import Annotated
 
-import rich
 import typer
 
-from nextmv.cli.community.list import download_file, download_manifest, find_app, versions_table
-from nextmv.cli.message import error, success
+from nextmv.cli.configuration.config import build_client
+from nextmv.cli.message import error
 from nextmv.cli.options import ProfileOption
+from nextmv.cloud.community import clone_community_app
 
 # Set up subcommand application.
 app = typer.Typer()
@@ -77,197 +72,15 @@ def clone(
         $ [dim]nextmv community clone --app go-nextroute --profile hare[/dim]
     """
 
-    manifest = download_manifest(profile=profile)
-    app_obj = find_app(manifest, app)
-
     if version is not None and version == "":
         error("The --version flag cannot be an empty string.")
 
-    if not app_has_version(app_obj, version):
-        # We don't use error() here to allow printing something before exiting.
-        rich.print(
-            f"[red]Error:[/red] Version [magenta]{version}[/magenta] not found "
-            f"for community app [magenta]{app}[/magenta]. Available versions are:"
-        )
-        versions_table(manifest, app)
-
-        raise typer.Exit(code=1)
-
-    original_version = version
-    if version == LATEST_VERSION:
-        version = app_obj.get("latest_app_version")
-
-    # Clean and normalize directory path in an OS-independent way
-    if directory is not None and directory != "":
-        destination = os.path.normpath(directory)
-    else:
-        destination = app
-
-    full_destination = get_valid_path(destination, os.stat)
-    os.makedirs(full_destination, exist_ok=True)
-
-    tarball = f"{app}_{version}.tar.gz"
-    s3_file_path = f"{app}/{version}/{tarball}"
-    downloaded_object = download_object(
-        file=s3_file_path,
-        path="community-apps",
-        output_dir=full_destination,
-        output_file=tarball,
-        profile=profile,
-    )
-
-    # Extract the tarball to a temporary directory to handle nested structure
-    with tempfile.TemporaryDirectory() as temp_dir:
-        with tarfile.open(downloaded_object, "r:gz") as tar:
-            tar.extractall(path=temp_dir, filter=None)
-
-        # Find the extracted directory (typically the app name)
-        extracted_items = os.listdir(temp_dir)
-        if len(extracted_items) == 1 and os.path.isdir(os.path.join(temp_dir, extracted_items[0])):
-            # Move contents from the extracted directory to full_destination
-            extracted_dir = os.path.join(temp_dir, extracted_items[0])
-            for item in os.listdir(extracted_dir):
-                shutil.move(os.path.join(extracted_dir, item), full_destination)
-        else:
-            # If structure is unexpected, move everything directly
-            for item in extracted_items:
-                shutil.move(os.path.join(temp_dir, item), full_destination)
-
-    # Remove the tarball after extraction
-    os.remove(downloaded_object)
-
-    success(
-        f"Successfully cloned the [magenta]{app}[/magenta] community app, "
-        f"using version [magenta]{original_version}[/magenta] in path: [magenta]{full_destination}[/magenta]."
+    client = build_client(profile)
+    clone_community_app(
+        client=client,
+        app=app,
+        directory=directory,
+        version=version,
+        verbose=True,
+        rich_print=True,
     )
-
-
-def app_has_version(app_obj: dict, version: str) -> bool:
-    """
-    Check if the given app object has the specified version.
-
-    Parameters
-    ----------
-    app_obj : dict
-        The community app object.
-    version : str
-        The version to check.
-
-    Returns
-    -------
-    bool
-        True if the app has the specified version, False otherwise.
-    """
-
-    if version == LATEST_VERSION:
-        version = app_obj.get("latest_app_version")
-
-    if version in app_obj.get("app_versions", []):
-        return True
-
-    return False
-
-
-def get_valid_path(path: str, stat_fn: Callable[[str], os.stat_result], ending: str = "") -> str:
-    """
-    Validates and returns a non-existing path. If the path exists,
-    it will append a number to the path and return it. If the path does not
-    exist, it will return the path as is.
-
-    The ending parameter is used to check if the path ends with a specific
-    string. This is useful to specify if it is a file (like foo.json, in which
-    case the next iteration is foo-1.json) or a directory (like foo, in which
-    case the next iteration is foo-1).
-
-    Parameters
-    ----------
-    path : str
-        The initial path to validate.
-    stat_fn : Callable[[str], os.stat_result]
-        A function that takes a path and returns its stat result.
-    ending : str, optional
-        The expected ending of the path (e.g., file extension), by default "".
-
-    Returns
-    -------
-    str
-        A valid, non-existing path.
-
-    Raises
-    ------
-    Exception
-        If an unexpected error occurs during path validation
-    """
-    base_name = os.path.basename(path)
-    name_without_ending = base_name.removesuffix(ending) if ending else base_name
-
-    while True:
-        try:
-            stat_fn(path)
-            # If we get here, the path exists
-            # Get folder/file name number, increase it and create new path
-            name = os.path.basename(path)
-
-            # Get folder/file name number
-            parts = name.split("-")
-            last = parts[-1].removesuffix(ending) if ending else parts[-1]
-
-            # Save last folder name index to be changed
-            i = path.rfind(name)
-
-            try:
-                num = int(last)
-                # Increase number and create new path
-                if ending:
-                    temp_path = path[:i] + f"{name_without_ending}-{num + 1}{ending}"
-                else:
-                    temp_path = path[:i] + f"{base_name}-{num + 1}"
-                path = temp_path
-            except ValueError:
-                # If there is no number, add it
-                if ending:
-                    temp_path = path[:i] + f"{name_without_ending}-1{ending}"
-                else:
-                    temp_path = path[:i] + f"{name}-1"
-                path = temp_path
-
-        except FileNotFoundError:
-            # Path doesn't exist, we can use it
-            return path
-        except Exception:
-            # Re-raise unexpected errors
-            error(f"An unexpected error occurred while validating the path: {path}")
-
-
-def download_object(file: str, path: str, output_dir: str, output_file: str, profile: str | None = None) -> str:
-    """
-    Downloads an object from the internal bucket and saves it to the specified
-    output directory.
-
-    Parameters
-    ----------
-    file : str
-        The name of the file to download.
-    path : str
-        The directory in the bucket where the file is located.
-    output_dir : str
-        The local directory where the file will be saved.
-    output_file : str
-        The name of the output file.
-    profile : str | None
-        The profile name to use. If None, the default profile is used.
-
-    Returns
-    -------
-    str
-        The path to the downloaded file.
-    """
-
-    response = download_file(directory=path, file=file, profile=profile)
-    file_name = os.path.join(output_dir, output_file)
-
-    with open(file_name, "wb") as f:
-        f.write(response.content)
-
-    return file_name
-    return file_name

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,57 @@ 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.
+    print(versions_output.rstrip("\n"))
 
-    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
-
-
-def find_app(manifest: dict[str, Any], app: str) -> dict[str, Any] | None:
+def _find_app(client: Client, app: str) -> CommunityApp:
     """
     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
+        The community app if found.
+
+    Raises
+    ------
+    ValueError
+        If the community app is not found.
     """
 
-    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/configuration/create.py

@@ -14,7 +14,7 @@ from nextmv.cli.configuration.config import (
     obscure_api_key,
     save_config,
 )
-from nextmv.cli.message import error, info, success
+from nextmv.cli.message import error, message, success
 
 # Set up subcommand application.
 app = typer.Typer()
@@ -88,7 +88,7 @@ def create(
     save_config(config)
 
     success("Configuration saved successfully.")
-    info(f"\t[bold]Profile[/bold]: {profile or 'Default'}")
-    info(f"\t[bold]API Key[/bold]: {obscure_api_key(api_key)}")
+    message(f"\t[bold]Profile[/bold]: [magenta]{profile or 'Default'}[/magenta]")
+    message(f"\t[bold]API Key[/bold]: [magenta]{obscure_api_key(api_key)}[/magenta]")
     if endpoint != DEFAULT_ENDPOINT:
-        info(f"\t[bold]Endpoint[/bold]: {endpoint}")
+        message(f"\t[bold]Endpoint[/bold]: [magenta]{endpoint}[/magenta]")

nextmv/cli/configuration/delete.py

@@ -58,7 +58,7 @@ def delete(
         )
 
         if not confirm:
-            info(msg=f"Profile [magenta]{profile}[/magenta] will not be deleted.", emoji=":bulb:")
+            info(f"Profile [magenta]{profile}[/magenta] will not be deleted.")
             return
 
     del config[profile]

nextmv/cli/main.py

@@ -101,11 +101,10 @@ def handle_go_cli() -> None:
             return
 
         info(
-            msg="You can delete the [italic red]deprecated[/italic red] Nextmv CLI later by removing "
+            "You can delete the [italic red]deprecated[/italic red] Nextmv CLI later by removing "
             f"[magenta]{GO_CLI_PATH}[/magenta]. "
             "Make sure you also clean up your [code]PATH[/code], "
-            f"by removing references to [magenta]{CONFIG_DIR}[/magenta] from it.",
-            emoji=":bulb:",
+            f"by removing references to [magenta]{CONFIG_DIR}[/magenta] from it."
         )