llamactl 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

llama_deploy/cli/commands/init.py

@@ -55,8 +55,6 @@ def init(
 
 def _create(template: str | None, dir: Path | None, force: bool) -> None:
     # defer loading to improve cli startup time
-    from vibe_llama.scaffold import create_scaffold
-    from vibe_llama.scaffold.scaffold import ProjectName
     from vibe_llama.sdk import VibeLlamaStarter
 
     @dataclass
@@ -64,13 +62,9 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
         id: str
         name: str
         description: str
-        source: VibeLlamaTemplate | GithubTemplateRepo
+        source: GithubTemplateRepo
         llama_cloud: bool
 
-    @dataclass
-    class VibeLlamaTemplate:
-        name: ProjectName
-
     @dataclass
     class GithubTemplateRepo:
         url: str
@@ -110,42 +104,54 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
             id="basic",
             name="Basic Workflow",
             description="A base example that showcases usage patterns for workflows",
-            source=VibeLlamaTemplate(name="basic"),
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-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"),
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-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"),
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-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"),
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-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"),
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-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"),
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-web-scraping"
+            ),
             llama_cloud=False,
         ),
     ]
@@ -202,21 +208,19 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
         else:
             shutil.rmtree(dir, ignore_errors=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)))
+    copier.run_copy(
+        resolved_template.source.url,
+        dir,
+        quiet=True,
+    )
     # Initialize git repository if git is available
     has_git = False
     try:
         subprocess.run(["git", "--version"], check=True, capture_output=True)
         has_git = True
-    except subprocess.CalledProcessError:
-        pass
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        # git is not available or broken; continue without git
+        has_git = False
 
     # Change to the new directory and initialize git repo
     original_cwd = Path.cwd()
@@ -227,7 +231,7 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
 
         vibe_llama_starter = VibeLlamaStarter(
             agents=["OpenAI Codex CLI"],  # AGENTS.md, supported by Cursor,
-            services=["LlamaIndex", "llama-index-workflows"]
+            services=["LlamaDeploy", "LlamaIndex", "llama-index-workflows"]
             + (["LlamaCloud Services"] if resolved_template.llama_cloud else []),
         )
         asyncio.run(vibe_llama_starter.write_instructions(overwrite=True))
@@ -237,7 +241,10 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
             agents_path = Path("AGENTS.md")
             if agents_path.exists() and not claude_path.exists():
                 claude_path.symlink_to("AGENTS.md")
-            if has_git:
+
+        # Initialize a git repo (best-effort). If anything fails, show a friendly note and continue.
+        if has_git:
+            try:
                 subprocess.run(["git", "init"], check=True, capture_output=True)
                 subprocess.run(["git", "add", "."], check=True, capture_output=True)
                 subprocess.run(
@@ -245,9 +252,40 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
                     check=True,
                     capture_output=True,
                 )
+            except (subprocess.CalledProcessError, FileNotFoundError) as e:
+                # Extract a short error message if present
+                err_msg = ""
+                if isinstance(e, subprocess.CalledProcessError):
+                    stderr = getattr(e, "stderr", b"")
+                    if isinstance(stderr, (bytes, bytearray)):
+                        try:
+                            stderr = stderr.decode("utf-8", "ignore")
+                        except Exception:
+                            stderr = ""
+                    if isinstance(stderr, str) and stderr.strip():
+                        err_msg = stderr.strip().split("\n")[-1]
+                elif isinstance(e, FileNotFoundError):
+                    err_msg = "git executable not found"
+
+                rprint("")
+                rprint("⚠️  [bold]Skipping git initialization due to an error.[/]")
+                if err_msg:
+                    rprint(f"    {err_msg}")
+                rprint("    You can initialize it manually:")
+                rprint("      git init && git add . && git commit -m 'Initial commit'")
+                rprint("")
     finally:
         os.chdir(original_cwd)
 
