llamactl 0.3.10__tar.gz → 0.3.11__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.10
+Version: 0.3.11
 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.11,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.11,<0.4.0
 Requires-Dist: httpx>=0.24.0,<1.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

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

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.10"
+version = "0.3.11"
 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.11,<0.4.0",
+    "llama-deploy-appserver>=0.3.11,<0.4.0",
     "httpx>=0.24.0,<1.0.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",

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

@@ -79,6 +79,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",
@@ -215,6 +224,7 @@ def _create(template: str | None, dir: Path | None, force: bool) -> 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
@@ -252,6 +262,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 +306,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 +318,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("")
 
 

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

@@ -92,6 +92,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(

{llamactl-0.3.10 → llamactl-0.3.11}/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.11}/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.11}/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.11/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