llamactl 0.2.7a1__py3-none-any.whl → 0.3.0__py3-none-any.whl

llama_deploy/cli/config/migrations/0002_add_auth_fields.sql

@@ -0,0 +1,24 @@
+PRAGMA user_version=2;
+
+-- Add new fields to profiles: api_key_id and device_oidc (stored as JSON string)
+ALTER TABLE profiles ADD COLUMN api_key_id TEXT;
+ALTER TABLE profiles ADD COLUMN device_oidc TEXT;
+
+-- Add synthetic identifier for profiles
+ALTER TABLE profiles ADD COLUMN id TEXT;
+
+-- Populate existing rows with random UUIDv4 values
+UPDATE profiles
+SET id = lower(
+    hex(randomblob(4)) || '-' ||
+    hex(randomblob(2)) || '-' ||
+    '4' || substr(hex(randomblob(2)), 2) || '-' ||
+    substr('89ab', 1 + (abs(random()) % 4), 1) || substr(hex(randomblob(2)), 2) || '-' ||
+    hex(randomblob(6))
+)
+WHERE id IS NULL;
+
+-- Ensure id values are unique
+CREATE UNIQUE INDEX IF NOT EXISTS idx_profiles_id ON profiles(id);
+
+

llama_deploy/cli/config/migrations/__init__.py

@@ -0,0 +1,7 @@
+"""SQL migrations for llamactl configuration database.
+
+Files are applied in lexicographic order and must start with:
+
+    PRAGMA user_version=N;
+
+"""

llama_deploy/cli/config/schema.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from pydantic import BaseModel
+
+
+@dataclass
+class Auth:
+    """Auth Profile configuration"""
+
+    id: str
+    name: str
+    api_url: str
+    project_id: str
+    api_key: str | None = None
+    # reference to the API key if we created it from device oauth, to be cleaned up
+    # once de-authenticated
+    api_key_id: str | None = None
+    device_oidc: DeviceOIDC | None = None
+
+
+class DeviceOIDC(BaseModel):
+    """Device OIDC configuration"""
+
+    # A name for this device, derived from the host. Used in API key name.
+    device_name: str
+    # A unique user ID to identify the user in the API. Prevents duplicate logins.
+    user_id: str
+    # email of the user
+    email: str
+    # OIDC client ID
+    client_id: str
+    # OIDC discovery URL
+    discovery_url: str
+    # usually 5m long JWT. For calling APIs.
+    device_access_token: str
+    # usually opaque, used to get new access tokens
+    device_refresh_token: str | None = None
+    # usually 1h long JWT. Contains user info (email, name, etc.)
+    device_id_token: str | None = None
+
+
+@dataclass
+class Environment:
+    """Environment configuration stored in SQLite.
+
+    Note: `api_url`, `requires_auth`, and `min_llamactl_version` are persisted
+    in the environments table.
+    """
+
+    api_url: str
+    requires_auth: bool
+    min_llamactl_version: str | None = None
+
+
+DEFAULT_ENVIRONMENT = Environment(
+    api_url="https://api.cloud.llamaindex.ai",
+    requires_auth=True,
+    min_llamactl_version=None,
+)

llama_deploy/cli/env.py

@@ -1,9 +1,11 @@
 """Environment variable handling utilities for llamactl"""
 
-from typing import Dict
 from io import StringIO
-from rich import print as rprint
+from typing import Dict
+
 from dotenv import dotenv_values
+from llama_deploy.cli.styles import WARNING
+from rich import print as rprint
 
 
 def load_env_secrets_from_string(env_content: str) -> Dict[str, str]:
@@ -25,6 +27,6 @@ def load_env_secrets_from_string(env_content: str) -> Dict[str, str]:
         return {k: str(v) for k, v in secrets.items() if v is not None}
     except Exception as e:
         rprint(
-            f"[yellow]Warning: Could not parse environment variables from string: {e}[/yellow]"
+            f"[{WARNING}]Warning: Could not parse environment variables from string: {e}[/]"
         )
         return {}

llama_deploy/cli/interactive_prompts/session_utils.py

@@ -0,0 +1,37 @@
+"""Utilities for detecting and handling interactive CLI sessions."""
+
+import functools
+import os
+import sys
+
+
+@functools.cache
+def is_interactive_session() -> bool:
+    """
+    Detect if the current CLI session is interactive.
+
+    Returns True if the session is interactive (user can be prompted),
+    False if it's non-interactive (e.g., CI/CD, scripted environment).
+
+    This function checks multiple indicators:
+    - Whether stdin/stdout are connected to a TTY
+    - Explicit non-interactive environment variables
+
+    Examples:
+        >>> if is_interactive_session():
+        ...     user_input = questionary.text("Enter value:").ask()
+        ... else:
+        ...     raise click.ClickException("Value required in non-interactive mode")
+    """
+
+    # Check if stdin and stdout are TTYs
+    # This is the most reliable indicator for interactive sessions
+    if not (sys.stdin.isatty() and sys.stdout.isatty()):
+        return False
+
+    # Additional check for TERM environment variable
+    # Some environments set TERM=dumb for non-interactive sessions
+    if os.environ.get("TERM") == "dumb":
+        return False
+
+    return True

