llamactl 0.3.20__tar.gz → 0.3.22__tar.gz

{llamactl-0.3.20 → llamactl-0.3.22}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.20
+Version: 0.3.22
 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.20,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.20,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.22,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.22,<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.20 → llamactl-0.3.22}/pyproject.toml

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

{llamactl-0.3.20 → llamactl-0.3.22}/src/llama_deploy/cli/commands/dev.py

@@ -3,15 +3,14 @@ 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.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,
-    load_workflows,
     parse_environment_variables,
     validate_required_env_vars,
 )
@@ -62,29 +61,28 @@ def validate_command(deployment_file: Path, interactive: bool) -> None:
     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())
+    # Ensure cloud credentials/env are available to the subprocess (if required)
+    _maybe_inject_llama_cloud_credentials(
+        deployment_file, interactive, require_cloud=False
+    )
 
-        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")
+    prepare_server(
+        deployment_file=deployment_file,
+        install=True,
+        build=False,
+        install_ui_deps=False,
+    )
 
-        _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()
+    # 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(
@@ -103,11 +101,18 @@ def validate_command(deployment_file: Path, interactive: bool) -> None:
     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, interactive: bool, cmd: tuple[str, ...]) -> None:  # type: ignore
+def run_command(
+    deployment_file: Path, no_auth: bool, 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."
@@ -115,7 +120,7 @@ def run_command(deployment_file: Path, interactive: bool, cmd: tuple[str, ...])
 
     try:
         config, config_parent = _prepare_environment(
-            deployment_file, interactive, require_cloud=False
+            deployment_file, interactive, require_cloud=not no_auth
         )
         env_overrides = parse_environment_variables(config, config_parent)
         env = os.environ.copy()
@@ -168,17 +173,4 @@ def _prepare_environment(
     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"]

{llamactl-0.3.20 → llamactl-0.3.22}/src/llama_deploy/cli/textual/deployment_monitor.py

@@ -390,7 +390,10 @@ class DeploymentMonitorWidget(Widget):
         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]}"
+        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())