llamactl 0.3.16__tar.gz → 0.3.18__tar.gz

{llamactl-0.3.16 → llamactl-0.3.18}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.16
+Version: 0.3.18
 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[client]>=0.3.16,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.16,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.18,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.18,<0.4.0
 Requires-Dist: vibe-llama-core>=0.1.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0

{llamactl-0.3.16 → llamactl-0.3.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.16"
+version = "0.3.18"
 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.11, <4"
 dependencies = [
-    "llama-deploy-core[client]>=0.3.16,<0.4.0",
-    "llama-deploy-appserver>=0.3.16,<0.4.0",
+    "llama-deploy-core[client]>=0.3.18,<0.4.0",
+    "llama-deploy-appserver>=0.3.18,<0.4.0",
     "vibe-llama-core>=0.1.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",

{llamactl-0.3.16 → llamactl-0.3.18}/src/llama_deploy/cli/__init__.py

@@ -4,6 +4,7 @@ from llama_deploy.cli.commands.auth import auth
 from llama_deploy.cli.commands.deployment import deployments
 from llama_deploy.cli.commands.env import env_group
 from llama_deploy.cli.commands.init import init
+from llama_deploy.cli.commands.pkg import pkg
 from llama_deploy.cli.commands.serve import serve
 
 from .app import app
@@ -22,7 +23,7 @@ def main() -> None:
     app()
 
 
-__all__ = ["app", "deployments", "auth", "serve", "init", "env_group"]
+__all__ = ["app", "deployments", "auth", "serve", "init", "env_group", "pkg"]
 
 
 if __name__ == "__main__":

{llamactl-0.3.16 → llamactl-0.3.18}/src/llama_deploy/cli/commands/aliased_group.py

@@ -27,7 +27,7 @@ class AliasedGroup(click.Group):
 
     def resolve_command(
         self, ctx: click.Context, args: list[str]
-    ) -> tuple[str, click.Command, list[str]]:
+    ) -> tuple[str | None, click.Command | None, list[str]]:
         # always return the full command name
         _, cmd, args = super().resolve_command(ctx, args)
-        return cmd.name, cmd, args
+        return cmd.name if cmd else None, cmd, args

{llamactl-0.3.16 → llamactl-0.3.18}/src/llama_deploy/cli/commands/auth.py

@@ -501,6 +501,8 @@ async def _run_device_authentication(base_url: str) -> DeviceOIDC:
                     raise click.ClickException(
                         "Device flow failed: token response missing access_token"
                     )
+                if not provider.jwks_uri:
+                    raise click.ClickException("Provider does not expose jwks_uri")
                 claims = await decode_jwt_claims(token.id_token, provider.jwks_uri)
                 email = claims.get("email")
                 if not email:

llamactl-0.3.18/src/llama_deploy/cli/commands/pkg.py

@@ -0,0 +1,122 @@
+from pathlib import Path
+
+import click
+from llama_deploy.cli.pkg import (
+    DEFAULT_DOCKER_IGNORE,
+    build_dockerfile_content,
+    infer_python_version,
+    pkg_container_options,
+)
+from llama_deploy.core.deployment_config import (
+    read_deployment_config_from_git_root_or_cwd,
+)
+from rich import print as rprint
+
+from ..app import app
+
+SUPPORTED_FORMATS = ["Docker", "Podman"]
+SUPPORTED_FORMATS_STR = ", ".join(SUPPORTED_FORMATS)
+
+
+@app.group(
+    help=f"Package your application in different formats. Currently supported: {SUPPORTED_FORMATS_STR}",
+    no_args_is_help=True,
+    context_settings={"max_content_width": None},
+)
+def pkg() -> None:
+    """Package application in different formats (Dockerfile, Podman config, Nixpack...)"""
+    pass
+
+
+@pkg.command(
+    "container",
+    help="Generate a minimal, build-ready file to containerize your workflows through Docker or Podman (currently frontend is not supported).",
+)
+@pkg_container_options
+def create_container_file(
+    deployment_file: Path,
+    python_version: str | None = None,
+    port: int = 4501,
+    exclude: tuple[str, ...] | None = None,
+    output_file: str = "Dockerfile",
+    dockerignore_path: str = ".dockerignore",
+    overwrite: bool = False,
+):
+    _create_file_for_container(
+        deployment_file=deployment_file,
+        python_version=python_version,
+        port=port,
+        exclude=exclude,
+        output_file=output_file,
+        dockerignore_path=dockerignore_path,
+        overwrite=overwrite,
+    )
+
+
+def _check_deployment_config(deployment_file: Path) -> Path:
+    if not deployment_file.exists():
+        rprint(f"[red]Deployment file '{deployment_file}' not found[/red]")
+        raise click.Abort()
+
+    # Early check: appserver requires a pyproject.toml in the config directory
+    config_dir = deployment_file if deployment_file.is_dir() else deployment_file.parent
+    if not (config_dir / "pyproject.toml").exists():
+        rprint(
+            "[red]No pyproject.toml found at[/red] "
+            f"[bold]{config_dir}[/bold].\n"
+            "Add a pyproject.toml to your project and re-run 'llamactl serve'."
+        )
+        raise click.Abort()
+
+    try:
+        config = read_deployment_config_from_git_root_or_cwd(
+            Path.cwd(), deployment_file
+        )
+    except Exception:
+        rprint(
+            "[red]Error: Could not read a deployment config. This doesn't appear to be a valid llama-deploy project.[/red]"
+        )
+        raise click.Abort()
+    if config.ui:
+        rprint(
+            "[bold red]Containerized UI builds are currently not supported. Please remove the UI configuration from your deployment file if you wish to proceed.[/]"
+        )
+        raise click.Abort()
+    return config_dir
+
+
+def _create_file_for_container(
+    deployment_file: Path,
+    output_file: str = "Dockerfile",
+    python_version: str | None = None,
+    port: int = 4501,
+    exclude: tuple[str, ...] | None = None,
+    dockerignore_path: str = ".dockerignore",
+    overwrite: bool = False,
+):
+    config_dir = _check_deployment_config(deployment_file=deployment_file)
+
+    if not python_version:
+        python_version = infer_python_version(config_dir)
+
+    dockerignore_content = DEFAULT_DOCKER_IGNORE
+    if exclude:
+        for item in exclude:
+            dockerignore_content += "\n" + item
+
+    dockerfile_content = build_dockerfile_content(python_version, port)
+
+    if Path(output_file).exists() and not overwrite:
+        rprint(
+            f"[red bold]Error: {output_file} already exists. If you wish to overwrite the file, pass `--overwrite` as a flag to the command.[/]"
+        )
+        raise click.Abort()
+    with open(output_file, "w") as f:
+        f.write(dockerfile_content)
+    if Path(dockerignore_path).exists() and not overwrite:
+        rprint(
+            f"[red bold]Error: {dockerignore_path} already exists. If you wish to overwrite the file, pass `--overwrite` as a flag to the command.[/]"
+        )
+        raise click.Abort()
+    with open(dockerignore_path, "w") as f:
+        f.write(dockerignore_content)

llamactl-0.3.18/src/llama_deploy/cli/pkg/__init__.py

@@ -0,0 +1,10 @@
+from .defaults import DEFAULT_DOCKER_IGNORE
+from .options import pkg_container_options
+from .utils import build_dockerfile_content, infer_python_version
+
+__all__ = [
+    "infer_python_version",
+    "build_dockerfile_content",
+    "DEFAULT_DOCKER_IGNORE",
+    "pkg_container_options",
+]

llamactl-0.3.18/src/llama_deploy/cli/pkg/defaults.py

@@ -0,0 +1,11 @@
+DEFAULT_DOCKER_IGNORE = """
+.venv/
+.git/
+__pycache__/
+*.py[oc]
+build/
+dist/
+wheels/
+*.egg-info
+.env
+"""

llamactl-0.3.18/src/llama_deploy/cli/pkg/options.py

@@ -0,0 +1,84 @@
+from pathlib import Path
+from typing import Callable, ParamSpec, TypeVar
+
+import click
+from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
+
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+def _deployment_file_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.argument(
+        "deployment_file",
+        required=False,
+        default=DEFAULT_DEPLOYMENT_FILE_PATH,
+        type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+    )(f)
+
+
+def _python_version_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.option(
+        "--python-version",
+        help="Python version for the base image. Default is inferred from the uv project configuration (.python-version or pyproject.toml). If no version can be inferred, python 3.12 is used.",
+        required=False,
+        default=None,
+    )(f)
+
+
+def _port_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.option(
+        "--port",
+        help="The port to run the API server on. Defaults to 4501.",
+        required=False,
+        default=4501,
+        type=int,
+    )(f)
+
+
+def _dockerignore_path_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.option(
+        "--dockerignore-path",
+        help="Path for the output .dockerignore file. Defaults to .dockerignore",
+        required=False,
+        default=".dockerignore",
+    )(f)
+
+
+def _output_file_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.option(
+        "--output-file",
+        help="Path for the output file to build the image. Defaults to Dockerfile",
+        required=False,
+        default="Dockerfile",
+    )(f)
+
+
+def _overwrite_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.option(
+        "--overwrite",
+        help="Overwrite output files",
+        is_flag=True,
+    )(f)
+
+
+def _exclude_option(f: Callable[P, R]) -> Callable[P, R]:
+    return click.option(
+        "--exclude",
+        help="Path to exclude from the build (will be appended to .dockerignore). Can be used multiple times.",
+        multiple=True,
+        required=False,
+        default=None,
+    )(f)
+
+
+def pkg_container_options(f: Callable[P, R]) -> Callable[P, R]:
+    return _deployment_file_option(
+        _python_version_option(
+            _port_option(
+                _dockerignore_path_option(
+                    _overwrite_option(_exclude_option(_output_file_option(f)))
+                )
+            )
+        )
+    )

llamactl-0.3.18/src/llama_deploy/cli/pkg/utils.py

@@ -0,0 +1,46 @@
+from pathlib import Path
+from tomllib import load as load_toml
+
+
+def _get_min_py_version(requires_python: str):
+    min_v = requires_python.split(",")[0].strip()
+    return (
+        min_v.replace("=", "")
+        .replace(">", "")
+        .replace("<", "")
+        .replace("~", "")
+        .strip()
+    )
+
+
+def infer_python_version(config_dir: Path):
+    if (config_dir / ".python-version").exists():
+        with open(config_dir / ".python-version", "r") as f:
+            content = f.read()
+            if content.strip():
+                py_version = content.strip()
+                return py_version
+    with open(config_dir / "pyproject.toml", "rb") as f:
+        data = load_toml(f)
+    return _get_min_py_version(data.get("project", {}).get("requires-python", "3.12"))
+
+
+def build_dockerfile_content(python_version: str | None = None, port: int = 4501):
+    return f"""
+FROM python:{python_version}-slim-trixie
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+WORKDIR /app
+
+COPY . /app/
+
+ENV PATH=/root/.local/bin:$PATH
+
+RUN uv sync --locked
+RUN uv tool install llamactl
+
+EXPOSE {port}
+
+ENTRYPOINT [ "uv", "run", "llamactl", "serve", "--host", "0.0.0.0", "--port", "{port}" ]
+"""

{llamactl-0.3.16 → llamactl-0.3.18}/src/llama_deploy/cli/textual/deployment_form.py

@@ -6,6 +6,7 @@ import re
 from dataclasses import dataclass, field
 from pathlib import Path
 from textwrap import dedent
+from typing import cast
 from urllib.parse import urlsplit
 
 from llama_deploy.cli.client import get_project_client as get_client
@@ -117,7 +118,11 @@ class DeploymentForm:
     def to_update(self) -> DeploymentUpdate:
         """Convert form data to API format"""
 
-        secrets: dict[str, str | None] = self.secrets.copy()
+        secrets: dict[str, str | None] = cast(
+            # dict isn't covariant, so whatever, make it work
+            dict[str, str | None],
+            self.secrets.copy(),
+        )
         for secret in self.removed_secrets:
             secrets[secret] = None
 
@@ -287,7 +292,11 @@ class DeploymentFormWidget(Widget):
                     or existing_version
                     or installed_version
                 )
