llamactl 0.3.0a4__py3-none-any.whl → 0.3.0a5__py3-none-any.whl

llama_deploy/cli/commands/serve.py

@@ -0,0 +1,68 @@
+from pathlib import Path
+
+import click
+from llama_deploy.appserver.app import (
+    prepare_server,
+    start_server_in_target_venv,
+)
+from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
+from rich import print as rprint
+
+from ..app import app
+from ..options import global_options
+
+
+@app.command(
+    "serve",
+    help="Serve a LlamaDeploy app locally for development and testing",
+)
+@click.argument(
+    "deployment_file",
+    required=False,
+    default=DEFAULT_DEPLOYMENT_FILE_PATH,
+    type=click.Path(dir_okay=False, resolve_path=True, path_type=Path),
+)
+@click.option(
+    "--no-install", is_flag=True, help="Skip installing python and js dependencies"
+)
+@click.option(
+    "--no-reload", is_flag=True, help="Skip reloading the API server on code changes"
+)
+@click.option("--no-open-browser", is_flag=True, help="Skip opening the browser")
+@click.option(
+    "--preview",
+    is_flag=True,
+    help="Preview mode pre-builds the UI to static files, like a production build",
+)
+@global_options
+def serve(
+    deployment_file: Path,
+    no_install: bool,
+    no_reload: bool,
+    no_open_browser: bool,
+    preview: bool,
+) -> None:
+    """Run llama_deploy API Server in the foreground. If no deployment_file is provided, will look for a llama_deploy.yaml in the current directory."""
+    if not deployment_file.exists():
+        rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
+        raise click.Abort()
+
+    try:
+        prepare_server(
+            install=not no_install,
+            build=preview,
+        )
+        start_server_in_target_venv(
+            cwd=Path.cwd(),
+            deployment_file=deployment_file,
+            proxy_ui=not preview,
+            reload=not no_reload,
+            open_browser=not no_open_browser,
+        )
+
+    except KeyboardInterrupt:
+        print("Shutting down...")
+
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()

llama_deploy/cli/config.py

@@ -1,10 +1,10 @@
 """Configuration and profile management for llamactl"""
 
+import os
 import sqlite3
-from pathlib import Path
-from typing import Optional, List
 from dataclasses import dataclass
-import os
+from pathlib import Path
+from typing import List, Optional
 
 
 @dataclass
@@ -13,7 +13,7 @@ class Profile:
 
     name: str
     api_url: str
-    active_project_id: Optional[str] = None
+    active_project_id: str | None = None
 
 
 class ConfigManager:
