llamactl 0.3.0a1__tar.gz → 0.3.0a3__tar.gz

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.0a1
+Version: 0.3.0a3
 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.0a1,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.0a1,<0.4.0
+Requires-Dist: llama-deploy-core>=0.3.0a3,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0a3,<0.4.0
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
@@ -15,6 +15,7 @@ Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: tenacity>=9.1.2
 Requires-Dist: textual>=4.0.0
 Requires-Dist: aiohttp>=3.12.14
+Requires-Dist: copier>=9.9.0
 Requires-Python: >=3.12, <4
 Description-Content-Type: text/markdown
 

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.0a1"
+version = "0.3.0a3"
 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.0a1,<0.4.0",
-    "llama-deploy-appserver>=0.3.0a1,<0.4.0",
+    "llama-deploy-core>=0.3.0a3,<0.4.0",
+    "llama-deploy-appserver>=0.3.0a3,<0.4.0",
     "httpx>=0.24.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",
@@ -19,6 +19,7 @@ dependencies = [
     "tenacity>=9.1.2",
     "textual>=4.0.0",
     "aiohttp>=3.12.14",
+    "copier>=9.9.0",
 ]
 
 [project.scripts]

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/src/llama_deploy/cli/__init__.py

@@ -1,5 +1,5 @@
 import click
-from .commands import projects, deployments, profile, health_check, serve
+from .commands import projects, deployments, profile, health_check, serve, version
 from .options import global_options
 
 
@@ -22,6 +22,9 @@ app.add_command(health_check, name="health")
 # Add serve command at root level
 app.add_command(serve, name="serve")
 
+# Add version command at root level
+app.add_command(version, name="version")
+
 
 # Main entry point function (called by the script)
 def main() -> None:

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/src/llama_deploy/cli/client.py

@@ -1,4 +1,3 @@
-import logging
 from typing import List, Optional
 
 import httpx
@@ -18,109 +17,102 @@ from rich.console import Console
 from .config import config_manager
 
 
-class LlamaDeployClient:
-    """HTTP client for communicating with the LlamaDeploy control plane API"""
-
-    def __init__(
-        self, base_url: Optional[str] = None, project_id: Optional[str] = None
-    ):
-        """Initialize the client with a configured profile"""
-        self.console = Console()
-
-        # Get profile data
-        profile = config_manager.get_current_profile()
-        if not profile:
-            self.console.print("\n[bold red]No profile configured![/bold red]")
-            self.console.print("\nTo get started, create a profile with:")
-            self.console.print("[cyan]llamactl profile create[/cyan]")
-            raise SystemExit(1)
-
-        # Use profile data with optional overrides
-        self.base_url = base_url or profile.api_url
-        self.project_id = project_id or profile.active_project_id
-
-        if not self.base_url:
-            raise ValueError("API URL is required")
-
-        if not self.project_id:
-            raise ValueError("Project ID is required")
-
-        self.base_url = self.base_url.rstrip("/")
-
-        # Create persistent client with event hooks
+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]}
         )
 
     def _handle_response(self, response: httpx.Response) -> None:
-        """Handle response middleware - warnings and error conversion"""
-        # Check for warnings in response headers
         if "X-Warning" in response.headers:
             self.console.print(
                 f"[yellow]Warning: {response.headers['X-Warning']}[/yellow]"
             )
-
-        # Convert httpx errors to our current exception format
         try:
             response.raise_for_status()
         except httpx.HTTPStatusError as e:
-            # Try to parse JSON error response
             try:
-                response.read()  # need to collect streaming data before calling json
+                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):
-                # Fallback to raw response text
                 error_message = e.response.text
-
             raise Exception(f"HTTP {e.response.status_code}: {error_message}") from e
         except httpx.RequestError as e:
             raise Exception(f"Request failed: {e}") from e
 
-    # Health check
+
+class ControlPlaneClient(BaseClient):
+    """Unscoped client for non-project endpoints."""
+
     def health_check(self) -> dict:
-        """Check if the API server is healthy"""
         response = self.client.get("/health")
         return response.json()
 
-    # Projects
+    def server_version(self) -> dict:
+        response = self.client.get("/version")
+        return response.json()
+
     def list_projects(self) -> List[ProjectSummary]:
-        """List all projects with deployment counts"""
         response = self.client.get("/projects/")
         projects_response = ProjectsListResponse.model_validate(response.json())
         return [project for project in projects_response.projects]
 
