llamactl 0.2.7a1__py3-none-any.whl → 0.3.0a1__py3-none-any.whl

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...")
 

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"
 

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:

{llamactl-0.2.7a1.dist-info → llamactl-0.3.0a1.dist-info}/METADATA

@@ -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.dist-info → llamactl-0.3.0a1.dist-info}/RECORD

@@ -1,19 +1,19 @@
 llama_deploy/cli/__init__.py,sha256=d0cda44bc0c9b76a5bff53f216c558541485910be36e94bd306dd0eeee8048c5,740
 llama_deploy/cli/client.py,sha256=1518e395291356538e2c7c63b1ad424c5484161b921fc0f54d7f6ad5cdcd0ccc,6385
-llama_deploy/cli/commands.py,sha256=d8ce617e18d0a7220d9c7f467f71db54bc6cfc49c3447fd5ae81c84bc95afe8f,17586
+llama_deploy/cli/commands.py,sha256=8c4a00343af301743922e1e7093b63e547a93804ed70457cb17e597bf12cd382,16981
 llama_deploy/cli/config.py,sha256=b339d95fceb7a15a183663032396aaeb2afffe1ddf06494416a6a0183a6658ca,6275
 llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f767385895c440afc762,496
 llama_deploy/cli/env.py,sha256=bb1dcde428c779796ad2b39b58d84f08df75a15031afca577aca0db5ce9a9ea0,1015
 llama_deploy/cli/interactive_prompts/utils.py,sha256=59bd7cab8fe359d5a52e1805e8c9555b5cdf16f3699d7fa3be4d189503c4617f,2482
 llama_deploy/cli/options.py,sha256=78b6e36e39fa88f0587146995e2cb66418b67d16f945f0b7570dab37cf5fc673,576
-llama_deploy/cli/textual/deployment_form.py,sha256=7e7d0e40ae451ca7bf202be746378ae54af30b94b85a3c524ad02933c66cc182,15107
-llama_deploy/cli/textual/git_validation.py,sha256=a00ab16b104b9f2f6c989243a65fb19f4b177562798a1174027e70b596fcb5c9,13378
+llama_deploy/cli/textual/deployment_form.py,sha256=0533bade514cef6451d149f03824408e55222b386448171d1ecdefc5e8d2710a,15054
+llama_deploy/cli/textual/git_validation.py,sha256=6ca9472b255c65ce2d5d420967798b41a49fd2ad9c62b9f5de5eff09f41f74cb,13279
 llama_deploy/cli/textual/github_callback_server.py,sha256=a74b1f5741bdaa682086771fd73a145e1e22359601f16f036f72a87e64b0a152,7444
 llama_deploy/cli/textual/llama_loader.py,sha256=dfef7118eb42d0fec033731b3f3b16ed4dbf4c551f4059c36e290e73c9aa5d13,1244
 llama_deploy/cli/textual/profile_form.py,sha256=2c6ca4690c22b499cc327b117c97e7914d4243b73faa92c0f5ac9cfdcf59b3d7,6015
 llama_deploy/cli/textual/secrets_form.py,sha256=1fd47a5a5ee9dfa0fd2a86f5888894820897c55fbb0cd30e60d6bc08570288b5,6303
 llama_deploy/cli/textual/styles.tcss,sha256=72338c5634bae0547384669382c4e06deec1380ef7bbc31099b1dca8ce49b2d0,2711
-llamactl-0.2.7a1.dist-info/WHEEL,sha256=cc8ae5806c5874a696cde0fcf78fdf73db4982e7c824f3ceab35e2b65182fa1a,79
-llamactl-0.2.7a1.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.2.7a1.dist-info/METADATA,sha256=b74e8a9886a9823e5b65476b5b0712a17d73d3ef6117e058c86bd290a70fac8a,3137
-llamactl-0.2.7a1.dist-info/RECORD,,
+llamactl-0.3.0a1.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.0a1.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.0a1.dist-info/METADATA,sha256=1fe014585182ab79295211197456127e248e5a2449612ce4793ab8d7d4a93d46,3137
+llamactl-0.3.0a1.dist-info/RECORD,,

{llamactl-0.2.7a1.dist-info → llamactl-0.3.0a1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.7.21
+Generator: uv 0.7.20
 Root-Is-Purelib: true
 Tag: py3-none-any