glaip-sdk 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

glaip_sdk/__init__.py

@@ -1,4 +1,4 @@
-"""GL AIP SDK - Python SDK for GDP Labs AI Agent Package.
+"""GL AIP - Python SDK for GDP Labs AI Agent Package.
 
 Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)

glaip_sdk/branding.py

@@ -42,7 +42,7 @@ LABEL = "bold"
 
 
 class AIPBranding:
-    """GL AIP SDK branding utilities with ASCII banner and version display."""
+    """GL AIP branding utilities with ASCII banner and version display."""
 
     # GL AIP ASCII art - Modern block style with enhanced visibility
     AIP_LOGO = r"""
@@ -60,7 +60,8 @@ GDP Labs AI Agents Package
         version: str | None = None,
         package_name: str | None = None,
     ) -> None:
-        """
+        """Initialize AIPBranding instance.
+
         Args:
             version: Explicit SDK version (overrides auto-detection).
             package_name: If set, attempt to read version from installed package.
@@ -105,6 +106,11 @@ GDP Labs AI Agents Package
         return banner
 
     def get_version_info(self) -> dict:
+        """Get comprehensive version information for the SDK.
+
+        Returns:
+            Dictionary containing version, Python version, platform, and architecture info
+        """
         return {
             "version": self.version,
             "python_version": f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
@@ -113,6 +119,11 @@ GDP Labs AI Agents Package
         }
 
     def display_welcome_panel(self, title: str = "Welcome to AIP") -> None:
+        """Display a welcome panel with branding.
+
+        Args:
+            title: Custom title for the welcome panel
+        """
         banner = self.get_welcome_banner()
         panel = AIPPanel(
             banner,
@@ -123,6 +134,7 @@ GDP Labs AI Agents Package
         self.console.print(panel)
 
     def display_version_panel(self) -> None:
+        """Display a panel with comprehensive version information."""
         v = self.get_version_info()
         version_text = (
             f"[{TITLE_STYLE}]AIP SDK Version Information[/{TITLE_STYLE}]\n\n"
@@ -140,6 +152,11 @@ GDP Labs AI Agents Package
         self.console.print(panel)
 
     def display_status_banner(self, status: str = "ready") -> None:
+        """Display a status banner for the current state.
+
+        Args:
+            status: Current status to display
+        """
         # Keep it simple (no emoji); easy to parse in logs/CI
         banner = f"[{LABEL}]AIP[/{LABEL}] - {status.title()}"
         self.console.print(banner)
@@ -148,4 +165,13 @@ GDP Labs AI Agents Package
     def create_from_sdk(
         cls, sdk_version: str | None = None, package_name: str | None = None
     ) -> AIPBranding:
+        """Create AIPBranding instance from SDK package information.
+
+        Args:
+            sdk_version: Explicit SDK version override
+            package_name: Package name to read version from
+
+        Returns:
+            AIPBranding instance
+        """
         return cls(version=sdk_version, package_name=package_name)

glaip_sdk/cli/commands/agents.py

@@ -12,7 +12,6 @@ from typing import Any
 
 import click
 from rich.console import Console
-from rich.text import Text
 
 from glaip_sdk.cli.agent_config import (
     merge_agent_config_with_cli_args as merge_import_with_cli_args,
@@ -45,6 +44,7 @@ from glaip_sdk.cli.io import (
     load_resource_from_file_with_validation as load_resource_from_file,
 )
 from glaip_sdk.cli.resolution import resolve_resource_reference
+from glaip_sdk.cli.rich_helpers import markup_text, print_markup
 from glaip_sdk.cli.utils import (
     _fuzzy_pick_for_resources,
     build_renderer,
@@ -78,7 +78,6 @@ AGENT_NOT_FOUND_ERROR = "Agent not found"
 
 def _safe_agent_attribute(agent: Any, name: str) -> Any:
     """Return attribute value for ``name`` while filtering Mock sentinels."""
-
     try:
         value = getattr(agent, name)
     except Exception:
@@ -91,7 +90,6 @@ def _safe_agent_attribute(agent: Any, name: str) -> Any:
 
 def _coerce_mapping_candidate(candidate: Any) -> dict[str, Any] | None:
     """Convert a mapping-like candidate to a plain dict when possible."""
-
     if candidate is None:
         return None
     if isinstance(candidate, Mapping):
@@ -101,7 +99,6 @@ def _coerce_mapping_candidate(candidate: Any) -> dict[str, Any] | None:
 
 def _call_agent_method(agent: Any, method_name: str) -> dict[str, Any] | None:
     """Attempt to call the named method and coerce its output to a dict."""
-
     method = getattr(agent, method_name, None)
     if not callable(method):
         return None
@@ -114,7 +111,6 @@ def _call_agent_method(agent: Any, method_name: str) -> dict[str, Any] | None:
 
 def _coerce_agent_via_methods(agent: Any) -> dict[str, Any] | None:
     """Try standard serialisation helpers to produce a mapping."""
-
     for attr in ("model_dump", "dict", "to_dict"):
         mapping = _call_agent_method(agent, attr)
         if mapping is not None:
@@ -124,7 +120,6 @@ def _coerce_agent_via_methods(agent: Any) -> dict[str, Any] | None:
 
 def _build_fallback_agent_mapping(agent: Any) -> dict[str, Any]:
     """Construct a minimal mapping from well-known agent attributes."""
-
     fallback_fields = (
         "id",
         "name",
@@ -136,6 +131,7 @@ def _build_fallback_agent_mapping(agent: Any) -> dict[str, Any]:
         "agents",
         "mcps",
         "timeout",
+        "tool_configs",
     )
 
     fallback: dict[str, Any] = {}
@@ -149,7 +145,6 @@ def _build_fallback_agent_mapping(agent: Any) -> dict[str, Any]:
 
 def _prepare_agent_output(agent: Any) -> dict[str, Any]:
     """Build a JSON-serialisable mapping for CLI output."""
-
     method_mapping = _coerce_agent_via_methods(agent)
     if method_mapping is not None:
         return method_mapping
@@ -256,11 +251,11 @@ def _format_fallback_agent_data(client: Any, agent: Any) -> dict:
         "metadata",
         "language_model_id",
         "agent_config",
-        "tool_configs",
         "tools",
         "agents",
         "mcps",
         "a2a_profile",
+        "tool_configs",
     ]
 
     result_data = build_resource_result_data(full_agent, fields)
@@ -280,7 +275,7 @@ def _format_fallback_agent_data(client: Any, agent: Any) -> dict:
 def _display_agent_details(ctx: Any, client: Any, agent: Any) -> None:
     """Display full agent details using raw API data to preserve ALL fields."""
     if agent is None:
-        handle_rich_output(ctx, Text("[red]❌ No agent provided[/red]"))
+        handle_rich_output(ctx, markup_text("[red]❌ No agent provided[/red]"))
         return
 
     # Try to fetch and format raw agent data first
@@ -297,13 +292,13 @@ def _display_agent_details(ctx: Any, client: Any, agent: Any) -> None:
         output_result(
             ctx,
             formatted_data,
-            title="Agent Details",
-            panel_title=panel_title,
+            title=panel_title,
         )
     else:
         # Fall back to Pydantic model data if raw fetch fails
         handle_rich_output(
-            ctx, Text("[yellow]Falling back to Pydantic model data[/yellow]")
+            ctx,
+            markup_text("[yellow]Falling back to Pydantic model data[/yellow]"),
         )
 
         with spinner_context(
@@ -318,7 +313,6 @@ def _display_agent_details(ctx: Any, client: Any, agent: Any) -> None:
             ctx,
             result_data,
             title="Agent Details",
-            panel_title=f"🤖 {result_data.get('name', 'Unknown')}",
         )
 
 
@@ -338,7 +332,14 @@ def _resolve_agent(
     """Resolve agent reference (ID or name) with ambiguity handling.
 
     Args:
-        interface_preference: "fuzzy" for fuzzy picker, "questionary" for up/down list
+        ctx: Click context object for CLI operations.
+        client: AIP client instance for API operations.
+        ref: Agent reference (ID or name) to resolve.
+        select: Pre-selected agent index for non-interactive mode.
+        interface_preference: "fuzzy" for fuzzy picker, "questionary" for up/down list.
+
+    Returns:
+        Resolved agent object or None if not found.
     """
     return resolve_resource_reference(
         ctx,
@@ -495,18 +496,19 @@ def get(ctx: Any, agent_ref: str, select: int | None, export: str | None) -> Non
             except Exception as e:
                 handle_rich_output(
                     ctx,
-                    Text(
+                    markup_text(
                         f"[yellow]⚠️  Could not fetch full agent details: {e}[/yellow]"
                     ),
                 )
                 handle_rich_output(
-                    ctx, Text("[yellow]⚠️  Proceeding with available data[/yellow]")
+                    ctx,
+                    markup_text("[yellow]⚠️  Proceeding with available data[/yellow]"),
                 )
 
             export_resource_to_file(agent, export_path, detected_format)
             handle_rich_output(
                 ctx,
-                Text(
+                markup_text(
                     f"[green]✅ Complete agent configuration exported to: {export_path} (format: {detected_format})[/green]"
                 ),
             )
@@ -619,7 +621,7 @@ def _save_run_transcript(save: str | None, result: Any, working_console: Any) ->
 
     with open(save, "w", encoding="utf-8") as f:
         f.write(content)
-    console.print(Text(f"[green]Full debug output saved to: {save}[/green]"))
+    print_markup(f"[green]Full debug output saved to: {save}[/green]", console=console)
 
 
 @agents_group.command()
@@ -878,7 +880,6 @@ def _add_import_file_attributes(
         "type",
         "framework",
         "version",
-        "tool_configs",
         "mcps",
         "a2a_profile",
     }
@@ -1050,6 +1051,7 @@ def _handle_update_import_file(
     instruction: str | None,
     tools: tuple[str, ...] | None,
     agents: tuple[str, ...] | None,
+    mcps: tuple[str, ...] | None,
     timeout: float | None,
 ) -> tuple[
     Any | None,
@@ -1057,11 +1059,12 @@ def _handle_update_import_file(
     str | None,
     tuple[str, ...] | None,
     tuple[str, ...] | None,
+    tuple[str, ...] | None,
     float | None,
 ]:
     """Handle import file processing for agent update."""
     if not import_file:
-        return None, name, instruction, tools, agents, timeout
+        return None, name, instruction, tools, agents, mcps, timeout
 
     import_data = load_resource_from_file(Path(import_file), "agent")
     import_data = convert_export_to_import_format(import_data)
@@ -1072,6 +1075,7 @@ def _handle_update_import_file(
         "instruction": instruction,
         "tools": tools or (),
         "agents": agents or (),
+        "mcps": mcps or (),
         "timeout": timeout,
     }
 
@@ -1083,6 +1087,7 @@ def _handle_update_import_file(
         merged_data.get("instruction"),
         tuple(merged_data.get("tools", ())),
         tuple(merged_data.get("agents", ())),
+        tuple(merged_data.get("mcps", ())),
         coerce_timeout(merged_data.get("timeout")),
     )
 
@@ -1092,6 +1097,7 @@ def _build_update_data(
     instruction: str | None,
     tools: tuple[str, ...] | None,
     agents: tuple[str, ...] | None,
+    mcps: tuple[str, ...] | None,
     timeout: float | None,
 ) -> dict[str, Any]:
     """Build the update data dictionary from provided parameters."""
@@ -1104,6 +1110,8 @@ def _build_update_data(
         update_data["tools"] = list(tools)
     if agents:
         update_data["agents"] = list(agents)
+    if mcps:
+        update_data["mcps"] = list(mcps)
     if timeout is not None:
         update_data["timeout"] = timeout
     return update_data
@@ -1141,8 +1149,6 @@ def _handle_update_import_config(
         "type",
         "framework",
         "version",
-        "tool_configs",
-        "mcps",
         "a2a_profile",
     }
     for key, value in merged_data.items():
@@ -1156,6 +1162,7 @@ def _handle_update_import_config(
 @click.option("--instruction", help="New instruction")
 @click.option("--tools", multiple=True, help="New tool names or IDs")
 @click.option("--agents", multiple=True, help="New sub-agent names")
+@click.option("--mcps", multiple=True, help="New MCP names or IDs")
 @click.option("--timeout", type=int, help="New timeout value")
 @click.option(
     "--import",
@@ -1172,6 +1179,7 @@ def update(
     instruction: str | None,
     tools: tuple[str, ...] | None,
     agents: tuple[str, ...] | None,
+    mcps: tuple[str, ...] | None,
     timeout: float | None,
     import_file: str | None,
 ) -> None:
@@ -1192,12 +1200,15 @@ def update(
             instruction,
             tools,
             agents,
+            mcps,
             timeout,
         ) = _handle_update_import_file(
-            import_file, name, instruction, tools, agents, timeout
+            import_file, name, instruction, tools, agents, mcps, timeout
         )
 
-        update_data = _build_update_data(name, instruction, tools, agents, timeout)
+        update_data = _build_update_data(
+            name, instruction, tools, agents, mcps, timeout
+        )
 
         if merged_data:
             _handle_update_import_config(import_file, merged_data, update_data)
@@ -1297,8 +1308,6 @@ def sync_langflow(ctx: Any, base_url: str | None, api_key: str | None) -> None:
 
         # Show success message for non-JSON output
         if get_ctx_value(ctx, "view") != "json":
-            from rich.text import Text
-
             # Extract some useful info from the result
             success_count = result.get("data", {}).get("created_count", 0) + result.get(
                 "data", {}
@@ -1307,7 +1316,7 @@ def sync_langflow(ctx: Any, base_url: str | None, api_key: str | None) -> None:
 
             handle_rich_output(
                 ctx,
-                Text(
+                markup_text(
                     f"[green]✅ Successfully synced {success_count} LangFlow agents ({total_count} total processed)[/green]"
                 ),
             )

glaip_sdk/cli/commands/configure.py

@@ -5,51 +5,21 @@ Authors:
 """
 
 import getpass
