llamactl 0.3.0a3__py3-none-any.whl → 0.3.0a5__py3-none-any.whl

llama_deploy/cli/__init__.py

@@ -1,29 +1,8 @@
-import click
-from .commands import projects, deployments, profile, health_check, serve, version
-from .options import global_options
+from llama_deploy.cli.commands.deployment import deployments
+from llama_deploy.cli.commands.profile import profile
+from llama_deploy.cli.commands.serve import serve
 
-
-# Main CLI application
-@click.group(help="LlamaDeploy CLI - Manage projects and deployments")
-@global_options
-def app():
-    """LlamaDeploy CLI - Manage projects and deployments"""
-    pass
-
-
-# Add sub-commands
-app.add_command(profile, name="profile")
-app.add_command(projects, name="project")
-app.add_command(deployments, name="deployment")
-
-# Add health check at root level
-app.add_command(health_check, name="health")
-
-# Add serve command at root level
-app.add_command(serve, name="serve")
-
-# Add version command at root level
-app.add_command(version, name="version")
+from .app import app
 
 
 # Main entry point function (called by the script)
@@ -31,5 +10,8 @@ def main() -> None:
     app()
 
 
+__all__ = ["app", "deployments", "profile", "serve"]
+
+
 if __name__ == "__main__":
     app()

llama_deploy/cli/app.py

@@ -0,0 +1,71 @@
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as pkg_version
+
+import click
+from llama_deploy.cli.client import get_control_plane_client
+from llama_deploy.cli.commands.aliased_group import AliasedGroup
+from llama_deploy.cli.config import config_manager
+from llama_deploy.cli.options import global_options
+from rich import print as rprint
+from rich.console import Console
+from rich.text import Text
+
+console = Console(highlight=False)
+
+
+def print_version(ctx: click.Context, param: click.Option, value: bool) -> None:
+    """Print the version of llama_deploy"""
+    if not value or ctx.resilient_parsing:
+        return
+    try:
+        ver = pkg_version("llamactl")
+        console.print(Text.assemble("client version: ", (ver, "green")))
+
+        # If there is an active profile, attempt to query server version
+        profile = config_manager.get_current_profile()
+        if profile and profile.api_url:
+            try:
+                cp_client = get_control_plane_client()
+                data = cp_client.server_version()
+                server_ver = data.get("version")
+                console.print(
+                    Text.assemble(
+                        "server version: ",
+                        (
+                            server_ver or "unknown",
+                            "bright_yellow" if server_ver is None else "green",
+                        ),
+                    )
+                )
+            except Exception as e:
+                console.print(
+                    Text.assemble(
+                        "server version: ",
+                        ("unavailable", "bright_yellow"),
+                        (f" - {e}", "dim"),
+                    )
+                )
+    except PackageNotFoundError:
+        rprint("[red]Package 'llamactl' not found[/red]")
+        raise click.Abort()
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+    ctx.exit()
+
+
+# Main CLI application
+@click.group(
+    help="Create, develop, and deploy LlamaIndex workflow based apps", cls=AliasedGroup
+)
+@click.option(
+    "--version",
+    is_flag=True,
+    callback=print_version,
+    expose_value=False,
+    is_eager=True,
+    help="Print client and server versions of LlamaDeploy",
+)
+@global_options
+def app():
+    pass

llama_deploy/cli/client.py

@@ -11,7 +11,7 @@ from llama_deploy.core.schema.git_validation import (
     RepositoryValidationRequest,
     RepositoryValidationResponse,
 )
-from llama_deploy.core.schema.projects import ProjectSummary, ProjectsListResponse
+from llama_deploy.core.schema.projects import ProjectsListResponse, ProjectSummary
 from rich.console import Console
 
 from .config import config_manager
@@ -69,9 +69,9 @@ class ProjectClient(BaseClient):
 
     def __init__(
         self,
-        base_url: Optional[str] = None,
-        project_id: Optional[str] = None,
-        console: Optional[Console] = None,
+        base_url: str | None = None,
+        project_id: str | None = None,
+        console: Console | None = None,
     ) -> None:
         # Allow default construction using active profile (for tests and convenience)
         if base_url is None or project_id is None:
@@ -119,15 +119,10 @@ class ProjectClient(BaseClient):
         self,
         deployment_id: str,
         update_data: DeploymentUpdate,
-        force_git_sha_update: bool = False,
     ) -> DeploymentResponse:
-        params = {}
-        if force_git_sha_update:
-            params["force_git_sha_update"] = True
         response = self.client.patch(
             f"/{self.project_id}/deployments/{deployment_id}",
             json=update_data.model_dump(),
-            params=params,
         )
         return DeploymentResponse.model_validate(response.json())
 
@@ -148,7 +143,7 @@ class ProjectClient(BaseClient):
         return RepositoryValidationResponse.model_validate(response.json())
 
 
-def get_control_plane_client(base_url: Optional[str] = None) -> ControlPlaneClient:
+def get_control_plane_client(base_url: str | None = None) -> ControlPlaneClient:
     console = Console()
     profile = config_manager.get_current_profile()
     if not profile and not base_url:
@@ -163,7 +158,7 @@ def get_control_plane_client(base_url: Optional[str] = None) -> ControlPlaneClie
 
 
 def get_project_client(
-    base_url: Optional[str] = None, project_id: Optional[str] = None
+    base_url: str | None = None, project_id: str | None = None
 ) -> ProjectClient:
     console = Console()
     profile = config_manager.get_current_profile()

llama_deploy/cli/commands/aliased_group.py

@@ -0,0 +1,31 @@
+"""Fully lifted from https://click.palletsprojects.com/en/stable/extending-click/"""
+
+import click
+
+
+class AliasedGroup(click.Group):
+    """
+    Implements a subclass of Group that accepts a prefix for a command.
+    If there was a command called push, it would accept pus as an alias (so long as it was unique):
+    """
+
+    def get_command(self, ctx: click.Context, cmd_name: str) -> click.Command | None:
+        rv = super().get_command(ctx, cmd_name)
+
+        if rv is not None:
+            return rv
+
+        matches = [x for x in self.list_commands(ctx) if x.startswith(cmd_name)]
+
+        if not matches:
+            return None
+
+        if len(matches) == 1:
+            return click.Group.get_command(self, ctx, matches[0])
+
+        ctx.fail(f"Too many matches: {', '.join(sorted(matches))}")
+
+    def resolve_command(self, ctx, args):
+        # always return the full command name
+        _, cmd, args = super().resolve_command(ctx, args)
+        return cmd.name, cmd, args

llama_deploy/cli/commands/deployment.py

