llamactl 0.3.0a13__py3-none-any.whl → 0.3.0a15__py3-none-any.whl

llama_deploy/cli/config/env_service.py

@@ -0,0 +1,64 @@
+from dataclasses import replace
+
+from llama_deploy.cli.config.schema import Environment
+
+from ._config import ConfigManager, config_manager
+from .auth_service import AuthService
+
+
+class EnvService:
+    def __init__(self, config_manager: ConfigManager):
+        self.config_manager = config_manager
+
+    def list_environments(self) -> list[Environment]:
+        return self.config_manager.list_environments()
+
+    def get_current_environment(self) -> Environment:
+        return self.config_manager.get_current_environment()
+
+    def switch_environment(self, api_url: str) -> Environment:
+        env = self.config_manager.get_environment(api_url)
+        if not env:
+            raise ValueError(
+                f"Environment '{api_url}' not found. Add it with 'llamactl auth env add <API_URL>'"
+            )
+        self.config_manager.set_settings_current_environment(api_url)
+        self.config_manager.set_settings_current_profile(None)
+        return env
+
+    def create_or_update_environment(self, env: Environment) -> None:
+        self.config_manager.create_or_update_environment(
+            env.api_url, env.requires_auth, env.min_llamactl_version
+        )
+
+    def delete_environment(self, api_url: str) -> bool:
+        return self.config_manager.delete_environment(api_url)
+
+    def current_auth_service(self) -> AuthService:
+        return AuthService(self.config_manager, self.get_current_environment())
+
+    def auto_update_env(self, env: Environment) -> Environment:
+        svc = AuthService(self.config_manager, env)
+        version = svc.fetch_server_version()
+        update = replace(env)
+        update.requires_auth = version.requires_auth
+        update.min_llamactl_version = version.min_llamactl_version
+        if update != env:
+            self.config_manager.create_or_update_environment(
+                update.api_url, update.requires_auth, update.min_llamactl_version
+            )
+        return update
+
+    def probe_environment(self, api_url: str) -> Environment:
+        clean = api_url.rstrip("/")
+        base_env = Environment(
+            api_url=clean, requires_auth=False, min_llamactl_version=None
+        )
+        svc = AuthService(self.config_manager, base_env)
+        version = svc.fetch_server_version()
+        base_env.requires_auth = version.requires_auth
+        base_env.min_llamactl_version = version.min_llamactl_version
+        return base_env
+
+
+service = EnvService(config_manager)

llama_deploy/cli/config/schema.py

@@ -0,0 +1,31 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class Auth:
+    """Auth Profile configuration"""
+
+    name: str
+    api_url: str
+    project_id: str
+    api_key: str | None = None
+
+
+@dataclass
+class Environment:
+    """Environment configuration stored in SQLite.
+
+    Note: `api_url`, `requires_auth`, and `min_llamactl_version` are persisted
+    in the environments table.
+    """
+
+    api_url: str
+    requires_auth: bool
+    min_llamactl_version: str | None = None
+
+
+DEFAULT_ENVIRONMENT = Environment(
+    api_url="https://api.cloud.llamaindex.ai",
+    requires_auth=True,
+    min_llamactl_version=None,
+)

llama_deploy/cli/interactive_prompts/utils.py

@@ -1,52 +1,13 @@
 """Shared utilities for CLI operations"""
 
 import questionary
-from rich import print as rprint
 from rich.console import Console
 
-from ..config import config_manager
 from .session_utils import is_interactive_session
 
 console = Console()
 
 
