llamactl 0.3.11__tar.gz → 0.3.12__tar.gz

{llamactl-0.3.11 → llamactl-0.3.12}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.11
+Version: 0.3.12
 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.11,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.11,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.12,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.12,<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,6 @@ 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.4,<0.5.0
 Requires-Python: >=3.11, <4
 Description-Content-Type: text/markdown
 

{llamactl-0.3.11 → llamactl-0.3.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.11"
+version = "0.3.12"
 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.11,<0.4.0",
-    "llama-deploy-appserver>=0.3.11,<0.4.0",
+    "llama-deploy-core[client]>=0.3.12,<0.4.0",
+    "llama-deploy-appserver>=0.3.12,<0.4.0",
     "httpx>=0.24.0,<1.0.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",
@@ -21,7 +21,6 @@ dependencies = [
     "aiohttp>=3.12.14",
     "copier>=9.9.0",
     "pyjwt[crypto]>=2.10.1",
-    "vibe-llama>=0.4.4,<0.5.0",
 ]
 
 [project.scripts]

{llamactl-0.3.11 → llamactl-0.3.12}/src/llama_deploy/cli/auth/client.py

@@ -9,6 +9,7 @@ import httpx
 import jwt
 from jwt.algorithms import RSAAlgorithm  # type: ignore[possibly-unbound-import]
 from llama_deploy.cli.config.schema import DeviceOIDC
+from llama_deploy.core.client.ssl_util import get_httpx_verify_param
 from pydantic import BaseModel
 
 logger = logging.getLogger(__name__)
@@ -57,10 +58,13 @@ class AuthMeResponse(BaseModel):
 class ClientContextManager(AsyncContextManager):
     def __init__(self, base_url: str | None, auth: httpx.Auth | None = None) -> None:
         self.base_url = base_url.rstrip("/") if base_url else None
+        verify = get_httpx_verify_param()
         if self.base_url:
-            self.client = httpx.AsyncClient(base_url=self.base_url, auth=auth)
+            self.client = httpx.AsyncClient(
+                base_url=self.base_url, auth=auth, verify=verify
+            )
         else:
-            self.client = httpx.AsyncClient(auth=auth)
+            self.client = httpx.AsyncClient(auth=auth, verify=verify)
 
     async def close(self) -> None:
         try:

{llamactl-0.3.11 → llamactl-0.3.12}/src/llama_deploy/cli/commands/init.py

@@ -9,12 +9,18 @@ from pathlib import Path
 
 import click
 import copier
+import httpx
 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.options import (
+    global_options,
+    interactive_option,
+)
 from llama_deploy.cli.styles import HEADER_COLOR_HEX
+from llama_deploy.core.client.ssl_util import get_httpx_verify_param
 from rich import print as rprint
+from rich.text import Text
 
 
 @app.command()
@@ -40,23 +46,24 @@ from rich import print as rprint
     help="Force overwrite the directory if it exists",
 )
 @global_options
+@interactive_option
 def init(
     update: bool,
     template: str | None,
     dir: Path | None,
     force: bool,
+    interactive: bool,
 ) -> None:
     """Create a new app repository from a template"""
     if update:
         _update()
     else:
-        _create(template, dir, force)
-
+        _create(template, dir, force, interactive)
 
-def _create(template: str | None, dir: Path | None, force: bool) -> None:
-    # defer loading to improve cli startup time
-    from vibe_llama.sdk import VibeLlamaStarter
 
+def _create(
+    template: str | None, dir: Path | None, force: bool, interactive: bool
+) -> None:
     @dataclass
     class TemplateOption:
         id: str
@@ -165,7 +172,23 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
         ),
     ]
 
-    if template is None:
+    # Initialize git repository if git is available
+    has_git = False
+    git_initialized = False
+    try:
+        subprocess.run(["git", "--version"], check=True, capture_output=True)
+        has_git = True
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        # git is not available or broken; continue without git
+        has_git = False
+
+    if not has_git:
+        rprint(
+            "git is required to initialize a template. Make sure you have it installed and available in your PATH."
+        )
+        raise Exit(1)
+
+    if template is None and interactive:
         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."
         )
@@ -191,16 +214,26 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
             ),
         ).ask()
     if template is None:
-        rprint("No template selected")
+        options = [o.id for o in ui_options + headless_options]
+        rprint(
+            Text(
+                f"No template selected. Select a template or pass a template name with --template <{'|'.join(options)}>"
+            )
+        )
         raise Exit(1)
     if dir is None:
-        dir_str = questionary.text(
-            "Enter the directory to create the new app in", default=template
-        ).ask()
-        if not dir_str:
-            rprint("No directory provided")
-            raise Exit(1)
-        dir = Path(dir_str)
+        if interactive:
+            dir_str = questionary.text(
+                "Enter the directory to create the new app in", default=template
+            ).ask()
+            if dir_str:
+                dir = Path(dir_str)
+            else:
+                return
+        else:
+            rprint(f"[yellow]No directory provided. Defaulting to {template}[/]")
+            dir = Path(template)
+
     resolved_template: TemplateOption | None = next(
         (o for o in ui_options + headless_options if o.id == template), None
     )
@@ -208,49 +241,44 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
         rprint(f"Template {template} not found")
         raise Exit(1)
     if dir.exists():
-        is_ok = (
-            force
-            or questionary.confirm("Directory exists. Overwrite?", default=False).ask()
+        is_ok = force or (
+            interactive
+            and questionary.confirm("Directory exists. Overwrite?", default=False).ask()
         )
+
         if not is_ok:
+            rprint(
+                f"[yellow]Try again with another directory or pass --force to overwrite the existing directory '{str(dir)}'[/]"
+            )
             raise Exit(1)
         else:
             shutil.rmtree(dir, ignore_errors=True)
 
     copier.run_copy(
-        resolved_template.source.url,
-        dir,
-        quiet=True,
+        resolved_template.source.url, dir, quiet=True, defaults=not interactive
     )
-    # Initialize git repository if git is available
-    has_git = False
-    git_initialized = False
-    try:
-        subprocess.run(["git", "--version"], check=True, capture_output=True)
-        has_git = True
-    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()
     os.chdir(dir)
 
     try:
-        # Dump in a bunch of docs for AI agents
-
-        vibe_llama_starter = VibeLlamaStarter(
-            agents=["OpenAI Codex CLI"],  # AGENTS.md, supported by Cursor,
-            services=["LlamaDeploy", "LlamaIndex", "llama-index-workflows"]
-            + (["LlamaCloud Services"] if resolved_template.llama_cloud else []),
+        # Dump in a bunch of docs for AI agents (best-effort)
+        docs_downloaded = asyncio.run(
+            _download_and_write_agents_md(
+                include_llama_cloud=resolved_template.llama_cloud
+            )
         )
-        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 docs_downloaded:
+            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")
 
         # Initialize a git repo (best-effort). If anything fails, show a friendly note and continue.
         if has_git:
@@ -369,3 +397,61 @@ def _update():
     except (subprocess.CalledProcessError, FileNotFoundError):
         # Git not available or not in a git repo - continue silently
         pass
+
+
+async def _download_and_write_agents_md(include_llama_cloud: bool) -> bool:
+    """Fetch a small set of reference docs and write AGENTS.md.
+
+    Replaces the previous vibe-llama usage with direct HTTP downloads.
+
+    Returns True if any documentation was fetched, False otherwise.
+    """
+    BASE_URL = "https://raw.githubusercontent.com/run-llama/vibe-llama/main"
+
+    services: dict[str, str] = {
+        "LlamaIndex": f"{BASE_URL}/documentation/llamaindex.md",
+        "LlamaCloud Services": f"{BASE_URL}/documentation/llamacloud.md",
+        "llama-index-workflows": f"{BASE_URL}/documentation/llama-index-workflows.md",
+        "LlamaDeploy": f"{BASE_URL}/documentation/llamadeploy.md",
+    }
+
+    selected_services: list[str] = [
+        "LlamaDeploy",
+        "LlamaIndex",
+        "llama-index-workflows",
+    ]
+    if include_llama_cloud:
+        selected_services.append("LlamaCloud Services")
+
+    urls: list[str] = [(s, u) for s in selected_services if (u := services.get(s))]
+
+    contents: list[str] = []
+    timeout = httpx.Timeout(5.0)
+    async with httpx.AsyncClient(
+        timeout=timeout, verify=get_httpx_verify_param()
+    ) as client:
+
+        async def get_docs(service: str, url: str) -> str | None:
+            try:
+                resp = await client.get(url)
+                resp.raise_for_status()
+                text = resp.text.strip()
+                if text:
+                    return text
+            except Exception:
+                # best-effort: skip failures
+                rprint(
+                    f"[yellow]Failed to fetch documentation for {service}, skipping[/]"
+                )
+                return None
+
+        results = await asyncio.gather(
+            *[get_docs(service, url) for service, url in urls]
+        )
+        contents = [r for r in results if r is not None]
+
+    if contents:
+        agents_md = "\n\n---\n\n".join(contents) + "\n"
+        Path("AGENTS.md").write_text(agents_md, encoding="utf-8")
+
+    return bool(contents)

{llamactl-0.3.11 → llamactl-0.3.12}/src/llama_deploy/cli/commands/serve.py

@@ -10,7 +10,7 @@ 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.options import global_options, 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
@@ -72,7 +72,13 @@ logger = logging.getLogger(__name__)
     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",
 )
+@click.option(
+    "--host",
+    type=str,
+    help="The host to run the API server on. Default is 127.0.0.1. Use 0.0.0.0 to allow remote access.",
+)
 @interactive_option
+@global_options
 def serve(
     deployment_file: Path,
     no_install: bool,
@@ -85,6 +91,7 @@ def serve(
     log_format: str | None = None,
     persistence: Literal["memory", "local", "cloud"] | None = None,
     local_persistence_path: Path | None = None,
+    host: 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."""
@@ -141,6 +148,7 @@ def serve(
             cloud_persistence_name=f"_public:serve_workflows_{deployment_config.name}"
             if persistence == "cloud"
             else None,
+            host=host,
         )
 
     except (Exit, Abort):

{llamactl-0.3.11 → llamactl-0.3.12}/src/llama_deploy/cli/options.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from typing import Callable, ParamSpec, TypeVar
 
 import click
@@ -13,6 +14,52 @@ R = TypeVar("R")
 def global_options(f: Callable[P, R]) -> Callable[P, R]:
     """Common decorator to add global options to command groups"""
 
+    return native_tls_option(file_logging(f))
+
+
+def interactive_option(f: Callable[P, R]) -> Callable[P, R]:
+    """Add an interactive option to the command"""
+
+    default = is_interactive_session()
+    return click.option(
+        "--interactive/--no-interactive",
+        help="Run in interactive mode. If not provided, will default to the current session's interactive state.",
+        is_flag=True,
+        default=default,
+    )(f)
+
+
+def native_tls_option(f: Callable[P, R]) -> Callable[P, R]:
+    """Enable native TLS to trust system configured trust store rather than python bundled trust stores.
+
+    When enabled, we set:
+    - UV_NATIVE_TLS=1 to instruct uv to use the platform trust store
+    - LLAMA_DEPLOY_USE_TRUSTSTORE=1 to use system certificate store for Python httpx clients
+    """
+
+    def _enable_native_tls(
+        ctx: click.Context, param: click.Parameter, value: bool
+    ) -> bool:
+        if value:
+            # Don't override if user explicitly set a value
+            os.environ.setdefault("UV_NATIVE_TLS", "1")
+            os.environ.setdefault("LLAMA_DEPLOY_USE_TRUSTSTORE", "1")
+        return value
+
+    return click.option(
+        "--native-tls",
+        is_flag=True,
+        help=(
+            "Enable native TLS mode to use system certificate store rather than runtime defaults. Can be set via LLAMACTL_NATIVE_TLS=1"
+        ),
+        callback=_enable_native_tls,
+        expose_value=False,
+        is_eager=True,
+        envvar=["LLAMACTL_NATIVE_TLS"],
+    )(f)
+
+
+def file_logging(f: Callable[P, R]) -> Callable[P, R]:
     def debug_callback(ctx: click.Context, param: click.Parameter, value: str) -> str:
         if value:
             setup_file_logging(level=logging._nameToLevel.get(value, logging.INFO))
@@ -29,15 +76,3 @@ def global_options(f: Callable[P, R]) -> Callable[P, R]:
         is_eager=True,
         hidden=True,
     )(f)
-
-
-def interactive_option(f: Callable[P, R]) -> Callable[P, R]:
-    """Add an interactive option to the command"""
-
-    default = is_interactive_session()
-    return click.option(
-        "--interactive/--no-interactive",
-        help="Run in interactive mode. If not provided, will default to the current session's interactive state.",
-        is_flag=True,
-        default=default,
-    )(f)