llamactl 0.3.10__tar.gz → 0.3.12__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.10
+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.10,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.10,<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.10 → llamactl-0.3.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.10"
+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.10,<0.4.0",
-    "llama-deploy-appserver>=0.3.10,<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.10 → 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.10 → 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
@@ -79,6 +86,15 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
             ),
             llama_cloud=False,
         ),
+        TemplateOption(
+            id="showcase",
+            name="Showcase",
+            description="A collection of workflow and UI patterns to build LlamaDeploy apps",
+            source=GithubTemplateRepo(
+                url="https://github.com/run-llama/template-workflow-showcase"
+            ),
+            llama_cloud=False,
+        ),
         TemplateOption(
             id="document-qa",
             name="Document Question & Answer",
@@ -156,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."
         )
@@ -182,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
     )
@@ -199,48 +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
-    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:
@@ -252,6 +290,7 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
                     check=True,
                     capture_output=True,
                 )
+                git_initialized = True
             except (subprocess.CalledProcessError, FileNotFoundError) as e:
                 # Extract a short error message if present
                 err_msg = ""
@@ -295,7 +334,8 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
     rprint("    [orange3]uvx[/] llamactl serve")
     rprint("")
     rprint("[bold]To deploy:[/]")
-    if has_git:
+    # Only show manual git init steps if repository failed to initialize earlier
+    if not git_initialized:
         rprint("    [orange3]git[/] init")
         rprint("    [orange3]git[/] add .")
         rprint("    [orange3]git[/] commit -m 'Initial commit'")
@@ -306,7 +346,7 @@ def _create(template: str | None, dir: Path | None, force: bool) -> None:
     rprint("    [orange3]git[/] push -u origin main")
     rprint("")
     # rprint("  [orange3]uvx[/] llamactl login")
-    rprint("    [orange3]uvx[/] llamactl deploy")
+    rprint("    [orange3]uvx[/] llamactl deploy create")
     rprint("")
 
 