-def select_profile(profile_name: str | None = None) -> str | None:
-    """
-    Select a profile interactively if name not provided.
-    Returns the selected profile name or None if cancelled.
-
-    In non-interactive sessions, returns None if profile_name is not provided.
-    """
-    if profile_name:
-        return profile_name
-
-    # Don't attempt interactive selection in non-interactive sessions
-    if not is_interactive_session():
-        return None
-
-    try:
-        profiles = config_manager.list_profiles()
-
-        if not profiles:
-            rprint("[yellow]No profiles found[/yellow]")
-            return None
-
-        choices = []
-        current_name = config_manager.get_current_profile_name()
-
-        for profile in profiles:
-            title = f"{profile.name} ({profile.api_url})"
-            if profile.name == current_name:
-                title += " [current]"
-            choices.append(questionary.Choice(title=title, value=profile.name))
-
-        return questionary.select("Select profile:", choices=choices).ask()
-
-    except Exception as e:
-        rprint(f"[red]Error loading profiles: {e}[/red]")
-        return None
-
-
 def confirm_action(message: str, default: bool = False) -> bool:
     """
     Ask for confirmation with a consistent interface.

llama_deploy/cli/options.py

@@ -2,7 +2,6 @@ import logging
 from typing import Callable, ParamSpec, TypeVar
 
 import click
-from llama_deploy.cli.config import config_manager
 from llama_deploy.cli.interactive_prompts.session_utils import is_interactive_session
 
 from .debug import setup_file_logging
@@ -32,14 +31,6 @@ def global_options(f: Callable[P, R]) -> Callable[P, R]:
     )(f)
 
 
-def control_plane_url_callback(
-    ctx: click.Context, param: click.Parameter, value: str
-) -> str:
-    if value:
-        config_manager.set_default_control_plane_url(value)
-    return value
-
-
 def interactive_option(f: Callable[P, R]) -> Callable[P, R]:
     """Add an interactive option to the command"""
 

{llamactl-0.3.0a13.dist-info → llamactl-0.3.0a15.dist-info}/METADATA

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

{llamactl-0.3.0a13.dist-info → llamactl-0.3.0a15.dist-info}/RECORD

@@ -1,20 +1,23 @@
-llama_deploy/cli/__init__.py,sha256=06afbb37cf01a3880f0487c3ab83a44ce72153b6ef8c2d6c0ed4324f03a5ae8f,411
-llama_deploy/cli/app.py,sha256=a909fcb06f6c2179986fefa5b561e597840aa14a0ee8c038b238d267c3e2a178,2345
-llama_deploy/cli/client.py,sha256=383601a4b9278972b4d8350a277d517d9b22a22776c1c4d6cd3f07db53f8d871,2098
+llama_deploy/cli/__init__.py,sha256=df028686233c4d5a3e244bb50c1c7b84cf2399ae03abe45eb4d01e53caa1be38,476
+llama_deploy/cli/app.py,sha256=9170e4f506c482522bd745eb1cdb700a198cfcfd7204c168c94e5ee2b6b43ffa,2199
+llama_deploy/cli/client.py,sha256=f0f72c90cddfbc9198e154883f3b8f05fb47dbe7ec1f5755106dbb8009d2bb54,1459
 llama_deploy/cli/commands/aliased_group.py,sha256=bc41007c97b7b93981217dbd4d4591df2b6c9412a2d9ed045b0ec5655ed285f2,1066
-llama_deploy/cli/commands/auth.py,sha256=145dfb175223ee0262677eed69806eb5e1b160574e9b480da6311ae80241141f,12806
-llama_deploy/cli/commands/deployment.py,sha256=7464e09ad53f082667a1e7e3f6c0040d01fcb312cbc92cf182efc66260a55e78,10454
+llama_deploy/cli/commands/auth.py,sha256=de584d11c1acf5a4e7aee8c8f30184335053ed206d38dbc8509b2d1d0677a092,12640
+llama_deploy/cli/commands/deployment.py,sha256=c99feb73a887063cad86e2cc555f21ebac6d47576749d79c551f26b8567af638,9879
+llama_deploy/cli/commands/env.py,sha256=e0b96b9f4e7921b4370ad5f8bc0a2bfb19b705e73004f72c37c9bed28a208e0d,6702
 llama_deploy/cli/commands/init.py,sha256=51b2de1e35ff34bc15c9dfec72fbad08aaf528c334df168896d36458a4e9401c,6307
 llama_deploy/cli/commands/serve.py,sha256=4d47850397ba172944df56a934a51bedb52403cbd3f9b000b1ced90a31c75049,2721
-llama_deploy/cli/config.py,sha256=0864c6e25646c28062b1adc081039bd59cbd9d87ab7e4a6e465660c6231f0489,8951
+llama_deploy/cli/config/_config.py,sha256=31376c3f3ecadaf52545e4aeb4a660dde2c22d7e6c33b232ec93eebeb926e3fb,14953
+llama_deploy/cli/config/auth_service.py,sha256=38a2de9bbcf5780675130d90e4f9116da190fd31a33e1c178a7f3847b943c229,2667
+llama_deploy/cli/config/env_service.py,sha256=6e50ffe2e33dcff4193c87b3df8daac71542d406314a7bcaf48187715a53780e,2445
+llama_deploy/cli/config/schema.py,sha256=086b6161b238c2037068a2b510f5d4bbda917494df764818ff9692e9735a8953,608
 llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f767385895c440afc762,496
 llama_deploy/cli/env.py,sha256=6ebc24579815b3787829c81fd5bb9f31698a06e62c0128a788559f962b33a7af,1016
 llama_deploy/cli/interactive_prompts/session_utils.py,sha256=b996f2eddf70d6c49636c4797d246d212fce0950fe7e9a3f59cf6a1bf7ae26f5,1142
-llama_deploy/cli/interactive_prompts/utils.py,sha256=2b29148f2cf2be8d1642fd800f529602cecb03997259790a3b8e1b879604cee2,1736
-llama_deploy/cli/options.py,sha256=9eb6f1c5d89f83cbf5b288d3a85c38acd929168d6afdf4b04d664df419aa1816,1543
+llama_deploy/cli/interactive_prompts/utils.py,sha256=594cc2a242cc3405d66d0e26a60647496cc5fcb4ce7d0500a4cfec4888c9a0fa,516
+llama_deploy/cli/options.py,sha256=62ee7286c3305ddb4b597783d19e854284d79bf9384800045f15b934dc245c1d,1298
 llama_deploy/cli/platform_client.py,sha256=69de23dc79a8f5922afc9e3bac1b633a531340ebbefeb7838e3a88419faa754c,1451
 llama_deploy/cli/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
-llama_deploy/cli/textual/api_key_profile_form.py,sha256=cf059426d758136318c3b6f340e2741e79ab1ec613b8741ef3d2a402214ea2c4,22253
 llama_deploy/cli/textual/deployment_form.py,sha256=1cf186b765d10a1bdd7394f22ddd7598d75dba8c9a8a7a8be74e6151da2f31dc,20941
 llama_deploy/cli/textual/deployment_help.py,sha256=d43e9ff29db71a842cf8b491545763d581ede3132b8af518c73af85a40950046,2464
 llama_deploy/cli/textual/deployment_monitor.py,sha256=7bcf3f0213401c2432fdb5a9d9acf468a4afe83b2d86d7f2852319768e6f2534,17231
@@ -23,7 +26,7 @@ llama_deploy/cli/textual/github_callback_server.py,sha256=dc74c510f8a98ef6ffaab0
 llama_deploy/cli/textual/llama_loader.py,sha256=33cb32a46dd40bcf889c553e44f2672c410e26bd1d4b17aa6cca6d0a5d59c2c4,1468
 llama_deploy/cli/textual/secrets_form.py,sha256=a43fbd81aad034d0d60906bfd917c107f9ace414648b0f63ac0b29eeba4050db,7061
 llama_deploy/cli/textual/styles.tcss,sha256=b1a54dc5fb0e0aa12cbf48807e9e6a94b9926838b8058dae1336a134f02e92b0,3327
-llamactl-0.3.0a13.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llamactl-0.3.0a13.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
-llamactl-0.3.0a13.dist-info/METADATA,sha256=87e30b0475ce6d5eaf7d400e4c5c00d41d2cabb0ae54abc02ab686659c1b1e15,3177
-llamactl-0.3.0a13.dist-info/RECORD,,
+llamactl-0.3.0a15.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.0a15.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.0a15.dist-info/METADATA,sha256=4d142f83a647194c1f5ed5d393d918de8dfc05286d82ea317c4480dd66ee4e8a,3177
+llamactl-0.3.0a15.dist-info/RECORD,,

llama_deploy/cli/config.py

@@ -1,241 +0,0 @@
-"""Configuration and profile management for llamactl"""
-
-import os
-import sqlite3
-from dataclasses import dataclass
-from pathlib import Path
-from typing import List
-
-
-@dataclass
-class Profile:
-    """Profile configuration"""
-
-    name: str
-    api_url: str
-    project_id: str
-    api_key_auth_token: str | None = None
-
-
-class ConfigManager:
-    """Manages profiles and configuration using SQLite"""
-
-    def __init__(self):
-        self.config_dir = self._get_config_dir()
-        self.db_path = self.config_dir / "profiles.db"
-        self._ensure_config_dir()
-        self._init_database()
-        self.default_control_plane_url = "https://api.llamacloud.com"
-
-    def _get_config_dir(self) -> Path:
-        """Get the configuration directory path based on OS.
-
-        Honors LLAMACTL_CONFIG_DIR when set. This helps tests isolate state.
-        """
-        override = os.environ.get("LLAMACTL_CONFIG_DIR")
-        if override:
-            return Path(override).expanduser()
-        if os.name == "nt":  # Windows
-            config_dir = Path(os.environ.get("APPDATA", "~")) / "llamactl"
-        else:  # Unix-like (Linux, macOS)
-            config_dir = Path.home() / ".config" / "llamactl"
-        return config_dir.expanduser()
-
-    def _ensure_config_dir(self):
-        """Create configuration directory if it doesn't exist"""
-        self.config_dir.mkdir(parents=True, exist_ok=True)
-
-    def _init_database(self):
-        """Initialize SQLite database with required tables"""
-        with sqlite3.connect(self.db_path) as conn:
-            # Check if we need to migrate from old schema
-            cursor = conn.execute("PRAGMA table_info(profiles)")
-            columns = [row[1] for row in cursor.fetchall()]
-
-            # Migration: handle old active_project_id -> project_id and make it required
-            if "active_project_id" in columns and "project_id" not in columns:
-                # Delete any profiles that have no active_project_id since project_id is now required
-                conn.execute(
-                    "DELETE FROM profiles WHERE active_project_id IS NULL OR active_project_id = ''"
-                )
-
-                # Rename active_project_id to project_id
-                # Note: SQLite doesn't allow changing column constraints easily, but we enforce
-                # the NOT NULL constraint in our application code and new table creation
-                conn.execute(
-                    "ALTER TABLE profiles RENAME COLUMN active_project_id TO project_id"
-                )
-
-                # Add api_key_auth_token column if not already present
-                mig_cursor = conn.execute("PRAGMA table_info(profiles)")
-                mig_columns = [row[1] for row in mig_cursor.fetchall()]
-                if "api_key_auth_token" not in mig_columns:
-                    conn.execute(
-                        "ALTER TABLE profiles ADD COLUMN api_key_auth_token TEXT"
-                    )
-
-            # Create tables with new schema (this will only create if they don't exist)
-            conn.execute("""
-                CREATE TABLE IF NOT EXISTS profiles (
-                    name TEXT PRIMARY KEY,
-                    api_url TEXT NOT NULL,
-                    project_id TEXT NOT NULL,
-                    api_key_auth_token TEXT
-                )
-            """)
-
-            conn.execute("""
-                CREATE TABLE IF NOT EXISTS settings (
-                    key TEXT PRIMARY KEY,
-                    value TEXT NOT NULL
-                )
-            """)
-
-            conn.commit()
-
-    def create_profile(
-        self,
-        name: str,
-        api_url: str,
-        project_id: str,
-        api_key_auth_token: str | None = None,
-    ) -> Profile:
-        """Create a new profile"""
-        if not project_id.strip():
-            raise ValueError("Project ID is required")
-        profile = Profile(
-            name=name,
-            api_url=api_url,
-            project_id=project_id,
-            api_key_auth_token=api_key_auth_token,
-        )
-
-        with sqlite3.connect(self.db_path) as conn:
-            try:
-                conn.execute(
-                    "INSERT INTO profiles (name, api_url, project_id, api_key_auth_token) VALUES (?, ?, ?, ?)",
-                    (
-                        profile.name,
-                        profile.api_url,
-                        profile.project_id,
-                        profile.api_key_auth_token,
-                    ),
-                )
-                conn.commit()
-            except sqlite3.IntegrityError:
-                raise ValueError(f"Profile '{name}' already exists")
-
-        return profile
-
-    def get_profile(self, name: str) -> Profile | None:
-        """Get a profile by name"""
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute(
-                "SELECT name, api_url, project_id, api_key_auth_token FROM profiles WHERE name = ?",
-                (name,),
-            )
-            row = cursor.fetchone()
-            if row:
-                return Profile(
-                    name=row[0],
-                    api_url=row[1],
-                    project_id=row[2],
-                    api_key_auth_token=row[3],
-                )
-        return None
-
-    def list_profiles(self) -> List[Profile]:
-        """List all profiles"""
-        profiles = []
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute(
-                "SELECT name, api_url, project_id, api_key_auth_token FROM profiles ORDER BY name"
-            )
-            for row in cursor.fetchall():
-                profiles.append(
-                    Profile(
-                        name=row[0],
-                        api_url=row[1],
-                        project_id=row[2],
-                        api_key_auth_token=row[3],
-                    )
-                )
-        return profiles
-
-    def delete_profile(self, name: str) -> bool:
-        """Delete a profile by name. Returns True if deleted, False if not found."""
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute("DELETE FROM profiles WHERE name = ?", (name,))
-            conn.commit()
-
-            # If this was the active profile, clear it
-            if self.get_current_profile_name() == name:
-                self.set_current_profile(None)
-
-            return cursor.rowcount > 0
-
-    def set_current_profile(self, name: str | None):
-        """Set the current active profile"""
-        with sqlite3.connect(self.db_path) as conn:
-            if name is None:
-                conn.execute("DELETE FROM settings WHERE key = 'current_profile'")
-            else:
-                conn.execute(
-                    "INSERT OR REPLACE INTO settings (key, value) VALUES ('current_profile', ?)",
-                    (name,),
-                )
-            conn.commit()
-
-    def get_current_profile_name(self) -> str | None:
-        """Get the name of the current active profile"""
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute(
-                "SELECT value FROM settings WHERE key = 'current_profile'"
-            )
-            row = cursor.fetchone()
-            return row[0] if row else None
-
-    def get_current_profile(self) -> Profile | None:
-        """Get the current active profile"""
-        current_name = self.get_current_profile_name()
-        if current_name:
-            return self.get_profile(current_name)
-        profiles = self.list_profiles()
-        if len(profiles) == 1:
-            return profiles[0]
-        return None
-
-    def set_project(self, profile_name: str, project_id: str) -> bool:
-        """Set the project for a profile. Returns True if profile exists."""
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute(
-                "UPDATE profiles SET project_id = ? WHERE name = ?",
-                (project_id, profile_name),
-            )
-            conn.commit()
-            return cursor.rowcount > 0
-
-    def set_default_control_plane_url(self, url: str) -> None:
-        """Set the default control plane URL for the current session"""
-        self.default_control_plane_url = url
-
-    def get_project(self, profile_name: str) -> str | None:
-        """Get the project for a profile"""
-        profile = self.get_profile(profile_name)
-        return profile.project_id if profile else None
-
-    def set_api_key_auth_token(
-        self, profile_name: str, api_key_auth_token: str | None
-    ) -> bool:
-        """Set the API key auth token for a profile. Returns True if profile exists."""
-        with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute(
-                "UPDATE profiles SET api_key_auth_token = ? WHERE name = ?",
-                (api_key_auth_token, profile_name),
-            )
-            conn.commit()
-            return cursor.rowcount > 0
-
-
-# Global config manager instance
-config_manager = ConfigManager()