llamactl 0.3.23__tar.gz → 0.3.25__tar.gz

{llamactl-0.3.23 → llamactl-0.3.25}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.3.23
+Version: 0.3.25
 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.23,<0.4.0
-Requires-Dist: llama-deploy-appserver>=0.3.23,<0.4.0
+Requires-Dist: llama-deploy-core[client]>=0.3.25,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.25,<0.4.0
 Requires-Dist: vibe-llama-core>=0.1.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
@@ -17,7 +17,9 @@ Requires-Dist: textual>=6.0.0
 Requires-Dist: aiohttp>=3.12.14
 Requires-Dist: copier>=9.10.2
 Requires-Dist: pyjwt[crypto]>=2.10.1
-Requires-Python: >=3.11, <4
+Requires-Dist: typing-extensions>=4.15.0
+Requires-Dist: typing-extensions>=4.15.0 ; python_full_version < '3.11'
+Requires-Python: >=3.10, <4
 Description-Content-Type: text/markdown
 
 # llamactl
@@ -89,7 +91,7 @@ uv add llamactl
 
 ## Configuration
 
-llamactl stores configuration in your home directory at `~/.llamactl/`. 
+llamactl stores configuration in your home directory at `~/.llamactl/`.
 
 ### Profile Configuration
 Profiles allow you to manage multiple control plane connections:

{llamactl-0.3.23 → llamactl-0.3.25}/README.md

@@ -67,7 +67,7 @@ uv add llamactl
 
 ## Configuration
 
-llamactl stores configuration in your home directory at `~/.llamactl/`. 
+llamactl stores configuration in your home directory at `~/.llamactl/`.
 
 ### Profile Configuration
 Profiles allow you to manage multiple control plane connections:

llamactl-0.3.25/pyproject.toml

@@ -0,0 +1,50 @@
+[build-system]
+requires = ["uv_build>=0.7.20,<0.8.0"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+  "pytest>=8.3.4",
+  "pytest-asyncio>=0.25.3",
+  "respx>=0.22.0",
+  "pytest-xdist>=3.8.0",
+  "ty>=0.0.1a19",
+  "ruff>=0.12.9"
+]
+
+[project]
+name = "llamactl"
+version = "0.3.25"
+description = "A command-line interface for managing LlamaDeploy projects and deployments"
+readme = "README.md"
+license = {text = "MIT"}
+authors = [
+  {name = "Adrian Lyjak", email = "adrianlyjak@gmail.com"}
+]
+requires-python = ">=3.10, <4"
+dependencies = [
+  "llama-deploy-core[client]>=0.3.25,<0.4.0",
+  "llama-deploy-appserver>=0.3.25,<0.4.0",
+  "vibe-llama-core>=0.1.0",
+  "rich>=13.0.0",
+  "questionary>=2.0.0",
+  "click>=8.2.1",
+  "python-dotenv>=1.0.0",
+  "tenacity>=9.1.2",
+  "textual>=6.0.0",
+  "aiohttp>=3.12.14",
+  "copier>=9.10.2",
+  "pyjwt[crypto]>=2.10.1",
+  "typing-extensions>=4.15.0",
+  "typing-extensions>=4.15.0 ; python_full_version < '3.11'"
+]
+
+[project.scripts]
+llamactl = "llama_deploy.cli:main"
+
+[tool.uv.build-backend]
+module-name = "llama_deploy.cli"
+
+[tool.uv.sources]
+llama-deploy-appserver = {workspace = true}
+llama-deploy-core = {workspace = true}

{llamactl-0.3.23 → llamactl-0.3.25}/src/llama_deploy/cli/app.py

@@ -1,9 +1,9 @@
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as pkg_version
+from typing import Any
 
 import click
 from llama_deploy.cli.commands.aliased_group import AliasedGroup
-from llama_deploy.cli.config.env_service import service
 from llama_deploy.cli.options import global_options
 from rich import print as rprint
 from rich.console import Console
@@ -12,10 +12,13 @@ from rich.text import Text
 console = Console(highlight=False)
 
 