@@ -0,0 +1,255 @@
+"""CLI commands for managing LlamaDeploy deployments.
+
+This command group lets you list, create, edit, refresh, and delete deployments.
+A deployment points the control plane at your Git repository and deployment file
+(e.g., `llama_deploy.yaml`). The control plane pulls your code at the selected
+git ref, reads the config, and runs your app.
+"""
+
+import click
+from llama_deploy.core.schema.deployments import DeploymentUpdate
+from rich import print as rprint
+from rich.table import Table
+
+from ..app import app, console
+from ..client import get_project_client
+from ..interactive_prompts.utils import (
+    confirm_action,
+    select_deployment,
+)
+from ..options import global_options
+from ..textual.deployment_form import create_deployment_form, edit_deployment_form
+
+
+@app.group(
+    help="Deploy your app to the cloud.",
+    no_args_is_help=True,
+)
+@global_options
+def deployments() -> None:
+    """Manage deployments"""
+    pass
+
+
+# Deployments commands
+@deployments.command("list")
+@global_options
+def list_deployments() -> None:
+    """List deployments for the configured project."""
+    try:
+        client = get_project_client()
+        deployments = client.list_deployments()
+
+        if not deployments:
+            rprint(
+                f"[yellow]No deployments found for project {client.project_id}[/yellow]"
+            )
+            return
+
+        table = Table(title=f"Deployments for project {client.project_id}")
+        table.add_column("Name", style="cyan")
+        table.add_column("ID", style="yellow")
+        table.add_column("Status", style="green")
+        table.add_column("Repository", style="blue")
+        table.add_column("Deployment File", style="magenta")
+        table.add_column("Git Ref", style="white")
+        table.add_column("PAT", style="red")
+        table.add_column("Secrets", style="bright_green")
+
+        for deployment in deployments:
+            name = deployment.name
+            deployment_id = deployment.id
+            status = deployment.status
+            repo_url = deployment.repo_url
+            deployment_file_path = deployment.deployment_file_path
+            git_ref = deployment.git_ref
+            has_pat = "✓" if deployment.has_personal_access_token else "-"
+            secret_names = deployment.secret_names
+            secrets_display = str(len(secret_names)) if secret_names else "-"
+
+            table.add_row(
+                name,
+                deployment_id,
+                status,
+                repo_url,
+                deployment_file_path,
+                git_ref,
+                has_pat,
+                secrets_display,
+            )
+
+        console.print(table)
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@deployments.command("get")
+@global_options
+@click.argument("deployment_id", required=False)
+def get_deployment(deployment_id: str | None) -> None:
+    """Get details of a specific deployment"""
+    try:
+        client = get_project_client()
+
+        deployment_id = select_deployment(deployment_id)
+        if not deployment_id:
+            rprint("[yellow]No deployment selected[/yellow]")
+            return
+
+        deployment = client.get_deployment(deployment_id)
+
+        table = Table(title=f"Deployment: {deployment.name}")
+        table.add_column("Property", style="cyan")
+        table.add_column("Value", style="green")
+
+        table.add_row("ID", deployment.id)
+        table.add_row("Project ID", deployment.project_id)
+        table.add_row("Status", deployment.status)
+        table.add_row("Repository", deployment.repo_url)
+        table.add_row("Deployment File", deployment.deployment_file_path)
+        table.add_row("Git Ref", deployment.git_ref)
+        table.add_row("Has PAT", str(deployment.has_personal_access_token))
+
+        apiserver_url = deployment.apiserver_url
+        if apiserver_url:
+            table.add_row("API Server URL", str(apiserver_url))
+
+        secret_names = deployment.secret_names
+        if secret_names:
+            table.add_row("Secrets", ", ".join(secret_names))
+
+        console.print(table)
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@deployments.command("create")
+@global_options
+@click.option("--repo-url", help="HTTP(S) Git Repository URL")
+@click.option("--name", help="Deployment name")
+@click.option("--deployment-file-path", help="Path to deployment file")
+@click.option("--git-ref", help="Git reference (branch, tag, or commit)")
+@click.option(
+    "--personal-access-token", help="Git Personal Access Token (HTTP Basic Auth)"
+)
+def create_deployment(
+    repo_url: str | None,
+    name: str | None,
+    deployment_file_path: str | None,
+    git_ref: str | None,
+    personal_access_token: str | None,
+) -> None:
+    """Create a new deployment"""
+
+    # Use interactive creation
+    deployment_form = create_deployment_form()
+    if deployment_form is None:
+        rprint("[yellow]Cancelled[/yellow]")
+        return
+
+    rprint(
+        f"[green]Created deployment: {deployment_form.name} (id: {deployment_form.id})[/green]"
+    )
+
+
+@deployments.command("delete")
+@global_options
+@click.argument("deployment_id", required=False)
+@click.option("--confirm", is_flag=True, help="Skip confirmation prompt")
+def delete_deployment(deployment_id: str | None, confirm: bool) -> None:
+    """Delete a deployment"""
+    try:
+        client = get_project_client()
+
+        deployment_id = select_deployment(deployment_id)
+        if not deployment_id:
+            rprint("[yellow]No deployment selected[/yellow]")
+            return
+
+        if not confirm:
+            if not confirm_action(f"Delete deployment '{deployment_id}'?"):
+                rprint("[yellow]Cancelled[/yellow]")
+                return
+
+        client.delete_deployment(deployment_id)
+        rprint(f"[green]Deleted deployment: {deployment_id}[/green]")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@deployments.command("edit")
+@global_options
+@click.argument("deployment_id", required=False)
+def edit_deployment(deployment_id: str | None) -> None:
+    """Interactively edit a deployment"""
+    try:
+        client = get_project_client()
+
+        deployment_id = select_deployment(deployment_id)
+        if not deployment_id:
+            rprint("[yellow]No deployment selected[/yellow]")
+            return
+
+        # Get current deployment details
+        current_deployment = client.get_deployment(deployment_id)
+
+        # Use the interactive edit form
+        updated_deployment = edit_deployment_form(current_deployment)
+        if updated_deployment is None:
+            rprint("[yellow]Cancelled[/yellow]")
+            return
+
+        rprint(
+            f"[green]Successfully updated deployment: {updated_deployment.name}[/green]"
+        )
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@deployments.command("refresh")
+@global_options
+@click.argument("deployment_id", required=False)
+def refresh_deployment(deployment_id: str | None) -> None:
+    """Refresh a deployment with the latest code from its git reference"""
+    try:
+        client = get_project_client()
+
+        deployment_id = select_deployment(deployment_id)
+        if not deployment_id:
+            rprint("[yellow]No deployment selected[/yellow]")
+            return
+
+        # Get current deployment details to show what we're refreshing
+        current_deployment = client.get_deployment(deployment_id)
+        deployment_name = current_deployment.name
+        old_git_sha = current_deployment.git_sha or ""
+
+        # Create an empty update to force git SHA refresh with spinner
+        with console.status(f"Refreshing {deployment_name}..."):
+            deployment_update = DeploymentUpdate()
+            updated_deployment = client.update_deployment(
+                deployment_id,
+                deployment_update,
+            )
+
+        # Show the git SHA change with short SHAs
+        new_git_sha = updated_deployment.git_sha or ""
+        old_short = old_git_sha[:7] if old_git_sha else "none"
+        new_short = new_git_sha[:7] if new_git_sha else "none"
+
+        if old_git_sha == new_git_sha:
+            rprint(f"No changes: already at {new_short}")
+        else:
+            rprint(f"Updated: {old_short} → {new_short}")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()

