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

nextmv/cli/configuration/config.py

@@ -7,7 +7,8 @@ from typing import Any
 
 import yaml
 
-from nextmv.cli.message import error
+from nextmv.cli.confirm import get_confirmation
+from nextmv.cli.message import error, success, warning
 from nextmv.cloud.account import Account
 from nextmv.cloud.application import Application
 from nextmv.cloud.client import Client
@@ -59,6 +60,18 @@ def save_config(config: dict[str, Any]) -> None:
         yaml.safe_dump(config, file)
 
 
+def non_profile_keys() -> set[str]:
+    """
+    Returns the set of keys that are not profile names in the configuration.
+
+    Returns
+    -------
+    set[str]
+        The set of non-profile keys.
+    """
+    return {API_KEY_KEY, ENDPOINT_KEY}
+
+
 def build_client(profile: str | None = None) -> Client:
     """
     Builds a `cloud.Client` using the API key and endpoint for the given
@@ -91,23 +104,35 @@ def build_client(profile: str | None = None) -> Client:
 
     if profile is not None:
         if profile not in config:
-            error(f"Profile [magenta]{profile}[/magenta] does not exist.")
+            error(
+                f"Profile [magenta]{profile}[/magenta] does not exist. "
+                "Create it using [code]nextmv configuration create[/code] with the --profile option."
+            )
 
         api_key = config[profile].get(API_KEY_KEY)
         if api_key is None or api_key == "":
-            error(f"API key for profile [magenta]{profile}[/magenta] is not set or is empty.")
+            error(
+                f"API key for profile [magenta]{profile}[/magenta] is not set or is empty. "
+                "Set it using [code]nextmv configuration create[/code] with the --profile and --api-key options."
+            )
 
         endpoint = config[profile].get(ENDPOINT_KEY)
         if endpoint is None or endpoint == "":
-            error(f"Endpoint for profile [magenta]{profile}[/magenta] is not set or is empty.")
+            error(
+                f"Endpoint for profile [magenta]{profile}[/magenta] is not set or is empty. "
+                "Please run [code]nextmv configuration create[/code]."
+            )
     else:
         api_key = config.get(API_KEY_KEY)
         if api_key is None or api_key == "":
-            error("Default API key is not set or is empty.")
+            error(
+                "Default API key is not set or is empty. "
+                "Please run [code]nextmv configuration create[/code] with the --api-key option."
+            )
 
         endpoint = config.get(ENDPOINT_KEY)
         if endpoint is None or endpoint == "":
-            error("Default endpoint is not set or is empty.")
+            error("Default endpoint is not set or is empty. Please run [code]nextmv configuration create[/code].")
 
     return Client(api_key=api_key, url=f"https://{endpoint}")
 
@@ -137,13 +162,21 @@ def build_app(app_id: str, profile: str | None = None) -> Application:
     """
     client = build_client(profile)
     exists = Application.exists(client=client, id=app_id)
-    if not exists:
+    if exists:
+        return Application(client=client, id=app_id)
+
+    warning(f"Application with ID [magenta]{app_id}[/magenta] does not exist.")
+    should_create = get_confirmation(f"Do you want to create a new application with ID [magenta]{app_id}[/magenta]?")
+    if not should_create:
         error(
-            f"Application with ID [magenta]{app_id}[/magenta] does not exist. "
-            "Use [code]nextmv cloud app create[/code] to create a new application."
+            f"Application with ID [magenta]{app_id}[/magenta] was not created and does not exist. "
+            "Use [code]nextmv cloud app create[/code] to create a new app."
         )
 
-    return Application(client=client, id=app_id)
+    app = Application.new(client=client, id=app_id, name=app_id)
+    success(f"Application with ID and name [magenta]{app_id}[/magenta] created successfully.")
+
+    return app
 
 
 def build_account(account_id: str | None = None, profile: str | None = None) -> Account:

nextmv/cli/configuration/create.py