-                is_upgrade = Version(installed_version) > Version(existing_version)
+                is_upgrade = (
+                    installed_version
+                    and existing_version
+                    and Version(installed_version) > Version(existing_version)
+                )
                 label = "Upgrade" if is_upgrade else "Downgrade"
                 yield Select(
                     [
@@ -563,11 +572,14 @@ class DeploymentEditApp(App[DeploymentResponse | None]):
         result = self.form_data
         client = get_client()
         try:
-            update_deployment = (
-                await client.update_deployment(result.id, result.to_update())
-                if result.is_editing
-                else await client.create_deployment(result.to_create())
-            )
+            if result.is_editing:
+                if not result.id:
+                    raise ValueError("Deployment ID is required for update")
+                update_deployment = await client.update_deployment(
+                    result.id, result.to_update()
+                )
+            else:
+                update_deployment = await client.create_deployment(result.to_create())
             # Save and navigate to embedded monitor screen
             self.saved_deployment = update_deployment
             # Ensure form_data carries the new ID for any subsequent operations

{llamactl-0.3.16 → llamactl-0.3.18}/src/llama_deploy/cli/textual/deployment_monitor.py

@@ -365,7 +365,9 @@ class DeploymentMonitorWidget(Widget):
         ev_details_widget = self.query_one("#last_event_details", Static)
         deployment_link_button = self.query_one("#deployment_link_button", Button)
         widget.update(self._render_status_line())
-        deployment_link_button.label = f"{str(self.deployment.apiserver_url or '')}"
+        deployment_link_button.label = (
+            f"{str(self.deployment.apiserver_url or '') if self.deployment else ''}"
+        )
         # Update last event line
         ev_widget.update(self._render_last_event_status())
         ev_details_widget.update(self._render_last_event_details())