+    # If git is not available at all, let the user know how to proceed
+    if not has_git:
+        rprint("")
+        rprint("⚠️  [bold]Skipping git initialization due to an error.[/]")
+        rprint("    git executable not found")
+        rprint("    You can initialize it manually:")
+        rprint("      git init && git add . && git commit -m 'Initial commit'")
+        rprint("")
+
     rprint(
         f"Successfully created [blue]{dir}[/] using the [blue]{resolved_template.name}[/] template! 🎉 🦙 💾"
     )

llama_deploy/cli/commands/serve.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import os
 from pathlib import Path
@@ -5,15 +6,19 @@ from typing import Literal
 
 import click
 import questionary
+from click.exceptions import Abort, Exit
 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.cli.utils.redact import redact_api_key
+from llama_deploy.core.client.manage_client import ControlPlaneClient
 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 llama_deploy.core.schema.projects import ProjectSummary
 from rich import print as rprint
 
 from ..app import app
@@ -108,6 +113,7 @@ def serve(
             build=preview,
         )
         deployment_config = get_deployment_config()
+        _print_connection_summary()
         start_server_in_target_venv(
             cwd=Path.cwd(),
             deployment_file=deployment_file,
@@ -127,6 +133,9 @@ def serve(
             else None,
         )
 
+    except (Exit, Abort):
+        raise
+
     except KeyboardInterrupt:
         logger.debug("Shutting down...")
 
@@ -207,6 +216,32 @@ def _maybe_inject_llama_cloud_credentials(
 
     existing = os.environ.get("LLAMA_CLOUD_API_KEY") or vars.get("LLAMA_CLOUD_API_KEY")
     if existing:
+        # If interactive, allow choosing between env var and configured profile
+        if interactive:
+            choice = questionary.select(
+                "LLAMA_CLOUD_API_KEY detected in environment. Which credentials do you want to use?",
+                choices=[
+                    questionary.Choice(
+                        title=f"Use environment variable - {redact_api_key(existing)}",
+                        value="env",
+                    ),
+                    questionary.Choice(title="Use configured profile", value="profile"),
+                ],
+            ).ask()
+            if choice is None:
+                raise Exit(0)
+            if choice == "profile":
+                # Ensure we have an authenticated profile and inject from it
+                authed = validate_authenticated_profile(True)
+                _set_env_vars_from_profile(authed)
+                return
+            # Default to env var path when cancelled or explicitly chosen
+            _set_env_vars_from_env({**os.environ, **vars})
+            # If no project id provided, try to detect and select one using the env API key
+            if not os.environ.get("LLAMA_DEPLOY_PROJECT_ID"):
+                _maybe_select_project_for_env_key()
+            return
+        # Non-interactive: trust current environment variables
         _set_env_vars_from_env({**os.environ, **vars})
         return
 
@@ -243,3 +278,56 @@ def _maybe_inject_llama_cloud_credentials(
     rprint(
         f"[{WARNING}]Warning: LLAMA_CLOUD_API_KEY is not set and no logged-in profile was found. The app may not work.[/]"
     )
+
+
+def _maybe_select_project_for_env_key() -> None:
+    """When using an env API key, ensure LLAMA_DEPLOY_PROJECT_ID is set.
+
+    If more than one project exists, prompt the user to select one.
+    """
+    api_key = os.environ.get("LLAMA_CLOUD_API_KEY")
+    base_url = os.environ.get("LLAMA_CLOUD_BASE_URL", "https://api.cloud.llamaindex.ai")
+    if not api_key:
+        return
+    try:
+
+        async def _run() -> list[ProjectSummary]:
+            async with ControlPlaneClient.ctx(base_url, api_key, None) as client:
+                return await client.list_projects()
+
+        projects = asyncio.run(_run())
+        if not projects:
+            return
+        if len(projects) == 1:
+            os.environ["LLAMA_DEPLOY_PROJECT_ID"] = projects[0].project_id
+            return
+        # Multiple: prompt selection
+        choice = questionary.select(
+            "Select a project",
+            choices=[
+                questionary.Choice(
+                    title=f"{p.project_name} ({p.deployment_count} deployments)",
+                    value=p.project_id,
+                )
+                for p in projects
+            ],
+        ).ask()
+        if choice:
+            os.environ["LLAMA_DEPLOY_PROJECT_ID"] = choice
+    except Exception:
+        # Best-effort; if we fail to list, do nothing
+        pass
+
+
+def _print_connection_summary() -> None:
+    base_url = os.environ.get("LLAMA_CLOUD_BASE_URL")
+    project_id = os.environ.get("LLAMA_DEPLOY_PROJECT_ID")
+    api_key = os.environ.get("LLAMA_CLOUD_API_KEY")
+    if not base_url and not project_id and not api_key:
+        return
+    redacted = redact_api_key(api_key)
+    env_text = base_url or "-"
+    proj_text = project_id or "-"
+    rprint(
+        f"Connecting to environment: [bold]{env_text}[/], project: [bold]{proj_text}[/], api key: [bold]{redacted}[/]"
+    )

llama_deploy/cli/config/auth_service.py

@@ -3,6 +3,7 @@ import asyncio
 from llama_deploy.cli.auth.client import PlatformAuthClient, RefreshMiddleware
 from llama_deploy.cli.config._config import Auth, ConfigManager, Environment
 from llama_deploy.cli.config.schema import DeviceOIDC
+from llama_deploy.cli.utils.redact import redact_api_key
 from llama_deploy.core.client.manage_client import ControlPlaneClient, httpx
 from llama_deploy.core.schema import VersionResponse
 from llama_deploy.core.schema.projects import ProjectSummary
@@ -123,8 +124,4 @@ class AuthService:
 
 def _auto_profile_name_from_token(api_key: str) -> str:
     token = api_key or "token"
-    cleaned = token.replace(" ", "")
-    first = cleaned[:6]
-    last = cleaned[-4:] if len(cleaned) > 10 else cleaned[-2:]
-    base = f"{first}****{last}"
-    return base
+    return redact_api_key(token)

llama_deploy/cli/utils/redact.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+
+def redact_api_key(
+    token: str | None,
+    visible_prefix: int = 6,
+    visible_suffix_long: int = 4,
+    visible_suffix_short: int = 2,
+    long_threshold: int = 10,
+    mask: str = "****",
+) -> str:
+    """Redact an API key for display.
+
+    Shows a prefix and suffix with a mask in the middle. If token is short,
+    reduces the suffix length to keep at least two trailing characters visible.
+
+    This mirrors the masking behavior used for profile names.
+    """
+    if not token:
+        return "-"
+    cleaned = token.replace(" ", "")
+    if len(cleaned) <= 0:
+        return "-"
+    first = cleaned[:visible_prefix]
+    last_len = (
+        visible_suffix_long if len(cleaned) > long_threshold else visible_suffix_short
+    )
+    last = cleaned[-last_len:] if last_len > 0 else ""
+    return f"{first}{mask}{last}"

{llamactl-0.3.8.dist-info → llamactl-0.3.10.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.8
+Version: 0.3.10
 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.8,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.8,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.10,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.10,<0.4.0
 Requires-Dist: httpx>=0.24.0,<1.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
@@ -17,7 +17,7 @@ Requires-Dist: textual>=6.0.0
 Requires-Dist: aiohttp>=3.12.14
 Requires-Dist: copier>=9.9.0
 Requires-Dist: pyjwt[crypto]>=2.10.1
-Requires-Dist: vibe-llama>=0.4.2,<0.5.0
+Requires-Dist: vibe-llama>=0.4.4,<0.5.0
 Requires-Python: >=3.11, <4
 Description-Content-Type: text/markdown
 

{llamactl-0.3.8.dist-info → llamactl-0.3.10.dist-info}/RECORD

@@ -6,11 +6,11 @@ llama_deploy/cli/commands/aliased_group.py,sha256=bc41007c97b7b93981217dbd4d4591
 llama_deploy/cli/commands/auth.py,sha256=1381eee494c3a0c73253322b4a54af1a857d5b89e5f1685b8afa3422eecc5607,23937
 llama_deploy/cli/commands/deployment.py,sha256=46339e09135521c46ff90235ccf765c37b1a161cec11d92e92a54ceac6528b01,9883
 llama_deploy/cli/commands/env.py,sha256=36cb1b0abb9e3d1c5546d3e8a3c4c7839c4d6c2abf75763e39efb08376b3eae9,6808
-llama_deploy/cli/commands/init.py,sha256=20c6f7d8ff60858df97e08d0a6c06ef3008a2b41cab76fdf3a4734d42c0a164a,10836
-llama_deploy/cli/commands/serve.py,sha256=985a8c7c27caf46878841de4452aff05b69b13c669227337665431e0d48f5fbc,8688
+llama_deploy/cli/commands/init.py,sha256=48032051263023082354d0260656d0422c3c659ebbaed70a530195beaeb28f82,12679
+llama_deploy/cli/commands/serve.py,sha256=fc88f80bda980752bcf163b69db6c36d4dd5d5c570983477d7e942de80c8f1f7,12165
 llama_deploy/cli/config/_config.py,sha256=654a4b6d06542e3503edab7023fc1c3148de510b3e3f6194e28cd4bd3e7c029a,14230
 llama_deploy/cli/config/_migrations.py,sha256=37055641970e1ea41abc583f270dc8a9dab03076224a02cd5fb08bbab2b9259f,2333
-llama_deploy/cli/config/auth_service.py,sha256=8a61110e18c752bbec5fbca23cd5d35d4ec232a4371f8c8291ba07ad83d30c6c,5208
+llama_deploy/cli/config/auth_service.py,sha256=9e62ed2ea112e6142a5d384835568d4a926627eb58730af89bef9420f549d42e,5126
 llama_deploy/cli/config/env_service.py,sha256=cd51a68f1e9aad0bdd49cd76351cd54cea612a7f669512484c42e2876fea0458,2650
 llama_deploy/cli/config/migrations/0001_init.sql,sha256=aaffcb1fd0a00398ecf0af2d98ae26479c91519ec938efa99270f2d98dfdd1f4,1091
 llama_deploy/cli/config/migrations/0002_add_auth_fields.sql,sha256=31bd109e5fa0a9ad563a205b4c0e8110db4df3b4b3956704a0c0cdf345002daa,724
@@ -32,7 +32,8 @@ llama_deploy/cli/textual/llama_loader.py,sha256=33cb32a46dd40bcf889c553e44f2672c
 llama_deploy/cli/textual/secrets_form.py,sha256=df6699de29d2bc2cbcaddd41ad2495ce0e622cdccaadbc8369a6ee09a9e79d34,7251
 llama_deploy/cli/textual/styles.tcss,sha256=c8fa0eec00a97fa6907d223faaad82c6add1ea3f60009f1630be19282ea77e3b,3271
 llama_deploy/cli/utils/env_inject.py,sha256=01911758bcc3cf22aad0db0d1ade56aece48d6ad6bdb7186ea213337c67f5a89,688
-llamactl-0.3.8.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.8.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.8.dist-info/METADATA,sha256=163a9428bd0648a9b48cbb6af32ea2a13ae4b29da524d5501b3c109359271040,3252
-llamactl-0.3.8.dist-info/RECORD,,
+llama_deploy/cli/utils/redact.py,sha256=1e768d76b4a6708230c34f7ce8a5a82ab52795bb3d6ab0387071ab4e8d7e7934,863
+llamactl-0.3.10.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.10.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.10.dist-info/METADATA,sha256=c8f61d981b0dd97d1b6508154e2a8ab45da30316f1c110f034e0a2b9c8fb61b4,3255
+llamactl-0.3.10.dist-info/RECORD,,