glaip-sdk 0.0.19__py3-none-any.whl → 0.1.0__py3-none-any.whl

glaip_sdk/cli/commands/configure.py

@@ -12,10 +12,20 @@ from rich.text import Text
 
 from glaip_sdk import Client
 from glaip_sdk._version import __version__ as _SDK_VERSION
-from glaip_sdk.branding import AIPBranding
+from glaip_sdk.branding import (
+    ACCENT_STYLE,
+    ERROR_STYLE,
+    INFO,
+    PRIMARY,
+    SUCCESS,
+    SUCCESS_STYLE,
+    WARNING_STYLE,
+    AIPBranding,
+)
 from glaip_sdk.cli.config import CONFIG_FILE, load_config, save_config
 from glaip_sdk.cli.rich_helpers import markup_text
-from glaip_sdk.cli.utils import command_hint
+from glaip_sdk.cli.utils import command_hint, format_command_hint
+from glaip_sdk.icons import ICON_TOOL
 from glaip_sdk.rich_components import AIPTable
 
 console = Console()
@@ -33,29 +43,10 @@ def list_config() -> None:
     config = load_config()
 
     if not config:
-        hint = command_hint("config configure", slash_command="login")
-        if hint:
-            console.print(
-                f"[yellow]No configuration found. Run '{hint}' to set up.[/yellow]"
-            )
-        else:
-            console.print("[yellow]No configuration found.[/yellow]")
+        _print_missing_config_hint()
         return
 
-    table = AIPTable(title="🔧 AIP Configuration")
-    table.add_column("Setting", style="cyan", width=20)
-    table.add_column("Value", style="green")
-
-    for key, value in config.items():
-        if key == "api_key" and value:
-            # Mask the API key
-            masked_value = "***" + value[-4:] if len(value) > 4 else "***"
-            table.add_row(key, masked_value)
-        else:
-            table.add_row(key, str(value))
-
-    console.print(table)
-    console.print(Text(f"\n📁 Config file: {CONFIG_FILE}"))
+    _render_config_table(config)
 
 
 @config_group.command("set")
@@ -67,7 +58,7 @@ def set_config(key: str, value: str) -> None:
 
     if key not in valid_keys:
         console.print(
-            f"[red]Error: Invalid key '{key}'. Valid keys are: {', '.join(valid_keys)}[/red]"
+            f"[{ERROR_STYLE}]Error: Invalid key '{key}'. Valid keys are: {', '.join(valid_keys)}[/]"
         )
         raise click.ClickException(f"Invalid configuration key: {key}")
 
@@ -76,10 +67,11 @@ def set_config(key: str, value: str) -> None:
     save_config(config)
 
     if key == "api_key":
-        masked_value = "***" + value[-4:] if len(value) > 4 else "***"
-        console.print(Text(f"✅ Set {key} = {masked_value}"))
+        console.print(
+            Text(f"✅ Set {key} = {_mask_api_key(value)}", style=SUCCESS_STYLE)
+        )
     else:
-        console.print(Text(f"✅ Set {key} = {value}"))
+        console.print(Text(f"✅ Set {key} = {value}", style=SUCCESS_STYLE))
 
 
 @config_group.command("get")
