llamactl 0.3.0a9__tar.gz → 0.3.0a11__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a9
+Version: 0.3.0a11
 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.0a9,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.0a9,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.0a11,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a11,<0.4.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

{llamactl-0.3.0a9 → llamactl-0.3.0a11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.0a9"
+version = "0.3.0a11"
 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.0a9,<0.4.0",
-    "llama-deploy-appserver>=0.3.0a9,<0.4.0",
+    "llama-deploy-core[client]>=0.3.0a11,<0.4.0",
+    "llama-deploy-appserver>=0.3.0a11,<0.4.0",
     "httpx>=0.24.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",
@@ -41,3 +41,4 @@ module-name = "llama_deploy.cli"
 
 [tool.uv.sources]
 llama-deploy-appserver = { workspace = true }
+llama-deploy-core = { workspace = true }

llamactl-0.3.0a11/src/llama_deploy/cli/client.py

@@ -0,0 +1,34 @@
+from llama_deploy.cli.config import config_manager
+from llama_deploy.core.client.manage_client import ControlPlaneClient, ProjectClient
+from rich import print as rprint
+
+
+def get_control_plane_client(base_url: str | None = None) -> ControlPlaneClient:
+    profile = config_manager.get_current_profile()
+    if not profile and not base_url:
+        rprint("\n[bold red]No profile configured![/bold red]")
+        rprint("\nTo get started, create a profile with:")
+        rprint("[cyan]llamactl profile create[/cyan]")
+        raise SystemExit(1)
+    resolved_base_url = (base_url or (profile.api_url if profile else "")).rstrip("/")
+    if not resolved_base_url:
+        raise ValueError("API URL is required")
+    return ControlPlaneClient(resolved_base_url)
+
+
+def get_project_client(
+    base_url: str | None = None, project_id: str | None = None
+) -> ProjectClient:
+    profile = config_manager.get_current_profile()
+    if not profile:
+        rprint("\n[bold red]No profile configured![/bold red]")
+        rprint("\nTo get started, create a profile with:")
+        rprint("[cyan]llamactl profile create[/cyan]")
+        raise SystemExit(1)
+    resolved_base_url = (base_url or profile.api_url or "").rstrip("/")
+    if not resolved_base_url:
+        raise ValueError("API URL is required")
+    resolved_project_id = project_id or profile.active_project_id
+    if not resolved_project_id:
+        raise ValueError("Project ID is required")
+    return ProjectClient(resolved_base_url, resolved_project_id)

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

@@ -9,11 +9,12 @@ import time
 from pathlib import Path
 from typing import Iterator
 
-from llama_deploy.cli.client import Closer
 from llama_deploy.cli.client import get_project_client as get_client
+from llama_deploy.core.client.manage_client import Closer
 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
@@ -423,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.0a9 → llamactl-0.3.0a11}/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.0a9 → llamactl-0.3.0a11}/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.0a9 → llamactl-0.3.0a11}/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.0a9/src/llama_deploy/cli/client.py