llama_deploy/cli/interactive_prompts/utils.py

@@ -1,86 +1,20 @@
 """Shared utilities for CLI operations"""
 
-from typing import Optional
-
 import questionary
-from rich import print as rprint
 from rich.console import Console
 
-from ..client import get_client
-from ..config import config_manager
+from .session_utils import is_interactive_session
 
 console = Console()
 
 
-def select_deployment(deployment_id: Optional[str] = None) -> Optional[str]:
-    """
-    Select a deployment interactively if ID not provided.
-    Returns the selected deployment ID or None if cancelled.
-    """
-    if deployment_id:
-        return deployment_id
-
-    try:
-        client = get_client()
-        deployments = client.list_deployments()
-
-        if not deployments:
-            rprint(
-                f"[yellow]No deployments found for project {client.project_id}[/yellow]"
-            )
-            return None
-
-        choices = []
-        for deployment in deployments:
-            name = deployment.name
-            deployment_id = deployment.id
-            status = deployment.status
-            choices.append(
-                questionary.Choice(
-                    title=f"{name} ({deployment_id}) - {status}", value=deployment_id
-                )
-            )
-
-        return questionary.select("Select deployment:", choices=choices).ask()
-
-    except Exception as e:
-        rprint(f"[red]Error loading deployments: {e}[/red]")
-        return None
-
-
-def select_profile(profile_name: Optional[str] = None) -> Optional[str]:
-    """
-    Select a profile interactively if name not provided.
-    Returns the selected profile name or None if cancelled.
-    """
-    if profile_name:
-        return profile_name
-
-    try:
-        profiles = config_manager.list_profiles()
-
-        if not profiles:
-            rprint("[yellow]No profiles found[/yellow]")
-            return None
-
-        choices = []
-        current_name = config_manager.get_current_profile_name()
-
-        for profile in profiles:
-            title = f"{profile.name} ({profile.api_url})"
-            if profile.name == current_name:
-                title += " [current]"
-            choices.append(questionary.Choice(title=title, value=profile.name))
-
-        return questionary.select("Select profile:", choices=choices).ask()
-
-    except Exception as e:
-        rprint(f"[red]Error loading profiles: {e}[/red]")
-        return None
-
-
 def confirm_action(message: str, default: bool = False) -> bool:
     """
     Ask for confirmation with a consistent interface.
+
+    In non-interactive sessions, returns the default value without prompting.
     """
+    if not is_interactive_session():
+        return default
+
     return questionary.confirm(message, default=default).ask() or False

llama_deploy/cli/options.py

@@ -1,21 +1,43 @@
 import logging
+from typing import Callable, ParamSpec, TypeVar
+
 import click
+from llama_deploy.cli.interactive_prompts.session_utils import is_interactive_session
+
+from .debug import setup_file_logging
 
+P = ParamSpec("P")
+R = TypeVar("R")
 
-def global_options(f):
+
+def global_options(f: Callable[P, R]) -> Callable[P, R]:
     """Common decorator to add global options to command groups"""
-    from .debug import setup_file_logging
 
-    def debug_callback(ctx, param, value):
+    def debug_callback(ctx: click.Context, param: click.Parameter, value: str) -> str:
         if value:
-            setup_file_logging(level=logging._nameToLevel[value])
+            setup_file_logging(level=logging._nameToLevel.get(value, logging.INFO))
         return value
 
     return click.option(
         "--log-level",
-        type=click.Choice(["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]),
+        type=click.Choice(
+            ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False
+        ),
         help="Enable debug logging to file",
         callback=debug_callback,
         expose_value=False,
         is_eager=True,
+        hidden=True,
+    )(f)
+
+
+def interactive_option(f: Callable[P, R]) -> Callable[P, R]:
+    """Add an interactive option to the command"""
+
+    default = is_interactive_session()
+    return click.option(
+        "--interactive/--no-interactive",
+        help="Run in interactive mode. If not provided, will default to the current session's interactive state.",
+        is_flag=True,
+        default=default,
     )(f)

llama_deploy/cli/styles.py

@@ -0,0 +1,10 @@
+# A place to centralize design tokens to simplify tweaking the appearance of the CLI
+# See https://rich.readthedocs.io/en/stable/appendix/colors.html
+
+
+HEADER_COLOR = "cornflower_blue"
+HEADER_COLOR_HEX = "#5f87ff"
+PRIMARY_COL = "default"
+MUTED_COL = "grey46"
+WARNING = "yellow"
+ACTIVE_INDICATOR = "magenta"