llamactl 0.3.0a10__tar.gz → 0.3.0a12__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a10
+Version: 0.3.0a12
 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.0a10,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.0a10,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.0a12,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a12,<0.4.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
@@ -16,7 +16,7 @@ Requires-Dist: tenacity>=9.1.2
 Requires-Dist: textual>=5.3.0
 Requires-Dist: aiohttp>=3.12.14
 Requires-Dist: copier>=9.9.0
-Requires-Python: >=3.12, <4
+Requires-Python: >=3.11, <4
 Description-Content-Type: text/markdown
 
 # llamactl

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

@@ -1,16 +1,16 @@
 [project]
 name = "llamactl"
-version = "0.3.0a10"
+version = "0.3.0a12"
 description = "A command-line interface for managing LlamaDeploy projects and deployments"
 readme = "README.md"
 license = { text = "MIT" }
 authors = [
     { name = "Adrian Lyjak", email = "adrianlyjak@gmail.com" }
 ]
-requires-python = ">=3.12, <4"
+requires-python = ">=3.11, <4"
 dependencies = [
-    "llama-deploy-core>=0.3.0a10,<0.4.0",
-    "llama-deploy-appserver>=0.3.0a10,<0.4.0",
+    "llama-deploy-core[client]>=0.3.0a12,<0.4.0",
+    "llama-deploy-appserver>=0.3.0a12,<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.0a12/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.0a10 → llamactl-0.3.0a12}/src/llama_deploy/cli/textual/deployment_monitor.py

@@ -9,8 +9,8 @@ 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

llamactl-0.3.0a10/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]