@@ -357,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.10 → 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."""
@@ -92,6 +99,16 @@ def serve(
         rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
         raise click.Abort()
 
+    # Early check: appserver requires a pyproject.toml in the config directory
+    config_dir = deployment_file if deployment_file.is_dir() else deployment_file.parent
+    if not (config_dir / "pyproject.toml").exists():
+        rprint(
+            "[red]No pyproject.toml found at[/red] "
+            f"[bold]{config_dir}[/bold].\n"
+            "Add a pyproject.toml to your project and re-run 'llamactl serve'."
+        )
+        raise click.Abort()
+
     try:
         # Pre-check: if the template requires llama cloud access, ensure credentials
         _maybe_inject_llama_cloud_credentials(
@@ -131,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.10 → 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)

{llamactl-0.3.10 → llamactl-0.3.12}/src/llama_deploy/cli/textual/deployment_form.py

@@ -5,6 +5,7 @@ import logging
 import re
 from dataclasses import dataclass, field
 from pathlib import Path
+from textwrap import dedent
 from urllib.parse import urlsplit
 
 from llama_deploy.cli.client import get_project_client as get_client
@@ -23,6 +24,7 @@ from llama_deploy.cli.textual.git_validation import (
     ValidationResultMessage,
 )
 from llama_deploy.cli.textual.secrets_form import SecretsWidget
+from llama_deploy.cli.utils.version import get_installed_appserver_version
 from llama_deploy.core.deployment_config import (
     DEFAULT_DEPLOYMENT_NAME,
     read_deployment_config,
@@ -40,6 +42,7 @@ from llama_deploy.core.schema.deployments import (
     DeploymentResponse,
     DeploymentUpdate,
 )
+from packaging.version import Version
 from textual import events
 from textual.app import App, ComposeResult
 from textual.containers import Container, HorizontalGroup, Widget
@@ -47,7 +50,7 @@ from textual.content import Content
 from textual.message import Message
 from textual.reactive import reactive
 from textual.validation import Length
-from textual.widgets import Button, Input, Label, Static
+from textual.widgets import Button, Input, Label, Select, Static
 
 
 @dataclass
@@ -75,11 +78,20 @@ class DeploymentForm:
     warnings: list[str] = field(default_factory=list)
     # env info
     env_info_messages: str | None = None
+    # appserver version fields
+    installed_appserver_version: str | None = None
+    existing_llama_deploy_version: str | None = None
+    selected_appserver_version: str | None = None
 
     @classmethod
     def from_deployment(cls, deployment: DeploymentResponse) -> "DeploymentForm":
         secret_names = deployment.secret_names or []
 
+        installed = get_installed_appserver_version()
+        existing = deployment.llama_deploy_version
+        # If versions match (or existing is None), treat as non-editable like create
+        selected = existing or installed
+
         return DeploymentForm(
             name=deployment.name,
             id=deployment.id,
@@ -91,8 +103,15 @@ class DeploymentForm:
             secrets={},
             initial_secrets=set(secret_names),
             is_editing=True,
+            installed_appserver_version=installed,
+            existing_llama_deploy_version=existing,
+            selected_appserver_version=selected,
         )
 
+    @staticmethod
+    def appserver_version() -> str | None:
+        return get_installed_appserver_version()
+
     def to_update(self) -> DeploymentUpdate:
         """Convert form data to API format"""
 
@@ -100,6 +119,8 @@ class DeploymentForm:
         for secret in self.removed_secrets:
             secrets[secret] = None
 
+        appserver_version = self.selected_appserver_version
+
         data = DeploymentUpdate(
             repo_url=self.repo_url,
             git_ref=self.git_ref or "main",
@@ -110,12 +131,14 @@ class DeploymentForm:
                 else self.personal_access_token
             ),
             secrets=secrets,
+            llama_deploy_version=appserver_version,
         )
 
         return data
 
     def to_create(self) -> DeploymentCreate:
         """Convert form data to API format"""
+        appserver_version = self.selected_appserver_version
 
         return DeploymentCreate(
             name=self.name,
@@ -124,6 +147,7 @@ class DeploymentForm:
             git_ref=self.git_ref or "main",
             personal_access_token=self.personal_access_token,
             secrets=self.secrets,
+            llama_deploy_version=appserver_version,
         )
 
 
@@ -149,12 +173,23 @@ class DeploymentFormWidget(Widget):
     def compose(self) -> ComposeResult:
         title = "Edit Deployment" if self.form_data.is_editing else "Create Deployment"
 
-        yield Static(
-            Content.from_markup(
-                f"{title} [italic][@click=app.show_help()]More info[/][/italic]"
-            ),
+        with HorizontalGroup(
             classes="primary-message",
-        )
+        ):
+            yield Static(
+                Content.from_markup(
+                    f"{title} [italic][@click=app.show_help()]More info[/][/]"
+                ),
+                classes="w-1fr",
+            )
+            yield Static(
+                Content.from_markup(
+                    dedent("""
+                [italic]Tab or click to navigate.[/]
+                """).strip()
+                ),
+                classes="text-right w-1fr",
+            )
         yield Static(
             self.error_message,
             id="error-message",
@@ -200,6 +235,11 @@ class DeploymentFormWidget(Widget):
                 compact=True,
             )
 
+            yield Static(classes="full-width")
+            yield Static(
+                Content.from_markup("[italic]Advanced[/]"),
+                classes="text-center full-width",
+            )
             yield Label("Config File:", classes="form-label", shrink=True)
             yield Input(
                 value=self.form_data.deployment_file_path,
@@ -207,6 +247,7 @@ class DeploymentFormWidget(Widget):
                 id="deployment_file_path",
                 compact=True,
             )
+
             yield Label("Personal Access Token:", classes="form-label", shrink=True)
             if self.form_data.has_existing_pat:
                 yield Button(
@@ -226,6 +267,45 @@ class DeploymentFormWidget(Widget):
                     compact=True,
                 )
 
+            # Appserver version display/selector
+            yield Label("Appserver Version:", classes="form-label", shrink=True)
+            versions_differ = (
+                self.form_data.is_editing
+                and self.form_data.installed_appserver_version
+                and self.form_data.existing_llama_deploy_version
+                and self.form_data.installed_appserver_version
+                != self.form_data.existing_llama_deploy_version
+            )
+            if versions_differ:
+                # Show dropdown selector for version choice
+                installed_version = self.form_data.installed_appserver_version
+                existing_version = self.form_data.existing_llama_deploy_version
+                current_selection = (
+                    self.form_data.selected_appserver_version
+                    or existing_version
+                    or installed_version
+                )
+                is_upgrade = Version(installed_version) > Version(existing_version)
+                label = "Upgrade" if is_upgrade else "Downgrade"
+                yield Select(
+                    [
+                        (f"{label} to {installed_version}", installed_version),
+                        (f"Keep {existing_version}", existing_version),
+                    ],
+                    value=current_selection,
+                    id="appserver_version_select",
+                    allow_blank=False,
+                    compact=True,
+                )
+            else:
+                # Non-editable display of version
+                readonly_version = (
+                    self.form_data.installed_appserver_version
+                    or self.form_data.existing_llama_deploy_version
+                    or "unknown"
+                )
+                yield Static(readonly_version, id="appserver_version_readonly")
+
         # Secrets section
         yield SecretsWidget(
             initial_secrets=self.form_data.secrets,
@@ -249,6 +329,13 @@ class DeploymentFormWidget(Widget):
             # Post message to parent app to handle cancel
             self.post_message(CancelFormMessage())
 
+    def on_select_changed(self, event: Select.Changed) -> None:
+        """Handle version selection changes"""
+        if event.select.id == "appserver_version_select" and event.value:
+            updated_form = dataclasses.replace(self.resolve_form_data())
+            updated_form.selected_appserver_version = str(event.value)
+            self.form_data = updated_form
+
     def _save(self) -> None:
         self.form_data = self.resolve_form_data()
         if self._validate_form():
@@ -318,6 +405,9 @@ class DeploymentFormWidget(Widget):
             removed_secrets=self.original_form_data.initial_secrets.difference(
                 updated_prior_secrets
             ),
+            installed_appserver_version=self.form_data.installed_appserver_version,
+            existing_llama_deploy_version=self.form_data.existing_llama_deploy_version,
+            selected_appserver_version=self.form_data.selected_appserver_version,
         )
 
 
@@ -583,6 +673,8 @@ def _initialize_deployment_data() -> DeploymentForm:
         if len(secrets) > 0:
             env_info_message = "Secrets were automatically seeded from your .env file. Remove or change any that should not be set. They must be manually configured after creation."
 
+    installed = get_installed_appserver_version()
+
     form = DeploymentForm(
         name=name or "",
         repo_url=repo_url or "",
@@ -591,6 +683,8 @@ def _initialize_deployment_data() -> DeploymentForm:
         deployment_file_path=config_file_path or "",
         warnings=warnings,
         env_info_messages=env_info_message,
+        installed_appserver_version=installed,
+        selected_appserver_version=installed,
     )
     return form
 

{llamactl-0.3.10 → llamactl-0.3.12}/src/llama_deploy/cli/textual/deployment_help.py

@@ -39,6 +39,12 @@ class DeploymentHelpWidget(Widget):
                 [b]Config File[/b]
                 Path to a directory or file containing a `[slategrey reverse]pyproject.toml[/]` or `[slategrey reverse]llama_deploy.yaml[/]` containing the llama deploy configuration. Only necessary if you have the configuration not at the root of the repo, or you have an unconventional configuration file.
                 
+                [b]Personal Access Token[/b]
+                A personal access token to access the git repository. Can be used instead of the github integration.
+
+                [b]Appserver Version[/b]
+                The version of the appserver to deploy. Affects features and functionality. By default this is set to the current llamactl version, and then retained until manually upgraded.
+
                 [b]Secrets[/b]
                 Secrets to add as environment variables to the deployment. e.g. to access a database or an API. Supports adding in `[slategrey reverse].env[/]` file format.
                 

{llamactl-0.3.10 → llamactl-0.3.12}/src/llama_deploy/cli/textual/styles.tcss

@@ -60,6 +60,10 @@ Input.disabled {
 /* UTILITIES, MESSAGES & NOTIFICATIONS                       */
 /* =============================================== */
 
+.mb-0 {
+    margin-bottom: 0 !important;
+}
+
 .mb-1 {
     margin-bottom: 1;
 }
@@ -68,6 +72,10 @@ Input.disabled {
     margin-bottom: 2;
 }
 
+.mt-0 {
+    margin-top: 0;
+}
+
 .mt-1 {
     margin-top: 1;
 }
@@ -76,6 +84,10 @@ Input.disabled {
     margin-top: 2;
 }
 
+.m-0 {
+    margin: 0;
+}
+
 .m-1 {
     margin: 1;
 }
@@ -102,6 +114,7 @@ Input.disabled {
     padding: 0 0 0 1
 }
 
+
 .error-message {
     color: $text-error;
     background: $error-muted;
@@ -201,3 +214,102 @@ Button.secondary {
     align: left middle;
 }
 
+
+.top-left {
+    align: left top;
+}
+.top-center {
+    align: left middle;
+}
+.top-right {
+    align: right top;
+}
+.middle-left {
+    align: left middle;
+}
+.middle-center {
+    align: center middle;
+}
+.middle-right {
+    align: right middle;
+}
+.bottom-left {
+    align: left bottom;
+}
+.bottom-center {
+    align: right bottom;
+}
+.bottom-right {
+    align: right bottom;
+}
+
+
+.text-right {
+    text-align: right;
+}
+.text-left {
+    text-align: left;
+}
+.text-center {
+    text-align: center;
+}
+.text-justify {
+    text-align: justify;
+}
+
+.background-red {
+    background: red;
+}
+
+
+.w-1 {
+    width: 1;
+}
+
+.w-2 {
+    width: 2;
+}
+
+.w-3 {
+    width: 3;
+}
+
+.w-1fr {
+    width: 1fr;
+}
+
+.w-100 {
+    width: 100%;
+}
+
+.w-2fr {
+    width: 2fr;
+}
+
+.h-1 {
+    height: 1;
+}
+
+.h-2 {
+    height: 2;
+}
+
+.h-3 {
+    height: 3;
+}
+
+.h-1fr {
+    height: 1fr;
+}
+
+.h-100 {
+    height: 100%;
+}
+
+.h-2fr {
+    height: 2fr;
+}
+
+.h-100 {
+    height: 100%;
+}

llamactl-0.3.12/src/llama_deploy/cli/utils/version.py

@@ -0,0 +1,11 @@
+"""Version utilities shared across CLI components."""
+
+from importlib import metadata as importlib_metadata
+
+
+def get_installed_appserver_version() -> str | None:
+    """Return the installed version of `llama-deploy-appserver`, if available."""
+    try:
+        return importlib_metadata.version("llama-deploy-appserver")
+    except Exception:
+        return None