llamactl 0.3.0a19__py3-none-any.whl → 0.3.0a21__py3-none-any.whl

llama_deploy/cli/commands/env.py

@@ -3,6 +3,13 @@ from importlib import metadata as importlib_metadata
 import click
 import questionary
 from llama_deploy.cli.config.schema import Environment
+from llama_deploy.cli.styles import (
+    ACTIVE_INDICATOR,
+    HEADER_COLOR,
+    MUTED_COL,
+    PRIMARY_COL,
+    WARNING,
+)
 from packaging import version as packaging_version
 from rich import print as rprint
 from rich.table import Table
@@ -32,23 +39,21 @@ def list_environments_cmd() -> None:
         current_env = service.get_current_environment()
 
         if not envs:
-            rprint("[yellow]No environments found[/yellow]")
+            rprint(f"[{WARNING}]No environments found[/]")
             return
 
-        table = Table(show_edge=False, box=None, header_style="bold cornflower_blue")
-        table.add_column("  API URL")
-        table.add_column("Requires Auth")
+        table = Table(show_edge=False, box=None, header_style=f"bold {HEADER_COLOR}")
+        table.add_column("  API URL", style=PRIMARY_COL)
+        table.add_column("Requires Auth", style=MUTED_COL)
 
         for env in envs:
             text = Text()
             if env == current_env:
-                text.append("* ", style="magenta")
+                text.append("* ", style=ACTIVE_INDICATOR)
             else:
                 text.append("  ")
             text.append(env.api_url)
-            table.add_row(
-                text, Text("true" if env.requires_auth else "false", style="grey46")
-            )
+            table.add_row(text, Text("true" if env.requires_auth else "false"))
 
         console.print(table)
     except Exception as e:
@@ -70,7 +75,7 @@ def add_environment_cmd(api_url: str | None, interactive: bool) -> None:
                 "Enter control plane API URL", default=current_env.api_url
             ).ask()
             if not entered:
-                rprint("[yellow]No environment entered[/yellow]")
+                rprint(f"[{WARNING}]No environment entered[/]")
                 return
             api_url = entered.strip()
 
@@ -102,7 +107,7 @@ def delete_environment_cmd(api_url: str | None, interactive: bool) -> None:
             )
 
             if not result:
-                rprint("[yellow]No environment selected[/yellow]")
+                rprint(f"[{WARNING}]No environment selected[/]")
                 return
             api_url = result.api_url
 
@@ -133,13 +138,13 @@ def switch_environment_cmd(api_url: str | None, interactive: bool) -> None:
                 "Select environment",
             )
             if not result:
-                rprint("[yellow]No environment selected[/yellow]")
+                rprint(f"[{WARNING}]No environment selected[/]")
                 return
             selected_url = result.api_url
 
         if not selected_url:
             if interactive:
-                rprint("[yellow]No environment selected[/yellow]")
+                rprint(f"[{WARNING}]No environment selected[/]")
                 return
             raise click.ClickException("API URL is required when not interactive")
 
@@ -150,7 +155,7 @@ def switch_environment_cmd(api_url: str | None, interactive: bool) -> None:
         try:
             env = service.auto_update_env(env)
         except Exception as e:
-            rprint(f"[yellow]Failed to resolve environment: {e}[/yellow]")
+            rprint(f"[{WARNING}]Failed to resolve environment: {e}[/]")
             return
         service.current_auth_service().select_any_profile()
         rprint(f"[green]Switched to environment[/green] {env.api_url}")
@@ -176,7 +181,7 @@ def _maybe_warn_min_version(min_required: str | None) -> None:
     try:
         if packaging_version.parse(current) < packaging_version.parse(min_required):
             rprint(
-                f"[yellow]Warning:[/yellow] This environment requires llamactl >= [bold]{min_required}[/bold], you have [bold]{current}[/bold]."
+                f"[{WARNING}]Warning:[/] This environment requires llamactl >= [bold]{min_required}[/bold], you have [bold]{current}[/bold]."
             )
     except Exception:
         # If packaging is not available or parsing fails, skip strict comparison

