llamactl 0.3.0a16__tar.gz → 0.3.0a18__tar.gz

{llamactl-0.3.0a16 → llamactl-0.3.0a18}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a16
+Version: 0.3.0a18
 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.0a16,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.0a16,<0.4.0
-Requires-Dist: httpx>=0.24.0
+Requires-Dist: llama-deploy-core[client]>=0.3.0a18,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a18,<0.4.0
+Requires-Dist: httpx>=0.24.0,<1.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
 Requires-Dist: click>=8.2.1

{llamactl-0.3.0a16 → llamactl-0.3.0a18}/pyproject.toml

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

{llamactl-0.3.0a16 → llamactl-0.3.0a18}/src/llama_deploy/cli/commands/auth.py

@@ -276,11 +276,10 @@ def validate_authenticated_profile(interactive: bool) -> Auth:
 
 
 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]")
+    entered = questionary.password("Enter API key token").ask()
+    if entered:
+        return entered.strip()
+    raise click.ClickException("No API key entered")
 
 
 def _validate_token_and_list_projects(

llamactl-0.3.0a18/src/llama_deploy/cli/commands/serve.py

@@ -0,0 +1,199 @@
+import os
+from pathlib import Path
+
+import click
+import questionary
+from llama_deploy.appserver.app import (
+    prepare_server,
+    start_server_in_target_venv,
+)
+from llama_deploy.appserver.workflow_loader import parse_environment_variables
+from llama_deploy.cli.commands.auth import validate_authenticated_profile
+from llama_deploy.cli.config.env_service import service
+from llama_deploy.cli.config.schema import Auth
+from llama_deploy.cli.options import interactive_option
+from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
+from llama_deploy.core.deployment_config import (
+    read_deployment_config_from_git_root_or_cwd,
+)
+from rich import print as rprint
+
+from ..app import app
+
+
+@app.command(
+    "serve",
+    help="Serve a LlamaDeploy app locally for development and testing",
+)
+@click.argument(
+    "deployment_file",
+    required=False,
+    default=DEFAULT_DEPLOYMENT_FILE_PATH,
+    type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+)
+@click.option(
+    "--no-install", is_flag=True, help="Skip installing python and js dependencies"
+)
+@click.option(
+    "--no-reload", is_flag=True, help="Skip reloading the API server on code changes"
+)
+@click.option("--no-open-browser", is_flag=True, help="Skip opening the browser")
+@click.option(
+    "--preview",
+    is_flag=True,
+    help="Preview mode pre-builds the UI to static files, like a production build",
+)
+@click.option("--port", type=int, help="The port to run the API server on")
+@click.option("--ui-port", type=int, help="The port to run the UI proxy server on")
+@click.option(
+    "--log-level",
+    type=click.Choice(
+        ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False
+    ),
+    help="The log level to run the API server at",
+)
+@click.option(
+    "--log-format",
+    type=click.Choice(["console", "json"], case_sensitive=False),
+    help="The format to use for logging",
+)
+@interactive_option
+def serve(
+    deployment_file: Path,
+    no_install: bool,
+    no_reload: bool,
+    no_open_browser: bool,
+    preview: bool,
+    port: int | None = None,
+    ui_port: int | None = None,
+    log_level: str | None = None,
+    log_format: str | None = None,
+    interactive: bool = False,
+) -> None:
+    """Run llama_deploy API Server in the foreground. Reads the deployment configuration from the current directory. Can optionally specify a deployment file path."""
+    if not deployment_file.exists():
+        rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
+        raise click.Abort()
+
+    try:
+        # Pre-check: if the template requires llama cloud access, ensure credentials
+        _maybe_inject_llama_cloud_credentials(deployment_file, interactive)
+
+        prepare_server(
+            deployment_file=deployment_file,
+            install=not no_install,
+            build=preview,
+        )
+        start_server_in_target_venv(
+            cwd=Path.cwd(),
+            deployment_file=deployment_file,
+            proxy_ui=not preview,
+            reload=not no_reload,
+            open_browser=not no_open_browser,
+            port=port,
+            ui_port=ui_port,
+            log_level=log_level.upper() if log_level else None,
+            log_format=log_format.lower() if log_format else None,
+        )
+
+    except KeyboardInterrupt:
+        print("Shutting down...")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+def _set_env_vars_from_profile(profile: Auth):
+    if profile.api_key:
+        _set_env_vars(profile.api_key, profile.api_url)
+
+
+def _set_env_vars_from_env(env_vars: dict[str, str]):
+    key = env_vars.get("LLAMA_CLOUD_API_KEY")
+    url = env_vars.get("LLAMA_CLOUD_BASE_URL", "https://api.cloud.llamaindex.ai")
+    if key:
+        _set_env_vars(key, url)
+
+
+def _set_env_vars(key: str, url: str):
+    print(f"Setting env vars: {key}, {url}")
+    os.environ["LLAMA_CLOUD_API_KEY"] = key
+    os.environ["LLAMA_CLOUD_BASE_URL"] = url
+    # kludge for common web servers to inject local auth key
+    for prefix in ["VITE_", "NEXT_PUBLIC_"]:
+        os.environ[f"{prefix}LLAMA_CLOUD_API_KEY"] = key
+        os.environ[f"{prefix}LLAMA_CLOUD_BASE_URL"] = url
+
+
+def _maybe_inject_llama_cloud_credentials(
+    deployment_file: Path, interactive: bool
+) -> None:
+    """If the deployment config indicates Llama Cloud usage, ensure LLAMA_CLOUD_API_KEY is set.
+
+    Behavior:
+    - If LLAMA_CLOUD_API_KEY is already set, do nothing.
+    - Else, try to read current profile's api_key and inject.
+    - If no profile/api_key and session is interactive, prompt to log in and inject afterward.
+    - If user declines or session is non-interactive, warn that deployment may not work.
+    """
+    # Read config directly to avoid cached global settings
+    try:
+        config = read_deployment_config_from_git_root_or_cwd(
+            Path.cwd(), deployment_file
+        )
+    except Exception:
+        rprint(
+            "[red]Error: Could not read a deployment config. This doesn't appear to be a valid llama-deploy project.[/red]"
+        )
+        raise click.Abort()
+
+    if not config.llama_cloud:
+        return
+
+    vars = parse_environment_variables(
+        config, deployment_file.parent if deployment_file.is_file() else deployment_file
+    )
+
+    existing = os.environ.get("LLAMA_CLOUD_API_KEY") or vars.get("LLAMA_CLOUD_API_KEY")
+    if existing:
+        _set_env_vars_from_env({**os.environ, **vars})
+        return
+
+    env = service.get_current_environment()
+    if not env.requires_auth:
+        rprint(
+            "[yellow]Warning: This app requires Llama Cloud authentication, and no LLAMA_CLOUD_API_KEY is present. The app may not work.[/yellow]"
+        )
+        return
+
+    auth_svc = service.current_auth_service()
+    profile = auth_svc.get_current_profile()
+    if profile and profile.api_key:
+        _set_env_vars_from_profile(profile)
+        return
+
+    # No key available; consider prompting if interactive
+    if interactive:
+        should_login = questionary.confirm(
+            "This deployment requires Llama Cloud. Login now to inject credentials?",
+            default=True,
+        ).ask()
+        if should_login:
+            try:
+                authed = validate_authenticated_profile(True)
+                if authed.api_key:
+                    _set_env_vars_from_profile(authed)
+                    return
+            except Exception:
+                # fall through to warning
+                pass
+        rprint(
+            "[yellow]Warning: No Llama Cloud credentials configured. The app may not work.[/yellow]"
+        )
+        return
+
+    # Non-interactive session
+    rprint(
+        "[yellow]Warning: LLAMA_CLOUD_API_KEY is not set and no logged-in profile was found. The deployment may not work.[/yellow]"
+    )

{llamactl-0.3.0a16 → llamactl-0.3.0a18}/src/llama_deploy/cli/config/_config.py

@@ -79,13 +79,40 @@ class ConfigManager:
                 if "api_key" not in mig_columns:
                     conn.execute("ALTER TABLE profiles ADD COLUMN api_key TEXT")
 
+            # Migration: change profiles primary key from name to composite (name, api_url)
+            # Only perform if the table exists with single-column PK on name
+            pk_info_cur = conn.execute("PRAGMA table_info(profiles)")
+            pk_info_rows = pk_info_cur.fetchall()
+            pk_columns = [row[1] for row in pk_info_rows if len(row) > 5 and row[5] > 0]
+            if pk_columns == ["name"] and "api_url" in columns:
+                conn.execute("ALTER TABLE profiles RENAME TO profiles_old")
+                conn.execute(
+                    """
+                    CREATE TABLE profiles (
+                        name TEXT NOT NULL,
+                        api_url TEXT NOT NULL,
+                        project_id TEXT NOT NULL,
+                        api_key TEXT,
+                        PRIMARY KEY (name, api_url)
+                    )
+                    """
+                )
+                conn.execute(
+                    """
+                    INSERT INTO profiles (name, api_url, project_id, api_key)
+                    SELECT name, api_url, project_id, api_key FROM profiles_old
+                    """
+                )
+                conn.execute("DROP TABLE profiles_old")
+
             # Create tables with new schema (this will only create if they don't exist)
             conn.execute("""
                 CREATE TABLE IF NOT EXISTS profiles (
-                    name TEXT PRIMARY KEY,
+                    name TEXT NOT NULL,
                     api_url TEXT NOT NULL,
                     project_id TEXT NOT NULL,
-                    api_key TEXT
+                    api_key TEXT,
+                    PRIMARY KEY (name, api_url)
                 )
             """)
 
@@ -177,7 +204,9 @@ class ConfigManager:
                 )
                 conn.commit()
             except sqlite3.IntegrityError:
-                raise ValueError(f"Profile '{name}' already exists")
+                raise ValueError(
+                    f"Profile '{name}' already exists for environment '{api_url}'"
+                )
 
         return profile
 

{llamactl-0.3.0a16 → llamactl-0.3.0a18}/src/llama_deploy/cli/config/auth_service.py

@@ -64,5 +64,5 @@ def _auto_profile_name_from_token(api_key: str) -> str:
     cleaned = token.replace(" ", "")
     first = cleaned[:6]
     last = cleaned[-4:] if len(cleaned) > 10 else cleaned[-2:]
-    base = f"token-{first}-{last}"
+    base = f"{first}****{last}"
     return base

{llamactl-0.3.0a16 → llamactl-0.3.0a18}/src/llama_deploy/cli/config/env_service.py

@@ -30,6 +30,8 @@ class EnvService:
         self.config_manager.create_or_update_environment(
             env.api_url, env.requires_auth, env.min_llamactl_version
         )
+        self.config_manager.set_settings_current_environment(env.api_url)
+        self.config_manager.set_settings_current_profile(None)
 
     def delete_environment(self, api_url: str) -> bool:
         return self.config_manager.delete_environment(api_url)

llamactl-0.3.0a16/src/llama_deploy/cli/commands/serve.py

@@ -1,88 +0,0 @@
-from pathlib import Path
-
-import click
-from llama_deploy.appserver.app import (
-    prepare_server,
-    start_server_in_target_venv,
-)
-from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
-from rich import print as rprint
-
-from ..app import app
-
-
-@app.command(
-    "serve",
-    help="Serve a LlamaDeploy app locally for development and testing",
-)
-@click.argument(
-    "deployment_file",
-    required=False,
-    default=DEFAULT_DEPLOYMENT_FILE_PATH,
-    type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
-)
-@click.option(
-    "--no-install", is_flag=True, help="Skip installing python and js dependencies"
-)
-@click.option(
-    "--no-reload", is_flag=True, help="Skip reloading the API server on code changes"
-)
-@click.option("--no-open-browser", is_flag=True, help="Skip opening the browser")
-@click.option(
-    "--preview",
-    is_flag=True,
-    help="Preview mode pre-builds the UI to static files, like a production build",
-)
-@click.option("--port", type=int, help="The port to run the API server on")
-@click.option("--ui-port", type=int, help="The port to run the UI proxy server on")
-@click.option(
-    "--log-level",
-    type=click.Choice(
-        ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False
-    ),
-    help="The log level to run the API server at",
-)
-@click.option(
-    "--log-format",
-    type=click.Choice(["console", "json"], case_sensitive=False),
-    help="The format to use for logging",
-)
-def serve(
-    deployment_file: Path,
-    no_install: bool,
-    no_reload: bool,
-    no_open_browser: bool,
-    preview: bool,
-    port: int | None = None,
-    ui_port: int | None = None,
-    log_level: str | None = None,
-    log_format: str | None = None,
-) -> None:
-    """Run llama_deploy API Server in the foreground. Reads the deployment configuration from the current directory. Can optionally specify a deployment file path."""
-    if not deployment_file.exists():
-        rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
-        raise click.Abort()
-
-    try:
-        prepare_server(
-            install=not no_install,
-            build=preview,
-        )
-        start_server_in_target_venv(
-            cwd=Path.cwd(),
-            deployment_file=deployment_file,
-            proxy_ui=not preview,
-            reload=not no_reload,
-            open_browser=not no_open_browser,
-            port=port,
-            ui_port=ui_port,
-            log_level=log_level.upper() if log_level else None,
-            log_format=log_format.lower() if log_format else None,
-        )
-
-    except KeyboardInterrupt:
-        print("Shutting down...")
-
-    except Exception as e:
-        rprint(f"[red]Error: {e}[/red]")
-        raise click.Abort()