@@ -1,275 +0,0 @@
-import contextlib
-from typing import Iterator, List
-
-import httpx
-from llama_deploy.core.schema.base import LogEvent
-from llama_deploy.core.schema.deployments import (
-    DeploymentCreate,
-    DeploymentResponse,
-    DeploymentsListResponse,
-    DeploymentUpdate,
-)
-from llama_deploy.core.schema.git_validation import (
-    RepositoryValidationRequest,
-    RepositoryValidationResponse,
-)
-from llama_deploy.core.schema.projects import ProjectsListResponse, ProjectSummary
-from rich.console import Console
-
-from .config import config_manager
-
-
-class ClientError(Exception):
-    """Base class for client errors."""
-
-    def __init__(self, message: str) -> None:
-        super().__init__(message)
-
-
-class BaseClient:
-    def __init__(self, base_url: str, console: Console) -> None:
-        self.base_url = base_url.rstrip("/")
-        self.console = console
-        self.client = httpx.Client(
-            base_url=self.base_url,
-            event_hooks={"response": [self._handle_response]},
-        )
-        self.hookless_client = httpx.Client(base_url=self.base_url)
-
-    def _handle_response(self, response: httpx.Response) -> None:
-        try:
-            response.raise_for_status()
-        except httpx.HTTPStatusError as e:
-            try:
-                response.read()
-                error_data = e.response.json()
-                if isinstance(error_data, dict) and "detail" in error_data:
-                    error_message = error_data["detail"]
-                else:
-                    error_message = str(error_data)
-            except (ValueError, KeyError):
-                error_message = e.response.text
-            raise ClientError(f"HTTP {e.response.status_code}: {error_message}") from e
-        except httpx.RequestError as e:
-            raise ClientError(f"Request failed: {e}") from e
-
-
-class ControlPlaneClient(BaseClient):
-    """Unscoped client for non-project endpoints."""
-
-    def health_check(self) -> dict:
-        response = self.client.get("/health")
-        return response.json()
-
-    def server_version(self) -> dict:
-        response = self.client.get("/version")
-        return response.json()
-
-    def list_projects(self) -> List[ProjectSummary]:
-        response = self.client.get("/api/v1beta1/deployments/list-projects")
-        projects_response = ProjectsListResponse.model_validate(response.json())
-        return [project for project in projects_response.projects]
-
-
-class ProjectClient(BaseClient):
-    """Project-scoped client for deployment operations."""
-
-    def __init__(
-        self,
-        base_url: str | None = None,
-        project_id: str | None = None,
-        console: Console | None = None,
-    ) -> None:
-        # Allow default construction using active profile (for tests and convenience)
-        if base_url is None or project_id is None:
-            profile = config_manager.get_current_profile()
-            if not profile:
-                # Match previous behavior for missing profiles
-                (console or Console()).print(
-                    "\n[bold red]No profile configured![/bold red]"
-                )
-                (console or Console()).print("\nTo get started, create a profile with:")
-                (console or Console()).print("[cyan]llamactl profile create[/cyan]")
-                raise SystemExit(1)
-            base_url = base_url or profile.api_url or ""
-            project_id = project_id or profile.active_project_id
-        if not base_url:
-            raise ValueError("API URL is required")
-        if not project_id:
-            raise ValueError("Project ID is required")
-        resolved_console = console or Console()
-        super().__init__(base_url, resolved_console)
-        self.project_id = project_id
-
-    def list_deployments(self) -> List[DeploymentResponse]:
-        response = self.client.get(
-            "/api/v1beta1/deployments",
-            params={"project_id": self.project_id},
-        )
-        deployments_response = DeploymentsListResponse.model_validate(response.json())
-        return [deployment for deployment in deployments_response.deployments]
-
-    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, "include_events": include_events},
-        )
-        return DeploymentResponse.model_validate(response.json())
-
-    def create_deployment(
-        self, deployment_data: DeploymentCreate
-    ) -> DeploymentResponse:
-        response = self.client.post(
-            "/api/v1beta1/deployments",
-            params={"project_id": self.project_id},
-            json=deployment_data.model_dump(exclude_none=True),
-        )
-        return DeploymentResponse.model_validate(response.json())
-
-    def delete_deployment(self, deployment_id: str) -> None:
-        self.client.delete(
-            f"/api/v1beta1/deployments/{deployment_id}",
-            params={"project_id": self.project_id},
-        )
-
-    def update_deployment(
-        self,
-        deployment_id: str,
-        update_data: DeploymentUpdate,
-    ) -> DeploymentResponse:
-        response = self.client.patch(
-            f"/api/v1beta1/deployments/{deployment_id}",
-            params={"project_id": self.project_id},
-            json=update_data.model_dump(),
-        )
-        return DeploymentResponse.model_validate(response.json())
-
-    def validate_repository(
-        self,
-        repo_url: str,
-        deployment_id: str | None = None,
-        pat: str | None = None,
-    ) -> RepositoryValidationResponse:
-        response = self.client.post(
-            "/api/v1beta1/deployments/validate-repository",
-            params={"project_id": self.project_id},
-            json=RepositoryValidationRequest(
-                repository_url=repo_url,
-                deployment_id=deployment_id,
-                pat=pat,
-            ).model_dump(),
-        )
-        return RepositoryValidationResponse.model_validate(response.json())
-
-    def stream_deployment_logs(
-        self,
-        deployment_id: str,
-        *,
-        include_init_containers: bool = False,
-        since_seconds: int | None = None,
-        tail_lines: int | None = None,
-    ) -> tuple["Closer", Iterator[LogEvent]]:
-        """Stream logs as LogEvent items from the control plane using SSE.
-
-        This yields `LogEvent` models until the stream ends (e.g. rollout).
-        """
-        # Use a separate client without response hooks so we don't consume the stream
-
-        params = {
-            "project_id": self.project_id,
-            "include_init_containers": include_init_containers,
-        }
-        if since_seconds is not None:
-            params["since_seconds"] = since_seconds
-        if tail_lines is not None:
-            params["tail_lines"] = tail_lines
-
-        url = f"/api/v1beta1/deployments/{deployment_id}/logs"
-        headers = {"Accept": "text/event-stream"}
-
-        stack = contextlib.ExitStack()
-        response = stack.enter_context(
-            self.hookless_client.stream(
-                "GET", url, params=params, headers=headers, timeout=None
-            )
-        )
-        try:
-            response.raise_for_status()
-        except Exception:
-            stack.close()
-            raise
-
-        return stack.close, _iterate_log_stream(response, stack.close)
-
-
-def _iterate_log_stream(
-    response: httpx.Response, closer: "Closer"
-) -> Iterator[LogEvent]:
-    event_name: str | None = None
-    data_lines: list[str] = []
-
-    try:
-        for line in response.iter_lines():
-            if line is None:
-                continue
-            line = line.decode() if isinstance(line, (bytes, bytearray)) else line
-            print("got line", line)
-            if line.startswith("event:"):
-                event_name = line[len("event:") :].strip()
-            elif line.startswith("data:"):
-                data_lines.append(line[len("data:") :].lstrip())
-            elif line.strip() == "":
-                if event_name == "log" and data_lines:
-                    data_str = "\n".join(data_lines)
-                    try:
-                        yield LogEvent.model_validate_json(data_str)
-                        print("yielded log event", data_str)
-                    except Exception:
-                        # If parsing fails, skip malformed event
-                        pass
-                # reset for next event
-                event_name = None
-                data_lines = []
-    finally:
-        try:
-            closer()
-        except Exception:
-            pass
-
-
-def get_control_plane_client(base_url: str | None = None) -> ControlPlaneClient:
-    console = Console()
-    profile = config_manager.get_current_profile()
-    if not profile and not base_url:
-        console.print("\n[bold red]No profile configured![/bold red]")
-        console.print("\nTo get started, create a profile with:")
-        console.print("[cyan]llamactl profile create[/cyan]")
-        raise SystemExit(1)
-    resolved_base_url = (base_url or (profile.api_url if profile else "")).rstrip("/")
-    if not resolved_base_url:
-        raise ValueError("API URL is required")
-    return ControlPlaneClient(resolved_base_url, console)
-
-
-def get_project_client(
-    base_url: str | None = None, project_id: str | None = None
-) -> ProjectClient:
-    console = Console()
-    profile = config_manager.get_current_profile()
-    if not profile:
-        console.print("\n[bold red]No profile configured![/bold red]")
-        console.print("\nTo get started, create a profile with:")
-        console.print("[cyan]llamactl profile create[/cyan]")
-        raise SystemExit(1)
-    resolved_base_url = (base_url or profile.api_url or "").rstrip("/")
-    if not resolved_base_url:
-        raise ValueError("API URL is required")
-    resolved_project_id = project_id or profile.active_project_id
-    if not resolved_project_id:
-        raise ValueError("Project ID is required")
-    return ProjectClient(resolved_base_url, resolved_project_id, console)
-
-
-type Closer = callable[tuple[()], None]

llamactl-0.3.0a9/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)