llamactl 0.3.0a8__tar.gz → 0.3.0a10__tar.gz

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a8
+Version: 0.3.0a10
 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>=0.3.0a8,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.0a8,<0.4.0
+Requires-Dist: llama-deploy-core>=0.3.0a10,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a10,<0.4.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.0a8"
+version = "0.3.0a10"
 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.12, <4"
 dependencies = [
-    "llama-deploy-core>=0.3.0a8,<0.4.0",
-    "llama-deploy-appserver>=0.3.0a8,<0.4.0",
+    "llama-deploy-core>=0.3.0a10,<0.4.0",
+    "llama-deploy-appserver>=0.3.0a10,<0.4.0",
     "httpx>=0.24.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/client.py

@@ -109,10 +109,12 @@ class ProjectClient(BaseClient):
         deployments_response = DeploymentsListResponse.model_validate(response.json())
         return [deployment for deployment in deployments_response.deployments]
 
-    def get_deployment(self, deployment_id: str) -> DeploymentResponse:
+    def get_deployment(
+        self, deployment_id: str, include_events: bool = False
+    ) -> DeploymentResponse:
         response = self.client.get(
             f"/api/v1beta1/deployments/{deployment_id}",
-            params={"project_id": self.project_id},
+            params={"project_id": self.project_id, "include_events": include_events},
         )
         return DeploymentResponse.model_validate(response.json())
 

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/commands/aliased_group.py

@@ -25,7 +25,9 @@ class AliasedGroup(click.Group):
 
         ctx.fail(f"Too many matches: {', '.join(sorted(matches))}")
 
-    def resolve_command(self, ctx, args):
+    def resolve_command(
+        self, ctx: click.Context, args: list[str]
+    ) -> tuple[str, click.Command, list[str]]:
         # always return the full command name
         _, cmd, args = super().resolve_command(ctx, args)
         return cmd.name, cmd, args

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/commands/init.py

@@ -26,7 +26,7 @@ options = [
         id="basic-ui",
         name="Basic UI",
         description="A basic starter workflow with a React Vite UI",
-        git_url="https://github.com/adrianlyjak/qs",
+        git_url="https://github.com/run-llama/template-workflow-basic-ui",
     ),
     TemplateOption(
         id="extraction-review",

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/commands/serve.py

@@ -9,7 +9,6 @@ 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(
@@ -36,7 +35,18 @@ from ..options import global_options
 )
 @click.option("--port", type=int, help="The port to run the API server on")
 @click.option("--ui-port", type=int, help="The port to run the UI proxy server on")
-@global_options
+@click.option(
+    "--log-level",
+    type=click.Choice(
+        ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False
+    ),
+    help="The log level to run the API server at",
+)
+@click.option(
+    "--log-format",
+    type=click.Choice(["console", "json"], case_sensitive=False),
+    help="The format to use for logging",
+)
 def serve(
     deployment_file: Path,
     no_install: bool,
@@ -45,6 +55,8 @@ def serve(
     preview: bool,
     port: int | None = None,
     ui_port: int | None = None,
+    log_level: str | None = None,
+    log_format: str | None = None,
 ) -> None:
     """Run llama_deploy API Server in the foreground. Reads the deployment configuration from the current directory. Can optionally specify a deployment file path."""
     if not deployment_file.exists():
@@ -64,6 +76,8 @@ def serve(
             open_browser=not no_open_browser,
             port=port,
             ui_port=ui_port,
+            log_level=log_level.upper() if log_level else None,
+            log_format=log_format.lower() if log_format else None,
         )
 
     except KeyboardInterrupt:

llamactl-0.3.0a10/src/llama_deploy/cli/options.py

@@ -0,0 +1,29 @@
+import logging
+from typing import Callable, ParamSpec, TypeVar
+
+import click
+
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+def global_options(f: Callable[P, R]) -> Callable[P, R]:
+    """Common decorator to add global options to command groups"""
+    from .debug import setup_file_logging
+
+    def debug_callback(ctx: click.Context, param: click.Parameter, value: str) -> str:
+        if value:
+            setup_file_logging(level=logging._nameToLevel.get(value, logging.INFO))
+        return value
+
+    return click.option(
+        "--log-level",
+        type=click.Choice(
+            ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False
+        ),
+        help="Enable debug logging to file",
+        callback=debug_callback,
+        expose_value=False,
+        is_eager=True,
+        hidden=True,
+    )(f)

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/textual/deployment_form.py

@@ -38,6 +38,7 @@ from llama_deploy.core.schema.deployments import (
     DeploymentResponse,
     DeploymentUpdate,
 )
+from textual import events
 from textual.app import App, ComposeResult
 from textual.containers import Container, HorizontalGroup, Widget
 from textual.content import Content
@@ -352,7 +353,7 @@ class DeploymentEditApp(App[DeploymentResponse | None]):
     def on_mount(self) -> None:
         self.theme = "tokyo-night"
 
-    def on_key(self, event) -> None:
+    def on_key(self, event: events.Key) -> None:
         """Handle key events, including Ctrl+C"""
         if event.key == "ctrl+c":
             if self.current_state == "monitor" and self.saved_deployment is not None:

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/textual/deployment_monitor.py

@@ -14,8 +14,10 @@ from llama_deploy.cli.client import get_project_client as get_client
 from llama_deploy.core.schema.base import LogEvent
 from llama_deploy.core.schema.deployments import DeploymentResponse
 from rich.text import Text
+from textual import events
 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.widgets import Button, RichLog, Static
@@ -58,6 +60,16 @@ class DeploymentMonitorWidget(Widget):
 		margin-top: 1;
 	}
 
+    .status-line .status-main {
+        width: auto;
+    }
+
+    .status-line .status-right {
+        width: 1fr;
+        text-align: right;
+        min-width: 12;
+    }
+
 
 	"""
 
@@ -87,10 +99,12 @@ class DeploymentMonitorWidget(Widget):
         yield Static("", classes="error-message", id="error_message")
 
         # Single-line status bar with colored icon and deployment ID
-        with HorizontalGroup(classes="mb-1"):
+        with HorizontalGroup(classes="status-line"):
             yield Static(
-                self._render_status_line(), classes="status-line", id="status_line"
+                self._render_status_line(), classes="status-main", id="status_line"
             )
+            yield Static("", classes="status-right", id="last_event_status")
+        yield Static("", classes="last-event mb-1", id="last_event_details")
 
         yield Static("Logs", classes="secondary-message log-header")
         yield RichLog(
@@ -128,7 +142,9 @@ class DeploymentMonitorWidget(Widget):
     async def _fetch_deployment(self) -> None:
         try:
             client = get_client()
-            self.deployment = client.get_deployment(self.deployment_id)
+            self.deployment = client.get_deployment(
+                self.deployment_id, include_events=True
+            )
             # Clear any previous error on success
             self.error_message = ""
         except Exception as e:  # pragma: no cover - network errors
@@ -271,7 +287,7 @@ class DeploymentMonitorWidget(Widget):
         return "●", gray
 
     def _render_status_line(self) -> Text:
-        phase = self.deployment.status if self.deployment else "-"
+        phase = self.deployment.status if self.deployment else "Unknown"
         icon, style = self._status_icon_and_style(phase)
         line = Text()
         line.append(icon, style=style)
@@ -279,6 +295,34 @@ class DeploymentMonitorWidget(Widget):
         line.append(f"Status: {phase} — Deployment ID: {self.deployment_id or '-'}")
         return line
 
+    def _render_last_event_details(self) -> Content:
+        if not self.deployment or not self.deployment.events:
+            return Content()
+        latest = self.deployment.events[-1]
+        txt = Text(f"  {latest.message}", style="dim")
+        return Content.from_rich_text(txt)
+
+    def _render_last_event_status(self) -> Content:
+        if not self.deployment or not self.deployment.events:
+            return Content()
+        txt = Text()
+        # Pick the most recent by last_timestamp
+        latest = self.deployment.events[-1]
+        ts = None
+        ts = (latest.last_timestamp or latest.first_timestamp).strftime(
+            "%Y-%m-%d %H:%M:%S"
+        )
+        parts: list[str] = []
+        if latest.type:
+            parts.append(latest.type)
+        if latest.reason:
+            parts.append(latest.reason)
+        kind = "/".join(parts) if parts else None
+        if kind:
+            txt.append(f"{kind} ", style="medium_purple3")
+        txt.append(f"{ts}", style="dim")
+        return Content.from_rich_text(txt)
+
     def on_unmount(self) -> None:
         # Attempt to stop the streaming loop
         self._stop_stream.set()
@@ -298,16 +342,16 @@ class DeploymentMonitorWidget(Widget):
     def watch_deployment(self, deployment: DeploymentResponse | None) -> None:
         if deployment is None:
             return
-        phase = deployment.status or "-"
-        last = getattr(self, "_last_phase", None)
-        if last == phase:
-            return
-        self._last_phase = phase
-        try:
-            widget = self.query_one("#status_line", Static)
-        except Exception:
-            return
+
+        widget = self.query_one("#status_line", Static)
+        ev_widget = self.query_one("#last_event_status", Static)
+        ev_details_widget = self.query_one("#last_event_details", Static)
+
         widget.update(self._render_status_line())
+        # Update last event line
+        ev_widget.update(self._render_last_event_status())
+        ev_details_widget.update(self._render_last_event_details())
+        ev_details_widget.display = bool(self.deployment and self.deployment.events)
 
     def watch_wrap_enabled(self, enabled: bool) -> None:
         try:
@@ -342,7 +386,9 @@ class DeploymentMonitorWidget(Widget):
         client = get_client()
         while not self._stop_stream.is_set():
             try:
-                self.deployment = client.get_deployment(self.deployment_id)
+                self.deployment = client.get_deployment(
+                    self.deployment_id, include_events=True
+                )
                 # Clear any previous error on success
                 if self.error_message:
                     self.error_message = ""
@@ -378,7 +424,7 @@ class DeploymentMonitorApp(App[None]):
     def on_monitor_close_message(self, _: MonitorCloseMessage) -> None:
         self.exit(None)
 
-    def on_key(self, event) -> None:
+    def on_key(self, event: events.Key) -> None:
         # Support Ctrl+C to exit, consistent with other screens and terminals
         if event.key == "ctrl+c":
             self.exit(None)

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/textual/git_validation.py

@@ -224,7 +224,7 @@ class GitValidationWidget(Widget):
             self.current_state = "options"
             self.error_message = ""
         elif event.button.id == "cancel_github_auth":
-            self._cancel_github_auth()
+            self.run_worker(self._cancel_github_auth())
         elif event.button.id == "recheck_github":
             self.run_worker(self._recheck_github_auth())
         elif event.button.id == "continue_success":
@@ -258,10 +258,10 @@ class GitValidationWidget(Widget):
         self.github_callback_server = GitHubCallbackServer()
         self.run_worker(self._wait_for_callback())
 
-    def _cancel_github_auth(self) -> None:
+    async def _cancel_github_auth(self) -> None:
         """Cancel GitHub authentication and return to options"""
         if self.github_callback_server:
-            self.github_callback_server.stop()
+            await self.github_callback_server.stop()
             self.github_callback_server = None
         self.current_state = "options"
 

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/textual/llama_loader.py

@@ -1,12 +1,23 @@
 import re
+from typing import TypedDict
 
 from textual.widgets import Static
 
 
+class StaticKwargs(TypedDict, total=False):
+    expand: bool
+    shrink: bool
+    markup: bool
+    name: str | None
+    id: str | None
+    classes: str | None
+    disabled: bool
+
+
 class PixelLlamaLoader(Static):
     """Pixelated llama loading animation using block characters"""
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: StaticKwargs):
         self.frame = 0
         # Pixelated llama frames using Unicode block characters
         self.frames = [

{llamactl-0.3.0a8 → llamactl-0.3.0a10}/src/llama_deploy/cli/textual/profile_form.py

@@ -3,6 +3,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 
+from textual import events
 from textual.app import App, ComposeResult
 from textual.containers import (
     Container,
@@ -45,7 +46,7 @@ class ProfileEditApp(App[ProfileForm | None]):
     def on_mount(self) -> None:
         self.theme = "tokyo-night"
 
-    def on_key(self, event) -> None:
+    def on_key(self, event: events.Key) -> None:
         """Handle key events, including Ctrl+C"""
         if event.key == "ctrl+c":
             self.exit(None)

llamactl-0.3.0a8/src/llama_deploy/cli/options.py

@@ -1,23 +0,0 @@
-import logging
-
-import click
-
-
-def global_options(f):
-    """Common decorator to add global options to command groups"""
-    from .debug import setup_file_logging
-
-    def debug_callback(ctx, param, value):
-        if value:
-            setup_file_logging(level=logging._nameToLevel[value])
-        return value
-
-    return click.option(
-        "--log-level",
-        type=click.Choice(["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]),
-        help="Enable debug logging to file",
-        callback=debug_callback,
-        expose_value=False,
-        is_eager=True,
-        hidden=True,
-    )(f)