glaip-sdk 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

glaip_sdk/cli/commands/common_config.py

@@ -0,0 +1,65 @@
+"""Shared helpers for configuration/account flows."""
+
+import click
+from rich.console import Console
+from rich.text import Text
+
+from glaip_sdk import Client
+from glaip_sdk.branding import PRIMARY, SUCCESS_STYLE, WARNING_STYLE, AIPBranding
+from glaip_sdk.cli.utils import sdk_version
+
+
+def render_branding_header(console: Console, rule_text: str) -> None:
+    """Render the standard CLI branding header with a custom rule text."""
+    branding = AIPBranding.create_from_sdk(sdk_version=sdk_version(), package_name="glaip-sdk")
+    heading = "[bold]>_ GDP Labs AI Agents Package (AIP CLI)[/bold]"
+    console.print(heading)
+    console.print()
+    console.print(branding.get_welcome_banner())
+    console.rule(rule_text, style=PRIMARY)
+
+
+def check_connection(
+    api_url: str,
+    api_key: str,
+    console: Console,
+    *,
+    abort_on_error: bool = False,
+    extra_hint: str | None = None,
+) -> bool:
+    """Test connectivity and report results.
+
+    Returns True on success, False on handled failures. Raises click.Abort when
+    abort_on_error is True and a fatal error occurs.
+    """
+    console.print("\n🔌 Testing connection...")
+    client: Client | None = None
+    try:
+        # Import lazily so test patches targeting glaip_sdk.Client are honored
+        from importlib import import_module  # noqa: PLC0415
+
+        client_module = import_module("glaip_sdk")
+        client = client_module.Client(api_url=api_url, api_key=api_key)
+        try:
+            agents = client.list_agents()
+            console.print(Text(f"✅ Connection successful! Found {len(agents)} agents", style=SUCCESS_STYLE))
+            return True
+        except Exception as exc:  # pragma: no cover - API failures depend on network
+            console.print(Text(f"⚠️  Connection established but API call failed: {exc}", style=WARNING_STYLE))
+            console.print("   You may need to check your API permissions or network access")
+            if extra_hint:
+                console.print(extra_hint)
+            if abort_on_error:
+                raise click.Abort() from exc
+            return False
+    except Exception as exc:
+        console.print(Text(f"❌ Connection failed: {exc}"))
+        console.print("   Please check your API URL and key")
+        if extra_hint:
+            console.print(extra_hint)
+        if abort_on_error:
+            raise click.Abort() from exc
+        return False
+    finally:
+        if client is not None:
+            client.close()

glaip_sdk/cli/commands/configure.py

@@ -10,42 +10,53 @@ import click
 from rich.console import Console
 from rich.text import Text
 
-from glaip_sdk import Client
-from glaip_sdk.branding import (
-    ACCENT_STYLE,
-    ERROR_STYLE,
-    INFO,
-    PRIMARY,
-    SUCCESS,
-    SUCCESS_STYLE,
-    WARNING_STYLE,
-    AIPBranding,
-)
+from glaip_sdk.branding import ACCENT_STYLE, ERROR_STYLE, INFO, SUCCESS, SUCCESS_STYLE, WARNING_STYLE
+from glaip_sdk.cli.account_store import get_account_store
+from glaip_sdk.cli.commands.common_config import check_connection, render_branding_header
 from glaip_sdk.cli.config import CONFIG_FILE, load_config, save_config
+from glaip_sdk.cli.hints import format_command_hint
+from glaip_sdk.cli.masking import mask_api_key_display
 from glaip_sdk.cli.rich_helpers import markup_text
-from glaip_sdk.cli.utils import command_hint, format_command_hint, sdk_version
+from glaip_sdk.cli.utils import command_hint
 from glaip_sdk.icons import ICON_TOOL
 from glaip_sdk.rich_components import AIPTable
 
 console = Console()
 
