llamactl 0.3.13__tar.gz → 0.3.15__tar.gz

{llamactl-0.3.13 → llamactl-0.3.15}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.13
+Version: 0.3.15
 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.13,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.13,<0.4.0
-Requires-Dist: httpx>=0.24.0,<1.0.0
+Requires-Dist: llama-deploy-core[client]>=0.3.15,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.15,<0.4.0
+Requires-Dist: vibe-llama-core>=0.1.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
 Requires-Dist: click>=8.2.1
@@ -15,7 +15,7 @@ Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: tenacity>=9.1.2
 Requires-Dist: textual>=6.0.0
 Requires-Dist: aiohttp>=3.12.14
-Requires-Dist: copier>=9.9.0
+Requires-Dist: copier>=9.10.2
 Requires-Dist: pyjwt[crypto]>=2.10.1
 Requires-Python: >=3.11, <4
 Description-Content-Type: text/markdown

{llamactl-0.3.13 → llamactl-0.3.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llamactl"
-version = "0.3.13"
+version = "0.3.15"
 description = "A command-line interface for managing LlamaDeploy projects and deployments"
 readme = "README.md"
 license = { text = "MIT" }
@@ -9,9 +9,9 @@ authors = [
 ]
 requires-python = ">=3.11, <4"
 dependencies = [
-    "llama-deploy-core[client]>=0.3.13,<0.4.0",
-    "llama-deploy-appserver>=0.3.13,<0.4.0",
-    "httpx>=0.24.0,<1.0.0",
+    "llama-deploy-core[client]>=0.3.15,<0.4.0",
+    "llama-deploy-appserver>=0.3.15,<0.4.0",
+    "vibe-llama-core>=0.1.0",
     "rich>=13.0.0",
     "questionary>=2.0.0",
     "click>=8.2.1",
@@ -19,7 +19,7 @@ dependencies = [
     "tenacity>=9.1.2",
     "textual>=6.0.0",
     "aiohttp>=3.12.14",
-    "copier>=9.9.0",
+    "copier>=9.10.2",
     "pyjwt[crypto]>=2.10.1",
 ]
 

{llamactl-0.3.13 → llamactl-0.3.15}/src/llama_deploy/cli/commands/deployment.py

@@ -12,13 +12,17 @@ import click
 import questionary
 from llama_deploy.cli.commands.auth import validate_authenticated_profile
 from llama_deploy.cli.styles import HEADER_COLOR, MUTED_COL, PRIMARY_COL, WARNING
-from llama_deploy.core.schema.deployments import DeploymentUpdate
+from llama_deploy.core.schema.deployments import (
+    DeploymentHistoryResponse,
+    DeploymentResponse,
+    DeploymentUpdate,
+)
 from rich import print as rprint
 from rich.table import Table
 from rich.text import Text
 
 from ..app import app, console
-from ..client import get_project_client
+from ..client import get_project_client, project_client_context
 from ..interactive_prompts.session_utils import (
     is_interactive_session,
 )
@@ -221,8 +225,15 @@ def edit_deployment(deployment_id: str | None, interactive: bool) -> None:
 @deployments.command("update")
 @global_options
 @click.argument("deployment_id", required=False)
+@click.option(
+    "--git-ref",
+    help="Reference branch or commit SHA for the deployment. If not provided, the current reference branch and latest commit on it will be used.",
+    default=None,
+)
 @interactive_option
-def refresh_deployment(deployment_id: str | None, interactive: bool) -> None:
+def refresh_deployment(
+    deployment_id: str | None, git_ref: str | None, interactive: bool
+) -> None:
     """Update the deployment, pulling the latest code from it's branch"""
     validate_authenticated_profile(interactive)
     try:
@@ -240,7 +251,9 @@ def refresh_deployment(deployment_id: str | None, interactive: bool) -> None:
 
         # Create an empty update to force git SHA refresh with spinner
         with console.status(f"Refreshing {deployment_name}..."):
-            deployment_update = DeploymentUpdate()
+            deployment_update = DeploymentUpdate(
+                git_ref=git_ref,
+            )
             updated_deployment = asyncio.run(
                 get_project_client().update_deployment(
                     deployment_id,
@@ -263,6 +276,116 @@ def refresh_deployment(deployment_id: str | None, interactive: bool) -> None:
         raise click.Abort()
 
 
+@deployments.command("history")
+@global_options
+@click.argument("deployment_id", required=False)
+@interactive_option
+def show_history(deployment_id: str | None, interactive: bool) -> None:
+    """Show release history for a deployment."""
+    validate_authenticated_profile(interactive)
+    try:
+        deployment_id = select_deployment(deployment_id, interactive=interactive)
+        if not deployment_id:
+            rprint(f"[{WARNING}]No deployment selected[/]")
+            return
+
+        async def _fetch_history() -> DeploymentHistoryResponse:
+            async with project_client_context() as client:
+                return await client.get_deployment_history(deployment_id)
+
+        history = asyncio.run(_fetch_history())
+        items = history.history
+        if not items:
+            rprint(f"No history recorded for {deployment_id}")
+            return
+
+        table = Table(show_edge=False, box=None, header_style=f"bold {HEADER_COLOR}")
+        table.add_column("Released At", style=MUTED_COL)
+        table.add_column("Git SHA", style=PRIMARY_COL)
+        # newest first
+        items_sorted = sorted(
+            items,
+            key=lambda it: it.released_at,
+            reverse=True,
+        )
+        for item in items_sorted:
+            ts = item.released_at.isoformat()
+            sha = item.git_sha
+            table.add_row(ts, sha)
+        console.print(table)
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
+@deployments.command("rollback", hidden=True)
+@global_options
+@click.argument("deployment_id", required=False)
+@click.option("--git-sha", required=False, help="Git SHA to roll back to")
+@interactive_option
+def rollback(deployment_id: str | None, git_sha: str | None, interactive: bool) -> None:
+    """Rollback a deployment to a previous git sha."""
+    validate_authenticated_profile(interactive)
+    try:
+        deployment_id = select_deployment(deployment_id, interactive=interactive)
+        if not deployment_id:
+            rprint(f"[{WARNING}]No deployment selected[/]")
+            return
+
+        if not git_sha:
+            # If not provided, prompt from history
+            async def _fetch_current_and_history() -> tuple[
+                DeploymentResponse, DeploymentHistoryResponse
+            ]:
+                async with project_client_context() as client:
+                    current = await client.get_deployment(deployment_id)
+                    hist = await client.get_deployment_history(deployment_id)
+                    return current, hist
+
+            current_deployment, history = asyncio.run(_fetch_current_and_history())
+            current_sha = current_deployment.git_sha or ""
+
+            items = history.history or []
+            # Sort newest first
+            items_sorted = sorted(items, key=lambda it: it.released_at, reverse=True)
+            choices = []
+            for it in items_sorted:
+                short = it.git_sha[:7]
+                suffix = (
+                    " [current]" if current_sha and it.git_sha == current_sha else ""
+                )
+                choices.append(
+                    questionary.Choice(
+                        title=f"{short}{suffix} ({it.released_at})", value=it.git_sha
+                    )
+                )
+            if not choices:
+                rprint(f"[{WARNING}]No history available to rollback[/]")
+                return
+            git_sha = questionary.select("Select git sha:", choices=choices).ask()
+            if not git_sha:
+                rprint(f"[{WARNING}]Cancelled[/]")
+                return
+
+        if interactive and not confirm_action(
+            f"Rollback '{deployment_id}' to {git_sha[:7]}?"
+        ):
+            rprint(f"[{WARNING}]Cancelled[/]")
+            return
+
+        async def _do_rollback() -> DeploymentResponse:
+            async with project_client_context() as client:
+                return await client.rollback_deployment(deployment_id, git_sha)
+
+        updated = asyncio.run(_do_rollback())
+        rprint(
+            f"[green]Rollback initiated[/green]: {deployment_id} → {updated.git_sha[:7] if updated.git_sha else 'unknown'}"
+        )
+    except Exception as e:
+        rprint(f"[red]Error: {e}[/red]")
+        raise click.Abort()
+
+
 def select_deployment(
     deployment_id: str | None = None, interactive: bool = is_interactive_session()
 ) -> str | None:

{llamactl-0.3.13 → llamactl-0.3.15}/src/llama_deploy/cli/commands/init.py

@@ -9,7 +9,6 @@ from pathlib import Path
 
 import click
 import copier
-import httpx
 import questionary
 from click.exceptions import Exit
 from llama_deploy.cli.app import app
@@ -18,9 +17,9 @@ from llama_deploy.cli.options import (
     interactive_option,
 )
 from llama_deploy.cli.styles import HEADER_COLOR_HEX
-from llama_deploy.core.client.ssl_util import get_httpx_verify_param
 from rich import print as rprint
 from rich.text import Text
+from vibe_llama_core.docs import get_agent_rules
 
 
 @app.command()
@@ -295,14 +294,16 @@ def _create(
                 # Extract a short error message if present
                 err_msg = ""
                 if isinstance(e, subprocess.CalledProcessError):
-                    stderr = getattr(e, "stderr", b"")
-                    if isinstance(stderr, (bytes, bytearray)):
+                    stderr_bytes = e.stderr or b""
+                    if isinstance(stderr_bytes, (bytes, bytearray)):
                         try:
-                            stderr = stderr.decode("utf-8", "ignore")
+                            stderr_text = stderr_bytes.decode("utf-8", "ignore")
                         except Exception:
-                            stderr = ""
-                    if isinstance(stderr, str) and stderr.strip():
-                        err_msg = stderr.strip().split("\n")[-1]
+                            stderr_text = ""
+                    else:
+                        stderr_text = str(stderr_bytes)
+                    if stderr_text.strip():
+                        err_msg = stderr_text.strip().split("\n")[-1]
                 elif isinstance(e, FileNotFoundError):
                     err_msg = "git executable not found"
 
@@ -406,14 +407,6 @@ async def _download_and_write_agents_md(include_llama_cloud: bool) -> bool:
 
     Returns True if any documentation was fetched, False otherwise.
     """
-    BASE_URL = "https://raw.githubusercontent.com/run-llama/vibe-llama/main"
-
-    services: dict[str, str] = {
-        "LlamaIndex": f"{BASE_URL}/documentation/llamaindex.md",
-        "LlamaCloud Services": f"{BASE_URL}/documentation/llamacloud.md",
-        "llama-index-workflows": f"{BASE_URL}/documentation/llama-index-workflows.md",
-        "LlamaDeploy": f"{BASE_URL}/documentation/llamadeploy.md",
-    }
 
     selected_services: list[str] = [
         "LlamaDeploy",
@@ -423,35 +416,19 @@ async def _download_and_write_agents_md(include_llama_cloud: bool) -> bool:
     if include_llama_cloud:
         selected_services.append("LlamaCloud Services")
 
-    urls: list[str] = [(s, u) for s in selected_services if (u := services.get(s))]
-
-    contents: list[str] = []
-    timeout = httpx.Timeout(5.0)
-    async with httpx.AsyncClient(
-        timeout=timeout, verify=get_httpx_verify_param()
-    ) as client:
-
-        async def get_docs(service: str, url: str) -> str | None:
-            try:
-                resp = await client.get(url)
-                resp.raise_for_status()
-                text = resp.text.strip()
-                if text:
-                    return text
-            except Exception:
-                # best-effort: skip failures
-                rprint(
-                    f"[yellow]Failed to fetch documentation for {service}, skipping[/]"
-                )
-                return None
-
-        results = await asyncio.gather(
-            *[get_docs(service, url) for service, url in urls]
-        )
-        contents = [r for r in results if r is not None]
-
-    if contents:
-        agents_md = "\n\n---\n\n".join(contents) + "\n"
-        Path("AGENTS.md").write_text(agents_md, encoding="utf-8")
+    downloads = 0
+
+    for service in selected_services:
+        try:
+            await get_agent_rules(
+                agent="OpenAI Codex CLI",
+                service=service,
+                overwrite_files=False,
+                verbose=False,
+            )  # type: ignore
+        except Exception:
+            rprint(f"[yellow]Failed to fetch documentation for {service}, skipping[/]")
+        else:
+            downloads += 1
 
-    return bool(contents)
+    return downloads > 0

{llamactl-0.3.13 → llamactl-0.3.15}/src/llama_deploy/cli/textual/deployment_form.py

@@ -82,6 +82,8 @@ class DeploymentForm:
     installed_appserver_version: str | None = None
     existing_llama_deploy_version: str | None = None
     selected_appserver_version: str | None = None
+    # required secret names from config
+    required_secret_names: list[str] = field(default_factory=list)
 
     @classmethod
     def from_deployment(cls, deployment: DeploymentResponse) -> "DeploymentForm":
@@ -319,6 +321,12 @@ class DeploymentFormWidget(Widget):
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "save":
+            # Ensure latest input values are captured by blurring current focus first
+            try:
+                if self.screen.focused is not None:
+                    self.screen.focused.blur()
+            except Exception:
+                pass
             self._save()
         elif event.button.id == "change_pat":
             updated_form = dataclasses.replace(self.resolve_form_data())
@@ -343,11 +351,11 @@ class DeploymentFormWidget(Widget):
             self.post_message(StartValidationMessage(self.form_data))
 
     def _validate_form(self) -> bool:
-        """Validate required fields"""
+        """Validate required fields from the current UI state"""
         name_input = self.query_one("#name", Input)
         repo_url_input = self.query_one("#repo_url", Input)
 
-        errors = []
+        errors: list[str] = []
 
         # Clear previous error state
         name_input.remove_class("error")
@@ -361,12 +369,19 @@ class DeploymentFormWidget(Widget):
             repo_url_input.add_class("error")
             errors.append("Repository URL is required")
 
+        missing_required: list[str] = []
+        for secret_name in sorted(self.form_data.required_secret_names):
+            value = (self.form_data.secrets.get(secret_name) or "").strip()
+            if value == "":
+                missing_required.append(secret_name)
+        if missing_required:
+            errors.append("Missing required secrets: " + ", ".join(missing_required))
+
         if errors:
             self._show_error("; ".join(errors))
             return False
-        else:
-            self._show_error("")
-            return True
+        self._show_error("")
+        return True
 
     def _show_error(self, message: str) -> None:
         """Show an error message"""
@@ -408,6 +423,7 @@ class DeploymentFormWidget(Widget):
             installed_appserver_version=self.form_data.installed_appserver_version,
             existing_llama_deploy_version=self.form_data.existing_llama_deploy_version,
             selected_appserver_version=self.form_data.selected_appserver_version,
+            required_secret_names=self.form_data.required_secret_names,
         )
 
 
@@ -608,11 +624,15 @@ def _initialize_deployment_data() -> DeploymentForm:
     warnings: list[str] = []
     has_git = is_git_repo()
     has_no_workflows = False
+    required_secret_names: list[str] = []
     try:
         config = read_deployment_config(Path("."), Path("."))
         if config.name != DEFAULT_DEPLOYMENT_NAME:
             name = config.name
         has_no_workflows = config.has_no_workflows()
+        # Seed required secret names from config if present
+        required_secret_names = config.required_env_vars
+
     except Exception:
         warnings.append("Could not parse local deployment config. It may be invalid.")
     if not has_git and has_no_workflows:
@@ -685,6 +705,7 @@ def _initialize_deployment_data() -> DeploymentForm:
         env_info_messages=env_info_message,
         installed_appserver_version=installed,
         selected_appserver_version=installed,
+        required_secret_names=required_secret_names,
     )
     return form