@@ -69,7 +69,7 @@ class ConfigManager:
             conn.commit()
 
     def create_profile(
-        self, name: str, api_url: str, active_project_id: Optional[str] = None
+        self, name: str, api_url: str, active_project_id: str | None = None
     ) -> Profile:
         """Create a new profile"""
         profile = Profile(
@@ -88,7 +88,7 @@ class ConfigManager:
 
         return profile
 
-    def get_profile(self, name: str) -> Optional[Profile]:
+    def get_profile(self, name: str) -> Profile | None:
         """Get a profile by name"""
         with sqlite3.connect(self.db_path) as conn:
             cursor = conn.execute(
@@ -125,7 +125,7 @@ class ConfigManager:
 
             return cursor.rowcount > 0
 
-    def set_current_profile(self, name: Optional[str]):
+    def set_current_profile(self, name: str | None):
         """Set the current active profile"""
         with sqlite3.connect(self.db_path) as conn:
             if name is None:
@@ -137,7 +137,7 @@ class ConfigManager:
                 )
             conn.commit()
 
-    def get_current_profile_name(self) -> Optional[str]:
+    def get_current_profile_name(self) -> str | None:
         """Get the name of the current active profile"""
         with sqlite3.connect(self.db_path) as conn:
             cursor = conn.execute(
@@ -146,14 +146,14 @@ class ConfigManager:
             row = cursor.fetchone()
             return row[0] if row else None
 
-    def get_current_profile(self) -> Optional[Profile]:
+    def get_current_profile(self) -> Profile | None:
         """Get the current active profile"""
         current_name = self.get_current_profile_name()
         if current_name:
             return self.get_profile(current_name)
         return None
 
-    def set_active_project(self, profile_name: str, project_id: Optional[str]) -> bool:
+    def set_active_project(self, profile_name: str, project_id: str | None) -> bool:
         """Set the active project for a profile. Returns True if profile exists."""
         with sqlite3.connect(self.db_path) as conn:
             cursor = conn.execute(
@@ -163,7 +163,7 @@ class ConfigManager:
             conn.commit()
             return cursor.rowcount > 0
 
-    def get_active_project(self, profile_name: str) -> Optional[str]:
+    def get_active_project(self, profile_name: str) -> str | None:
         """Get the active project for a profile"""
         profile = self.get_profile(profile_name)
         return profile.active_project_id if profile else None

llama_deploy/cli/env.py

@@ -1,9 +1,10 @@
 """Environment variable handling utilities for llamactl"""
 
-from typing import Dict
 from io import StringIO
-from rich import print as rprint
+from typing import Dict
+
 from dotenv import dotenv_values
+from rich import print as rprint
 
 
 def load_env_secrets_from_string(env_content: str) -> Dict[str, str]:

llama_deploy/cli/interactive_prompts/utils.py

@@ -12,7 +12,7 @@ from ..config import config_manager
 console = Console()
 
 
-def select_deployment(deployment_id: Optional[str] = None) -> Optional[str]:
+def select_deployment(deployment_id: str | None = None) -> str | None:
     """
     Select a deployment interactively if ID not provided.
     Returns the selected deployment ID or None if cancelled.
@@ -48,7 +48,7 @@ def select_deployment(deployment_id: Optional[str] = None) -> Optional[str]:
         return None
 
 
-def select_profile(profile_name: Optional[str] = None) -> Optional[str]:
+def select_profile(profile_name: str | None = None) -> str | None:
     """
     Select a profile interactively if name not provided.
     Returns the selected profile name or None if cancelled.

llama_deploy/cli/options.py

@@ -1,4 +1,5 @@
 import logging
+
 import click
 
 
@@ -18,4 +19,5 @@ def global_options(f):
         callback=debug_callback,
         expose_value=False,
         is_eager=True,
+        hidden=True,
     )(f)

llama_deploy/cli/textual/deployment_form.py

@@ -1,16 +1,27 @@
 """Textual-based deployment forms for CLI interactions"""
 
-from dataclasses import dataclass, field
 import dataclasses
 import logging
+import os
+import re
+from dataclasses import dataclass, field
 from pathlib import Path
+from urllib.parse import urlsplit
 
-from llama_deploy.cli.textual.secrets_form import SecretsWidget
+from llama_deploy.cli.client import get_project_client as get_client
+from llama_deploy.cli.env import load_env_secrets_from_string
+from llama_deploy.cli.textual.deployment_help import (
+    DeploymentHelpBackMessage,
+    DeploymentHelpWidget,
+)
 from llama_deploy.cli.textual.git_validation import (
     GitValidationWidget,
-    ValidationResultMessage,
     ValidationCancelMessage,
+    ValidationResultMessage,
 )
+from llama_deploy.cli.textual.secrets_form import SecretsWidget
+from llama_deploy.core.deployment_config import DeploymentConfig
+from llama_deploy.core.git.git_util import get_current_branch, is_git_repo, list_remotes
 from llama_deploy.core.schema.deployments import (
     DeploymentCreate,
     DeploymentResponse,
@@ -18,11 +29,11 @@ from llama_deploy.core.schema.deployments import (
 )
 from textual.app import App, ComposeResult
 from textual.containers import Container, HorizontalGroup, Widget
+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.reactive import reactive
-from llama_deploy.cli.client import get_project_client as get_client
-from textual.message import Message
 
 
 @dataclass
@@ -119,8 +130,11 @@ class DeploymentFormWidget(Widget):
 
     def compose(self) -> ComposeResult:
         title = "Edit Deployment" if self.form_data.is_editing else "Create Deployment"
+
         yield Static(
-            title,
+            Content.from_markup(
+                f"{title} [italic][@click=app.show_help()]More info[/][/italic]"
+            ),
             classes="primary-message",
         )
         yield Static(
@@ -201,7 +215,7 @@ class DeploymentFormWidget(Widget):
         if event.button.id == "save":
             self._save()
         elif event.button.id == "change_pat":
-            updated_form = dataclasses.replace(self._get_form_data())
+            updated_form = dataclasses.replace(self.resolve_form_data())
             updated_form.has_existing_pat = False
             updated_form.personal_access_token = ""
             self.form_data = updated_form
@@ -210,7 +224,7 @@ class DeploymentFormWidget(Widget):
             self.post_message(CancelFormMessage())
 
     def _save(self) -> None:
-        self.form_data = self._get_form_data()
+        self.form_data = self.resolve_form_data()
         if self._validate_form():
             # Post message to parent app to start validation
             self.post_message(StartValidationMessage(self.form_data))
@@ -245,7 +259,7 @@ class DeploymentFormWidget(Widget):
         """Show an error message"""
         self.error_message = message
 
-    def _get_form_data(self) -> DeploymentForm:
+    def resolve_form_data(self) -> DeploymentForm:
         """Extract form data from inputs"""
         name_input = self.query_one("#name", Input)
         repo_url_input = self.query_one("#repo_url", Input)
@@ -299,12 +313,22 @@ class StartValidationMessage(Message):
         self.form_data = form_data
 
 
+class ShowHelpMessage(Message):
+    def __init__(self, form_data: DeploymentForm):
+        super().__init__()
+        self.form_data = form_data
+
+
+class HelpBackMessage(Message):
+    pass
+
+
 class DeploymentEditApp(App[DeploymentResponse | None]):
     """Textual app for editing/creating deployments"""
 
     CSS_PATH = Path(__file__).parent / "styles.tcss"
 
-    # App states: 'form' or 'validation'
+    # App states: 'form', 'validation', or 'help'
     current_state: reactive[str] = reactive("form", recompose=True)
     form_data: reactive[DeploymentForm] = reactive(DeploymentForm())
     save_error: reactive[str] = reactive("", recompose=True)
@@ -336,6 +360,23 @@ class DeploymentEditApp(App[DeploymentResponse | None]):
                     if self.form_data.personal_access_token
                     else None,
                 )
+            elif self.current_state == "help":
+                yield DeploymentHelpWidget()
+            else:
+                yield Static("Unknown state: " + self.current_state)
+
+    def action_show_help(self) -> None:
+        widget = self.query("DeploymentFormWidget")
+        if widget:
+            typed_widget: DeploymentFormWidget = widget[0]
+            self.form_data = typed_widget.resolve_form_data()
+
+        self.current_state = "help"
+
+    def on_deployment_help_back_message(
+        self, message: DeploymentHelpBackMessage
+    ) -> None:
+        self.current_state = "form"
 
     def on_start_validation_message(self, message: StartValidationMessage) -> None:
         """Handle validation start message from form widget"""
@@ -364,6 +405,15 @@ class DeploymentEditApp(App[DeploymentResponse | None]):
         self.save_error = ""
         self.current_state = "form"
 
+    def on_show_help_message(self, message: ShowHelpMessage) -> None:
+        """Navigate to help view, preserving current form state."""
+        self.form_data = message.form_data
+        self.current_state = "help"
+
+    def on_help_back_message(self, message: HelpBackMessage) -> None:
+        """Return from help to form, keeping form state intact."""
+        self.current_state = "form"
+
     def _perform_save(self) -> None:
         """Actually save the deployment after validation"""
         logging.info("saving form data", self.form_data)
@@ -403,6 +453,91 @@ def edit_deployment_form(
 
 def create_deployment_form() -> DeploymentResponse | None:
     """Launch deployment creation form and return result"""
-    initial_data = DeploymentForm()
+    initial_data = _initialize_deployment_data()
     app = DeploymentEditApp(initial_data)
     return app.run()
+
+
+def _initialize_deployment_data() -> DeploymentForm:
+    """
+    initialize the deployment form data from the current git repo and .env file
+    """
+
+    repo_url: str | None = None
+    git_ref: str | None = None
+    secrets: dict[str, str] = {}
+    name: str | None = None
+    if is_git_repo():
+        seen = set[str]()
+        remotes = list_remotes()
+        candidate_origins = []
+        for remote in remotes:
+            normalized_url = _normalize_to_http(remote)
+            if normalized_url not in seen:
+                candidate_origins.append(normalized_url)
+                seen.add(normalized_url)
+        preferred_origin = sorted(
+            candidate_origins, key=lambda x: "github.com" in x, reverse=True
+        )
+        if preferred_origin:
+            repo_url = preferred_origin[0]
+        git_ref = get_current_branch()
+    if Path(".env").exists():
+        secrets = load_env_secrets_from_string(Path(".env").read_text())
+    for f in os.listdir("."):
+        if f.endswith(".yml") or f.endswith(".yaml"):
+            try:
+                config = DeploymentConfig.from_yaml(Path(f))
+                name = config.name
+                break
+            except Exception:
+                pass
+
+    form = DeploymentForm(
+        name=name or "",
+        repo_url=repo_url or "",
+        git_ref=git_ref or "main",
+        secrets=secrets,
+    )
+    return form
+
+
+def _normalize_to_http(url: str) -> str:
+    """
+    normalize a git url to a best guess for a corresponding http(s) url
+    """
+    candidate = (url or "").strip()
+
+    # If no scheme, first try scp-like SSH syntax: [user@]host:path
+    has_scheme = "://" in candidate
+    if not has_scheme:
+        scp_match = re.match(
+            r"^(?:(?P<user>[^@]+)@)?(?P<host>[^:/\s]+):(?P<path>[^/].+)$",
+            candidate,
+        )
+        if scp_match:
+            host = scp_match.group("host")
+            path = scp_match.group("path").lstrip("/")
+            if path.endswith(".git"):
+                path = path[:-4]
+            return f"https://{host}/{path}"
+
+    # If no scheme (and not scp), assume host/path and prepend https
+    parsed = urlsplit(candidate if has_scheme else f"https://{candidate}")
+
+    # Drop credentials from netloc
+    netloc = parsed.netloc.split("@", 1)[-1]
+
+    # Drop explicit port (common for SSH like :7999 which is wrong for https)
+    if ":" in netloc:
+        netloc = netloc.split(":", 1)[0]
+
+    # Normalize path and strip .git
+    path = parsed.path.lstrip("/")
+    if path.endswith(".git"):
+        path = path[:-4]
+
+    if path:
+        return f"https://{netloc}/{path}"
+    else:
+        return f"https://{netloc}"

llama_deploy/cli/textual/deployment_help.py

@@ -0,0 +1,53 @@
+from textwrap import dedent
+
+from textual.app import ComposeResult
+from textual.containers import HorizontalGroup, Widget
+from textual.content import Content
+from textual.message import Message
+from textual.widgets import Button, Static
+
+
+class DeploymentHelpBackMessage(Message):
+    pass
+
+
+class DeploymentHelpWidget(Widget):
+    DEFAULT_CSS = """
+    DeploymentHelpWidget {
+        layout: vertical;
+        height: auto;
+    }
+    """
+
+    def compose(self) -> ComposeResult:
+        yield Static(
+            "Deploy your app to llama cloud or your own infrastructure:",
+            classes="primary-message",
+        )
+        yield Static(
+            Content.from_markup(
+                dedent("""
+                [b]Deployment Name[/b]
+                A unique name to identify this deployment. Controls the URL where your deployment is accessible. Will have a random suffix appended if not unique.
+                
+                [b]Git Repository[/b]
+                A git repository URL to pull code from. If not publically accessible, you will be prompted to install the llama deploy github app. If code is on another platform, either provide a Personal Access Token (basic access credentials) instead.
+                
+                [b]Git Ref[/b]
+                The git ref to deploy. This can be a branch, tag, or commit hash. If this is a branch, after deploying, run a `[slategrey reverse]llamactl deploy refresh[/]` to update the deployment to the latest git ref after you make updates.
+                
+                [b]Deployment File[/b]
+                The `[slategrey reverse]llama_deploy.yaml[/]` file to use for the deployment. This is a yaml file that contains the configuration for how to serve the deployment.
+                
+                [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.
+                
+                """).strip()
+            ),
+        )
+        with HorizontalGroup(classes="button-row"):
+            yield Button("Back", variant="primary", id="help_back", compact=True)
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        if event.button.id == "help_back":
+            self.post_message(DeploymentHelpBackMessage())

llama_deploy/cli/textual/git_validation.py

@@ -4,17 +4,16 @@ import logging
 import webbrowser
 from typing import Literal, cast
 
+from llama_deploy.cli.client import get_project_client as get_client
+from llama_deploy.cli.textual.github_callback_server import GitHubCallbackServer
+from llama_deploy.cli.textual.llama_loader import PixelLlamaLoader
+from llama_deploy.core.schema.git_validation import RepositoryValidationResponse
 from textual.app import ComposeResult
 from textual.containers import HorizontalGroup, Widget
-from textual.widgets import Button, Input, Label, Static
-from textual.message import Message
 from textual.content import Content
+from textual.message import Message
 from textual.reactive import reactive
-
-from llama_deploy.cli.client import get_project_client as get_client
-from llama_deploy.core.schema.git_validation import RepositoryValidationResponse
-from llama_deploy.cli.textual.llama_loader import PixelLlamaLoader
-from llama_deploy.cli.textual.github_callback_server import GitHubCallbackServer
+from textual.widgets import Button, Input, Label, Static
 
 logger = logging.getLogger(__name__)
 

llama_deploy/cli/textual/github_callback_server.py

@@ -4,7 +4,7 @@ import asyncio
 import logging
 import webbrowser
 from textwrap import dedent
-from typing import Dict, Any, cast
+from typing import Any, Dict, cast
 
 from aiohttp import web
 

llama_deploy/cli/textual/llama_loader.py

@@ -1,4 +1,5 @@
 import re
+
 from textual.widgets import Static
 
 

llama_deploy/cli/textual/profile_form.py

@@ -12,8 +12,7 @@ from textual.containers import (
 from textual.validation import Length
 from textual.widgets import Button, Input, Label, Static
 
-from ..config import Profile
-from ..config import config_manager
+from ..config import Profile, config_manager
 
 
 @dataclass
@@ -23,7 +22,7 @@ class ProfileForm:
     name: str = ""
     api_url: str = ""
     active_project_id: str = ""
-    existing_name: Optional[str] = None
+    existing_name: str | None = None
 
     @classmethod
     def from_profile(cls, profile: Profile) -> "ProfileForm":
@@ -35,7 +34,7 @@ class ProfileForm:
         )
 
 
-class ProfileEditApp(App[Optional[ProfileForm]]):
+class ProfileEditApp(App[ProfileForm | None]):
     """Textual app for editing profiles"""
 
     CSS_PATH = Path(__file__).parent / "styles.tcss"
@@ -71,7 +70,7 @@ class ProfileEditApp(App[Optional[ProfileForm]]):
                 yield Label("API URL: *", classes="required form-label", shrink=True)
                 yield Input(
                     value=self.form_data.api_url,
-                    placeholder="https://prod-cloud-llama-deploy",
+                    placeholder="http://prod-cloud-llama-deploy",
                     validators=[Length(minimum=1)],
                     id="api_url",
                     compact=True,
@@ -162,10 +161,10 @@ def edit_profile_form(profile: Profile) -> ProfileForm | None:
     return app.run()
 
 
-def create_profile_form() -> Optional[ProfileForm]:
+def create_profile_form() -> ProfileForm | None:
     """Launch profile creation form and return result"""
     return edit_profile_form(
         Profile(
-            name="", api_url="https://prod-cloud-llama-deploy", active_project_id=None
+            name="", api_url="http://prod-cloud-llama-deploy", active_project_id=None
         )
     )

llama_deploy/cli/textual/secrets_form.py

@@ -1,11 +1,10 @@
 """Textual-based deployment forms for CLI interactions"""
 
 from llama_deploy.cli.env import load_env_secrets_from_string
-
 from textual.app import ComposeResult
 from textual.containers import HorizontalGroup, Widget
-from textual.widgets import Button, Input, Label, Static, TextArea
 from textual.reactive import reactive
+from textual.widgets import Button, Input, Label, Static, TextArea
 
 
 class SecretsWidget(Widget):
@@ -62,9 +61,7 @@ class SecretsWidget(Widget):
     """
     secrets = reactive({}, recompose=True)  # Auto-recompose when secrets change
     prior_secrets = reactive(set(), recompose=True)
-    visible_secrets = reactive(
-        set(), recompose=True
-    )  # Auto-recompose when visible secrets change
+    visible_secrets = reactive(set(), recompose=True)
 
     def __init__(
         self,
@@ -75,11 +72,18 @@ class SecretsWidget(Widget):
         self.secrets = initial_secrets or {}
         self.prior_secrets = prior_secrets or set()
         self.visible_secrets = set()
+        # Persist textarea content across recomposes triggered by other actions
+        self._new_secrets_text = ""
 
     def compose(self) -> ComposeResult:
         """Compose the secrets section - called automatically when secrets change"""
-        yield Static("Environment Variables", classes="secrets-header")
-        secret_names = self.prior_secrets.union(self.secrets.keys())
+        yield Static("Secrets", classes="secrets-header")
+        # Preserve deterministic order: known secrets in insertion order, then prior-only sorted
+        known_secret_names = list(self.secrets.keys())
+        prior_only_secret_names = sorted(
+            [name for name in self.prior_secrets if name not in self.secrets]
+        )
+        secret_names = known_secret_names + prior_only_secret_names
         hidden = len(secret_names) == 0
         with Static(
             classes="secrets-grid" + (" hidden" if hidden else ""),
@@ -108,9 +112,15 @@ class SecretsWidget(Widget):
                     compact=True,
                 )
 
+        # Short help text for textarea format
+        yield Static(
+            "Format: one per line, KEY=VALUE (e.g., API_KEY=abc).",
+            classes="secret-label",
+        )
+
         with HorizontalGroup(classes="text-container"):
             yield TextArea(
-                "",
+                self._new_secrets_text,
                 id="new_secrets",
                 show_line_numbers=True,
                 highlight_cursor_line=True,
@@ -154,6 +164,7 @@ class SecretsWidget(Widget):
 
         # Clear textarea
         textarea.text = ""
+        self._new_secrets_text = ""
 
     def _toggle_secret_visibility(self, secret_name: str) -> None:
         """Toggle the visibility of a secret"""
@@ -175,6 +186,11 @@ class SecretsWidget(Widget):
             updated_prior_secrets.remove(secret_name)
             self.prior_secrets = updated_prior_secrets
 
+    def on_text_area_changed(self, event: TextArea.Changed) -> None:
+        """Track textarea edits so content persists across recomposes."""
+        text = event.text_area.text
+        self._new_secrets_text = text
+
     def get_updated_secrets(self) -> dict[str, str]:
         """Get current secrets with values from input fields"""
         self._add_secrets_from_textarea()