llamactl 0.3.0a8__tar.gz → 0.3.0a9__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a8
+Version: 0.3.0a9
 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.0a9,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a9,<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.0a9}/pyproject.toml

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

{llamactl-0.3.0a8 → llamactl-0.3.0a9}/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.0a9}/src/llama_deploy/cli/textual/deployment_monitor.py

@@ -16,6 +16,7 @@ from llama_deploy.core.schema.deployments import DeploymentResponse
 from rich.text import Text
 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 +59,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 +98,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 +141,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 +286,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 +294,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 +341,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 +385,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 = ""