@@ -90,16 +82,14 @@ def get_config(key: str) -> None:
 
     if key not in config:
         console.print(
-            markup_text(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+            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":
-        # Mask the API key for display
-        masked_value = "***" + value[-4:] if len(value) > 4 else "***"
-        console.print(masked_value)
+        console.print(_mask_api_key(value))
     else:
         console.print(value)
 
@@ -112,14 +102,14 @@ def unset_config(key: str) -> None:
 
     if key not in config:
         console.print(
-            markup_text(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+            markup_text(f"[{WARNING_STYLE}]Configuration key '{key}' not found.[/]")
         )
         return
 
     del config[key]
     save_config(config)
 
-    console.print(Text(f"✅ Removed {key} from configuration"))
+    console.print(Text(f"✅ Removed {key} from configuration", style=SUCCESS_STYLE))
 
 
 @config_group.command("reset")
@@ -127,7 +117,7 @@ def unset_config(key: str) -> None:
 def reset_config(force: bool) -> None:
     """Reset all configuration to defaults."""
     if not force:
-        console.print("[yellow]This will remove all AIP configuration.[/yellow]")
+        console.print(f"[{WARNING_STYLE}]This will remove all AIP configuration.[/]")
         confirm = input("Are you sure? (y/N): ").strip().lower()
         if confirm not in ["y", "yes"]:
             console.print("Cancelled.")
@@ -137,8 +127,10 @@ def reset_config(force: bool) -> None:
     file_exists = CONFIG_FILE.exists()
 
     if not file_exists and not config_data:
-        console.print("[yellow]No configuration found to reset.[/yellow]")
-        console.print("✅ Configuration reset (nothing to remove).")
+        console.print(f"[{WARNING_STYLE}]No configuration found to reset.[/]")
+        console.print(
+            Text("✅ Configuration reset (nothing to remove).", style=SUCCESS_STYLE)
+        )
         return
 
     if file_exists:
@@ -151,103 +143,162 @@ def reset_config(force: bool) -> None:
         save_config({})
 
     hint = command_hint("config configure", slash_command="login")
-    message = "✅ Configuration reset."
+    message = Text("✅ Configuration reset.", style=SUCCESS_STYLE)
     if hint:
-        message += f" Run '{hint}' to set up again."
+        message.append(f" Run '{hint}' to set up again.")
     console.print(message)
 
 
 def _configure_interactive() -> None:
     """Shared configuration logic for both configure commands."""
-    # Display AIP welcome banner
+    _render_configuration_header()
+    config = load_config()
+    _prompt_configuration_inputs(config)
+    _save_configuration(config)
+    _test_and_report_connection(config)
+    _print_post_configuration_hints()
+
+
+@config_group.command()
+def configure() -> None:
+    """Configure AIP CLI credentials and settings interactively."""
+    _configure_interactive()
+
+
+# Alias command for backward compatibility
+@click.command()
+def configure_command() -> None:
+    """Configure AIP CLI credentials and settings interactively.
+
+    This is an alias for 'aip config configure' for backward compatibility.
+    """
+    # Delegate to the shared function
+    _configure_interactive()
+
+
+# Note: The config command group should be registered in main.py
+
+
+def _mask_api_key(value: str | None) -> str:
+    if not value:
+        return ""
+    return "***" + value[-4:] if len(value) > 4 else "***"
+
+
+def _print_missing_config_hint() -> None:
+    hint = command_hint("config configure", slash_command="login")
+    if hint:
+        console.print(
+            f"[{WARNING_STYLE}]No configuration found.[/] Run {format_command_hint(hint) or hint} to set up."
+        )
+    else:
+        console.print(f"[{WARNING_STYLE}]No configuration found.[/]")
+
+
+def _render_config_table(config: dict[str, str]) -> None:
+    table = AIPTable(title=f"{ICON_TOOL} AIP Configuration")
+    table.add_column("Setting", style=INFO, width=20)
+    table.add_column("Value", style=SUCCESS)
+
+    for key, value in config.items():
+        table.add_row(key, _mask_api_key(value) if key == "api_key" else str(value))
+
+    console.print(table)
+    console.print(Text(f"\n📁 Config file: {CONFIG_FILE}"))
+
+
+def _render_configuration_header() -> None:
     branding = AIPBranding.create_from_sdk(
         sdk_version=_SDK_VERSION, package_name="glaip-sdk"
     )
-    branding.display_welcome_panel(title="🔧 AIP Configuration")
+    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)
 
-    # Load existing config
-    config = load_config()
 
+def _prompt_configuration_inputs(config: dict[str, str]) -> None:
     console.print("\n[bold]Enter your AIP configuration:[/bold]")
     console.print("(Leave blank to keep current values)")
     console.print("─" * 50)
 
-    # API URL
+    _prompt_api_url(config)
+    _prompt_api_key(config)
+
+
+def _prompt_api_url(config: dict[str, str]) -> None:
     current_url = config.get("api_url", "")
-    console.print(
-        f"\n[cyan]AIP API URL[/cyan] {f'(current: {current_url})' if current_url else ''}:"
-    )
+    suffix = f"(current: {current_url})" if current_url else ""
+    console.print(f"\n[{ACCENT_STYLE}]AIP API URL[/] {suffix}:")
     new_url = input("> ").strip()
     if new_url:
         config["api_url"] = new_url
     elif not current_url:
         config["api_url"] = "https://your-aip-instance.com"
 
-    # API Key
-    current_key_masked = (
-        "***" + config.get("api_key", "")[-4:] if config.get("api_key") else ""
-    )
-    console.print(
-        f"\n[cyan]AIP API Key[/cyan] {f'(current: {current_key_masked})' if current_key_masked else ''}:"
-    )
+
+def _prompt_api_key(config: dict[str, str]) -> None:
+    current_key_masked = _mask_api_key(config.get("api_key"))
+    suffix = f"(current: {current_key_masked})" if current_key_masked else ""
+    console.print(f"\n[{ACCENT_STYLE}]AIP API Key[/] {suffix}:")
     new_key = getpass.getpass("> ")
     if new_key:
         config["api_key"] = new_key
 
-    # Save configuration
+
+def _save_configuration(config: dict[str, str]) -> None:
     save_config(config)
+    console.print(
+        Text(f"\n✅ Configuration saved to: {CONFIG_FILE}", style=SUCCESS_STYLE)
+    )
 
-    console.print(Text(f"\n✅ Configuration saved to: {CONFIG_FILE}"))
 
-    # Test the new configuration
+def _test_and_report_connection(config: dict[str, str]) -> None:
     console.print("\n🔌 Testing connection...")
+    client: Client | None = None
     try:
-        # Create client with new config
         client = Client(api_url=config["api_url"], api_key=config["api_key"])
-
-        # Try to list resources to test connection
         try:
             agents = client.list_agents()
-            console.print(Text(f"✅ Connection successful! Found {len(agents)} agents"))
-        except Exception as e:
-            console.print(Text(f"⚠️  Connection established but API call failed: {e}"))
+            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"
             )
-
-        client.close()
-
-    except Exception as e:
-        console.print(Text(f"❌ Connection failed: {e}"))
+    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 '{hint_status}' later to test again")
+            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()
+
 
+def _print_post_configuration_hints() -> None:
     console.print("\n💡 You can now use AIP CLI commands!")
     hint_status = command_hint("status", slash_command="status")
     if hint_status:
-        console.print(f"   • Run '{hint_status}' to check connection")
+        console.print(
+            f"   • Run {format_command_hint(hint_status) or hint_status} to check connection"
+        )
     hint_agents = command_hint("agents list", slash_command="agents")
     if hint_agents:
-        console.print(f"   • Run '{hint_agents}' to see your agents")
-
-
-@config_group.command()
-def configure() -> None:
-    """Configure AIP CLI credentials and settings interactively."""
-    _configure_interactive()
-
-
-# Alias command for backward compatibility
-@click.command()
-def configure_command() -> None:
-    """Configure AIP CLI credentials and settings interactively.
-
-    This is an alias for 'aip config configure' for backward compatibility.
-    """
-    # Delegate to the shared function
-    _configure_interactive()
-
-
-# Note: The config command group should be registered in main.py
+        console.print(
+            f"   • Run {format_command_hint(hint_agents) or hint_agents} to see your agents"
+        )

glaip_sdk/cli/commands/mcps.py

@@ -13,6 +13,13 @@ from typing import Any
 import click
 from rich.console import Console
 
+from glaip_sdk.branding import (
+    ACCENT_STYLE,
+    INFO,
+    SUCCESS,
+    SUCCESS_STYLE,
+    WARNING_STYLE,
+)
 from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     display_api_error,
@@ -44,6 +51,7 @@ from glaip_sdk.cli.utils import (
 from glaip_sdk.config.constants import (
     DEFAULT_MCP_TYPE,
 )
+from glaip_sdk.icons import ICON_TOOL
 from glaip_sdk.rich_components import AIPPanel
 from glaip_sdk.utils import format_datetime
 from glaip_sdk.utils.import_export import convert_export_to_import_format
@@ -73,6 +81,38 @@ def _is_sensitive_data(val: Any) -> bool:
     )
 
 
+def _redact_sensitive_dict(val: dict[str, Any]) -> dict[str, Any]:
+    """Redact sensitive fields from a dictionary.
+
+    Args:
+        val: Dictionary to redact
+
+    Returns:
+        Redacted dictionary
+    """
+    redacted = val.copy()
+    sensitive_patterns = {"token", "password", "secret", "key", "credential"}
+    for k in redacted.keys():
+        if any(pattern in k.lower() for pattern in sensitive_patterns):
+            redacted[k] = "<REDACTED>"
+    return redacted
+
+
+def _format_dict_value(val: dict[str, Any]) -> str:
+    """Format a dictionary value for display.
+
+    Args:
+        val: Dictionary to format
+
+    Returns:
+        Formatted string representation
+    """
+    if _is_sensitive_data(val):
+        redacted = _redact_sensitive_dict(val)
+        return json.dumps(redacted, indent=2)
+    return json.dumps(val, indent=2)
+
+
 def _format_preview_value(val: Any) -> str:
     """Format a value for display in update preview with sensitive data redaction.
 
@@ -85,15 +125,7 @@ def _format_preview_value(val: Any) -> str:
     if val is None:
         return "[dim]None[/dim]"
     if isinstance(val, dict):
-        # Redact sensitive fields in authentication
-        if _is_sensitive_data(val):
-            redacted = val.copy()
-            sensitive_patterns = {"token", "password", "secret", "key", "credential"}
-            for k in list(redacted.keys()):
-                if any(pattern in k.lower() for pattern in sensitive_patterns):
-                    redacted[k] = "<REDACTED>"
-            return json.dumps(redacted, indent=2)
-        return json.dumps(val, indent=2)
+        return _format_dict_value(val)
     if isinstance(val, str):
         return f'"{val}"' if val else '""'
     return str(val)
@@ -143,6 +175,26 @@ def _validate_import_payload_fields(import_payload: dict[str, Any]) -> bool:
     return has_updatable
 
 
+def _get_config_transport(
+    transport: str | None,
+    import_payload: dict[str, Any] | None,
+    mcp: Any,
+) -> str | None:
+    """Get the transport value for config validation.
+
+    Args:
+        transport: CLI transport flag
+        import_payload: Optional import payload
+        mcp: Current MCP object
+
+    Returns:
+        Transport value or None
+    """
+    if import_payload:
+        return transport or import_payload.get("transport")
+    return transport or getattr(mcp, "transport", None)
+
+
 def _build_update_data_from_sources(
     import_payload: dict[str, Any] | None,
     mcp: Any,
@@ -190,11 +242,7 @@ def _build_update_data_from_sources(
         update_data["description"] = description
     if config is not None:
         parsed_config = parse_json_input(config)
-        config_transport = (
-            (transport or import_payload.get("transport"))
-            if import_payload
-            else (transport or getattr(mcp, "transport", None))
-        )
+        config_transport = _get_config_transport(transport, import_payload, mcp)
         update_data["config"] = validate_mcp_config_structure(
             parsed_config,
             transport=config_transport,
@@ -487,8 +535,8 @@ def list_mcps(ctx: Any) -> None:
         # Define table columns: (data_key, header, style, width)
         columns = [
             ("id", "ID", "dim", 36),
-            ("name", "Name", "cyan", None),
-            ("config", "Config", "blue", None),
+            ("name", "Name", ACCENT_STYLE, None),
+            ("config", "Config", INFO, None),
         ]
 
         # Transform function for safe dictionary access
@@ -675,11 +723,11 @@ def _handle_mcp_export(
             mcp = client.mcps.get_mcp_by_id(mcp.id)
     except Exception as e:
         print_markup(
-            f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]",
+            f"[{WARNING_STYLE}]⚠️  Could not fetch full MCP details: {e}[/]",
             console=console,
         )
         print_markup(
-            "[yellow]⚠️  Proceeding with available data[/yellow]", console=console
+            f"[{WARNING_STYLE}]⚠️  Proceeding with available data[/]", console=console
         )
 
     # Determine if we should prompt for secrets
@@ -688,8 +736,8 @@ def _handle_mcp_export(
     # Warn user if non-interactive mode forces placeholder usage
     if not no_auth_prompt and not sys.stdin.isatty():
         print_markup(
-            "[yellow]⚠️  Non-interactive mode detected. "
-            "Using placeholder values for secrets.[/yellow]",
+            f"[{WARNING_STYLE}]⚠️  Non-interactive mode detected. "
+            "Using placeholder values for secrets.[/]",
             console=console,
         )
 
@@ -724,8 +772,8 @@ def _handle_mcp_export(
             write_resource_export(export_path, export_payload, detected_format)
 
     print_markup(
-        f"[green]✅ Complete MCP configuration exported to: "
-        f"{export_path} (format: {detected_format})[/green]",
+        f"[{SUCCESS_STYLE}]✅ Complete MCP configuration exported to: "
+        f"{export_path} (format: {detected_format})[/]",
         console=console,
     )
 
@@ -767,7 +815,7 @@ def _display_mcp_details(ctx: Any, client: Any, mcp: Any) -> None:
         )
     else:
         # Fall back to Pydantic model data
-        console.print("[yellow]Falling back to Pydantic model data[/yellow]")
+        console.print(f"[{WARNING_STYLE}]Falling back to Pydantic model data[/]")
         result_data = {
             "id": str(getattr(mcp, "id", "N/A")),
             "name": getattr(mcp, "name", "N/A"),
@@ -873,8 +921,8 @@ def list_tools(ctx: Any, mcp_ref: str) -> None:
 
         # Define table columns: (data_key, header, style, width)
         columns = [
-            ("name", "Name", "cyan", None),
-            ("description", "Description", "green", 50),
+            ("name", "Name", ACCENT_STYLE, None),
+            ("description", "Description", INFO, 50),
         ]
 
         # Transform function for safe dictionary access
@@ -887,7 +935,11 @@ def list_tools(ctx: Any, mcp_ref: str) -> None:
             }
 
         output_list(
-            ctx, tools, f"🔧 Tools from MCP: {mcp.name}", columns, transform_tool
+            ctx,
+            tools,
+            f"{ICON_TOOL} Tools from MCP: {mcp.name}",
+            columns,
+            transform_tool,
         )
 
     except Exception as e:
@@ -927,7 +979,7 @@ def connect(ctx: Any, config_file: str) -> None:
         view = get_ctx_value(ctx, "view", "rich")
         if view != "json":
             print_markup(
-                f"[yellow]Connecting to MCP with config from {config_file}...[/yellow]",
+                f"[{WARNING_STYLE}]Connecting to MCP with config from {config_file}...[/]",
                 console=console,
             )
 
@@ -944,10 +996,10 @@ def connect(ctx: Any, config_file: str) -> None:
             handle_json_output(ctx, result)
         else:
             success_panel = AIPPanel(
-                f"[green]✓[/green] MCP connection successful!\n\n"
+                f"[{SUCCESS_STYLE}]✓[/] MCP connection successful!\n\n"
                 f"[bold]Result:[/bold] {result}",
                 title="🔌 Connection",
-                border_style="green",
+                border_style=SUCCESS,
             )
             console.print(success_panel)
 
@@ -1074,8 +1126,7 @@ def update(
         )
         if not import_file and not cli_flags_provided:
             raise click.ClickException(
-                "No update fields specified. Use --import file or at least one of: "
-                "--name, --transport, --description, --config, --auth"
+                "No update fields specified. Use --import or one of: --name, --transport, --description, --config, --auth"
             )
 
         # Resolve MCP using helper function

glaip_sdk/cli/commands/models.py

@@ -9,6 +9,7 @@ from typing import Any
 import click
 from rich.console import Console
 
+from glaip_sdk.branding import ACCENT_STYLE, INFO, SUCCESS
 from glaip_sdk.cli.context import output_flags
 from glaip_sdk.cli.utils import (
     get_client,
@@ -42,9 +43,9 @@ def list_models(ctx: Any) -> None:
         # Define table columns: (data_key, header, style, width)
         columns = [
             ("id", "ID", "dim", 36),
-            ("provider", "Provider", "cyan", None),
-            ("name", "Model", "green", None),
-            ("base_url", "Base URL", "yellow", None),
+            ("provider", "Provider", ACCENT_STYLE, None),
+            ("name", "Model", SUCCESS, None),
+            ("base_url", "Base URL", INFO, None),
         ]
 
         # Transform function for safe dictionary access