llamactl 0.3.11__py3-none-any.whl → 0.3.13__py3-none-any.whl

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:

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)

llama_deploy/cli/commands/serve.py

@@ -10,7 +10,10 @@ 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 (
+    interactive_option,
+    native_tls_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 +75,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
+@native_tls_option
 def serve(
     deployment_file: Path,
     no_install: bool,
@@ -85,6 +94,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 +151,7 @@ def serve(
             cloud_persistence_name=f"_public:serve_workflows_{deployment_config.name}"
             if persistence == "cloud"
             else None,
+            host=host,
         )
 
     except (Exit, Abort):

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)

{llamactl-0.3.11.dist-info → llamactl-0.3.13.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.11
+Version: 0.3.13
 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.13,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.13,<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.dist-info → llamactl-0.3.13.dist-info}/RECORD

@@ -1,13 +1,13 @@
 llama_deploy/cli/__init__.py,sha256=116170a773d7377f2e61bc8b006999d463af24027867be54ff9b20132970490f,781
 llama_deploy/cli/app.py,sha256=9170e4f506c482522bd745eb1cdb700a198cfcfd7204c168c94e5ee2b6b43ffa,2199
-llama_deploy/cli/auth/client.py,sha256=0673e2fdc71e8cf1f6d79a64e39596e608dc0257b7dddfebcc38e13e1545a2a8,11670
+llama_deploy/cli/auth/client.py,sha256=3ebd2526f65f8d576e17d304df1b8a163d07586b88b5628cb36c9fa487a23ef6,11841
 llama_deploy/cli/client.py,sha256=f4053b5183224cff55c1393e78887d1af2597219135379a851b742c676adc154,1727
 llama_deploy/cli/commands/aliased_group.py,sha256=bc41007c97b7b93981217dbd4d4591df2b6c9412a2d9ed045b0ec5655ed285f2,1066
 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=9efe78d89a8511eb0b27044f6cb5b011dbe73ab445a4e10d23048a0f7ad6633b,13194
-llama_deploy/cli/commands/serve.py,sha256=6f0b8103baed2fdc1e0c4ea4808ee94a4e347a9d40f3ba3119bc2d0d6e5448e2,12618
+llama_deploy/cli/commands/init.py,sha256=68d6dbfd21596cb0012009c32f023e3b6960415ef69363b2b328e15ae17029e6,15974
+llama_deploy/cli/commands/serve.py,sha256=e1e91f17e13dce31ebadb4a1b91cda9e2e3eeb45f89f1db0ae3fadd879e8a2ab,12871
 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=9e62ed2ea112e6142a5d384835568d4a926627eb58730af89bef9420f549d42e,5126
@@ -20,7 +20,7 @@ llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f76
 llama_deploy/cli/env.py,sha256=d4b83c1f12e07f90893fcc7388d769de37dc2b41d345eb6bc2041c39b4fb2c31,1057
 llama_deploy/cli/interactive_prompts/session_utils.py,sha256=b996f2eddf70d6c49636c4797d246d212fce0950fe7e9a3f59cf6a1bf7ae26f5,1142
 llama_deploy/cli/interactive_prompts/utils.py,sha256=594cc2a242cc3405d66d0e26a60647496cc5fcb4ce7d0500a4cfec4888c9a0fa,516
-llama_deploy/cli/options.py,sha256=62ee7286c3305ddb4b597783d19e854284d79bf9384800045f15b934dc245c1d,1298
+llama_deploy/cli/options.py,sha256=1bddcaf69c0293b07ce8b73fa4ef92d62ea5d8eecd7f66b65e957d4a59381243,2479
 llama_deploy/cli/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
 llama_deploy/cli/styles.py,sha256=15901fb567b0d10470f56a06d863819c4ed00a9f90b2a8c46b4bc2fb1dbdf6c3,307
 llama_deploy/cli/textual/deployment_form.py,sha256=f153aa256bef51598432190604822d3f5295d1715696de6c0234dfe92fa5173d,27906
@@ -34,7 +34,7 @@ llama_deploy/cli/textual/styles.tcss,sha256=2536f52ea1a654ae1f8990a25d45c845cb31
 llama_deploy/cli/utils/env_inject.py,sha256=01911758bcc3cf22aad0db0d1ade56aece48d6ad6bdb7186ea213337c67f5a89,688
 llama_deploy/cli/utils/redact.py,sha256=1e768d76b4a6708230c34f7ce8a5a82ab52795bb3d6ab0387071ab4e8d7e7934,863
 llama_deploy/cli/utils/version.py,sha256=bf01a6dda948b868cc08c93701ed44cd36b487402404af8451d4c0996a2edb31,364
-llamactl-0.3.11.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.11.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.11.dist-info/METADATA,sha256=87785ede95f32b13681c788277b991ad9a70d06dcaea8229a98076f1b55e67bc,3255
-llamactl-0.3.11.dist-info/RECORD,,
+llamactl-0.3.13.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.13.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.13.dist-info/METADATA,sha256=110d516438520370097db9b543db32fedbbc9cef3a03a2508ac7b64339b258ce,3215
+llamactl-0.3.13.dist-info/RECORD,,