llamactl 0.3.0a13__tar.gz → 0.3.0a15__tar.gz

{llamactl-0.3.0a13 → llamactl-0.3.0a15}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a13
+Version: 0.3.0a15
 Summary: A command-line interface for managing LlamaDeploy projects and deployments
 Author: Adrian Lyjak
 Author-email: Adrian Lyjak <adrianlyjak@gmail.com>
 License: MIT
-Requires-Dist: llama-deploy-core[client]>=0.3.0a13,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.0a13,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.0a15,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a15,<0.4.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

{llamactl-0.3.0a13 → llamactl-0.3.0a15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.0a13"
+version = "0.3.0a15"
 description = "A command-line interface for managing LlamaDeploy projects and deployments"
 readme = "README.md"
 license = { text = "MIT" }
@@ -9,8 +9,8 @@ authors = [
 ]
 requires-python = ">=3.11, <4"
 dependencies = [
-    "llama-deploy-core[client]>=0.3.0a13,<0.4.0",
-    "llama-deploy-appserver>=0.3.0a13,<0.4.0",
+    "llama-deploy-core[client]>=0.3.0a15,<0.4.0",
+    "llama-deploy-appserver>=0.3.0a15,<0.4.0",
     "httpx>=0.24.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",

{llamactl-0.3.0a13 → llamactl-0.3.0a15}/src/llama_deploy/cli/__init__.py

@@ -1,5 +1,6 @@
 from llama_deploy.cli.commands.auth import auth
 from llama_deploy.cli.commands.deployment import deployments
+from llama_deploy.cli.commands.env import env_group
 from llama_deploy.cli.commands.init import init
 from llama_deploy.cli.commands.serve import serve
 
@@ -11,7 +12,7 @@ def main() -> None:
     app()
 
 
-__all__ = ["app", "deployments", "auth", "serve", "init"]
+__all__ = ["app", "deployments", "auth", "serve", "init", "env_group"]
 
 
 if __name__ == "__main__":

{llamactl-0.3.0a13 → llamactl-0.3.0a15}/src/llama_deploy/cli/app.py

@@ -1,11 +1,9 @@
-import asyncio
 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.config.env_service import service
 from llama_deploy.cli.options import global_options
 from rich import print as rprint
 from rich.console import Console
@@ -23,11 +21,10 @@ def print_version(ctx: click.Context, param: click.Option, value: bool) -> None:
         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:
+        auth_service = service.current_auth_service()
+        if auth_service:
             try:
-                cp_client = get_control_plane_client()
-                data = asyncio.run(cp_client.server_version())
+                data = auth_service.fetch_server_version()
                 server_ver = data.version
                 console.print(
                     Text.assemble(

llamactl-0.3.0a15/src/llama_deploy/cli/client.py

@@ -0,0 +1,41 @@
+from contextlib import asynccontextmanager
+from typing import AsyncGenerator
+
+from llama_deploy.cli.config.env_service import service
+from llama_deploy.core.client.manage_client import ControlPlaneClient, ProjectClient
+from rich import print as rprint
+
+
+def get_control_plane_client() -> ControlPlaneClient:
+    profile = service.current_auth_service().get_current_profile()
+    if profile:
+        resolved_base_url = profile.api_url.rstrip("/")
+        resolved_api_key = profile.api_key
+        return ControlPlaneClient(resolved_base_url, resolved_api_key)
+
+    # Fallback: allow env-scoped client construction for env operations
+    env = service.get_current_environment()
+    resolved_base_url = env.api_url.rstrip("/")
+    return ControlPlaneClient(resolved_base_url, None)
+
+
+def get_project_client() -> ProjectClient:
+    profile = service.current_auth_service().get_current_profile()
+    if not profile:
+        rprint("\n[bold red]No profile configured![/bold red]")
+        rprint("\nTo get started, create a profile with:")
+        rprint("[cyan]llamactl auth token[/cyan]")
+        raise SystemExit(1)
+    return ProjectClient(profile.api_url, profile.project_id, profile.api_key)
+
+
+@asynccontextmanager
+async def project_client_context() -> AsyncGenerator[ProjectClient, None]:
+    client = get_project_client()
+    try:
+        yield client
+    finally:
+        try:
+            await client.aclose()
+        except Exception:
+            pass

llamactl-0.3.0a15/src/llama_deploy/cli/commands/auth.py

@@ -0,0 +1,377 @@
+import asyncio
+
+import click
+import questionary
+from llama_deploy.cli.client import get_control_plane_client
+from llama_deploy.cli.config.auth_service import AuthService
+from llama_deploy.cli.config.env_service import service
+from llama_deploy.core.client.manage_client import ClientError, ControlPlaneClient
+from llama_deploy.core.schema.projects import ProjectSummary
+from rich import print as rprint
+from rich.table import Table
+from rich.text import Text
+
+from ..app import app, console
+from ..config.schema import Auth
+from ..options import global_options, interactive_option
+
+
+# Create sub-applications for organizing commands
+@app.group(
+    help="Login to llama cloud control plane to manage deployments",
+    no_args_is_help=True,
+)
+@global_options
+def auth() -> None:
+    """Login to llama cloud control plane"""
+    pass
+
+
+@auth.command("token")
+@global_options
+@click.option(
+    "--project-id",
+    help="Project ID to use for the login when creating non-interactively",
+)
+@click.option(
+    "--api-key",
+    help="API key to use for the login when creating non-interactively",
+)
+@interactive_option
+def create_api_key_profile(
+    project_id: str | None,
+    api_key: str | None,
+    interactive: bool,
+) -> None:
+    """Authenticate with an API key and create a profile in the current environment."""
+    try:
+        auth_svc = service.current_auth_service()
+
+        # Non-interactive mode: require both api-key and project-id
+        if not interactive:
+            if not api_key or not project_id:
+                raise click.ClickException(
+                    "--api-key and --project-id are required in non-interactive mode"
+                )
+            created = auth_svc.create_profile_from_token(project_id, api_key)
+            rprint(
+                f"[green]Created API key profile '{created.name}' and set as current[/green]"
+            )
+            return
+
+        # Interactive mode: prompt for token (masked) and validate
+        token_value = api_key or _prompt_for_api_key()
+        projects = _validate_token_and_list_projects(auth_svc, token_value)
+
+        # Select or enter project ID
+        selected_project_id = project_id or _select_or_enter_project(
+            projects, auth_svc.env.requires_auth
+        )
+        if not selected_project_id:
+            rprint("[yellow]No project selected[/yellow]")
+            return
+
+        # Create and set profile
+        created = auth_svc.create_profile_from_token(selected_project_id, token_value)
+        rprint(
+            f"[green]Created API key profile '{created.name}' and set as current[/green]"
+        )
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@auth.command("list")
+@global_options
+def list_profiles() -> None:
+    """List all logged in profiles"""
+    try:
+        auth_svc = service.current_auth_service()
+        profiles = auth_svc.list_profiles()
+        current = auth_svc.get_current_profile()
+
+        if not profiles:
+            rprint("[yellow]No profiles found[/yellow]")
+            rprint("Create one with: [cyan]llamactl auth token[/cyan]")
+            return
+
+        table = Table(show_edge=False, box=None, header_style="bold cornflower_blue")
+        table.add_column("  Name")
+        table.add_column("Active Project", style="grey46")
+
+        for profile in profiles:
+            text = Text()
+            if profile == current:
+                text.append("* ", style="magenta")
+            else:
+                text.append("  ")
+            text.append(profile.name)
+            active_project = profile.project_id or "-"
+            table.add_row(
+                text,
+                active_project,
+            )
+
+        console.print(table)
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@auth.command("switch")
+@global_options
+@click.argument("name", required=False)
+@interactive_option
+def switch_profile(name: str | None, interactive: bool) -> None:
+    """Switch to a different profile"""
+    auth_svc = service.current_auth_service()
+    try:
+        selected_auth = _select_profile(auth_svc, name, interactive)
+        if not selected_auth:
+            rprint("[yellow]No profile selected[/yellow]")
+            return
+
+        auth_svc.set_current_profile(selected_auth.name)
+        rprint(f"[green]Switched to profile '{selected_auth.name}'[/green]")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@auth.command("logout")
+@global_options
+@click.argument("name", required=False)
+@interactive_option
+def delete_profile(name: str | None, interactive: bool) -> None:
+    """Logout from a profile and wipe all associated data"""
+    try:
+        auth_svc = service.current_auth_service()
+        auth = _select_profile(auth_svc, name, interactive)
+        if not auth:
+            rprint("[yellow]No profile selected[/yellow]")
+            return
+
+        if auth_svc.delete_profile(auth.name):
+            rprint(f"[green]Logged out from '{auth.name}'[/green]")
+        else:
+            rprint(f"[red]Profile '{auth.name}' not found[/red]")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+# Projects commands
+@auth.command("project")
+@click.argument("project_id", required=False)
+@interactive_option
+@global_options
+def change_project(project_id: str | None, interactive: bool) -> None:
+    """Change the active project for the current profile"""
+    profile = validate_authenticated_profile(interactive)
+    if project_id and profile.project_id == project_id:
+        return
+    auth_svc = service.current_auth_service()
+    if project_id:
+        auth_svc.set_project(profile.name, project_id)
+        rprint(f"[green]Set active project to '{project_id}'[/green]")
+        return
+    if not interactive:
+        raise click.ClickException(
+            "No --project-id provided. Run `llamactl auth project --help` for more information."
+        )
+    try:
+        client = get_control_plane_client()
+        projects = asyncio.run(client.list_projects())
+
+        if not projects:
+            rprint("[yellow]No projects found[/yellow]")
+            return
+        result = questionary.select(
+            "Select a project",
+            choices=[
+                questionary.Choice(
+                    title=f"{project.project_name} ({project.deployment_count} deployments)",
+                    value=project.project_id,
+                )
+                for project in projects
+            ]
+            + (
+                [questionary.Choice(title="Create new project", value="__CREATE__")]
+                if not auth_svc.env.requires_auth
+                else []
+            ),
+        ).ask()
+        if result == "__CREATE__":
+            project_id = questionary.text("Enter project ID").ask()
+            result = project_id
+        if result:
+            auth_svc.set_project(profile.name, result)
+            rprint(f"[green]Set active project to '{result}'[/green]")
+        else:
+            rprint("[yellow]No project selected[/yellow]")
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+def validate_authenticated_profile(interactive: bool) -> Auth:
+    """Validate that the user is authenticated within the current environment.
+
+    - If there is a current profile, return it.
+    - If multiple profiles exist in the current environment, prompt to select in interactive mode.
+    - If none exist:
+      - If environment requires_auth: run token flow inline.
+      - Else: create profile without token after selecting a project.
+    """
+
+    auth_svc = service.current_auth_service()
+    existing = auth_svc.get_current_profile()
+    if existing:
+        return existing
+
+    if not interactive:
+        raise click.ClickException(
+            "No profile configured. Run `llamactl auth token` to create a profile."
+        )
+
+    # Filter profiles by current environment
+    env_profiles = auth_svc.list_profiles()
+    current_env = auth_svc.env
+
+    if len(env_profiles) > 1:
+        # Prompt to select
+        choice: Auth | None = questionary.select(
+            "Select profile",
+            choices=[questionary.Choice(title=p.name, value=p) for p in env_profiles],
+        ).ask()
+        if not choice:
+            raise click.ClickException("No profile selected")
+        auth_svc.set_current_profile(choice.name)
+        return choice
+    if len(env_profiles) == 1:
+        only = env_profiles[0]
+        auth_svc.set_current_profile(only.name)
+        return only
+
+    # No profiles exist for this env
+    if current_env.requires_auth:
+        # Inline token flow
+        created = _token_flow_for_env(auth_svc)
+        return created
+    else:
+        # No auth required: select project and create a default profile without token
+        project_id: str | None = questionary.text("Enter project ID").ask()
+        if not project_id:
+            raise click.ClickException("No project ID provided")
+        created = auth_svc.create_profile_from_token(project_id, None)
+        return created
+
+
+# -----------------------------
+# Helpers for token/profile flow
+# -----------------------------
+
+
+def _prompt_for_api_key() -> str:
+    while True:
+        entered = questionary.password("Enter API key token").ask()
+        if entered:
+            return entered.strip()
+        rprint("[yellow]API key is required[/yellow]")
+
+
+def _validate_token_and_list_projects(
+    auth_svc: AuthService, api_key: str
+) -> list[ProjectSummary]:
+    async def _run():
+        async with ControlPlaneClient.ctx(auth_svc.env.api_url, api_key) as client:
+            return await client.list_projects()
+
+    try:
+        return asyncio.run(_run())
+    except ClientError as e:
+        if getattr(e, "status_code", None) == 401:
+            rprint("[red]Invalid API key. Please try again.[/red]")
+            return _validate_token_and_list_projects(auth_svc, _prompt_for_api_key())
+        if getattr(e, "status_code", None) == 403:
+            rprint("[red]This environment requires a valid API key.[/red]")
+            return _validate_token_and_list_projects(auth_svc, _prompt_for_api_key())
+        raise
+    except Exception as e:
+        raise click.ClickException(f"Failed to validate API key: {e}")
+
+
+def _select_or_enter_project(
+    projects: list[ProjectSummary], requires_auth: bool
+) -> str | None:
+    if not projects:
+        return None
+    # select the only authorized project if there is only one
+    elif len(projects) == 1 and requires_auth:
+        return projects[0].project_id
+    else:
+        choice = questionary.select(
+            "Select a project",
+            choices=[
+                questionary.Choice(
+                    title=f"{p.project_name} ({p.deployment_count} deployments)",
+                    value=p.project_id,
+                )
+                for p in projects
+            ],
+        ).ask()
+        return choice
+
+
+def _token_flow_for_env(auth_service: AuthService) -> Auth:
+    token_value = _prompt_for_api_key()
+    projects = _validate_token_and_list_projects(auth_service, token_value)
+    project_id = _select_or_enter_project(projects, auth_service.env.requires_auth)
+    if not project_id:
+        raise click.ClickException("No project selected")
+    created = auth_service.create_profile_from_token(project_id, token_value)
+    return created
+
+
+def _select_profile(
+    auth_svc: AuthService, profile_name: str | None, is_interactive: bool
+) -> Auth | None:
+    """
+    Select a profile interactively if name not provided.
+    Returns the selected profile name or None if cancelled.
+
+    In non-interactive sessions, returns None if profile_name is not provided.
+    """
+    if profile_name:
+        profile = auth_svc.get_profile(profile_name)
+        if profile:
+            return profile
+
+    # Don't attempt interactive selection in non-interactive sessions
+    if not is_interactive:
+        return None
+
+    try:
+        profiles = auth_svc.list_profiles()
+
+        if not profiles:
+            rprint("[yellow]No profiles found[/yellow]")
+            return None
+
+        choices = []
+        current = auth_svc.get_current_profile()
+
+        for profile in profiles:
+            title = f"{profile.name} ({profile.api_url})"
+            if profile == current:
+                title += " [current]"
+            choices.append(questionary.Choice(title=title, value=profile))
+
+        return questionary.select("Select profile:", choices=choices).ask()
+
+    except Exception as e:
+        rprint(f"[red]Error loading profiles: {e}[/red]")
+        return None

{llamactl-0.3.0a13 → llamactl-0.3.0a15}/src/llama_deploy/cli/commands/deployment.py

@@ -14,6 +14,7 @@ from llama_deploy.cli.commands.auth import validate_authenticated_profile
 from llama_deploy.core.schema.deployments import DeploymentUpdate
 from rich import print as rprint
 from rich.table import Table
+from rich.text import Text
 
 from ..app import app, console
 from ..client import get_project_client
@@ -55,36 +56,23 @@ def list_deployments(interactive: bool) -> None:
             )
             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")
+        table = Table(show_edge=False, box=None, header_style="bold cornflower_blue")
+        table.add_column("Name")
+        table.add_column("Status", style="grey46")
+        table.add_column("Repository", style="grey46")
 
         for deployment in deployments:
-            name = deployment.name
-            deployment_id = deployment.id
+            name = 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 "-"
+            gh = "https://github.com/"
+            if repo_url.startswith(gh):
+                repo_url = "gh:" + repo_url.removeprefix(gh)
 
             table.add_row(
                 name,
-                deployment_id,
                 status,
                 repo_url,
-                deployment_file_path,
-                git_ref,
-                has_pat,
-                secrets_display,
             )
 
         console.print(table)
@@ -114,25 +102,25 @@ def get_deployment(deployment_id: str | None, interactive: bool) -> None:
 
         deployment = asyncio.run(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 = Table(show_edge=False, box=None, header_style="bold cornflower_blue")
+        table.add_column("Property", style="grey46", justify="right")
+        table.add_column("Value")
 
-        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))
+        table.add_row("ID", Text(deployment.id))
+        table.add_row("Project ID", Text(deployment.project_id))
+        table.add_row("Status", Text(deployment.status))
+        table.add_row("Repository", Text(deployment.repo_url))
+        table.add_row("Deployment File", Text(deployment.deployment_file_path))
+        table.add_row("Git Ref", Text(deployment.git_ref or "-"))
 
         apiserver_url = deployment.apiserver_url
-        if apiserver_url:
-            table.add_row("API Server URL", str(apiserver_url))
+        table.add_row(
+            "API Server URL",
+            Text(str(apiserver_url) if apiserver_url else "-"),
+        )
 
-        secret_names = deployment.secret_names
-        if secret_names:
-            table.add_row("Secrets", ", ".join(secret_names))
+        secret_names = deployment.secret_names or []
+        table.add_row("Secrets", Text("\n".join(secret_names), style="italic"))
 
         console.print(table)