llama_deploy/cli/commands/init.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+import asyncio
 import os
 import shutil
 import subprocess
@@ -10,7 +13,11 @@ import questionary
 from click.exceptions import Exit
 from llama_deploy.cli.app import app
 from llama_deploy.cli.options import global_options
+from llama_deploy.cli.styles import HEADER_COLOR_HEX
 from rich import print as rprint
+from vibe_llama.scaffold import create_scaffold
+from vibe_llama.scaffold.scaffold import ProjectName
+from vibe_llama.sdk import VibeLlamaStarter
 
 
 @dataclass
@@ -18,21 +25,82 @@ class TemplateOption:
     id: str
     name: str
     description: str
-    git_url: str
+    source: VibeLlamaTemplate | GithubTemplateRepo
+    llama_cloud: bool
+
 
+@dataclass
+class VibeLlamaTemplate:
+    name: ProjectName
 
-options = [
+
+@dataclass
+class GithubTemplateRepo:
+    url: str
+
+
+ui_options = [
     TemplateOption(
         id="basic-ui",
         name="Basic UI",
         description="A basic starter workflow with a React Vite UI",
-        git_url="https://github.com/run-llama/template-workflow-basic-ui",
+        source=GithubTemplateRepo(
+            url="https://github.com/run-llama/template-workflow-basic-ui"
+        ),
+        llama_cloud=False,
     ),
     TemplateOption(
         id="extraction-review",
         name="Extraction Agent with Review UI",
         description="Extract data from documents using a custom schema and Llama Cloud. Includes a UI to review and correct the results",
-        git_url="https://github.com/run-llama/template-workflow-data-extraction",
+        source=GithubTemplateRepo(
+            url="https://github.com/run-llama/template-workflow-data-extraction"
+        ),
+        llama_cloud=True,
+    ),
+]
+headless_options = [
+    TemplateOption(
+        id="basic",
+        name="Basic Workflow",
+        description="A base example that showcases usage patterns for workflows",
+        source=VibeLlamaTemplate(name="basic"),
+        llama_cloud=False,
+    ),
+    TemplateOption(
+        id="document_parsing",
+        name="Document Parser",
+        description="A workflow that, using LlamaParse, parses unstructured documents and returns their raw text content",
+        source=VibeLlamaTemplate(name="document_parsing"),
+        llama_cloud=True,
+    ),
+    TemplateOption(
+        id="human_in_the_loop",
+        name="Human in the Loop",
+        description="A workflow showcasing how to use human in the loop with LlamaIndex workflows",
+        source=VibeLlamaTemplate(name="human_in_the_loop"),
+        llama_cloud=False,
+    ),
+    TemplateOption(
+        id="invoice_extraction",
+        name="Invoice Extraction",
+        description="A workflow that, given an invoice, extracts several key details using LlamaExtract",
+        source=VibeLlamaTemplate(name="invoice_extraction"),
+        llama_cloud=True,
+    ),
+    TemplateOption(
+        id="rag",
+        name="RAG",
+        description="A workflow that embeds, indexes and queries your documents on the fly, providing you with a simple RAG pipeline",
+        source=VibeLlamaTemplate(name="rag"),
+        llama_cloud=False,
+    ),
+    TemplateOption(
+        id="web_scraping",
+        name="Web Scraping",
+        description="A workflow that, given several urls, scrapes and summarizes their content using Google's Gemini API",
+        source=VibeLlamaTemplate(name="web_scraping"),
+        llama_cloud=False,
     ),
 ]
 
@@ -45,7 +113,7 @@ options = [
 )
 @click.option(
     "--template",
-    type=click.Choice([o.id for o in options]),
+    type=click.Choice([o.id for o in ui_options]),
     help="The template to use for the new app",
 )
 @click.option(
@@ -76,12 +144,29 @@ def init(
 
 def _create(template: str | None, dir: Path | None, force: bool) -> None:
     if template is None:
+        rprint(
+            "[bold]Select a template to start from.[/bold] Either with javascript frontend UI, or just a python workflow that can be used as an API."
+        )
         template = questionary.select(
-            "Choose a template",
-            choices=[
+            "",
+            choices=[questionary.Separator("------------ With UI -------------")]
+            + [
+                questionary.Choice(title=o.name, value=o.id, description=o.description)
+                for o in ui_options
+            ]
+            + [
+                questionary.Separator(" "),
+                questionary.Separator("--- Headless Workflows (No UI) ---"),
+            ]
+            + [
                 questionary.Choice(title=o.name, value=o.id, description=o.description)
-                for o in options
+                for o in headless_options
             ],
+            style=questionary.Style(
+                [
+                    ("separator", f"fg:{HEADER_COLOR_HEX}"),
+                ]
+            ),
         ).ask()
     if template is None:
         rprint("No template selected")
@@ -94,7 +179,9 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
             rprint("No directory provided")
             raise Exit(1)
         dir = Path(dir_str)
-    resolved_template = next((o for o in options if o.id == template), None)
+    resolved_template: TemplateOption | None = next(
+        (o for o in ui_options + headless_options if o.id == template), None
+    )
     if resolved_template is None:
         rprint(f"Template {template} not found")
         raise Exit(1)
@@ -107,35 +194,51 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
             raise Exit(1)
         else:
             shutil.rmtree(dir, ignore_errors=True)
-    copier.run_copy(
-        resolved_template.git_url,
-        dir,
-        quiet=True,
-    )
+
+    if isinstance(resolved_template.source, GithubTemplateRepo):
+        copier.run_copy(
+            resolved_template.source.url,
+            dir,
+            quiet=True,
+        )
+    else:
+        asyncio.run(create_scaffold(resolved_template.source.name, str(dir)))
     # Initialize git repository if git is available
-    is_git_initialized = False
+    has_git = False
     try:
         subprocess.run(["git", "--version"], check=True, capture_output=True)
+        has_git = True
+    except subprocess.CalledProcessError:
+        pass
 
-        # Change to the new directory and initialize git repo
-        original_cwd = Path.cwd()
-        os.chdir(dir)
-
-        try:
-            subprocess.run(["git", "init"], check=True, capture_output=True)
-            subprocess.run(["git", "add", "."], check=True, capture_output=True)
-            subprocess.run(
-                ["git", "commit", "-m", "Initial commit"],
-                check=True,
-                capture_output=True,
-            )
-            is_git_initialized = True
-        finally:
-            os.chdir(original_cwd)
+    # Change to the new directory and initialize git repo
+    original_cwd = Path.cwd()
+    os.chdir(dir)
 
-    except (subprocess.CalledProcessError, FileNotFoundError):
-        # Git not available or failed - continue without git initialization
-        pass
+    try:
+        # Dump in a bunch of docs for AI agents
+        vibe_llama_starter = VibeLlamaStarter(
+            agents=["OpenAI Codex CLI"],  # AGENTS.md, supported by Cursor,
+            services=["LlamaIndex", "llama-index-workflows"]
+            + (["LlamaCloud Services"] if resolved_template.llama_cloud else []),
+        )
+        asyncio.run(vibe_llama_starter.write_instructions(overwrite=True))
+        # Create symlink for Claude.md to point to AGENTS.md
+        for alternate in ["CLAUDE.md", "GEMINI.md"]:  # don't support AGENTS.md (yet?)
+            claude_path = Path(alternate)  # not supported yet
+            agents_path = Path("AGENTS.md")
+            if agents_path.exists() and not claude_path.exists():
+                claude_path.symlink_to("AGENTS.md")
+            if has_git:
+                subprocess.run(["git", "init"], check=True, capture_output=True)
+                subprocess.run(["git", "add", "."], check=True, capture_output=True)
+                subprocess.run(
+                    ["git", "commit", "-m", "Initial commit"],
+                    check=True,
+                    capture_output=True,
+                )
+    finally:
+        os.chdir(original_cwd)
 
     rprint(
         f"Successfully created [blue]{dir}[/] using the [blue]{resolved_template.name}[/] template! 🎉 🦙 💾"
@@ -146,7 +249,7 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
     rprint("    [orange3]uvx[/] llamactl serve")
     rprint("")
     rprint("[bold]To deploy:[/]")
-    if not is_git_initialized:
+    if has_git:
         rprint("    [orange3]git[/] init")
         rprint("    [orange3]git[/] add .")
         rprint("    [orange3]git[/] commit -m 'Initial commit'")

llama_deploy/cli/commands/serve.py

@@ -1,3 +1,4 @@
+import logging
 import os
 from pathlib import Path
 
@@ -12,6 +13,7 @@ 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.cli.styles import WARNING
 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,
@@ -20,6 +22,8 @@ from rich import print as rprint
 
 from ..app import app
 
+logger = logging.getLogger(__name__)
+
 
 @app.command(
     "serve",
@@ -97,7 +101,7 @@ def serve(
         )
 
     except KeyboardInterrupt:
-        print("Shutting down...")
+        logger.debug("Shutting down...")
 
     except Exception as e:
         rprint(f"[red]Error: {e}[/red]")
@@ -107,11 +111,14 @@ def serve(
 def _set_env_vars_from_profile(profile: Auth):
     if profile.api_key:
         _set_env_vars(profile.api_key, profile.api_url)
+    _set_project_id_from_profile(profile)
 
 
 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")
+    # Also propagate project id if present in the environment
+    _set_project_id_from_env(env_vars)
     if key:
         _set_env_vars(key, url)
 
@@ -125,6 +132,17 @@ def _set_env_vars(key: str, url: str):
         os.environ[f"{prefix}LLAMA_CLOUD_BASE_URL"] = url
 
 
+def _set_project_id_from_env(env_vars: dict[str, str]):
+    project_id = env_vars.get("LLAMA_DEPLOY_PROJECT_ID")
+    if project_id:
+        os.environ["LLAMA_DEPLOY_PROJECT_ID"] = project_id
+
+
+def _set_project_id_from_profile(profile: Auth):
+    if profile.project_id:
+        os.environ["LLAMA_DEPLOY_PROJECT_ID"] = profile.project_id
+
+
 def _maybe_inject_llama_cloud_credentials(
     deployment_file: Path, interactive: bool
 ) -> None:
@@ -154,6 +172,9 @@ def _maybe_inject_llama_cloud_credentials(
         config, deployment_file.parent if deployment_file.is_file() else deployment_file
     )
 
+    # Ensure project id is available to the app and UI processes
+    _set_project_id_from_env({**os.environ, **vars})
+
     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})
@@ -162,7 +183,7 @@ def _maybe_inject_llama_cloud_credentials(
     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]"
+            f"[{WARNING}]Warning: This app requires Llama Cloud authentication, and no LLAMA_CLOUD_API_KEY is present. The app may not work.[/]"
         )
         return
 
@@ -179,20 +200,16 @@ def _maybe_inject_llama_cloud_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
+            authed = validate_authenticated_profile(True)
+            if authed.api_key:
+                _set_env_vars_from_profile(authed)
+                return
         rprint(
-            "[yellow]Warning: No Llama Cloud credentials configured. The app may not work.[/yellow]"
+            f"[{WARNING}]Warning: No Llama Cloud credentials configured. The app may not work.[/]"
         )
         return
 
     # Non-interactive session
     rprint(
-        "[yellow]Warning: LLAMA_CLOUD_API_KEY is not set and no logged-in profile was found. The app may not work.[/yellow]"
+        f"[{WARNING}]Warning: LLAMA_CLOUD_API_KEY is not set and no logged-in profile was found. The app may not work.[/]"
     )