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

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"]

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())

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

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

@@ -5,7 +5,7 @@ llama_deploy/cli/client.py,sha256=f4053b5183224cff55c1393e78887d1af2597219135379
 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=2571aa7f220930adc47f17e9aa33147c13156f81acfb911f3455f3800c742720,14611
-llama_deploy/cli/commands/dev.py,sha256=d1ca964d181c71290c6e63b92977a108cb3e707bb5e95c088b9306a51ac699e8,6354
+llama_deploy/cli/commands/dev.py,sha256=e4f17c6fdb13dd370ba594f0d4084ec8a454f41f932ecba1b6222e4e3c676409,5875
 llama_deploy/cli/commands/env.py,sha256=36cb1b0abb9e3d1c5546d3e8a3c4c7839c4d6c2abf75763e39efb08376b3eae9,6808
 llama_deploy/cli/commands/init.py,sha256=7254c9ad1824dc546fe33f8592034ef044700ffbaf843b9ee7dc49495ca9166e,16137
 llama_deploy/cli/commands/pkg.py,sha256=31049a8266fba71a45920187ef983988bb5ba3b9ad81ab4b7bca6042a071a810,4068
@@ -31,7 +31,7 @@ llama_deploy/cli/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934
 llama_deploy/cli/styles.py,sha256=15901fb567b0d10470f56a06d863819c4ed00a9f90b2a8c46b4bc2fb1dbdf6c3,307
 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=ec638b1450821c40a5db557be649b669f9a015fdad7b6f90942df64a446ab117,17726
+llama_deploy/cli/textual/deployment_monitor.py,sha256=f14680cdd0d913a7b5e850560abb3923122d4f86ebd71e6efc358ad357c08387,17815
 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
@@ -40,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.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,,
+llamactl-0.3.21.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.21.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.21.dist-info/METADATA,sha256=aa46592d9763fa8e9476cd6456fe51fb628c0b34f8bfef64be958b04addff872,3217
+llamactl-0.3.21.dist-info/RECORD,,