llama_deploy/cli/commands/profile.py

@@ -0,0 +1,217 @@
+import click
+from llama_deploy.cli.client import get_control_plane_client
+from rich import print as rprint
+from rich.table import Table
+
+from ..app import app, console
+from ..config import config_manager
+from ..interactive_prompts.utils import (
+    select_profile,
+)
+from ..options import global_options
+from ..textual.profile_form import create_profile_form, edit_profile_form
+
+
+# Create sub-applications for organizing commands
+@app.group(
+    help="Login to manage deployments and switch between projects",
+    no_args_is_help=True,
+)
+@global_options
+def profile() -> None:
+    """Manage profiles"""
+    pass
+
+
+# Profile commands
+@profile.command("create")
+@global_options
+@click.option("--name", help="Profile name")
+@click.option("--api-url", help="API server URL")
+@click.option("--project-id", help="Default project ID")
+def create_profile(
+    name: str | None, api_url: str | None, project_id: str | None
+) -> None:
+    """Create a new profile"""
+    try:
+        # If all required args are provided via CLI, skip interactive mode
+        if name and api_url:
+            # Use CLI args directly
+            profile = config_manager.create_profile(name, api_url, project_id)
+            rprint(f"[green]Created profile '{profile.name}'[/green]")
+
+            # Automatically switch to the new profile
+            config_manager.set_current_profile(name)
+            rprint(f"[green]Switched to profile '{name}'[/green]")
+            return
+
+        # Use interactive creation
+        profile = create_profile_form()
+        if profile is None:
+            rprint("[yellow]Cancelled[/yellow]")
+            return
+
+        try:
+            rprint(f"[green]Created profile '{profile.name}'[/green]")
+
+            # Automatically switch to the new profile
+            config_manager.set_current_profile(profile.name)
+            rprint(f"[green]Switched to profile '{profile.name}'[/green]")
+        except Exception as e:
+            rprint(f"[red]Error creating profile: {e}[/red]")
+            raise click.Abort()
+
+    except ValueError as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@profile.command("list")
+@global_options
+def list_profiles() -> None:
+    """List all profiles"""
+    try:
+        profiles = config_manager.list_profiles()
+        current_name = config_manager.get_current_profile_name()
+
+        if not profiles:
+            rprint("[yellow]No profiles found[/yellow]")
+            rprint("Create one with: [cyan]llamactl profile create[/cyan]")
+            return
+
+        table = Table(title="Profiles")
+        table.add_column("Name", style="cyan")
+        table.add_column("API URL", style="green")
+        table.add_column("Active Project", style="yellow")
+        table.add_column("Current", style="magenta")
+
+        for profile in profiles:
+            is_current = "✓" if profile.name == current_name else ""
+            active_project = profile.active_project_id or "-"
+            table.add_row(profile.name, profile.api_url, active_project, is_current)
+
+        console.print(table)
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@profile.command("switch")
+@global_options
+@click.argument("name", required=False)
+def switch_profile(name: str | None) -> None:
+    """Switch to a different profile"""
+    try:
+        name = select_profile(name)
+        if not name:
+            rprint("[yellow]No profile selected[/yellow]")
+            return
+
+        profile = config_manager.get_profile(name)
+        if not profile:
+            rprint(f"[red]Profile '{name}' not found[/red]")
+            raise click.Abort()
+
+        config_manager.set_current_profile(name)
+        rprint(f"[green]Switched to profile '{name}'[/green]")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@profile.command("delete")
+@global_options
+@click.argument("name", required=False)
+def delete_profile(name: str | None) -> None:
+    """Delete a profile"""
+    try:
+        name = select_profile(name)
+        if not name:
+            rprint("[yellow]No profile selected[/yellow]")
+            return
+
+        profile = config_manager.get_profile(name)
+        if not profile:
+            rprint(f"[red]Profile '{name}' not found[/red]")
+            raise click.Abort()
+
+        if config_manager.delete_profile(name):
+            rprint(f"[green]Deleted profile '{name}'[/green]")
+        else:
+            rprint(f"[red]Profile '{name}' not found[/red]")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@profile.command("edit")
+@global_options
+@click.argument("name", required=False)
+def edit_profile(name: str | None) -> None:
+    """Edit a profile"""
+    try:
+        name = select_profile(name)
+        if not name:
+            rprint("[yellow]No profile selected[/yellow]")
+            return
+
+        # Get current profile
+        maybe_profile = config_manager.get_profile(name)
+        if not maybe_profile:
+            rprint(f"[red]Profile '{name}' not found[/red]")
+            raise click.Abort()
+        profile = maybe_profile
+
+        # Use the interactive edit menu
+        updated = edit_profile_form(profile)
+        if updated is None:
+            rprint("[yellow]Cancelled[/yellow]")
+            return
+
+        try:
+            current_profile = config_manager.get_current_profile()
+            if not current_profile or current_profile.name != updated.name:
+                config_manager.set_current_profile(updated.name)
+                rprint(f"[green]Updated profile '{profile.name}'[/green]")
+        except Exception as e:
+            rprint(f"[red]Error updating profile: {e}[/red]")
+            raise click.Abort()
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+# Projects commands
+@profile.command("list-projects")
+@global_options
+def list_projects() -> None:
+    """List all projects with deployment counts"""
+    try:
+        client = get_control_plane_client()
+        projects = client.list_projects()
+
+        if not projects:
+            rprint("[yellow]No projects found[/yellow]")
+            return
+
+        table = Table(title="Projects")
+        table.add_column("Project ID", style="cyan")
+        table.add_column("Deployments", style="green")
+
+        for project in projects:
+            project_id = project.project_id
+            deployment_count = project.deployment_count
+            table.add_row(project_id, str(deployment_count))
+
+        console.print(table)
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()