+# Shared deprecation banner for legacy config commands
+CONFIG_DEPRECATION_MSG = (
+    f"[{WARNING_STYLE}]Deprecated: 'aip config ...' will be removed in a future release. "
+    "Use 'aip accounts ...' (list/add/use/remove) or 'aip configure' for the wizard.[/]"
+)
+
+
+def _print_config_deprecation() -> None:
+    """Print a standardized deprecation warning for legacy config commands."""
+    console.print(CONFIG_DEPRECATION_MSG)
+
 
 @click.group()
 def config_group() -> None:
     """Configuration management operations."""
-    pass
+    _print_config_deprecation()
 
 
 @config_group.command("list")
-def list_config() -> None:
-    """List current configuration."""
-    config = load_config()
+@click.option("--json", "output_json", is_flag=True, help="Output in JSON format")
+@click.pass_context
+def list_config(ctx: click.Context, output_json: bool) -> None:
+    """List current configuration.
 
-    if not config:
-        _print_missing_config_hint()
-        return
+    Deprecated: run 'aip accounts list' for profile-aware output.
+    """
+    console.print(f"[{WARNING_STYLE}]Deprecated: run 'aip accounts list' for profile-aware output.[/]")
+
+    # Delegate to accounts list by invoking the command
+    from glaip_sdk.cli.commands.accounts import accounts_group  # noqa: PLC0415
 