-    # Deployments
+
+class ProjectClient(BaseClient):
+    """Project-scoped client for deployment operations."""
+
+    def __init__(
+        self,
+        base_url: Optional[str] = None,
+        project_id: Optional[str] = None,
+        console: Optional[Console] = 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]:
-        """List deployments for the configured project"""
         response = self.client.get(f"/{self.project_id}/deployments/")
         deployments_response = DeploymentsListResponse.model_validate(response.json())
         return [deployment for deployment in deployments_response.deployments]
 
     def get_deployment(self, deployment_id: str) -> DeploymentResponse:
-        """Get a specific deployment"""
         response = self.client.get(f"/{self.project_id}/deployments/{deployment_id}")
-        deployment = DeploymentResponse.model_validate(response.json())
-        return deployment
+        return DeploymentResponse.model_validate(response.json())
 
     def create_deployment(
-        self,
-        deployment_data: DeploymentCreate,
+        self, deployment_data: DeploymentCreate
     ) -> DeploymentResponse:
-        """Create a new deployment"""
-
         response = self.client.post(
             f"/{self.project_id}/deployments/",
             json=deployment_data.model_dump(exclude_none=True),
         )
-        deployment = DeploymentResponse.model_validate(response.json())
-        return deployment
+        return DeploymentResponse.model_validate(response.json())
 
     def delete_deployment(self, deployment_id: str) -> None:
-        """Delete a deployment"""
         self.client.delete(f"/{self.project_id}/deployments/{deployment_id}")
 
     def update_deployment(
@@ -129,19 +121,15 @@ class LlamaDeployClient:
         update_data: DeploymentUpdate,
         force_git_sha_update: bool = False,
     ) -> DeploymentResponse:
-        """Update an existing deployment"""
-
         params = {}
         if force_git_sha_update:
             params["force_git_sha_update"] = True
-
         response = self.client.patch(
             f"/{self.project_id}/deployments/{deployment_id}",
             json=update_data.model_dump(),
             params=params,
         )
-        deployment = DeploymentResponse.model_validate(response.json())
-        return deployment
+        return DeploymentResponse.model_validate(response.json())
 
     def validate_repository(
         self,
@@ -149,10 +137,6 @@ class LlamaDeployClient:
         deployment_id: str | None = None,
         pat: str | None = None,
     ) -> RepositoryValidationResponse:
-        """Validate a repository URL"""
-        logging.info(
-            f"Validating repository with params: {repo_url}, {deployment_id}, {pat}"
-        )
         response = self.client.post(
             f"/{self.project_id}/deployments/validate-repository",
             json=RepositoryValidationRequest(
@@ -161,13 +145,37 @@ class LlamaDeployClient:
                 pat=pat,
             ).model_dump(),
         )
-        logging.info(f"Response: {response.json()}")
         return RepositoryValidationResponse.model_validate(response.json())
 
 
-# Global client factory function
-def get_client(
+def get_control_plane_client(base_url: Optional[str] = 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: Optional[str] = None, project_id: Optional[str] = None
-) -> LlamaDeployClient:
-    """Get a client instance with optional overrides"""
-    return LlamaDeployClient(base_url=base_url, project_id=project_id)
+) -> 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)

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/src/llama_deploy/cli/commands.py

@@ -7,9 +7,10 @@ from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
 from llama_deploy.core.schema.deployments import DeploymentUpdate
 from rich import print as rprint
 from rich.console import Console
+from rich.text import Text
 from rich.table import Table
 