-import os
-from pathlib import Path
-from typing import Any
 
 import click
-import yaml
 from rich.console import Console
 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.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.rich_components import AIPTable
 
 console = Console()
 
-CONFIG_DIR = Path.home() / ".aip"
-CONFIG_FILE = CONFIG_DIR / "config.yaml"
-
-
-def load_config() -> dict[str, Any]:
-    """Load configuration from file."""
-    if not CONFIG_FILE.exists():
-        return {}
-
-    try:
-        with open(CONFIG_FILE) as f:
-            return yaml.safe_load(f) or {}
-    except yaml.YAMLError:
-        return {}
-
-
-def save_config(config: dict[str, Any]) -> None:
-    """Save configuration to file."""
-    CONFIG_DIR.mkdir(exist_ok=True)
-
-    with open(CONFIG_FILE, "w") as f:
-        yaml.dump(config, f, default_flow_style=False)
-
-    # Set secure file permissions
-    try:
-        os.chmod(CONFIG_FILE, 0o600)
-    except Exception:  # pragma: no cover - platform dependent best effort
-        pass
-
 
 @click.group()
 def config_group() -> None:
@@ -60,13 +30,16 @@ def config_group() -> None:
 @config_group.command("list")
 def list_config() -> None:
     """List current configuration."""
