llamactl 0.3.19__tar.gz → 0.3.21__tar.gz

{llamactl-0.3.19 → llamactl-0.3.21}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.19
+Version: 0.3.21
 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.19,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.19,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.21,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.21,<0.4.0
 Requires-Dist: vibe-llama-core>=0.1.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

{llamactl-0.3.19 → llamactl-0.3.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.19"
+version = "0.3.21"
 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.19,<0.4.0",
-    "llama-deploy-appserver>=0.3.19,<0.4.0",
+    "llama-deploy-core[client]>=0.3.21,<0.4.0",
+    "llama-deploy-appserver>=0.3.21,<0.4.0",
     "vibe-llama-core>=0.1.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",

{llamactl-0.3.19 → llamactl-0.3.21}/src/llama_deploy/cli/__init__.py

@@ -2,6 +2,7 @@ import warnings
 
 from llama_deploy.cli.commands.auth import auth
 from llama_deploy.cli.commands.deployment import deployments
+from llama_deploy.cli.commands.dev import dev
 from llama_deploy.cli.commands.env import env_group
 from llama_deploy.cli.commands.init import init
 from llama_deploy.cli.commands.pkg import pkg
@@ -23,7 +24,16 @@ def main() -> None:
     app()
 
 
-__all__ = ["app", "deployments", "auth", "serve", "init", "env_group", "pkg"]
+__all__ = [
+    "app",
+    "deployments",
+    "auth",
+    "serve",
+    "init",
+    "env_group",
+    "pkg",
+    "dev",
+]
 
 
 if __name__ == "__main__":

{llamactl-0.3.19 → llamactl-0.3.21}/src/llama_deploy/cli/commands/deployment.py

@@ -119,6 +119,7 @@ def get_deployment(deployment_id: str | None, interactive: bool) -> None:
         table.add_row("Repository", Text(deployment.repo_url))
         table.add_row("Deployment File", Text(deployment.deployment_file_path))
         table.add_row("Git Ref", Text(deployment.git_ref or "-"))
+        table.add_row("Last Deployed Commit", Text((deployment.git_sha or "-")[:7]))
 
         apiserver_url = deployment.apiserver_url
         table.add_row(

llamactl-0.3.21/src/llama_deploy/cli/commands/dev.py

@@ -0,0 +1,176 @@
+from __future__ import annotations
+
+import os
+import subprocess
+from pathlib import Path
+
+import click
+from click.exceptions import Abort, Exit
+from llama_deploy.appserver.app import prepare_server, start_preflight_in_target_venv
+from llama_deploy.appserver.deployment_config_parser import get_deployment_config
+from llama_deploy.appserver.settings import configure_settings, settings
+from llama_deploy.appserver.workflow_loader import (
+    load_environment_variables,
+    parse_environment_variables,
+    validate_required_env_vars,
+)
+from llama_deploy.cli.commands.aliased_group import AliasedGroup
+from llama_deploy.cli.commands.serve import (
+    _maybe_inject_llama_cloud_credentials,
+    _print_connection_summary,
+)
+from llama_deploy.cli.commands.serve import (
+    serve as serve_command,
+)
+from llama_deploy.cli.options import global_options, interactive_option
+from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
+from llama_deploy.core.deployment_config import DeploymentConfig
+from rich import print as rprint
+
+from ..app import app
+
+
+@app.group(
+    name="dev",
+    help="Development utilities for llama-deploy projects",
+    cls=AliasedGroup,
+    no_args_is_help=True,
+)
+@global_options
+def dev() -> None:
+    """Collection of development commands."""
+
+
+dev.add_command(serve_command, name="serve")
+
+
+@dev.command(
+    "validate",
+    help="Load configured workflows and run their validation hooks",
+)
+@click.argument(
+    "deployment_file",
+    required=False,
+    default=DEFAULT_DEPLOYMENT_FILE_PATH,
+    type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+)
+@interactive_option
+@global_options
+def validate_command(deployment_file: Path, interactive: bool) -> None:
+    """Validate workflows defined in the deployment configuration."""
+    config_dir = _ensure_project_layout(
+        deployment_file, command_name="llamactl dev validate"
+    )
+    # Ensure cloud credentials/env are available to the subprocess (if required)
+    _maybe_inject_llama_cloud_credentials(
+        deployment_file, interactive, require_cloud=False
+    )
+
+    prepare_server(
+        deployment_file=deployment_file,
+        install=True,
+        build=False,
+        install_ui_deps=False,
+    )
+
+    # Delegate venv-targeted invocation to the appserver helper (mirrors start_server_in_target_venv)
+
+    try:
+        start_preflight_in_target_venv(cwd=Path.cwd(), deployment_file=deployment_file)
+    except subprocess.CalledProcessError as exc:
+        rprint("[red]Workflow validation failed. See errors above.[/red]")
+        raise Exit(exc.returncode)
+
+    _print_connection_summary()
+    rprint(f"[green]Validated workflows in {config_dir} successfully.[/green]")
+
+
+@dev.command(
+    "run",
+    help=(
+        "Load env configuration and execute a command. Use '--' before the command "
+        "to avoid option parsing."
+    ),
+    context_settings={"ignore_unknown_options": True, "allow_extra_args": True},
+)
+@global_options
+@click.option(
+    "deployment_file",
+    "--deployment-file",
+    default=DEFAULT_DEPLOYMENT_FILE_PATH,
+    type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+    help="The deployment file to use for the command",
+)
+@click.option(
+    "no_auth",
+    "--no-auth",
+    is_flag=True,
+    help="Do not inject/authenticate with Llama Cloud credentials",
+)
+@interactive_option
+@click.argument("cmd", nargs=-1, type=click.UNPROCESSED)
+def run_command(
+    deployment_file: Path, no_auth: bool, interactive: bool, cmd: tuple[str, ...]
+) -> None:  # type: ignore
+    """Execute COMMAND with deployment environment variables applied."""
+    if not cmd:
+        raise click.ClickException(
+            "No command provided. Use '--' before the command arguments if needed."
+        )
+
+    try:
+        config, config_parent = _prepare_environment(
+            deployment_file, interactive, require_cloud=not no_auth
+        )
+        env_overrides = parse_environment_variables(config, config_parent)
+        env = os.environ.copy()
+        env.update({k: v for k, v in env_overrides.items() if v is not None})
+
+        _print_connection_summary()
+        result = subprocess.run(cmd, env=env, check=False)
+        if result.returncode != 0:
+            raise SystemExit(result.returncode)
+    except (Exit, Abort, SystemExit, click.ClickException):
+        raise
+    except FileNotFoundError as exc:
+        rprint(f"[red]Command not found: {exc.filename}[/red]")
+        raise click.Abort()
+    except Exception as exc:  # pragma: no cover - unexpected errors reported to user
+        rprint(f"[red]Failed to run command: {exc}[/red]")
+        raise click.Abort()
+
+
+def _ensure_project_layout(deployment_file: Path, *, command_name: str) -> Path:
+    if not deployment_file.exists():
+        rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
+        raise click.Abort()
+
+    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"
+            f"Add a pyproject.toml to your project and re-run '{command_name}'."
+        )
+        raise click.Abort()
+    return config_dir
+
+
+def _prepare_environment(
+    deployment_file: Path, interactive: bool, *, require_cloud: bool
+) -> tuple[DeploymentConfig, Path]:
+    _maybe_inject_llama_cloud_credentials(
+        deployment_file, interactive, require_cloud=require_cloud
+    )
+    configure_settings(
+        deployment_file_path=deployment_file,
+        app_root=Path.cwd(),
+    )
+    config = get_deployment_config()
+    config_parent = settings.resolved_config_parent
+    load_environment_variables(config, config_parent)
+    validate_required_env_vars(config)
+    return config, config_parent
+
+
+__all__ = ["dev", "validate_command", "run_command"]

{llamactl-0.3.19 → llamactl-0.3.21}/src/llama_deploy/cli/commands/init.py

@@ -279,41 +279,64 @@ def _create(
                 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.
+        # Initialize a git repo unless we're already inside one.
         if has_git:
+            # Detect whether the target directory is already inside a git work tree
+            inside_existing_repo = False
             try:
-                subprocess.run(["git", "init"], check=True, capture_output=True)
-                subprocess.run(["git", "add", "."], check=True, capture_output=True)
-                subprocess.run(
-                    ["git", "commit", "-m", "Initial commit"],
+                result = subprocess.run(
+                    ["git", "rev-parse", "--is-inside-work-tree"],
                     check=True,
                     capture_output=True,
+                    text=True,
                 )
-                git_initialized = True
-            except (subprocess.CalledProcessError, FileNotFoundError) as e:
-                # Extract a short error message if present
-                err_msg = ""
-                if isinstance(e, subprocess.CalledProcessError):
-                    stderr_bytes = e.stderr or b""
-                    if isinstance(stderr_bytes, (bytes, bytearray)):
-                        try:
-                            stderr_text = stderr_bytes.decode("utf-8", "ignore")
-                        except Exception:
-                            stderr_text = ""
-                    else:
-                        stderr_text = str(stderr_bytes)
-                    if stderr_text.strip():
-                        err_msg = stderr_text.strip().split("\n")[-1]
-                elif isinstance(e, FileNotFoundError):
-                    err_msg = "git executable not found"
+                inside_existing_repo = result.stdout.strip().lower() == "true"
+            except (subprocess.CalledProcessError, FileNotFoundError):
+                inside_existing_repo = False
 
-                rprint("")
-                rprint("⚠️  [bold]Skipping git initialization due to an error.[/]")
-                if err_msg:
-                    rprint(f"    {err_msg}")
-                rprint("    You can initialize it manually:")
-                rprint("      git init && git add . && git commit -m 'Initial commit'")
-                rprint("")
+            if inside_existing_repo:
+                # Do not create a nested repo; user likely wants this within the parent repo
+                rprint(
+                    "[yellow]Detected an existing Git repository in a parent directory; skipping git initialization for this app.[/]"
+                )
+                # Treat as initialized for purposes of what instructions to show later
+                git_initialized = True
+            else:
+                try:
+                    subprocess.run(["git", "init"], check=True, capture_output=True)
+                    subprocess.run(["git", "add", "."], check=True, capture_output=True)
+                    subprocess.run(
+                        ["git", "commit", "-m", "Initial commit"],
+                        check=True,
+                        capture_output=True,
+                    )
+                    git_initialized = True
+                except (subprocess.CalledProcessError, FileNotFoundError) as e:
+                    # Extract a short error message if present
+                    err_msg = ""
+                    if isinstance(e, subprocess.CalledProcessError):
+                        stderr_bytes = e.stderr or b""
+                        if isinstance(stderr_bytes, (bytes, bytearray)):
+                            try:
+                                stderr_text = stderr_bytes.decode("utf-8", "ignore")
+                            except Exception:
+                                stderr_text = ""
+                        else:
+                            stderr_text = str(stderr_bytes)
+                        if stderr_text.strip():
+                            err_msg = stderr_text.strip().split("\n")[-1]
+                    elif isinstance(e, FileNotFoundError):
+                        err_msg = "git executable not found"
+
+                    rprint("")
+                    rprint("⚠️  [bold]Skipping git initialization due to an error.[/]")
+                    if err_msg:
+                        rprint(f"    {err_msg}")
+                    rprint("    You can initialize it manually:")
+                    rprint(
+                        "      git init && git add . && git commit -m 'Initial commit'"
+                    )
+                    rprint("")
     finally:
         os.chdir(original_cwd)
 

{llamactl-0.3.19 → llamactl-0.3.21}/src/llama_deploy/cli/textual/deployment_form.py

@@ -63,6 +63,7 @@ class DeploymentForm:
     id: str | None = None
     repo_url: str = ""
     git_ref: str = "main"
+    git_sha: str | None = None
     deployment_file_path: str = ""
     personal_access_token: str = ""
     # indicates if the deployment has a personal access token (value is unknown)
@@ -100,6 +101,7 @@ class DeploymentForm:
             id=deployment.id,
             repo_url=deployment.repo_url,
             git_ref=deployment.git_ref or "main",
+            git_sha=deployment.git_sha or "-",
             deployment_file_path=deployment.deployment_file_path,
             personal_access_token="",  # Always start empty for security
             has_existing_pat=deployment.has_personal_access_token,
@@ -242,6 +244,15 @@ class DeploymentFormWidget(Widget):
                 compact=True,
             )
 
+            yield Label("Last Deployed Commit:", classes="form-label", shrink=True)
+            yield Input(
+                value=(self.form_data.git_sha or "-")[:7],
+                placeholder="-",
+                id="git_sha",
+                compact=True,
+                disabled=True,
+            )
+
             yield Static(classes="full-width")
             yield Static(
                 Content.from_markup("[italic]Advanced[/]"),

{llamactl-0.3.19 → llamactl-0.3.21}/src/llama_deploy/cli/textual/deployment_monitor.py

@@ -133,6 +133,16 @@ class DeploymentMonitorWidget(Widget):
                 compact=True,
                 variant="default",
             )
+
+        with HorizontalGroup(classes=""):
+            yield Static("  Last Deployed Commit:  ", classes="deployment-link-label")
+            yield Button(
+                "",
+                id="last_deployed_commit",
+                classes="deployment-link",
+                compact=True,
+                variant="default",
+            )
         yield Static("", classes="error-message", id="error_message")
 
         # Single-line status bar with colored icon and deployment ID
@@ -168,6 +178,13 @@ class DeploymentMonitorWidget(Widget):
             self.app.copy_to_clipboard(txt)
         elif event.button.id == "deployment_link_button":
             self.action_open_url()
+        elif event.button.id == "last_deployed_commit":
+            if self.deployment is not None:
+                self.action_open_url(
+                    url=self.deployment.repo_url
+                    + "/commit/"
+                    + (self.deployment.git_sha or "")
+                )
 
     async def _fetch_deployment(self) -> None:
         try:
@@ -300,11 +317,15 @@ class DeploymentMonitorWidget(Widget):
             return "●", red
         return "●", gray
 
-    def action_open_url(self) -> None:
-        if not self.deployment or not self.deployment.apiserver_url:
-            return
-        logger.debug(f"Opening URL: {self.deployment.apiserver_url}")
-        webbrowser.open(str(self.deployment.apiserver_url))
+    def action_open_url(self, url: str | None = None) -> None:
+        if not url:
+            if not self.deployment or not self.deployment.apiserver_url:
+                return
+            logger.debug(f"Opening URL: {self.deployment.apiserver_url}")
+            webbrowser.open(str(self.deployment.apiserver_url))
+        else:
+            logger.debug(f"Opening URL: {url}")
+            webbrowser.open(str(url))
 
     def _render_status_line(self) -> Text:
         phase = self.deployment.status if self.deployment else "Unknown"
@@ -364,10 +385,15 @@ class DeploymentMonitorWidget(Widget):
         ev_widget = self.query_one("#last_event_status", Static)
         ev_details_widget = self.query_one("#last_event_details", Static)
         deployment_link_button = self.query_one("#deployment_link_button", Button)
+        last_commit_button = self.query_one("#last_deployed_commit", Button)
         widget.update(self._render_status_line())
         deployment_link_button.label = (
             f"{str(self.deployment.apiserver_url or '') if self.deployment else ''}"
         )
+        if self.deployment:
+            last_commit_button.label = f"{(str(self.deployment.git_sha or '-'))[:7]}"
+        else:
+            last_commit_button.label = "-"
         # Update last event line
         ev_widget.update(self._render_last_event_status())
         ev_details_widget.update(self._render_last_event_details())