llamactl 0.3.19__py3-none-any.whl → 0.3.20__py3-none-any.whl

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__":

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(

llama_deploy/cli/commands/dev.py

@@ -0,0 +1,184 @@
+from __future__ import annotations
+
+import os
+import subprocess
+from pathlib import Path
+from typing import Iterable
+
+import click
+from click.exceptions import Abort, Exit
+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,
+    load_workflows,
+    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"
+    )
+    try:
+        config, _ = _prepare_environment(
+            deployment_file, interactive, require_cloud=False
+        )
+        workflows = load_workflows(config)
+        errors: list[tuple[str, Exception]] = _run_validations(workflows.values())
+
+        if errors:
+            for idx, (name, error) in enumerate(errors, start=1):
+                rprint(f"[red]Validation {idx} failed for '{name}': {error}[/red]")
+            raise click.ClickException("Workflow validation failed")
+
+        _print_connection_summary()
+        rprint(
+            f"[green]Validated workflows in {config_dir} successfully ({len(workflows)} found).[/green]"
+        )
+    except (Exit, Abort):
+        raise
+    except click.ClickException:
+        raise
+    except Exception as exc:  # pragma: no cover - unexpected errors reported to user
+        rprint(f"[red]Failed to validate workflows: {exc}[/red]")
+        raise click.Abort()
+
+
+@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",
+)
+@interactive_option
+@click.argument("cmd", nargs=-1, type=click.UNPROCESSED)
+def run_command(deployment_file: Path, interactive: bool, cmd: tuple[str, ...]) -> None:  # type: ignore
+    """Execute COMMAND with deployment environment variables applied."""
+    _ensure_project_layout(deployment_file, command_name="llamactl dev run")
+    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=False
+        )
+        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
+
+
+def _run_validations(workflows: Iterable[object]) -> list[tuple[str, Exception]]:
+    errors: list[tuple[str, Exception]] = []
+    for workflow in workflows:
+        workflow_name = getattr(workflow, "name", "workflow")
+        try:
+            validate_method = getattr(workflow, "_validate", None)
+            if callable(validate_method):
+                validate_method()
+        except Exception as exc:
+            errors.append((str(workflow_name), exc))
+    return errors
+
+
+__all__ = ["dev", "validate_command", "run_command"]

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)
 

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[/]"),

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,12 @@ 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 ''}"
         )
+        last_commit_button.label = f"{(str(self.deployment.git_sha or '-'))[:7]}"
         # Update last event line
         ev_widget.update(self._render_last_event_status())
         ev_details_widget.update(self._render_last_event_details())

{llamactl-0.3.19.dist-info → llamactl-0.3.20.dist-info}/METADATA

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

@@ -1,12 +1,13 @@
-llama_deploy/cli/__init__.py,sha256=ae22d4cdf686aeef367d80d71938c62d7570d9bddd454c44fa78b3354f25d4f5,834
+llama_deploy/cli/__init__.py,sha256=7c13390f1b6aa0e0970b0e7c661c6ae97e3e6ef266129c0daaa7acc5732388a6,922
 llama_deploy/cli/app.py,sha256=9170e4f506c482522bd745eb1cdb700a198cfcfd7204c168c94e5ee2b6b43ffa,2199
 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=101fe7733802dfb448198331818123184523b54cb80a27f166d4ff7010a76e49,1097
 llama_deploy/cli/commands/auth.py,sha256=48c4cc786e8c4e0fb8c0caaba690cef359cddac9b7fbb0b88505111323c07667,24754
-llama_deploy/cli/commands/deployment.py,sha256=abea89e94ed978821a998453792d127605831ba23108df776873852ddd19f97e,14526
+llama_deploy/cli/commands/deployment.py,sha256=2571aa7f220930adc47f17e9aa33147c13156f81acfb911f3455f3800c742720,14611
+llama_deploy/cli/commands/dev.py,sha256=d1ca964d181c71290c6e63b92977a108cb3e707bb5e95c088b9306a51ac699e8,6354
 llama_deploy/cli/commands/env.py,sha256=36cb1b0abb9e3d1c5546d3e8a3c4c7839c4d6c2abf75763e39efb08376b3eae9,6808
-llama_deploy/cli/commands/init.py,sha256=348ec90fb54a6774062b109afe8cc9ac7f3c59144f941fd5697001ea52d5b946,14981
+llama_deploy/cli/commands/init.py,sha256=7254c9ad1824dc546fe33f8592034ef044700ffbaf843b9ee7dc49495ca9166e,16137
 llama_deploy/cli/commands/pkg.py,sha256=31049a8266fba71a45920187ef983988bb5ba3b9ad81ab4b7bca6042a071a810,4068
 llama_deploy/cli/commands/serve.py,sha256=e1e91f17e13dce31ebadb4a1b91cda9e2e3eeb45f89f1db0ae3fadd879e8a2ab,12871
 llama_deploy/cli/config/_config.py,sha256=654a4b6d06542e3503edab7023fc1c3148de510b3e3f6194e28cd4bd3e7c029a,14230
@@ -28,9 +29,9 @@ llama_deploy/cli/pkg/options.py,sha256=540c619a2a11f72161b8e41002446cf9d3f62de60
 llama_deploy/cli/pkg/utils.py,sha256=b25348ac0f9ddc984ef98edc930aef0648ed182437e660cc60b0daf56172b171,1197
 llama_deploy/cli/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
 llama_deploy/cli/styles.py,sha256=15901fb567b0d10470f56a06d863819c4ed00a9f90b2a8c46b4bc2fb1dbdf6c3,307
-llama_deploy/cli/textual/deployment_form.py,sha256=d30779c225e5388671d84982a819e78ed0b3a0c3b9f7868483cfc3f3f3212f28,29377
+llama_deploy/cli/textual/deployment_form.py,sha256=a7f6d8fffe2ae066241a397bf920c109aed7503faf5bcbf4c8b5bb46ac27cb6f,29762
 llama_deploy/cli/textual/deployment_help.py,sha256=991d8cdcc61ae0cf79ddd27715db5452c9902d343ce20775f8651252056eca77,2859
-llama_deploy/cli/textual/deployment_monitor.py,sha256=c39abf72b76a46de80403c6986b75b18eeca777a29f62cc847a193ca264ff4ea,16774
+llama_deploy/cli/textual/deployment_monitor.py,sha256=ec638b1450821c40a5db557be649b669f9a015fdad7b6f90942df64a446ab117,17726
 llama_deploy/cli/textual/git_validation.py,sha256=94c95b61d0cbc490566a406b4886c9c12e1d1793dc14038a5be37119223c9568,13419
 llama_deploy/cli/textual/github_callback_server.py,sha256=3111cc45b3ff2632255a37e4472c85084670c94bcea25ec428f06b0761dd27bf,7584
 llama_deploy/cli/textual/llama_loader.py,sha256=33cb32a46dd40bcf889c553e44f2672c410e26bd1d4b17aa6cca6d0a5d59c2c4,1468
@@ -39,7 +40,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.19.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.19.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.19.dist-info/METADATA,sha256=21a1074e9ef4081337b502bbc53fcd68da625680ae427dc10c8e65543414f5c0,3217
-llamactl-0.3.19.dist-info/RECORD,,
+llamactl-0.3.20.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.20.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.20.dist-info/METADATA,sha256=e95a71bcdec2df10da451a5299d2b9974d81d20daf50ecef4299c9e766fc5ec6,3217
+llamactl-0.3.20.dist-info/RECORD,,