llamactl 0.3.0a23__tar.gz → 0.3.0a24__tar.gz

{llamactl-0.3.0a23 → llamactl-0.3.0a24}/PKG-INFO

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

{llamactl-0.3.0a23 → llamactl-0.3.0a24}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.0a23"
+version = "0.3.0a24"
 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.0a23,<0.4.0",
-    "llama-deploy-appserver>=0.3.0a23,<0.4.0",
+    "llama-deploy-core[client]>=0.3.0a24,<0.4.0",
+    "llama-deploy-appserver>=0.3.0a24,<0.4.0",
     "httpx>=0.24.0,<1.0.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",

{llamactl-0.3.0a23 → llamactl-0.3.0a24}/src/llama_deploy/cli/commands/auth.py

@@ -5,10 +5,12 @@ import platform
 import subprocess
 import sys
 import webbrowser
+from pathlib import Path
 
 import click
 import httpx
 import questionary
+from dotenv import set_key
 from llama_deploy.cli.auth.client import (
     DeviceAuthorizationRequest,
     OIDCClient,
@@ -28,6 +30,7 @@ from llama_deploy.cli.styles import (
     PRIMARY_COL,
     WARNING,
 )
+from llama_deploy.cli.utils.env_inject import env_vars_from_profile
 from llama_deploy.core.client.manage_client import (
     ControlPlaneClient,
 )
@@ -314,6 +317,56 @@ def change_project(project_id: str | None, interactive: bool) -> None:
         raise click.Abort()
 
 
+@auth.command("inject")
+@global_options
+@click.option(
+    "--env-file",
+    "env_file",
+    default=Path(".env"),
+    type=click.Path(dir_okay=False, resolve_path=True, path_type=Path),
+    help="Path to the .env file to write",
+)
+@interactive_option
+def inject_env_vars(
+    env_file: Path,
+    interactive: bool,
+) -> None:
+    """Inject auth environment variables into a .env file.
+
+    Writes LLAMA_CLOUD_API_KEY, LLAMA_CLOUD_BASE_URL, and LLAMA_DEPLOY_PROJECT_ID
+    based on the current profile. Always overwrites and creates the file if missing.
+    """
+    try:
+        auth_svc = service.current_auth_service()
+        profile = auth_svc.get_current_profile()
+        if not profile:
+            if interactive:
+                profile = validate_authenticated_profile(True)
+            else:
+                raise click.ClickException(
+                    "No profile configured. Run `llamactl auth token` to create a profile."
+                )
+        if not profile.api_key:
+            raise click.ClickException(
+                "Current profile is unauthenticated (missing API key)"
+            )
+
+        vars = env_vars_from_profile(profile)
+        if not vars:
+            rprint(f"[{WARNING}]No variables to inject[/]")
+            return
+        env_file.parent.mkdir(parents=True, exist_ok=True)
+        for key, value in vars.items():
+            set_key(str(env_file), key, value)
+        rel = os.path.relpath(env_file, Path.cwd())
+        rprint(
+            f"[green]Wrote environment variables: {', '.join(vars.keys())} to {rel}[/green]"
+        )
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
 def _auto_device_name() -> str:
     try:
         if sys.platform == "darwin":  # macOS

{llamactl-0.3.0a23 → llamactl-0.3.0a24}/src/llama_deploy/cli/commands/serve.py

@@ -1,6 +1,7 @@
 import logging
 import os
 from pathlib import Path
+from typing import Literal
 
 import click
 import questionary
@@ -8,6 +9,7 @@ from llama_deploy.appserver.app import (
     prepare_server,
     start_server_in_target_venv,
 )
+from llama_deploy.appserver.deployment_config_parser import get_deployment_config
 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
@@ -61,6 +63,16 @@ logger = logging.getLogger(__name__)
     type=click.Choice(["console", "json"], case_sensitive=False),
     help="The format to use for logging",
 )
+@click.option(
+    "--persistence",
+    type=click.Choice(["memory", "local", "cloud"]),
+    help="The persistence mode to use for the workflow server",
+)
+@click.option(
+    "--local-persistence-path",
+    type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+    help="The path to the sqlite database to use for the workflow server if using local persistence",
+)
 @interactive_option
 def serve(
     deployment_file: Path,
@@ -72,6 +84,8 @@ def serve(
     ui_port: int | None = None,
     log_level: str | None = None,
     log_format: str | None = None,
+    persistence: Literal["memory", "local", "cloud"] | None = None,
+    local_persistence_path: Path | 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."""
@@ -81,13 +95,16 @@ def serve(
 
     try:
         # Pre-check: if the template requires llama cloud access, ensure credentials
-        _maybe_inject_llama_cloud_credentials(deployment_file, interactive)
+        _maybe_inject_llama_cloud_credentials(
+            deployment_file, interactive, require_cloud=persistence == "cloud"
+        )
 
         prepare_server(
             deployment_file=deployment_file,
             install=not no_install,
             build=preview,
         )
+        deployment_config = get_deployment_config()
         start_server_in_target_venv(
             cwd=Path.cwd(),
             deployment_file=deployment_file,
@@ -98,6 +115,13 @@ def serve(
             ui_port=ui_port,
             log_level=log_level.upper() if log_level else None,
             log_format=log_format.lower() if log_format else None,
+            persistence=persistence if persistence else "local",
+            local_persistence_path=str(local_persistence_path)
+            if local_persistence_path and persistence == "local"
+            else None,
+            cloud_persistence_name=f"_public:serve_workflows_{deployment_config.name}"
+            if persistence == "cloud"
+            else None,
         )
 
     except KeyboardInterrupt:
@@ -144,7 +168,7 @@ def _set_project_id_from_profile(profile: Auth):
 
 
 def _maybe_inject_llama_cloud_credentials(
-    deployment_file: Path, interactive: bool
+    deployment_file: Path, interactive: bool, require_cloud: bool
 ) -> None:
     """If the deployment config indicates Llama Cloud usage, ensure LLAMA_CLOUD_API_KEY is set.
 
@@ -165,7 +189,7 @@ def _maybe_inject_llama_cloud_credentials(
         )
         raise click.Abort()
 
-    if not config.llama_cloud:
+    if not config.llama_cloud and not require_cloud:
         return
 
     vars = parse_environment_variables(

llamactl-0.3.0a24/src/llama_deploy/cli/utils/env_inject.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+from typing import Dict
+
+from llama_deploy.cli.config.schema import Auth
+
+
+def env_vars_from_profile(profile: Auth) -> Dict[str, str]:
+    """Return env var values derived strictly from the given profile.
+
+    Produces the three keys expected by CLI commands:
+    - LLAMA_CLOUD_API_KEY
+    - LLAMA_CLOUD_BASE_URL
+    - LLAMA_DEPLOY_PROJECT_ID
+    """
+    values: Dict[str, str] = {}
+    if profile.api_key:
+        values["LLAMA_CLOUD_API_KEY"] = profile.api_key
+    if profile.api_url:
+        values["LLAMA_CLOUD_BASE_URL"] = profile.api_url
+    if profile.project_id:
+        values["LLAMA_DEPLOY_PROJECT_ID"] = profile.project_id
+    return values