-from .client import get_client
+from .client import get_project_client, get_control_plane_client
 from .config import config_manager
 from .interactive_prompts.utils import (
     confirm_action,
@@ -21,7 +22,7 @@ from .textual.deployment_form import create_deployment_form, edit_deployment_for
 from .textual.profile_form import create_profile_form, edit_profile_form
 
 RETRY_WAIT_SECONDS = 1
-console = Console()
+console = Console(highlight=False)
 
 
 # Create sub-applications for organizing commands
@@ -217,7 +218,7 @@ def edit_profile(name: Optional[str]) -> None:
 def list_projects() -> None:
     """List all projects with deployment counts"""
     try:
-        client = get_client()
+        client = get_control_plane_client()
         projects = client.list_projects()
 
         if not projects:
@@ -246,7 +247,7 @@ def list_projects() -> None:
 def health_check() -> None:
     """Check if the API server is healthy"""
     try:
-        client = get_client()
+        client = get_control_plane_client()
         health = client.health_check()
 
         status = health.get("status", "unknown")
@@ -266,7 +267,7 @@ def health_check() -> None:
 def list_deployments() -> None:
     """List deployments for the configured project"""
     try:
-        client = get_client()
+        client = get_project_client()
         deployments = client.list_deployments()
 
         if not deployments:
@@ -320,7 +321,7 @@ def list_deployments() -> None:
 def get_deployment(deployment_id: Optional[str]) -> None:
     """Get details of a specific deployment"""
     try:
-        client = get_client()
+        client = get_project_client()
 
         deployment_id = select_deployment(deployment_id)
         if not deployment_id:
@@ -392,7 +393,7 @@ def create_deployment(
 def delete_deployment(deployment_id: Optional[str], confirm: bool) -> None:
     """Delete a deployment"""
     try:
-        client = get_client()
+        client = get_project_client()
 
         deployment_id = select_deployment(deployment_id)
         if not deployment_id:
@@ -418,7 +419,7 @@ def delete_deployment(deployment_id: Optional[str], confirm: bool) -> None:
 def edit_deployment(deployment_id: Optional[str]) -> None:
     """Interactively edit a deployment"""
     try:
-        client = get_client()
+        client = get_project_client()
 
         deployment_id = select_deployment(deployment_id)
         if not deployment_id:
@@ -449,7 +450,7 @@ def edit_deployment(deployment_id: Optional[str]) -> None:
 def refresh_deployment(deployment_id: Optional[str]) -> None:
     """Refresh a deployment with the latest code from its git reference"""
     try:
-        client = get_client()
+        client = get_project_client()
 
         deployment_id = select_deployment(deployment_id)
         if not deployment_id:
@@ -532,3 +533,45 @@ def serve(
     except Exception as e:
         rprint(f"[red]Error: {e}[/red]")
         raise click.Abort()
+
+
+@click.command("version")
+@global_options
+def version() -> None:
+    """Print the version of llama_deploy"""
+    try:
+        from importlib.metadata import PackageNotFoundError, version as pkg_version
+
+        ver = pkg_version("llamactl")
+        console.print(Text.assemble("client version: ", (ver, "green")))
+
+        # If there is an active profile, attempt to query server version
+        profile = config_manager.get_current_profile()
+        if profile and profile.api_url:
+            try:
+                cp_client = get_control_plane_client()
+                data = cp_client.server_version()
+                server_ver = data.get("version")
+                console.print(
+                    Text.assemble(
+                        "server version: ",
+                        (
+                            server_ver or "unknown",
+                            "bright_yellow" if server_ver is None else "green",
+                        ),
+                    )
+                )
+            except Exception as e:
+                console.print(
+                    Text.assemble(
+                        "server version: ",
+                        ("unavailable", "bright_yellow"),
+                        (f" - {e}", "dim"),
+                    )
+                )
+    except PackageNotFoundError:
+        rprint("[red]Package 'llamactl' not found[/red]")
+        raise click.Abort()
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/src/llama_deploy/cli/interactive_prompts/utils.py

@@ -6,7 +6,7 @@ import questionary
 from rich import print as rprint
 from rich.console import Console
 
-from ..client import get_client
+from ..client import get_project_client as get_client
 from ..config import config_manager
 
 console = Console()

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/src/llama_deploy/cli/textual/deployment_form.py

@@ -21,7 +21,7 @@ from textual.containers import Container, HorizontalGroup, Widget
 from textual.validation import Length
 from textual.widgets import Button, Input, Label, Static
 from textual.reactive import reactive
-from llama_deploy.cli.client import get_client
+from llama_deploy.cli.client import get_project_client as get_client
 from textual.message import Message
 
 

{llamactl-0.3.0a1 → llamactl-0.3.0a3}/src/llama_deploy/cli/textual/git_validation.py

@@ -11,7 +11,7 @@ from textual.message import Message
 from textual.content import Content
 from textual.reactive import reactive
 
-from llama_deploy.cli.client import get_client
+from llama_deploy.cli.client import get_project_client as get_client
 from llama_deploy.core.schema.git_validation import RepositoryValidationResponse
 from llama_deploy.cli.textual.llama_loader import PixelLlamaLoader
 from llama_deploy.cli.textual.github_callback_server import GitHubCallbackServer