llamactl 0.3.17__tar.gz → 0.3.19__tar.gz

{llamactl-0.3.17 → llamactl-0.3.19}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.17
+Version: 0.3.19
 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.17,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.17,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.19,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.19,<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.17 → llamactl-0.3.19}/pyproject.toml

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

{llamactl-0.3.17 → llamactl-0.3.19}/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.17 → llamactl-0.3.19}/src/llama_deploy/cli/commands/auth.py

@@ -44,6 +44,11 @@ from ..config.schema import Auth, DeviceOIDC
 from ..options import global_options, interactive_option
 
 
+# Specific auth/login flow exceptions
+class NoProjectsFoundError(Exception):
+    """Raised when the authenticated user has no accessible projects."""
+
+
 # Create sub-applications for organizing commands
 @app.group(
     help="Login to llama cloud control plane to manage deployments",
@@ -120,6 +125,15 @@ def device_login() -> None:
             f"[green]Created login profile '{created.name}' and set as current[/green]"
         )
 
+    except NoProjectsFoundError:
+        # Friendly guidance for first-time users with no projects
+        rprint(f"[{WARNING}]⚠️ No Existing Projects - Welcome to LlamaCloud![/]")
+        rprint(f"[{WARNING}]Looks like this may be your first time logging in.[/]")
+        rprint(
+            f"[{WARNING}]Before you can get started, log in to https://cloud.llamaindex.ai to complete your account setup.[/]"
+        )
+        return
+
     except Exception as e:
         rprint(f"[red]Error: {e}[/red]")
         raise click.Abort()
@@ -418,11 +432,14 @@ def _create_device_profile() -> Auth:
 
     # Obtain or prompt for project ID and create profile
     projects = _list_projects(auth_svc, oidc_device.device_access_token)
+    if not projects:
+        # No projects available for this user yet
+        raise NoProjectsFoundError()
+
     selected_project_id = _select_or_enter_project(projects, True)
     if not selected_project_id:
-        raise click.ClickException(
-            "Project is required. Does this user have access to any projects?"
-        )
+        # User cancelled selection despite having projects
+        raise click.ClickException("No project selected")
     created = auth_svc.create_or_update_profile_from_oidc(
         selected_project_id, oidc_device
     )
@@ -501,6 +518,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.17 → llamactl-0.3.19}/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.17 → llamactl-0.3.19}/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())