-    _render_config_table(config)
+    list_cmd = accounts_group.get_command(ctx, "list")
+    if list_cmd:
+        ctx.invoke(list_cmd, output_json=output_json)
 
 
 CONFIG_VALUE_TYPES: dict[str, str] = {
@@ -103,14 +114,49 @@ def _coerce_config_value(key: str, raw_value: str) -> str | bool | int | float:
 @config_group.command("set")
 @click.argument("key")
 @click.argument("value")
-def set_config(key: str, value: str) -> None:
-    """Set a configuration value."""
-    valid_keys = tuple(CONFIG_VALUE_TYPES.keys())
+@click.option(
+    "--account",
+    "account_name",
+    help="Account name to set value for (defaults to active account)",
+)
+def set_config(key: str, value: str, account_name: str | None) -> None:
+    """Set a configuration value.
 
+    For api_url and api_key, this operates on the specified account (or active account).
+    Other keys (timeout, history_default_limit) are global settings.
+    """
+    # For other keys, use legacy config
+    valid_keys = tuple(CONFIG_VALUE_TYPES.keys())
     if key not in valid_keys:
         console.print(f"[{ERROR_STYLE}]Error: Invalid key '{key}'. Valid keys are: {', '.join(valid_keys)}[/]")
         raise click.ClickException(f"Invalid configuration key: {key}")
 
+    store = get_account_store()
+    # For api_url and api_key, update account profile but also mirror to legacy config
+    if key in ("api_url", "api_key"):
+        target_account = account_name or store.get_active_account() or "default"
+        try:
+            account = store.get_account(target_account) or {}
+            account[key] = value
+            store.add_account(
+                target_account,
+                account.get("api_url", ""),
+                account.get("api_key", ""),
+                overwrite=True,
+            )
+        except Exception:
+            # If account store persistence fails (e.g., mocked I/O), continue with legacy config
+            pass
+
+        # Always update legacy config for backward compatibility and test isolation
+        legacy_config = load_config()
+        legacy_config[key] = value
+        save_config(legacy_config)
+
+        display_value = _mask_api_key(value) if key == "api_key" else value
+        console.print(Text(f"✅ Set {key} = {display_value} for account '{target_account}'", style=SUCCESS_STYLE))
+        return
+
     coerced_value = _coerce_config_value(key, value)
     config = load_config()
     config[key] = coerced_value
@@ -126,12 +172,19 @@ def get_config(key: str) -> None:
     """Get a configuration value."""
     config = load_config()
 
-    if key not in config:
+    value = config.get(key)
+
+    # Fallback to account store for api_url/api_key when legacy config lacks the key
+    if value is None and key in {"api_url", "api_key"}:
+        store = get_account_store()
+        active = store.get_active_account() or "default"
+        account = store.get_account(active) or {}
+        value = account.get(key)
+
+    if value is None:
         console.print(markup_text(f"[{WARNING_STYLE}]Configuration key '{key}' not found.[/]"))
         raise click.ClickException(f"Configuration key not found: {key}")
 
-    value = config[key]
-
     if key == "api_key":
         console.print(_mask_api_key(value))
     else:
@@ -189,41 +242,73 @@ def reset_config(force: bool) -> None:
     console.print(message)
 
 
-def _configure_interactive() -> None:
+def _configure_interactive(account_name: str | None = None) -> None:
     """Shared configuration logic for both configure commands."""
+    store = get_account_store()
+
+    # Determine account name (use provided, active, or default)
+    if not account_name:
+        account_name = store.get_active_account() or "default"
+
+    # Get existing account if it exists
+    existing = store.get_account(account_name)
+
     _render_configuration_header()
-    config = load_config()
-    _prompt_configuration_inputs(config)
-    _save_configuration(config)
-    _test_and_report_connection(config)
+    config = _prompt_configuration_inputs_for_account(existing)
+
+    # Save to account store
+    api_url = config.get("api_url", "")
+    api_key = config.get("api_key", "")
+    if api_url and api_key:
+        store.add_account(account_name, api_url, api_key, overwrite=True)
+        console.print(Text(f"\n✅ Configuration saved to account '{account_name}'", style=SUCCESS_STYLE))
+
+    _test_and_report_connection_for_account(account_name)
     _print_post_configuration_hints()
+    # Show active account footer
+    from glaip_sdk.cli.commands.accounts import _print_active_account_footer  # noqa: PLC0415
+
+    _print_active_account_footer(store)
 
 
 @config_group.command()
-def configure() -> None:
-    """Configure AIP CLI credentials and settings interactively."""
-    _configure_interactive()
+@click.option(
+    "--account",
+    "account_name",
+    help="Account name to configure (defaults to active account)",
+)
+def configure(account_name: str | None) -> None:
+    """Configure AIP CLI credentials and settings interactively.
+
+    This command is an alias for 'aip accounts add <name>' and will
+    configure the specified account (or active account if not specified).
+    """
+    _configure_interactive(account_name)
 
 
 # Alias command for backward compatibility
 @click.command()
-def configure_command() -> None:
+@click.option(
+    "--account",
+    "account_name",
+    help="Account name to configure (defaults to active account)",
+)
+def configure_command(account_name: str | None) -> None:
     """Configure AIP CLI credentials and settings interactively.
 
     This is an alias for 'aip config configure' for backward compatibility.
+    For multi-account support, use 'aip accounts add <name>' instead.
     """
+    console.print(
+        f"[{WARNING_STYLE}]Setup tip:[/] Prefer 'aip accounts add <name>' or 'aip configure' from your terminal for "
+        "multi-account setup. Launching the interactive wizard now..."
+    )
     # Delegate to the shared function
-    _configure_interactive()
+    _configure_interactive(account_name)
 
 
 # Note: The config command group should be registered in main.py
-
-
-def _mask_api_key(value: str | None) -> str:
-    """Return a redacted API key string suitable for display."""
-    if not value:
-        return ""
-    return "***" + value[-4:] if len(value) > 4 else "***"
+_mask_api_key = mask_api_key_display
 
 
 def _print_missing_config_hint() -> None:
@@ -250,23 +335,23 @@ def _render_config_table(config: dict[str, str]) -> None:
 
 def _render_configuration_header() -> None:
     """Display the interactive configuration heading/banner."""
-    branding = AIPBranding.create_from_sdk(sdk_version=sdk_version(), package_name="glaip-sdk")
-    heading = "[bold]>_ GDP Labs AI Agents Package (AIP CLI)[/bold]"
-    console.print(heading)
-    console.print()
-    console.print(branding.get_welcome_banner())
-    console.rule("[bold]AIP Configuration[/bold]", style=PRIMARY)
+    render_branding_header(console, "[bold]AIP Configuration[/bold]")
 
 
-def _prompt_configuration_inputs(config: dict[str, str]) -> None:
-    """Interactively prompt for configuration values."""
+def _prompt_configuration_inputs_for_account(existing: dict[str, str] | None) -> dict[str, str]:
+    """Interactively prompt for account configuration values."""
     console.print("\n[bold]Enter your AIP configuration:[/bold]")
-    console.print("(Leave blank to keep current values)")
+    if existing:
+        console.print("(Leave blank to keep current values)")
     console.print("─" * 50)
 
+    config = existing.copy() if existing else {}
+
     _prompt_api_url(config)
     _prompt_api_key(config)
 
+    return config
+
 
 def _prompt_api_url(config: dict[str, str]) -> None:
     """Ask the user for the API URL, preserving existing values by default."""
@@ -290,43 +375,24 @@ def _prompt_api_key(config: dict[str, str]) -> None:
         config["api_key"] = new_key
 
 
-def _save_configuration(config: dict[str, str]) -> None:
-    """Persist the collected configuration to disk."""
-    save_config(config)
-    console.print(Text(f"\n✅ Configuration saved to: {CONFIG_FILE}", style=SUCCESS_STYLE))
+def _test_and_report_connection_for_account(account_name: str) -> None:
+    """Sanity-check the provided credentials against the backend."""
+    store = get_account_store()
+    account = store.get_account(account_name)
+    if not account:
+        return
 
+    api_url = account.get("api_url", "")
+    api_key = account.get("api_key", "")
+    if not api_url or not api_key:
+        return
 
-def _test_and_report_connection(config: dict[str, str]) -> None:
-    """Sanity-check the provided credentials against the backend."""
-    console.print("\n🔌 Testing connection...")
-    client: Client | None = None
-    try:
-        client = Client(api_url=config["api_url"], api_key=config["api_key"])
-        try:
-            agents = client.list_agents()
-            console.print(
-                Text(
-                    f"✅ Connection successful! Found {len(agents)} agents",
-                    style=SUCCESS_STYLE,
-                )
-            )
-        except Exception as exc:  # pragma: no cover - API failures depend on network
-            console.print(
-                Text(
-                    f"⚠️  Connection established but API call failed: {exc}",
-                    style=WARNING_STYLE,
-                )
-            )
-            console.print("   You may need to check your API permissions or network access")
-    except Exception as exc:
-        console.print(Text(f"❌ Connection failed: {exc}"))
-        console.print("   Please check your API URL and key")
-        hint_status = command_hint("status", slash_command="status")
-        if hint_status:
-            console.print(f"   You can run {format_command_hint(hint_status) or hint_status} later to test again")
-    finally:
-        if client is not None:
-            client.close()
+    hint_status = command_hint("status", slash_command="status")
+    extra_hint = None
+    if hint_status:
+        extra_hint = f"   You can run {format_command_hint(hint_status) or hint_status} later to test again"
+
+    check_connection(api_url, api_key, console, abort_on_error=False, extra_hint=extra_hint)
 
 
 def _print_post_configuration_hints() -> None:

glaip_sdk/cli/commands/mcps.py

@@ -63,6 +63,7 @@ from glaip_sdk.utils.serialization import (
 )
 
 console = Console()
+MAX_DESCRIPTION_LEN = 50
 
 
 def _is_sensitive_data(val: Any) -> bool:
@@ -879,64 +880,210 @@ def get(
         raise click.ClickException(str(e)) from e
 
 
+def _get_tools_from_config(ctx: Any, client: Any, config_file: str) -> tuple[list[dict[str, Any]], str]:
+    """Get tools from MCP config file.
+
+    Args:
+        ctx: Click context
+        client: GlaIP client instance
+        config_file: Path to config file
+
+    Returns:
+        Tuple of (tools list, title string)
+    """
+    config_data = load_resource_from_file_with_validation(Path(config_file), "MCP config")
+
+    # Validate config structure
+    transport = config_data.get("transport")
+    if "config" not in config_data:
+        raise click.ClickException("Invalid MCP config: missing 'config' section in the file.")
+    config_data["config"] = validate_mcp_config_structure(
+        config_data["config"],
+        transport=transport,
+        source=config_file,
+    )
+
+    # Get tools from config without saving
+    with spinner_context(
+        ctx,
+        "[bold blue]Fetching tools from config…[/bold blue]",
+        console_override=console,
+    ):
+        tools = client.mcps.get_mcp_tools_from_config(config_data)
+
+    title = f"{ICON_TOOL} Tools from config: {Path(config_file).name}"
+    return tools, title
+
+
+def _get_tools_from_mcp(ctx: Any, client: Any, mcp_ref: str | None) -> tuple[list[dict[str, Any]], str]:
+    """Get tools from saved MCP.
+
+    Args:
+        ctx: Click context
+        client: GlaIP client instance
+        mcp_ref: MCP reference (ID or name)
+
+    Returns:
+        Tuple of (tools list, title string)
+    """
+    mcp = _resolve_mcp(ctx, client, mcp_ref)
+
+    with spinner_context(
+        ctx,
+        "[bold blue]Fetching MCP tools…[/bold blue]",
+        console_override=console,
+    ):
+        tools = client.mcps.get_mcp_tools(mcp.id)
+
+    title = f"{ICON_TOOL} Tools from MCP: {mcp.name}"
+    return tools, title
+
+
+def _output_tool_names(ctx: Any, tools: list[dict[str, Any]]) -> None:
+    """Output only tool names.
+
+    Args:
+        ctx: Click context
+        tools: List of tool dictionaries
+    """
+    view = get_ctx_value(ctx, "view", "rich")
+    tool_names = [tool.get("name", "N/A") for tool in tools]
+
+    if view == "json":
+        handle_json_output(ctx, tool_names)
+    elif view == "plain":
+        if tool_names:
+            for name in tool_names:
+                console.print(name, markup=False)
+            console.print(f"Total: {len(tool_names)} tools", markup=False)
+        else:
+            console.print("No tools found", markup=False)
+    else:
+        if tool_names:
+            for name in tool_names:
+                console.print(name)
+            console.print(f"[dim]Total: {len(tool_names)} tools[/dim]")
+        else:
+            console.print("[yellow]No tools found[/yellow]")
+
+
+def _transform_tool(tool: dict[str, Any]) -> dict[str, Any]:
+    """Transform a tool dictionary to a display row dictionary.
+
+    Args:
+        tool: Tool dictionary to transform.
+
+    Returns:
+        Dictionary with name and description fields.
+    """
+    description = tool.get("description", "N/A")
+    if len(description) > MAX_DESCRIPTION_LEN:
+        description = description[: MAX_DESCRIPTION_LEN - 3] + "..."
+    return {
+        "name": tool.get("name", "N/A"),
+        "description": description,
+    }
+
+
+def _output_tools_table(ctx: Any, tools: list[dict[str, Any]], title: str) -> None:
+    """Output tools in table format.
+
+    Args:
+        ctx: Click context
+        tools: List of tool dictionaries
+        title: Table title
+    """
+    columns = [
+        ("name", "Name", ACCENT_STYLE, None),
+        ("description", "Description", INFO, 50),
+    ]
+
+    output_list(
+        ctx,
+        tools,
+        title,
+        columns,
+        _transform_tool,
+    )
+
+
+def _validate_tool_command_args(mcp_ref: str | None, config_file: str | None) -> None:
+    """Validate that exactly one of mcp_ref or config_file is provided.
+
+    Args:
+        mcp_ref: MCP reference (ID or name)
+        config_file: Path to config file
+
+    Raises:
+        ClickException: If validation fails
+    """
+    if not mcp_ref and not config_file:
+        raise click.ClickException(
+            "Either MCP_REF or --from-config must be provided.\n"
+            "Examples:\n"
+            "  aip mcps tools <MCP_ID>\n"
+            "  aip mcps tools --from-config mcp-config.json"
+        )
+    if mcp_ref and config_file:
+        raise click.ClickException(
+            "Cannot use both MCP_REF and --from-config at the same time.\n"
+            "Use either:\n"
+            "  aip mcps tools <MCP_ID>\n"
+            "  aip mcps tools --from-config mcp-config.json"
+        )
+
+
 @mcps_group.command("tools")
-@click.argument("mcp_ref")
+@click.argument("mcp_ref", required=False)
+@click.option(
+    "--from-config",
+    "--config",
+    "config_file",
+    type=click.Path(exists=True, dir_okay=False),
+    help="Get tools from MCP config file without saving to DB (JSON or YAML)",
+)
+@click.option(
+    "--names-only",
+    is_flag=True,
+    help="Show only tool names (useful for allowed_tools config)",
+)
 @output_flags()
 @click.pass_context
-def list_tools(ctx: Any, mcp_ref: str) -> None:
-    """List tools available from a specific MCP.
+def list_tools(ctx: Any, mcp_ref: str | None, config_file: str | None, names_only: bool) -> None:
+    """List tools available from a specific MCP or config file.
 
     Args:
         ctx: Click context containing output format preferences
-        mcp_ref: MCP reference (ID or name)
+        mcp_ref: MCP reference (ID or name) - required if --from-config not used
+        config_file: Path to MCP config file - alternative to mcp_ref
+        names_only: Show only tool names instead of full table
 
     Raises:
         ClickException: If MCP not found or tools fetch fails
-    """
-    try:
-        client = get_client(ctx)
 
-        # Resolve MCP using helper function
-        mcp = _resolve_mcp(ctx, client, mcp_ref)
-
-        # Get tools from MCP
-        with spinner_context(
-            ctx,
-            "[bold blue]Fetching MCP tools…[/bold blue]",
-            console_override=console,
-        ):
-            tools = client.mcps.get_mcp_tools(mcp.id)
-
-        # Define table columns: (data_key, header, style, width)
-        columns = [
-            ("name", "Name", ACCENT_STYLE, None),
-            ("description", "Description", INFO, 50),
-        ]
+    Examples:
+        Get tools from saved MCP:
+            aip mcps tools <MCP_ID>
 
-        # Transform function for safe dictionary access
-        def transform_tool(tool: dict[str, Any]) -> dict[str, Any]:
-            """Transform a tool dictionary to a display row dictionary.
+        Get tools from config file (without saving to DB):
+            aip mcps tools --from-config mcp-config.json
 
-            Args:
-                tool: Tool dictionary to transform.
+        Get just tool names for allowed_tools config:
+            aip mcps tools <MCP_ID> --names-only
+    """
+    try:
+        _validate_tool_command_args(mcp_ref, config_file)
+        client = get_client(ctx)
 
-            Returns:
-                Dictionary with name and description fields.
-            """
-            return {
-                "name": tool.get("name", "N/A"),
-                "description": tool.get("description", "N/A")[:47] + "..."
-                if len(tool.get("description", "")) > 47
-                else tool.get("description", "N/A"),
-            }
+        if config_file:
+            tools, title = _get_tools_from_config(ctx, client, config_file)
+        else:
+            tools, title = _get_tools_from_mcp(ctx, client, mcp_ref)
 
-        output_list(
-            ctx,
-            tools,
-            f"{ICON_TOOL} Tools from MCP: {mcp.name}",
-            columns,
-            transform_tool,
-        )
+        if names_only:
+            _output_tool_names(ctx, tools)
+        else:
+            _output_tools_table(ctx, tools, title)
 
     except Exception as e:
         raise click.ClickException(str(e)) from e

glaip_sdk/cli/commands/transcripts.py

@@ -36,8 +36,8 @@ from glaip_sdk.cli.transcript.history import (
 from glaip_sdk.cli.transcript.viewer import ViewerContext, run_viewer_session
 from glaip_sdk.cli.utils import format_size, get_ctx_value, parse_json_line
 from glaip_sdk.rich_components import AIPTable
+from glaip_sdk.utils.rendering.layout.panels import create_final_panel
 from glaip_sdk.utils.rendering.renderer.debug import render_debug_event
-from glaip_sdk.utils.rendering.renderer.panels import create_final_panel
 
 console = Console()