llamactl 0.3.0a16__py3-none-any.whl → 0.3.0a18__py3-none-any.whl

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(

llama_deploy/cli/commands/serve.py

@@ -1,11 +1,21 @@
+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
@@ -47,6 +57,7 @@ from ..app import app
     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,
@@ -57,6 +68,7 @@ def serve(
     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():
@@ -64,7 +76,11 @@ def serve(
         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,
         )
@@ -86,3 +102,98 @@ def serve(
     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]"
+    )

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
 

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

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.dist-info → llamactl-0.3.0a18.dist-info}/METADATA

@@ -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.dist-info → llamactl-0.3.0a18.dist-info}/RECORD

@@ -2,14 +2,14 @@ llama_deploy/cli/__init__.py,sha256=df028686233c4d5a3e244bb50c1c7b84cf2399ae03ab
 llama_deploy/cli/app.py,sha256=9170e4f506c482522bd745eb1cdb700a198cfcfd7204c168c94e5ee2b6b43ffa,2199
 llama_deploy/cli/client.py,sha256=f0f72c90cddfbc9198e154883f3b8f05fb47dbe7ec1f5755106dbb8009d2bb54,1459
 llama_deploy/cli/commands/aliased_group.py,sha256=bc41007c97b7b93981217dbd4d4591df2b6c9412a2d9ed045b0ec5655ed285f2,1066
-llama_deploy/cli/commands/auth.py,sha256=de584d11c1acf5a4e7aee8c8f30184335053ed206d38dbc8509b2d1d0677a092,12640
+llama_deploy/cli/commands/auth.py,sha256=da8ad888a199955b8c970e84e6933c92211a1c823e77ec6d746ed994e09c7adf,12610
 llama_deploy/cli/commands/deployment.py,sha256=ae6e20c216edf51df94cd66397743076bb97ee2b64bccd14e602e9642fe6befd,9980
 llama_deploy/cli/commands/env.py,sha256=e0b96b9f4e7921b4370ad5f8bc0a2bfb19b705e73004f72c37c9bed28a208e0d,6702
 llama_deploy/cli/commands/init.py,sha256=51b2de1e35ff34bc15c9dfec72fbad08aaf528c334df168896d36458a4e9401c,6307
-llama_deploy/cli/commands/serve.py,sha256=4d47850397ba172944df56a934a51bedb52403cbd3f9b000b1ced90a31c75049,2721
-llama_deploy/cli/config/_config.py,sha256=31376c3f3ecadaf52545e4aeb4a660dde2c22d7e6c33b232ec93eebeb926e3fb,14953
-llama_deploy/cli/config/auth_service.py,sha256=38a2de9bbcf5780675130d90e4f9116da190fd31a33e1c178a7f3847b943c229,2667
-llama_deploy/cli/config/env_service.py,sha256=6e50ffe2e33dcff4193c87b3df8daac71542d406314a7bcaf48187715a53780e,2445
+llama_deploy/cli/commands/serve.py,sha256=1841c9c63fdd6616b28f36ab899582bfd5b513ed77f3d176e99ccaa8bdd7944a,6775
+llama_deploy/cli/config/_config.py,sha256=91caae934d27f2b956156a4e9f5df151692786e139e7e13611961df0dd67a3b5,16287
+llama_deploy/cli/config/auth_service.py,sha256=d1c978e1249276285db7aa7b490ca3f6d06e892c0cb171bdbe08799fe55d1d40,2664
+llama_deploy/cli/config/env_service.py,sha256=d8583b1632aec33c74bfe62fa5f3489161dbc00edbfb317f24907a0bc8ac671b,2582
 llama_deploy/cli/config/schema.py,sha256=086b6161b238c2037068a2b510f5d4bbda917494df764818ff9692e9735a8953,608
 llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f767385895c440afc762,496
 llama_deploy/cli/env.py,sha256=6ebc24579815b3787829c81fd5bb9f31698a06e62c0128a788559f962b33a7af,1016
@@ -26,7 +26,7 @@ llama_deploy/cli/textual/github_callback_server.py,sha256=dc74c510f8a98ef6ffaab0
 llama_deploy/cli/textual/llama_loader.py,sha256=33cb32a46dd40bcf889c553e44f2672c410e26bd1d4b17aa6cca6d0a5d59c2c4,1468
 llama_deploy/cli/textual/secrets_form.py,sha256=a43fbd81aad034d0d60906bfd917c107f9ace414648b0f63ac0b29eeba4050db,7061
 llama_deploy/cli/textual/styles.tcss,sha256=b1a54dc5fb0e0aa12cbf48807e9e6a94b9926838b8058dae1336a134f02e92b0,3327
-llamactl-0.3.0a16.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.0a16.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.0a16.dist-info/METADATA,sha256=f3383216d44bc4e4bd19e7589cac4e4e24918f513ad9d2b46498f4848a380047,3177
-llamactl-0.3.0a16.dist-info/RECORD,,
+llamactl-0.3.0a18.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.0a18.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.0a18.dist-info/METADATA,sha256=a7089a1d4aac69fdc32c230ea89700ec038b320d8a8e297c908bf01b3c7ede2a,3184
+llamactl-0.3.0a18.dist-info/RECORD,,