llamactl 0.2.7a1__tar.gz → 0.3.0a1__tar.gz

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

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

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

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

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

@@ -1,16 +1,13 @@
-import os
-import subprocess
 from pathlib import Path
 from typing import Optional
 
 import click
-from llama_deploy.appserver.client import Client as ApiserverClient
+from llama_deploy.appserver.app import start_server
 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.table import Table
-from tenacity import RetryError, Retrying, stop_after_attempt, wait_fixed
 
 from .client import get_client
 from .config import config_manager
@@ -493,54 +490,42 @@ def refresh_deployment(deployment_id: Optional[str]) -> None:
     default=DEFAULT_DEPLOYMENT_FILE_PATH,
     type=click.Path(dir_okay=False, resolve_path=True, path_type=Path),  # type: ignore
 )
+@click.option(
+    "--no-install", is_flag=True, help="Skip installing python and js dependencies"
+)
+@click.option(
+    "--no-reload", is_flag=True, help="Skip reloading the API server on code changes"
+)
+@click.option("--no-open-browser", is_flag=True, help="Skip opening the browser")
+@click.option(
+    "--preview",
+    is_flag=True,
+    help="Preview mode pre-builds the UI to static files, like a production build",
+)
 @global_options
-def serve(deployment_file: Path) -> None:
+def serve(
+    deployment_file: Path,
+    no_install: bool,
+    no_reload: bool,
+    no_open_browser: bool,
+    preview: bool,
+) -> None:
     """Run llama_deploy API Server in the foreground. If no deployment_file is provided, will look for a llama_deploy.yaml in the current directory."""
     if not deployment_file.exists():
         rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
         raise click.Abort()
 
     try:
-        env = os.environ.copy()
-        env["LLAMA_DEPLOY_APISERVER_DEPLOYMENTS_PATH"] = str(deployment_file.parent)
-
-        client = ApiserverClient()
-
-        uvicorn_p = subprocess.Popen(
-            [
-                "uvicorn",
-                "llama_deploy.appserver.app:app",
-                "--host",
-                "localhost",
-                "--port",
-                "4501",
-            ],
-            env=env,
+        start_server(
+            cwd=deployment_file.parent,
+            deployment_file=deployment_file,
+            proxy_ui=not preview,
+            reload=not no_reload,
+            install=not no_install,
+            build=preview,
+            open_browser=not no_open_browser,
         )
 
-        retrying = Retrying(
-            stop=stop_after_attempt(5), wait=wait_fixed(RETRY_WAIT_SECONDS)
-        )
-        try:
-            for attempt in retrying:
-                with attempt:
-                    client.sync.apiserver.deployments.create(
-                        deployment_file.open("rb"),
-                        base_path=deployment_file.parent,
-                        local=True,
-                    )
-        except RetryError as e:
-            uvicorn_p.terminate()
-            last: Optional[BaseException] = e.last_attempt.exception(0)
-            last_msg = ""
-            if last is not None:
-                last_msg = ": " + (
-                    str(last.message) if hasattr(last, "message") else str(last)
-                )
-            raise click.ClickException(f"Failed to create deployment{last_msg}")
-
-        uvicorn_p.wait()
-
     except KeyboardInterrupt:
         print("Shutting down...")
 

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

@@ -361,7 +361,6 @@ class DeploymentEditApp(App[DeploymentResponse | None]):
     def on_validation_cancel_message(self, message: ValidationCancelMessage) -> None:
         """Handle validation cancellation from git validation widget"""
         # Return to form, clearing any save error
-        print("DEBUG: on_validation_cancel_message")
         self.save_error = ""
         self.current_state = "form"
 

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

@@ -206,7 +206,6 @@ class GitValidationWidget(Widget):
                 yield Button(
                     "Continue", id="continue_success", variant="primary", compact=True
                 )
-            print("DEBUG: render cancel button")
             # Always show cancel button
             yield Button("Back to Edit", id="cancel", variant="default", compact=True)
 
@@ -238,7 +237,6 @@ class GitValidationWidget(Widget):
             )
             self.post_message(ValidationResultMessage(self.repo_url, pat_to_send))
         elif event.button.id == "cancel":
-            print("DEBUG: cancel button pressed")
             self.post_message(ValidationCancelMessage())
 
     def _start_github_auth(self) -> None: