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

llama_deploy/cli/__init__.py

@@ -1,5 +1,6 @@
 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.serve import serve
 
@@ -11,7 +12,7 @@ def main() -> None:
     app()
 
 
-__all__ = ["app", "deployments", "auth", "serve", "init"]
+__all__ = ["app", "deployments", "auth", "serve", "init", "env_group"]
 
 
 if __name__ == "__main__":

llama_deploy/cli/app.py

@@ -1,11 +1,9 @@
-import asyncio
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as pkg_version
 
 import click
-from llama_deploy.cli.client import get_control_plane_client
 from llama_deploy.cli.commands.aliased_group import AliasedGroup
-from llama_deploy.cli.config import config_manager
+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
@@ -23,11 +21,10 @@ def print_version(ctx: click.Context, param: click.Option, value: bool) -> None:
         console.print(Text.assemble("client version: ", (ver, "green")))
 
         # If there is an active profile, attempt to query server version
-        profile = config_manager.get_current_profile()
-        if profile and profile.api_url:
+        auth_service = service.current_auth_service()
+        if auth_service:
             try:
-                cp_client = get_control_plane_client()
-                data = asyncio.run(cp_client.server_version())
+                data = auth_service.fetch_server_version()
                 server_ver = data.version
                 console.print(
                     Text.assemble(

llama_deploy/cli/client.py

@@ -1,46 +1,32 @@
 from contextlib import asynccontextmanager
 from typing import AsyncGenerator
 
-from llama_deploy.cli.config import config_manager
+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(
-    base_url: str | None = None, api_key: str | None = None
-) -> ControlPlaneClient:
-    profile = config_manager.get_current_profile()
-    if not profile and not base_url:
-        rprint("\n[bold red]No profile configured![/bold red]")
-        rprint("\nTo get started, create a profile with:")
-        rprint("[cyan]llamactl profile create[/cyan]")
-        raise SystemExit(1)
-    resolved_base_url = (base_url or (profile.api_url if profile else "")).rstrip("/")
-    if not resolved_base_url:
-        raise ValueError("API URL is required")
-    resolved_api_key = api_key or (profile.api_key_auth_token if profile else None)
-    return ControlPlaneClient(resolved_base_url, resolved_api_key)
-
-
-def get_project_client(
-    base_url: str | None = None,
-    project_id: str | None = None,
-    api_key: str | None = None,
-) -> ProjectClient:
-    profile = config_manager.get_current_profile()
+def get_control_plane_client() -> ControlPlaneClient:
+    profile = service.current_auth_service().get_current_profile()
+    if profile:
+        resolved_base_url = profile.api_url.rstrip("/")
+        resolved_api_key = profile.api_key
+        return ControlPlaneClient(resolved_base_url, resolved_api_key)
+
+    # Fallback: allow env-scoped client construction for env operations
+    env = service.get_current_environment()
+    resolved_base_url = env.api_url.rstrip("/")
+    return ControlPlaneClient(resolved_base_url, None)
+
+
+def get_project_client() -> ProjectClient:
+    profile = service.current_auth_service().get_current_profile()
     if not profile:
         rprint("\n[bold red]No profile configured![/bold red]")
         rprint("\nTo get started, create a profile with:")
-        rprint("[cyan]llamactl profile create[/cyan]")
+        rprint("[cyan]llamactl auth token[/cyan]")
         raise SystemExit(1)
-    resolved_base_url = (base_url or profile.api_url or "").rstrip("/")
-    if not resolved_base_url:
-        raise ValueError("API URL is required")
-    resolved_project_id = project_id or profile.project_id
-    if not resolved_project_id:
-        raise ValueError("Project ID is required")
-    resolved_api_key = api_key or profile.api_key_auth_token
-    return ProjectClient(resolved_base_url, resolved_project_id, resolved_api_key)
+    return ProjectClient(profile.api_url, profile.project_id, profile.api_key)
 
 
 @asynccontextmanager