llamactl 0.3.0a6__py3-none-any.whl → 0.3.0a7__py3-none-any.whl

llama_deploy/cli/client.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 import httpx
 from llama_deploy.core.schema.deployments import (

llama_deploy/cli/commands/serve.py

@@ -20,7 +20,7 @@ from ..options import global_options
     "deployment_file",
     required=False,
     default=DEFAULT_DEPLOYMENT_FILE_PATH,
-    type=click.Path(dir_okay=False, resolve_path=True, path_type=Path),
+    type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
 )
 @click.option(
     "--no-install", is_flag=True, help="Skip installing python and js dependencies"
@@ -34,6 +34,8 @@ from ..options import global_options
     is_flag=True,
     help="Preview mode pre-builds the UI to static files, like a production build",
 )
+@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
 def serve(
     deployment_file: Path,
@@ -41,8 +43,10 @@ def serve(
     no_reload: bool,
     no_open_browser: bool,
     preview: bool,
+    port: int | None = None,
+    ui_port: int | None = None,
 ) -> 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."""
+    """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():
         rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
         raise click.Abort()
@@ -58,6 +62,8 @@ def serve(
             proxy_ui=not preview,
             reload=not no_reload,
             open_browser=not no_open_browser,
+            port=port,
+            ui_port=ui_port,
         )
 
     except KeyboardInterrupt:

llama_deploy/cli/config.py

@@ -4,7 +4,7 @@ import os
 import sqlite3
 from dataclasses import dataclass
 from pathlib import Path
-from typing import List, Optional
+from typing import List
 
 
 @dataclass

llama_deploy/cli/interactive_prompts/utils.py

@@ -1,7 +1,5 @@
 """Shared utilities for CLI operations"""
 
-from typing import Optional
-
 import questionary
 from rich import print as rprint
 from rich.console import Console

llama_deploy/cli/textual/deployment_form.py

@@ -2,7 +2,6 @@
 
 import dataclasses
 import logging
-import os
 import re
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -20,8 +19,16 @@ from llama_deploy.cli.textual.git_validation import (
     ValidationResultMessage,
 )
 from llama_deploy.cli.textual.secrets_form import SecretsWidget
-from llama_deploy.core.deployment_config import DeploymentConfig
-from llama_deploy.core.git.git_util import get_current_branch, is_git_repo, list_remotes
+from llama_deploy.core.deployment_config import (
+    DEFAULT_DEPLOYMENT_NAME,
+    read_deployment_config,
+)
+from llama_deploy.core.git.git_util import (
+    get_current_branch,
+    get_git_root,
+    is_git_repo,
+    list_remotes,
+)
 from llama_deploy.core.schema.deployments import (
     DeploymentCreate,
     DeploymentResponse,
@@ -45,7 +52,7 @@ class DeploymentForm:
     id: str | None = None
     repo_url: str = ""
     git_ref: str = "main"
-    deployment_file_path: str = "llama_deploy.yaml"
+    deployment_file_path: str = ""
     personal_access_token: str = ""
     # indicates if the deployment has a personal access token (value is unknown)
     has_existing_pat: bool = False
@@ -67,7 +74,7 @@ class DeploymentForm:
             id=deployment.id,
             repo_url=deployment.repo_url,
             git_ref=deployment.git_ref or "main",
-            deployment_file_path=deployment.deployment_file_path or "llama_deploy.yaml",
+            deployment_file_path=deployment.deployment_file_path,
             personal_access_token="",  # Always start empty for security
             has_existing_pat=deployment.has_personal_access_token,
             secrets={},
@@ -85,7 +92,7 @@ class DeploymentForm:
         data = DeploymentUpdate(
             repo_url=self.repo_url,
             git_ref=self.git_ref or "main",
-            deployment_file_path=self.deployment_file_path or "llama_deploy.yaml",
+            deployment_file_path=self.deployment_file_path or None,
             personal_access_token=(
                 ""
                 if self.personal_access_token is None and not self.has_existing_pat
@@ -102,7 +109,7 @@ class DeploymentForm:
         return DeploymentCreate(
             name=self.name,
             repo_url=self.repo_url,
-            deployment_file_path=self.deployment_file_path or "llama_deploy.yaml",
+            deployment_file_path=self.deployment_file_path or None,
             git_ref=self.git_ref or "main",
             personal_access_token=self.personal_access_token,
             secrets=self.secrets,
@@ -175,10 +182,10 @@ class DeploymentFormWidget(Widget):
                 compact=True,
             )
 
-            yield Label("Deployment File:", classes="form-label", shrink=True)
+            yield Label("Config File:", classes="form-label", shrink=True)
             yield Input(
                 value=self.form_data.deployment_file_path,
-                placeholder="llama_deploy.yaml",
+                placeholder="Optional path to config dir/file",
                 id="deployment_file_path",
                 compact=True,
             )
@@ -283,8 +290,7 @@ class DeploymentFormWidget(Widget):
             id=self.form_data.id,
             repo_url=repo_url_input.value.strip(),
             git_ref=git_ref_input.value.strip() or "main",
-            deployment_file_path=deployment_file_input.value.strip()
-            or "llama_deploy.yaml",
+            deployment_file_path=deployment_file_input.value.strip(),
             personal_access_token=pat_value,
             secrets=updated_secrets,
             initial_secrets=self.original_form_data.initial_secrets,
@@ -467,6 +473,7 @@ def _initialize_deployment_data() -> DeploymentForm:
     git_ref: str | None = None
     secrets: dict[str, str] = {}
     name: str | None = None
+    config_file_path: str | None = None
     if is_git_repo():
         seen = set[str]()
         remotes = list_remotes()
@@ -482,22 +489,25 @@ def _initialize_deployment_data() -> DeploymentForm:
         if preferred_origin:
             repo_url = preferred_origin[0]
         git_ref = get_current_branch()
+        root = get_git_root()
+        if root != Path.cwd():
+            config_file_path = str(Path.cwd().relative_to(root))
+
     if Path(".env").exists():
         secrets = load_env_secrets_from_string(Path(".env").read_text())
-    for f in os.listdir("."):
-        if f.endswith(".yml") or f.endswith(".yaml"):
-            try:
-                config = DeploymentConfig.from_yaml(Path(f))
-                name = config.name
-                break
-            except Exception:
-                pass
+    try:
+        config = read_deployment_config(Path("."), Path("."))
+        if config.name != DEFAULT_DEPLOYMENT_NAME:
+            name = config.name
+    except Exception:
+        pass
 
     form = DeploymentForm(
         name=name or "",
         repo_url=repo_url or "",
         git_ref=git_ref or "main",
         secrets=secrets,
+        deployment_file_path=config_file_path or "",
     )
     return form
 

llama_deploy/cli/textual/deployment_help.py

@@ -36,8 +36,8 @@ class DeploymentHelpWidget(Widget):
                 [b]Git Ref[/b]
                 The git ref to deploy. This can be a branch, tag, or commit hash. If this is a branch, after deploying, run a `[slategrey reverse]llamactl deploy refresh[/]` to update the deployment to the latest git ref after you make updates.
                 
-                [b]Deployment File[/b]
-                The `[slategrey reverse]llama_deploy.yaml[/]` file to use for the deployment. This is a yaml file that contains the configuration for how to serve the deployment.
+                [b]Config File[/b]
+                Path to a directory or file containing a `[slategrey reverse]pyproject.toml[/]` or `[slategrey reverse]llama_deploy.yaml[/]` containing the llama deploy configuration. Only necessary if you have the configuration not at the root of the repo, or you have an unconventional configuration file.
                 
                 [b]Secrets[/b]
                 Secrets to add as environment variables to the deployment. e.g. to access a database or an API. Supports adding in `[slategrey reverse].env[/]` file format.

llama_deploy/cli/textual/github_callback_server.py

@@ -6,7 +6,10 @@ import webbrowser
 from textwrap import dedent
 from typing import Any, Dict, cast
 
-from aiohttp import web
+from aiohttp.web_app import Application
+from aiohttp.web_request import Request
+from aiohttp.web_response import Response
+from aiohttp.web_runner import AppRunner, TCPSite
 
 logger = logging.getLogger(__name__)
 
@@ -18,9 +21,9 @@ class GitHubCallbackServer:
         self.port = port
         self.callback_data: Dict[str, Any] = {}
         self.callback_received = asyncio.Event()
-        self.app: web.Application | None = None
-        self.runner: web.AppRunner | None = None
-        self.site: web.TCPSite | None = None
+        self.app: Application | None = None
+        self.runner: AppRunner | None = None
+        self.site: TCPSite | None = None
 
     async def start_and_wait(self, timeout: float = 300) -> Dict[str, Any]:
         """Start the server and wait for a callback with timeout"""
@@ -38,19 +41,19 @@ class GitHubCallbackServer:
 
     async def _start_server(self) -> None:
         """Start the aiohttp server"""
-        self.app = web.Application()
+        self.app = Application()
         self.app.router.add_get("/", self._handle_callback)
         self.app.router.add_get("/{path:.*}", self._handle_callback)
 
-        self.runner = web.AppRunner(self.app, logger=None)  # Suppress server logs
+        self.runner = AppRunner(self.app, logger=None)  # Suppress server logs
         await self.runner.setup()
 
-        self.site = web.TCPSite(self.runner, "localhost", self.port)
+        self.site = TCPSite(self.runner, "localhost", self.port)
         await self.site.start()
 
         logger.debug(f"GitHub callback server started on port {self.port}")
 
-    async def _handle_callback(self, request: web.Request) -> web.Response:
+    async def _handle_callback(self, request: Request) -> Response:
         """Handle the GitHub callback"""
         # Capture query parameters
         query_params: dict[str, str] = dict(cast(Any, request.query))
@@ -62,7 +65,7 @@ class GitHubCallbackServer:
 
         # Return success page
         html_response = self._get_success_html()
-        return web.Response(text=html_response, content_type="text/html")
+        return Response(text=html_response, content_type="text/html")
 
     async def stop(self) -> None:
         """Stop the server and cleanup"""

llama_deploy/cli/textual/profile_form.py

@@ -2,7 +2,6 @@
 
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
 
 from textual.app import App, ComposeResult
 from textual.containers import (

llama_deploy/cli/textual/secrets_form.py

@@ -114,7 +114,7 @@ class SecretsWidget(Widget):
 
         # Short help text for textarea format
         yield Static(
-            "Format: one per line, KEY=VALUE (e.g., API_KEY=abc).",
+            "Format: one per line, KEY=VALUE",
             classes="secret-label",
         )
 

{llamactl-0.3.0a6.dist-info → llamactl-0.3.0a7.dist-info}/METADATA

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

llamactl-0.3.0a7.dist-info/RECORD

@@ -0,0 +1,24 @@
+llama_deploy/cli/__init__.py,sha256=a7ac1d286680f8b95d046ed3f116c54d6301cf524ba39f0c19b39f9c95978d22,366
+llama_deploy/cli/app.py,sha256=5200b4ac01b0ad0c405ce841fc01a12ed32f7b6474472f00a7d6c75fe274ea45,2324
+llama_deploy/cli/client.py,sha256=3074f269c6c29b7af9822cc1fa2e647f699e7985901058d0ac534d38cb761817,6901
+llama_deploy/cli/commands/aliased_group.py,sha256=6e2457cdea51de83bb7f02b37abb77cb9b5bff0a61bdddd66c43240b66b13f13,986
+llama_deploy/cli/commands/deployment.py,sha256=d1aacc8c6cbe4d73b3284d04e805fb044af591f9b323cc5c4acb2c07b0ad649c,8463
+llama_deploy/cli/commands/profile.py,sha256=933d7a434c2684c7b47bfbd7340a09e4b34d56d20624886e15fdb4e0af97ce0b,6765
+llama_deploy/cli/commands/serve.py,sha256=22227f383bb5a9d43de7c788139c685c7370e24f495c9b1929faae80b87d4ded,2232
+llama_deploy/cli/config.py,sha256=ebec8cf9e2112378ee6ecd626166711f3fba8cfa27cd1c931fe899c0b2a047b3,6241
+llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f767385895c440afc762,496
+llama_deploy/cli/env.py,sha256=6ebc24579815b3787829c81fd5bb9f31698a06e62c0128a788559f962b33a7af,1016
+llama_deploy/cli/interactive_prompts/utils.py,sha256=db78eba78bf347738feb89ac3eeb77a1d11f4003980f81cf3c13842f8d41afeb,2463
+llama_deploy/cli/options.py,sha256=38bb4a231ad0436d8b910c98ff659c0736f619efdf56c402d60bb3f755df38e0,598
+llama_deploy/cli/textual/deployment_form.py,sha256=7cdef6df6b39fcb3bf0110e6339ca98fe213f44862123f4fbfe6f4df08ad1cf3,19578
+llama_deploy/cli/textual/deployment_help.py,sha256=d43e9ff29db71a842cf8b491545763d581ede3132b8af518c73af85a40950046,2464
+llama_deploy/cli/textual/git_validation.py,sha256=44e359d16aa879f4566a0077d025fdd799f500862a8462b5ed3586e528f7a273,13300
+llama_deploy/cli/textual/github_callback_server.py,sha256=dc74c510f8a98ef6ffaab0f6d11c7ea86ee77ca5adbc7725a2a29112bae24191,7556
+llama_deploy/cli/textual/llama_loader.py,sha256=468213a504057f21838b01f48d51f52e60aa622d6f0fe5bb800d76ced846cea9,1245
+llama_deploy/cli/textual/profile_form.py,sha256=4410678edbd59b014f937ce760bafa51ae86f6dd58bec88f048a9eda273446aa,5956
+llama_deploy/cli/textual/secrets_form.py,sha256=a43fbd81aad034d0d60906bfd917c107f9ace414648b0f63ac0b29eeba4050db,7061
+llama_deploy/cli/textual/styles.tcss,sha256=536cec7627d2a16dd03bf25bb9b6e4d53f1e0d18272b07ec0dc3bf76b0a7c2e0,3056
+llamactl-0.3.0a7.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.0a7.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.0a7.dist-info/METADATA,sha256=72f7abfbe8472f252debd8a0aef3ea5ca26a9ad0aaeef6e9ffdbae6a1b54fb35,3166
+llamactl-0.3.0a7.dist-info/RECORD,,

llamactl-0.3.0a6.dist-info/RECORD

@@ -1,24 +0,0 @@
-llama_deploy/cli/__init__.py,sha256=a7ac1d286680f8b95d046ed3f116c54d6301cf524ba39f0c19b39f9c95978d22,366
-llama_deploy/cli/app.py,sha256=5200b4ac01b0ad0c405ce841fc01a12ed32f7b6474472f00a7d6c75fe274ea45,2324
-llama_deploy/cli/client.py,sha256=b0a1f002bd3feab188459c6e56f75a995048016d135666a17e53c4588beea9cc,6911
-llama_deploy/cli/commands/aliased_group.py,sha256=6e2457cdea51de83bb7f02b37abb77cb9b5bff0a61bdddd66c43240b66b13f13,986
-llama_deploy/cli/commands/deployment.py,sha256=d1aacc8c6cbe4d73b3284d04e805fb044af591f9b323cc5c4acb2c07b0ad649c,8463
-llama_deploy/cli/commands/profile.py,sha256=933d7a434c2684c7b47bfbd7340a09e4b34d56d20624886e15fdb4e0af97ce0b,6765
-llama_deploy/cli/commands/serve.py,sha256=38e29816529af97bf00b8abea3ba6eb39e9a51e6b03616c2d8611b557079ddf2,1945
-llama_deploy/cli/config.py,sha256=1759e502ee77e72cce5358a4a85296f3e4182dd1495d21a3d9f308f92690e702,6251
-llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f767385895c440afc762,496
-llama_deploy/cli/env.py,sha256=6ebc24579815b3787829c81fd5bb9f31698a06e62c0128a788559f962b33a7af,1016
-llama_deploy/cli/interactive_prompts/utils.py,sha256=4ecab983c3f4869e7b8fcbb385e3ea91fde3bf86e8db7afe72d2febfd45d551e,2492
-llama_deploy/cli/options.py,sha256=38bb4a231ad0436d8b910c98ff659c0736f619efdf56c402d60bb3f755df38e0,598
-llama_deploy/cli/textual/deployment_form.py,sha256=9a7a364ab9735585db83d5955f4bb46faf0776b050c3477e2e7e5cfca5b11b2d,19465
-llama_deploy/cli/textual/deployment_help.py,sha256=7dae54ffbdaea201362928883cc206b496b1386023fb7f1c78d168132543e592,2339
-llama_deploy/cli/textual/git_validation.py,sha256=44e359d16aa879f4566a0077d025fdd799f500862a8462b5ed3586e528f7a273,13300
-llama_deploy/cli/textual/github_callback_server.py,sha256=031929592f448c5005e11cea19268fd696d60d92573c385a0397cfabacb06eb7,7444
-llama_deploy/cli/textual/llama_loader.py,sha256=468213a504057f21838b01f48d51f52e60aa622d6f0fe5bb800d76ced846cea9,1245
-llama_deploy/cli/textual/profile_form.py,sha256=6c2d55b7c0a1712796eebc8f05bb0597e955cf1dd6f96d37a6f0dce7865a2554,5984
-llama_deploy/cli/textual/secrets_form.py,sha256=b46b0e5999cd7c92433b91dcfb560bb5f8de9e5c4e96abbad63ee68544c387be,7082
-llama_deploy/cli/textual/styles.tcss,sha256=536cec7627d2a16dd03bf25bb9b6e4d53f1e0d18272b07ec0dc3bf76b0a7c2e0,3056
-llamactl-0.3.0a6.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.0a6.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.0a6.dist-info/METADATA,sha256=6bf285b99000994431ec30eb1d6a97881e6fbd2a85785ca1d36dcb25156a4abc,3166
-llamactl-0.3.0a6.dist-info/RECORD,,