@@ -58,14 +58,14 @@ def create(
     [bold][underline]Examples[/underline][/bold]
 
     - Default configuration.
-        $ [green]nextmv configuration create --api-key NEXTMV_API_KEY[/green]
+        $ [dim]nextmv configuration create --api-key NEXTMV_API_KEY[/dim]
 
     - Configure a profile named [magenta]hare[/magenta].
-        $ [green]nextmv configuration create --api-key NEXTMV_API_KEY --profile hare[/green]
+        $ [dim]nextmv configuration create --api-key NEXTMV_API_KEY --profile hare[/dim]
     """
 
     if profile is not None and profile.strip().lower() == "default":
-        error("[code]default[/code] is a reserved profile name.")
+        error("[magenta]default[/magenta] is a reserved profile name.")
 
     endpoint = str(endpoint)
     if endpoint.startswith("https://"):

nextmv/cli/configuration/delete.py

@@ -5,9 +5,9 @@ This module defines the configuration delete command for the Nextmv CLI.
 from typing import Annotated
 
 import typer
-from rich.prompt import Confirm
 
 from nextmv.cli.configuration.config import load_config, save_config
+from nextmv.cli.confirm import get_confirmation
 from nextmv.cli.message import error, info, success
 
 # Set up subcommand application.
@@ -36,25 +36,25 @@ def delete(
     ] = False,
 ) -> None:
     """
-    Delete a profile from the configuration. Use the [code]--yes[/code]
-    flag to skip the confirmation prompt.
+    Delete a profile from the configuration.
+
+    Use the --yes flag to skip the confirmation prompt.
 
     [bold][underline]Examples[/underline][/bold]
 
     - Delete a profile named [magenta]hare[/magenta].
-        $ [green]nextmv configuration delete --profile hare[/green]
+        $ [dim]nextmv configuration delete --profile hare[/dim]
 
     - Delete a profile named [magenta]hare[/magenta] without confirmation prompt.
-        $ [green]nextmv configuration delete --profile hare --yes[/green]
+        $ [dim]nextmv configuration delete --profile hare --yes[/dim]
     """
     config = load_config()
     if profile not in config:
         error(f"Profile [magenta]{profile}[/magenta] does not exist.")
 
     if not yes:
-        confirm = Confirm.ask(
+        confirm = get_confirmation(
             f"Are you sure you want to delete profile [magenta]{profile}[/magenta]? This action cannot be undone.",
-            default=False,
         )
 
         if not confirm:

nextmv/cli/configuration/list.py

@@ -6,7 +6,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
-from nextmv.cli.configuration.config import API_KEY_KEY, ENDPOINT_KEY, load_config, obscure_api_key
+from nextmv.cli.configuration.config import API_KEY_KEY, ENDPOINT_KEY, load_config, non_profile_keys, obscure_api_key
 from nextmv.cli.message import error
 
 # Set up subcommand application.
@@ -22,7 +22,7 @@ def list() -> None:
     [bold][underline]Examples[/underline][/bold]
 
     - Show current configuration and all profiles.
-        $ [green]nextmv configuration list[/green]
+        $ [dim]nextmv configuration list[/dim]
     """
 
     config = load_config()
@@ -38,7 +38,7 @@ def list() -> None:
 
     for k, v in config.items():
         # Skip default configuration.
-        if k in {API_KEY_KEY, ENDPOINT_KEY}:
+        if k in non_profile_keys():
             continue
 
         profile = {

nextmv/cli/confirm.py

@@ -0,0 +1,32 @@
+import sys
+
+from rich.prompt import Confirm
+
+
+def get_confirmation(msg: str) -> bool:
+    """
+    Method to get a yes/no confirmation from the user.
+
+    Parameters
+    ----------
+    msg : str
+        The message to display to the user.
+
+    Returns
+    -------
+    bool
+        True if the user confirmed, False otherwise.
+    """
+
+    # 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 Confirm.ask(
+        msg,
+        default=False,
+        case_sensitive=False,
+        show_default=True,
+        show_choices=True,
+    )

nextmv/cli/main.py

@@ -13,22 +13,25 @@ about the features used here. An example of Rich markup can be found in the
 epilog of the Typer application defined below.
 """
 
-import os
 import sys
 from typing import Annotated
 
 import rich
 import typer
-from rich.prompt import Confirm
+from typer import rich_utils
 
 from nextmv.cli.cloud import app as cloud_app
 from nextmv.cli.community import app as community_app
 from nextmv.cli.configuration import app as configuration_app
 from nextmv.cli.configuration.config import CONFIG_DIR, GO_CLI_PATH, load_config
+from nextmv.cli.confirm import get_confirmation
 from nextmv.cli.message import error, info, success, warning
 from nextmv.cli.version import app as version_app
 from nextmv.cli.version import version_callback
 
+# Disable dim text for the extended help of commands.
+rich_utils.STYLE_HELPTEXT = ""
+
 # Main CLI application.
 app = typer.Typer(
     help="The Nextmv Command Line Interface (CLI).",
@@ -66,6 +69,15 @@ def callback(
     environment.
     """
 
+    # Skip checks for help commands.
+    if "--help" in sys.argv or "-h" in sys.argv:
+        return
+
+    # Skip checks for certain commands.
+    ignored_commands = {"configuration", "version"}
+    if ctx.invoked_subcommand in ignored_commands:
+        return
+
     handle_go_cli()
     handle_config_existence(ctx)
 
@@ -80,19 +92,21 @@ def handle_go_cli() -> None:
 
     exists = go_cli_exists()
     if exists:
-        delete = Confirm.ask(
+        delete = get_confirmation(
             "Do you want to delete the [italic red]deprecated[/italic red] Nextmv CLI "
-            f"at [magenta]{GO_CLI_PATH}[/magenta] now?",
-            default=False,
+            f"at [magenta]{GO_CLI_PATH}[/magenta] now?"
         )
         if delete:
             remove_go_cli()
-        else:
-            info(
-                msg="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].",
-                emoji=":bulb:",
-            )
+            return
+
+        info(
+            msg="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:",
+        )
 
 
 def handle_config_existence(ctx: typer.Context) -> None:
@@ -105,10 +119,6 @@ def handle_config_existence(ctx: typer.Context) -> None:
         The Typer context object.
     """
 
-    ignored_commands = {"configuration", "version"}
-    if ctx.invoked_subcommand in ignored_commands:
-        return
-
     config = load_config()
     if config == {}:
         error("No configuration found. Please run [code]nextmv configuration create[/code].")
@@ -130,11 +140,9 @@ def go_cli_exists() -> bool:
     if exists:
         warning(
             "A [italic red]deprecated[/italic red] Nextmv CLI is installed at "
-            f"[magenta]{GO_CLI_PATH}[/magenta]. You must delete it to avoid conflicts."
+            f"[magenta]{GO_CLI_PATH}[/magenta]. You should delete it to avoid conflicts."
         )
 
-    check_config_in_path()
-
     return exists
 
 
@@ -145,24 +153,7 @@ def remove_go_cli() -> None:
 
     if GO_CLI_PATH.exists():
         GO_CLI_PATH.unlink()
-        success(f"Deleted deprecated [magenta]{GO_CLI_PATH}[/magenta].")
-
-    check_config_in_path()
-
-
-def check_config_in_path() -> None:
-    """
-    Check if the configuration directory is in the PATH and notify the user.
-    """
-
-    path_dirs = os.environ.get("PATH", "").split(os.pathsep)
-    config_dir_str = str(CONFIG_DIR)
-
-    if config_dir_str in path_dirs:
-        warning(
-            f"[magenta]{CONFIG_DIR}[/magenta] was found in your [code]PATH[/code]. "
-            f"You should remove any entries related to [magenta]{CONFIG_DIR}[/magenta] from your [code]PATH[/code]."
-        )
+        success(f"Deleted [italic red]deprecated[/italic red] [magenta]{GO_CLI_PATH}[/magenta].")
 
 
 def main() -> None:

nextmv/cli/message.py

@@ -31,7 +31,7 @@ def error(msg: str) -> None:
     if not msg.endswith("."):
         msg += "."
 
-    rich.print(f"[red]Error:[/red] {msg}", file=sys.stderr)
+    rich.print(f":x: [red]Error:[/red] {msg}", file=sys.stderr)
 
     raise typer.Exit(code=1)
 
@@ -67,7 +67,7 @@ def warning(msg: str) -> None:
     if not msg.endswith("."):
         msg += "."
 
-    rich.print(f":construction: {msg}", file=sys.stderr)
+    rich.print(f":construction: [yellow] Warning:[/yellow] {msg}", file=sys.stderr)
 
 
 def info(msg: str, emoji: str | None = None) -> None:

nextmv/cli/version.py

@@ -18,7 +18,7 @@ def version() -> None:
     [bold][underline]Examples[/underline][/bold]
 
     - Show the version.
-        $ [green]nextmv version[/green]
+        $ [dim]nextmv version[/dim]
     """
 
     version_callback(True)