glaip-sdk 0.1.3__py3-none-any.whl → 0.6.19__py3-none-any.whl

glaip_sdk/cli/commands/mcps.py

@@ -43,17 +43,19 @@ 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,
+    fetch_resource_for_export,
+    format_datetime_fields,
     get_client,
     output_list,
     output_result,
     spinner_context,
+    with_client_and_spinner,
 )
 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
 from glaip_sdk.utils.serialization import (
     build_mcp_export_payload,
@@ -61,6 +63,7 @@ from glaip_sdk.utils.serialization import (
 )
 
 console = Console()
+MAX_DESCRIPTION_LEN = 50
 
 
 def _is_sensitive_data(val: Any) -> bool:
@@ -300,27 +303,36 @@ def mcps_group() -> None:
 
 
 def _resolve_mcp(ctx: Any, client: Any, ref: str, select: int | None = None) -> Any | None:
-    """Resolve MCP reference (ID or name) with ambiguity handling.
+    """Resolve an MCP server by ID or name, with interactive selection support.
+
+    This function provides MCP-specific resolution logic. It delegates to
+    resolve_resource_reference for MCP-specific resolution, supporting UUID
+    lookups and name-based fuzzy matching.
 
     Args:
-        ctx: Click context object
-        client: API client instance
-        ref: MCP reference (ID or name)
-        select: Index to select when multiple matches found
+        ctx: Click context for command execution.
+        client: API client for backend operations.
+        ref: MCP identifier (UUID or name string).
+        select: Optional selection index when multiple MCPs match (1-based).
 
     Returns:
-        MCP object if found, None otherwise
+        MCP instance if resolution succeeds, None if not found.
 
     Raises:
-        ClickException: If MCP not found or selection invalid
+        click.ClickException: When resolution fails or selection is invalid.
     """
+    # Configure MCP-specific resolution functions
+    mcp_client = client.mcps
+    get_by_id_func = mcp_client.get_mcp_by_id
+    find_by_name_func = mcp_client.find_mcps
+    # Use MCP-specific resolution with standard fuzzy matching
     return resolve_resource_reference(
         ctx,
         client,
         ref,
         "mcp",
-        client.mcps.get_mcp_by_id,
-        client.mcps.find_mcps,
+        get_by_id_func,
+        find_by_name_func,
         "MCP",
         select=select,
     )
@@ -513,12 +525,11 @@ def list_mcps(ctx: Any) -> None:
         ClickException: If API request fails
     """
     try:
-        client = get_client(ctx)
-        with spinner_context(
+        with with_client_and_spinner(
             ctx,
             "[bold blue]Fetching MCPs…[/bold blue]",
             console_override=console,
-        ):
+        ) as client:
             mcps = client.mcps.list_mcps()
 
         # Define table columns: (data_key, header, style, width)
@@ -530,6 +541,14 @@ def list_mcps(ctx: Any) -> None:
 
         # Transform function for safe dictionary access
         def transform_mcp(mcp: Any) -> dict[str, Any]:
+            """Transform an MCP object to a display row dictionary.
+
+            Args:
+                mcp: MCP object to transform.
+
+            Returns:
+                Dictionary with id, name, and config fields.
+            """
             row = coerce_to_row(mcp, ["id", "name", "config"])
             # Ensure id is always a string
             row["id"] = str(row["id"])
@@ -575,7 +594,7 @@ def create(
     auth: str | None,
     import_file: str | None,
 ) -> None:
-    """Create a new MCP with specified configuration.
+    r"""Create a new MCP with specified configuration.
 
     You can create an MCP by providing all parameters via CLI options, or by
     importing from a file and optionally overriding specific fields.
@@ -593,6 +612,7 @@ def create(
     Raises:
         ClickException: If JSON parsing fails or API request fails
 
+    \b
     Examples:
         Create from CLI options:
             aip mcps create --name my-mcp --transport http --config '{"url": "https://api.example.com"}'
@@ -604,8 +624,10 @@ def create(
             aip mcps create --import mcp-export.json --name new-name --transport sse
     """
     try:
-        client = get_client(ctx)
+        # Get API client instance for MCP operations
+        api_client = get_client(ctx)
 
+        # Process import file if specified, otherwise use None
         import_payload = _load_import_ready_payload(import_file) if import_file is not None else None
 
         merged_payload, missing_fields = _merge_import_payload(
@@ -649,7 +671,7 @@ def create(
             if mcp_metadata is not None:
                 create_kwargs["mcp_metadata"] = mcp_metadata
 
-            mcp = client.mcps.create_mcp(**create_kwargs)
+            mcp = api_client.mcps.create_mcp(**create_kwargs)
 
         # Handle JSON output
         handle_json_output(ctx, mcp.model_dump())
@@ -696,19 +718,14 @@ def _handle_mcp_export(
     detected_format = detect_export_format(export_path)
 
     # Always export comprehensive data - re-fetch with full details
-    try:
-        with spinner_context(
-            ctx,
-            "[bold blue]Fetching complete MCP details…[/bold blue]",
-            console_override=console,
-        ):
-            mcp = client.mcps.get_mcp_by_id(mcp.id)
-    except Exception as e:
-        print_markup(
-            f"[{WARNING_STYLE}]⚠️  Could not fetch full MCP details: {e}[/]",
-            console=console,
-        )
-        print_markup(f"[{WARNING_STYLE}]⚠️  Proceeding with available data[/]", console=console)
+
+    mcp = fetch_resource_for_export(
+        ctx,
+        mcp,
+        resource_type="MCP",
+        get_by_id_func=client.mcps.get_mcp_by_id,
+        console_override=console,
+    )
 
     # Determine if we should prompt for secrets
     prompt_for_secrets = not no_auth_prompt and sys.stdin.isatty()
@@ -779,11 +796,7 @@ def _display_mcp_details(ctx: Any, client: Any, mcp: Any) -> None:
 
     if raw_mcp_data:
         # Use raw API data - this preserves ALL fields
-        formatted_data = raw_mcp_data.copy()
-        if "created_at" in formatted_data:
-            formatted_data["created_at"] = format_datetime(formatted_data["created_at"])
-        if "updated_at" in formatted_data:
-            formatted_data["updated_at"] = format_datetime(formatted_data["updated_at"])
+        formatted_data = format_datetime_fields(raw_mcp_data)
 
         output_result(
             ctx,
@@ -832,7 +845,7 @@ def get(
     no_auth_prompt: bool,
     auth_placeholder: str,
 ) -> None:
-    """Get MCP details and optionally export configuration to file.
+    r"""Get MCP details and optionally export configuration to file.
 
     Args:
         ctx: Click context containing output format preferences
@@ -844,6 +857,7 @@ def get(
     Raises:
         ClickException: If MCP not found or export fails
 
+    \b
     Examples:
         aip mcps get my-mcp
         aip mcps get my-mcp --export mcp.json    # Export as JSON
@@ -866,56 +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)
+    Examples:
+        Get tools from saved MCP:
+            aip mcps tools <MCP_ID>
 
-        # 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)
+        Get tools from config file (without saving to DB):
+            aip mcps tools --from-config mcp-config.json
 
-        # Define table columns: (data_key, header, style, width)
-        columns = [
-            ("name", "Name", ACCENT_STYLE, None),
-            ("description", "Description", INFO, 50),
-        ]
+        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)
 
-        # Transform function for safe dictionary access
-        def transform_tool(tool: dict[str, Any]) -> dict[str, Any]:
-            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
@@ -1050,7 +1218,7 @@ def update(
     import_file: str | None,
     y: bool,
 ) -> None:
-    """Update an existing MCP with new configuration values.
+    r"""Update an existing MCP with new configuration values.
 
     You can update an MCP by providing individual fields via CLI options, or by
     importing from a file and optionally overriding specific fields.
@@ -1075,6 +1243,7 @@ def update(
         CLI options override imported values when both are specified.
         Uses PATCH for import-based updates, PUT/PATCH for CLI-only updates.
 
+    \b
     Examples:
         Update with CLI options:
             aip mcps update my-mcp --name new-name --transport sse

glaip_sdk/cli/commands/models.py

@@ -12,9 +12,8 @@ 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,
     output_list,
-    spinner_context,
+    with_client_and_spinner,
 )
 
 console = Console()
@@ -32,12 +31,11 @@ def models_group() -> None:
 def list_models(ctx: Any) -> None:
     """List available language models."""
     try:
-        client = get_client(ctx)
-        with spinner_context(
+        with with_client_and_spinner(
             ctx,
             "[bold blue]Fetching language models…[/bold blue]",
             console_override=console,
-        ):
+        ) as client:
             models = client.list_language_models()
 
         # Define table columns: (data_key, header, style, width)
@@ -50,6 +48,14 @@ def list_models(ctx: Any) -> None:
 
         # Transform function for safe dictionary access
         def transform_model(model: dict[str, Any]) -> dict[str, Any]:
+            """Transform a model dictionary to a display row dictionary.
+
+            Args:
+                model: Model dictionary to transform.
+
+            Returns:
+                Dictionary with id, provider, name, and base_url fields.
+            """
             return {
                 "id": str(model.get("id", "N/A")),
                 "provider": model.get("provider", "N/A"),