-
     config = load_config()
 
     if not config:
-        console.print(
-            "[yellow]No configuration found. Run 'aip config configure' to set up.[/yellow]"
-        )
+        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]")
         return
 
     table = AIPTable(title="🔧 AIP Configuration")
@@ -90,7 +63,6 @@ def list_config() -> None:
 @click.argument("value")
 def set_config(key: str, value: str) -> None:
     """Set a configuration value."""
-
     valid_keys = ["api_url", "api_key"]
 
     if key not in valid_keys:
@@ -114,11 +86,12 @@ def set_config(key: str, value: str) -> None:
 @click.argument("key")
 def get_config(key: str) -> None:
     """Get a configuration value."""
-
     config = load_config()
 
     if key not in config:
-        console.print(Text(f"[yellow]Configuration key '{key}' not found.[/yellow]"))
+        console.print(
+            markup_text(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+        )
         raise click.ClickException(f"Configuration key not found: {key}")
 
     value = config[key]
@@ -135,11 +108,12 @@ def get_config(key: str) -> None:
 @click.argument("key")
 def unset_config(key: str) -> None:
     """Remove a configuration value."""
-
     config = load_config()
 
     if key not in config:
-        console.print(Text(f"[yellow]Configuration key '{key}' not found.[/yellow]"))
+        console.print(
+            markup_text(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+        )
         return
 
     del config[key]
@@ -152,7 +126,6 @@ def unset_config(key: str) -> None:
 @click.option("--force", is_flag=True, help="Skip confirmation prompt")
 def reset_config(force: bool) -> None:
     """Reset all configuration to defaults."""
-
     if not force:
         console.print("[yellow]This will remove all AIP configuration.[/yellow]")
         confirm = input("Are you sure? (y/N): ").strip().lower()
@@ -160,13 +133,28 @@ def reset_config(force: bool) -> None:
             console.print("Cancelled.")
             return
 
-    if CONFIG_FILE.exists():
-        CONFIG_FILE.unlink()
-        console.print(
-            "✅ Configuration reset. Run 'aip config configure' to set up again."
-        )
-    else:
+    config_data = load_config()
+    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).")
+        return
+
+    if file_exists:
+        try:
+            CONFIG_FILE.unlink()
+        except FileNotFoundError:  # pragma: no cover - defensive cleanup
+            pass
+    else:
+        # In-memory configuration (e.g., tests) needs explicit clearing
+        save_config({})
+
+    hint = command_hint("config configure", slash_command="login")
+    message = "✅ Configuration reset."
+    if hint:
+        message += f" Run '{hint}' to set up again."
+    console.print(message)
 
 
 def _configure_interactive() -> None:
@@ -232,11 +220,17 @@ def _configure_interactive() -> None:
     except Exception as e:
         console.print(Text(f"❌ Connection failed: {e}"))
         console.print("   Please check your API URL and key")
-        console.print("   You can run 'aip status' later to test again")
+        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("\n💡 You can now use AIP CLI commands!")
-    console.print("   • Run 'aip status' to check connection")
-    console.print("   • Run 'aip agents list' to see your agents")
+    hint_status = command_hint("status", slash_command="status")
+    if hint_status:
+        console.print(f"   • Run '{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()

glaip_sdk/cli/commands/mcps.py

@@ -11,7 +11,6 @@ from typing import Any
 
 import click
 from rich.console import Console
-from rich.text import Text
 
 from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
@@ -33,6 +32,7 @@ from glaip_sdk.cli.mcp_validators import (
 )
 from glaip_sdk.cli.parsers.json_input import parse_json_input
 from glaip_sdk.cli.resolution import resolve_resource_reference
+from glaip_sdk.cli.rich_helpers import print_markup
 from glaip_sdk.cli.utils import (
     coerce_to_row,
     get_client,
@@ -481,21 +481,23 @@ def _handle_mcp_export(
         ):
             mcp = client.mcps.get_mcp_by_id(mcp.id)
     except Exception as e:
-        console.print(
-            Text(f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]")
+        print_markup(
+            f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]",
+            console=console,
+        )
+        print_markup(
+            "[yellow]⚠️  Proceeding with available data[/yellow]", console=console
         )
-        console.print(Text("[yellow]⚠️  Proceeding with available data[/yellow]"))
 
     # Determine if we should prompt for secrets
     prompt_for_secrets = not no_auth_prompt and sys.stdin.isatty()
 
     # Warn user if non-interactive mode forces placeholder usage
     if not no_auth_prompt and not sys.stdin.isatty():
-        console.print(
-            Text(
-                "[yellow]⚠️  Non-interactive mode detected. "
-                "Using placeholder values for secrets.[/yellow]"
-            )
+        print_markup(
+            "[yellow]⚠️  Non-interactive mode detected. "
+            "Using placeholder values for secrets.[/yellow]",
+            console=console,
         )
 
     # Build and write export payload
@@ -528,11 +530,10 @@ def _handle_mcp_export(
             )
             write_resource_export(export_path, export_payload, detected_format)
 
-    console.print(
-        Text(
-            f"[green]✅ Complete MCP configuration exported to: "
-            f"{export_path} (format: {detected_format})[/green]"
-        )
+    print_markup(
+        f"[green]✅ Complete MCP configuration exported to: "
+        f"{export_path} (format: {detected_format})[/green]",
+        console=console,
     )
 
 
@@ -582,9 +583,7 @@ def _display_mcp_details(ctx: Any, client: Any, mcp: Any) -> None:
             "status": getattr(mcp, "status", "N/A"),
             "connection_status": getattr(mcp, "connection_status", "N/A"),
         }
-        output_result(
-            ctx, result_data, title="MCP Details", panel_title=f"🔌 {mcp.name}"
-        )
+        output_result(ctx, result_data, title=f"🔌 {mcp.name}")
 
 
 @mcps_group.command()
@@ -734,11 +733,9 @@ def connect(ctx: Any, config_file: str) -> None:
 
         view = get_ctx_value(ctx, "view", "rich")
         if view != "json":
-            console.print(
-                Text(
-                    f"[yellow]Connecting to MCP with config from "
-                    f"{config_file}...[/yellow]"
-                )
+            print_markup(
+                f"[yellow]Connecting to MCP with config from {config_file}...[/yellow]",
+                console=console,
             )
 
         # Test connection using config