-def print_version(ctx: click.Context, param: click.Option, value: bool) -> None:
+def print_version(ctx: click.Context, param: click.Parameter, value: Any) -> None:
     """Print the version of llama_deploy"""
+
+    from llama_deploy.cli.config.env_service import service
+
     if not value or ctx.resilient_parsing:
-        return
+        return None
     try:
         ver = pkg_version("llamactl")
         console.print(Text.assemble("client version: ", (ver, "green")))
@@ -65,5 +68,5 @@ def print_version(ctx: click.Context, param: click.Option, value: bool) -> None:
     help="Print client and server versions of LlamaDeploy",
 )
 @global_options
-def app():
+def app() -> None:
     pass

{llamactl-0.3.23 → llamactl-0.3.25}/src/llama_deploy/cli/auth/client.py

@@ -2,16 +2,30 @@ from __future__ import annotations
 
 import asyncio
 import logging
+import sys
 from types import TracebackType
-from typing import Any, AsyncContextManager, AsyncGenerator, Awaitable, Callable, Self
+from typing import (
+    Any,
+    AsyncContextManager,
+    AsyncGenerator,
+    Awaitable,
+    Callable,
+)
 
 import httpx
 import jwt
+from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
 from jwt.algorithms import RSAAlgorithm  # type: ignore[possibly-unbound-import]
 from llama_deploy.cli.config.schema import DeviceOIDC
 from llama_deploy.core.client.ssl_util import get_httpx_verify_param
 from pydantic import BaseModel
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -328,7 +342,10 @@ async def decode_jwt_claims(
     if key.kty != "RSA":
         raise ValueError("Unsupported JWK kty; only RSA is supported")
     key_json = key.model_dump_json()
-    public_key = RSAAlgorithm.from_jwk(key_json)
+    raw_key = RSAAlgorithm.from_jwk(key_json)
+    if not isinstance(raw_key, RSAPublicKey):
+        raise ValueError("Unsupported RSA key type; expected RSAPublicKey from JWKS")
+    public_key = raw_key
 
     return jwt.decode(
         token,

{llamactl-0.3.23 → llamactl-0.3.25}/src/llama_deploy/cli/client.py

@@ -1,12 +1,13 @@
 from contextlib import asynccontextmanager
 from typing import AsyncGenerator
 
-from llama_deploy.cli.config.env_service import service
 from llama_deploy.core.client.manage_client import ControlPlaneClient, ProjectClient
 from rich import print as rprint
 
 
 def get_control_plane_client() -> ControlPlaneClient:
+    from llama_deploy.cli.config.env_service import service
+
     auth_svc = service.current_auth_service()
     profile = service.current_auth_service().get_current_profile()
     if profile:
@@ -23,6 +24,8 @@ def get_control_plane_client() -> ControlPlaneClient:
 
 
 def get_project_client() -> ProjectClient:
+    from llama_deploy.cli.config.env_service import service
+
     auth_svc = service.current_auth_service()
     profile = auth_svc.get_current_profile()
     if not profile:

{llamactl-0.3.23 → llamactl-0.3.25}/src/llama_deploy/cli/commands/aliased_group.py

@@ -27,7 +27,15 @@ class AliasedGroup(click.Group):
 
     def resolve_command(
         self, ctx: click.Context, args: list[str]
-    ) -> tuple[str | None, click.Command | None, list[str]]:
+    ) -> tuple[str, click.Command, list[str]]:
         # always return the full command name
-        _, cmd, args = super().resolve_command(ctx, args)
-        return cmd.name if cmd else None, cmd, args
+        cmd_name, cmd, args = super().resolve_command(ctx, args)
+        assert cmd is not None
+        full_name: str = (
+            cmd.name
+            if cmd.name
+            else cmd_name
+            if isinstance(cmd_name, str)
+            else "<none>"  # shouldn't happen
+        )
+        return (full_name, cmd, args)

{llamactl-0.3.23 → llamactl-0.3.25}/src/llama_deploy/cli/commands/auth.py

@@ -1,28 +1,15 @@
+from __future__ import annotations
+
 import asyncio
 import json
 import os
 import platform
 import subprocess
 import sys
-import webbrowser
 from pathlib import Path
+from typing import TYPE_CHECKING, Any
 
 import click
-import httpx
-import questionary
-from dotenv import set_key
-from llama_deploy.cli.auth.client import (
-    DeviceAuthorizationRequest,
-    OIDCClient,
-    PlatformAuthClient,
-    PlatformAuthDiscoveryClient,
-    TokenRequestDeviceCode,
-    decode_jwt_claims,
-    decode_jwt_claims_from_device_oidc,
-)
-from llama_deploy.cli.config._config import ConfigManager
-from llama_deploy.cli.config.auth_service import AuthService
-from llama_deploy.cli.config.env_service import service
 from llama_deploy.cli.styles import (
     ACTIVE_INDICATOR,
     HEADER_COLOR,
@@ -30,19 +17,34 @@ from llama_deploy.cli.styles import (
     PRIMARY_COL,
     WARNING,
 )
-from llama_deploy.cli.utils.env_inject import env_vars_from_profile
-from llama_deploy.core.client.manage_client import (
-    ControlPlaneClient,
-)
-from llama_deploy.core.schema.projects import ProjectSummary
 from rich import print as rprint
 from rich.table import Table
 from rich.text import Text
 
 from ..app import app, console
-from ..config.schema import Auth, DeviceOIDC
 from ..options import global_options, interactive_option
 
+if TYPE_CHECKING:
+    from llama_deploy.cli.config.auth_service import AuthService
+    from llama_deploy.cli.config.env_service import EnvService
+    from llama_deploy.core.schema.projects import ProjectSummary
+
+    from ..config.schema import Auth, DeviceOIDC
+
+
+_ClickPath = getattr(click, "Path")
+
+
+def _get_service() -> EnvService:
+    """Return the EnvService instance lazily.
+
+    Imports ``service`` only when needed so CLI startup stays fast and tests
+    can patch ``llama_deploy.cli.config.env_service.service`` directly.
+    """
+    from llama_deploy.cli.config.env_service import service  # local import on purpose
+
+    return service
+
 
 # Specific auth/login flow exceptions
 class NoProjectsFoundError(Exception):
@@ -78,7 +80,7 @@ def create_api_key_profile(
 ) -> None:
     """Authenticate with an API key and create a profile in the current environment."""
     try:
-        auth_svc = service.current_auth_service()
+        auth_svc = _get_service().current_auth_service()
 
         # Non-interactive mode: require both api-key and project-id
         if not interactive:
@@ -144,7 +146,7 @@ def device_login() -> None:
 def list_profiles() -> None:
     """List all logged in users/tokens"""
     try:
-        auth_svc = service.current_auth_service()
+        auth_svc = _get_service().current_auth_service()
         profiles = auth_svc.list_profiles()
         current = auth_svc.get_current_profile()
 
@@ -184,6 +186,9 @@ def list_profiles() -> None:
 @global_options
 def destroy_database() -> None:
     """Destroy the database"""
+    import questionary
+    from llama_deploy.cli.config._config import ConfigManager
+
     if not questionary.confirm(
         "Are you sure you want to destroy all of your local logins? This action cannot be undone."
     ).ask():
@@ -196,7 +201,7 @@ def destroy_database() -> None:
 @global_options
 def config_database() -> None:
     """Config the database"""
-    path = service.config_manager().db_path
+    path = _get_service().config_manager().db_path
     rprint(f"[bold]{path}[/bold]")
 
 
@@ -206,7 +211,7 @@ def config_database() -> None:
 @interactive_option
 def switch_profile(name: str | None, interactive: bool) -> None:
     """Switch to a different profile"""
-    auth_svc = service.current_auth_service()
+    auth_svc = _get_service().current_auth_service()
     try:
         selected_auth = _select_profile(auth_svc, name, interactive)
         if not selected_auth:
@@ -228,7 +233,7 @@ def switch_profile(name: str | None, interactive: bool) -> None:
 def delete_profile(name: str | None, interactive: bool) -> None:
     """Logout from a profile and wipe all associated data"""
     try:
-        auth_svc = service.current_auth_service()
+        auth_svc = _get_service().current_auth_service()
         auth = _select_profile(auth_svc, name, interactive)
         if not auth:
             rprint(f"[{WARNING}]No profile selected[/]")
@@ -253,7 +258,9 @@ def me() -> None:
     Assumes the stored API key is a JWT (e.g., OIDC id_token).
     """
     try:
-        auth_svc = service.current_auth_service()
+        from llama_deploy.cli.auth.client import decode_jwt_claims_from_device_oidc
+
+        auth_svc = _get_service().current_auth_service()
         profile = auth_svc.get_current_profile()
         if not profile or not profile.device_oidc:
             raise click.ClickException(
@@ -274,10 +281,12 @@ def me() -> None:
 @global_options
 def change_project(project_id: str | None, interactive: bool) -> None:
     """Change the active project for the current profile"""
+    import questionary
+
+    auth_svc = _get_service().current_auth_service()
     profile = validate_authenticated_profile(interactive)
     if project_id and profile.project_id == project_id:
         return
-    auth_svc = service.current_auth_service()
     if project_id:
         if auth_svc.env.requires_auth:
             projects = _list_projects(auth_svc)
@@ -337,7 +346,7 @@ def change_project(project_id: str | None, interactive: bool) -> None:
     "--env-file",
     "env_file",
     default=Path(".env"),
-    type=click.Path(dir_okay=False, resolve_path=True, path_type=Path),
+    type=_ClickPath(dir_okay=False, resolve_path=True, path_type=Path),
     help="Path to the .env file to write",
 )
 @interactive_option
@@ -351,7 +360,10 @@ def inject_env_vars(
     based on the current profile. Always overwrites and creates the file if missing.
     """
     try:
-        auth_svc = service.current_auth_service()
+        from dotenv import set_key
+        from llama_deploy.cli.utils.env_inject import env_vars_from_profile
+
+        auth_svc = _get_service().current_auth_service()
         profile = auth_svc.get_current_profile()
         if not profile:
             if interactive:
@@ -401,6 +413,10 @@ async def _create_or_update_agent_api_key(auth_svc: AuthService, profile: Auth)
     """
     Mutates and updates the profile with an agent API key if it does not exist or is invalid.
     """
+    import httpx
+    from llama_deploy.cli.auth.client import PlatformAuthClient
+    from llama_deploy.cli.utils.retry import run_with_network_retries
+
     if profile.api_key is not None:
         async with PlatformAuthClient(profile.api_url, profile.api_key) as client:
             try:
@@ -415,14 +431,30 @@ async def _create_or_update_agent_api_key(auth_svc: AuthService, profile: Auth)
     if profile.api_key is None:
         async with auth_svc.profile_client(profile) as client:
             name = f"{profile.name} llamactl on {profile.device_oidc.device_name if profile.device_oidc else 'unknown'}"
-            api_key = await client.create_agent_api_key(name)
+
+            try:
+                api_key = await run_with_network_retries(
+                    lambda: client.create_agent_api_key(name)
+                )
+            except httpx.HTTPStatusError:
+                # Do not treat HTTP errors as transient; re-raise for normal handling.
+                raise
+            except httpx.RequestError as e:
+                detail = str(e) or e.__class__.__name__
+                raise click.ClickException(
+                    "Network error while provisioning an API token for llamactl. "
+                    "Your login may have succeeded, but we could not create a CLI API token. "
+                    "Please check your internet connection and try again. "
+                    f"Details: {detail}"
+                ) from e
+
         profile.api_key = api_key.token
         profile.api_key_id = api_key.id
         auth_svc.update_profile(profile)
 
 
 def _create_device_profile() -> Auth:
-    auth_svc = service.current_auth_service()
+    auth_svc = _get_service().current_auth_service()
     if not auth_svc.env.requires_auth:
         raise click.ClickException("This environment does not support authentication")
 
@@ -440,14 +472,39 @@ def _create_device_profile() -> Auth:
     if not selected_project_id:
         # 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
     )
-    asyncio.run(_create_or_update_agent_api_key(auth_svc, created))
+
+    # Ensure login is atomic: if provisioning the CLI API key fails, clean up the
+    # partially created profile so we don't leave a "logged-in but unusable" state.
+    try:
+        asyncio.run(_create_or_update_agent_api_key(auth_svc, created))
+    except Exception:
+        try:
+            asyncio.run(auth_svc.delete_profile(created.name))
+        except Exception:
+            # Best-effort cleanup; original error is more important for the user.
+            pass
+        raise
+
     return created
 
 
 async def _run_device_authentication(base_url: str) -> DeviceOIDC:
+    import webbrowser
+
+    from llama_deploy.cli.auth.client import (
+        DeviceAuthorizationRequest,
+        OIDCClient,
+        PlatformAuthDiscoveryClient,
+        TokenRequestDeviceCode,
+        decode_jwt_claims,
+    )
+
+    from ..config.schema import DeviceOIDC
+
     device_name = _auto_device_name()
     # 1) Discover upstream and CLI client_id via client
     async with PlatformAuthDiscoveryClient(base_url) as discovery:
@@ -549,8 +606,9 @@ def validate_authenticated_profile(interactive: bool) -> Auth:
       - If environment requires_auth: run token flow inline.
       - Else: create profile without token after selecting a project.
     """
+    import questionary
 
-    auth_svc = service.current_auth_service()
+    auth_svc = _get_service().current_auth_service()
     existing = auth_svc.get_current_profile()
     if existing:
         return existing
@@ -599,6 +657,8 @@ def validate_authenticated_profile(interactive: bool) -> Auth:
 
 
 def _prompt_for_api_key() -> str:
+    import questionary
+
     entered = questionary.password("Enter API key token to login").ask()
     if entered:
         return entered.strip()
@@ -609,7 +669,9 @@ def _list_projects(
     auth_svc: AuthService,
     api_key: str | None = None,
 ) -> list[ProjectSummary]:
-    async def _run():
+    async def _run() -> list[ProjectSummary]:
+        from llama_deploy.core.client.manage_client import ControlPlaneClient
+
         profile = auth_svc.get_current_profile()
         async with ControlPlaneClient.ctx(
             auth_svc.env.api_url,
@@ -624,6 +686,8 @@ def _list_projects(
 def _prompt_validate_api_key_and_list_projects(
     auth_svc: AuthService, api_key: str
 ) -> list[ProjectSummary]:
+    import httpx
+
     try:
         return _list_projects(auth_svc, api_key)
     except httpx.HTTPStatusError as e:
@@ -645,6 +709,8 @@ def _prompt_validate_api_key_and_list_projects(
 def _select_or_enter_project(
     projects: list[ProjectSummary], requires_auth: bool
 ) -> str | None:
+    import questionary
+
     if not projects:
         return None
     # select the only authorized project if there is only one
@@ -693,13 +759,15 @@ def _select_profile(
         return None
 
     try:
+        import questionary
+
         profiles = auth_svc.list_profiles()
 
         if not profiles:
             rprint(f"[{WARNING}]No profiles found[/]")
             return None
 
-        choices = []
+        choices: list[Any] = []
         current = auth_svc.get_current_profile()
 
         for profile in profiles:

{llamactl-0.3.23 → llamactl-0.3.25}/src/llama_deploy/cli/commands/deployment.py

@@ -9,8 +9,6 @@ git ref, reads the config, and runs your app.
 import asyncio
 
 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 (
     DeploymentHistoryResponse,
@@ -22,16 +20,7 @@ from rich.table import Table
 from rich.text import Text
 
 from ..app import app, console
-from ..client import get_project_client, project_client_context
-from ..interactive_prompts.session_utils import (
-    is_interactive_session,
-)
-from ..interactive_prompts.utils import (
-    confirm_action,
-)
 from ..options import global_options, interactive_option
-from ..textual.deployment_form import create_deployment_form, edit_deployment_form
-from ..textual.deployment_monitor import monitor_deployment_screen
 
 
 @app.group(
@@ -50,6 +39,10 @@ def deployments() -> None:
 @interactive_option
 def list_deployments(interactive: bool) -> None:
     """List deployments for the configured project."""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import get_project_client
+
     validate_authenticated_profile(interactive)
     try:
         client = get_project_client()
@@ -95,11 +88,16 @@ def list_deployments(interactive: bool) -> None:
 @interactive_option
 def get_deployment(deployment_id: str | None, interactive: bool) -> None:
     """Get details of a specific deployment"""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import get_project_client
+    from ..textual.deployment_monitor import monitor_deployment_screen
+
     validate_authenticated_profile(interactive)
     try:
         client = get_project_client()
 
-        deployment_id = select_deployment(deployment_id)
+        deployment_id = select_deployment(deployment_id, interactive=interactive)
         if not deployment_id:
             rprint(f"[{WARNING}]No deployment selected[/]")
             return
@@ -144,6 +142,9 @@ def create_deployment(
     interactive: bool,
 ) -> None:
     """Interactively create a new deployment"""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..textual.deployment_form import create_deployment_form
 
     if not interactive:
         raise click.ClickException(
@@ -168,6 +169,13 @@ def create_deployment(
 @interactive_option
 def delete_deployment(deployment_id: str | None, interactive: bool) -> None:
     """Delete a deployment"""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import get_project_client
+    from ..interactive_prompts.utils import (
+        confirm_action,
+    )
+
     validate_authenticated_profile(interactive)
     try:
         client = get_project_client()
@@ -196,6 +204,11 @@ def delete_deployment(deployment_id: str | None, interactive: bool) -> None:
 @interactive_option
 def edit_deployment(deployment_id: str | None, interactive: bool) -> None:
     """Interactively edit a deployment"""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import get_project_client
+    from ..textual.deployment_form import edit_deployment_form
+
     validate_authenticated_profile(interactive)
     try:
         client = get_project_client()
@@ -236,9 +249,13 @@ 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"""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import get_project_client
+
     validate_authenticated_profile(interactive)
     try:
-        deployment_id = select_deployment(deployment_id)
+        deployment_id = select_deployment(deployment_id, interactive=interactive)
         if not deployment_id:
             rprint(f"[{WARNING}]No deployment selected[/]")
             return
@@ -283,6 +300,10 @@ def refresh_deployment(
 @interactive_option
 def show_history(deployment_id: str | None, interactive: bool) -> None:
     """Show release history for a deployment."""
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import project_client_context
+
     validate_authenticated_profile(interactive)
     try:
         deployment_id = select_deployment(deployment_id, interactive=interactive)
@@ -326,6 +347,14 @@ def show_history(deployment_id: str | None, interactive: bool) -> None:
 @interactive_option
 def rollback(deployment_id: str | None, git_sha: str | None, interactive: bool) -> None:
     """Rollback a deployment to a previous git sha."""
+    import questionary
+    from llama_deploy.cli.commands.auth import validate_authenticated_profile
+
+    from ..client import project_client_context
+    from ..interactive_prompts.utils import (
+        confirm_action,
+    )
+
     validate_authenticated_profile(interactive)
     try:
         deployment_id = select_deployment(deployment_id, interactive=interactive)
@@ -387,22 +416,23 @@ def rollback(deployment_id: str | None, git_sha: str | None, interactive: bool)
         raise click.Abort()
 
 
-def select_deployment(
-    deployment_id: str | None = None, interactive: bool = is_interactive_session()
-) -> str | None:
+def select_deployment(deployment_id: str | None, interactive: bool) -> str | None:
     """
     Select a deployment interactively if ID not provided.
     Returns the selected deployment ID or None if cancelled.
 
     In non-interactive sessions, returns None if deployment_id is not provided.
     """
+    import questionary
+
+    from ..client import get_project_client
+
     if deployment_id:
         return deployment_id
 
     # Don't attempt interactive selection in non-interactive sessions
     if not interactive:
         return None
-
     client = get_project_client()
     deployments = asyncio.run(client.list_deployments())