glaip-sdk 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

glaip_sdk/cli/commands/mcps.py

@@ -10,15 +10,15 @@ import click
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
-
-from glaip_sdk.utils import is_uuid
+from rich.text import Text
 
 from ..utils import (
+    coerce_to_row,
     get_client,
-    handle_ambiguous_resource,
     output_flags,
     output_list,
     output_result,
+    resolve_resource,
 )
 
 console = Console()
@@ -32,25 +32,14 @@ def mcps_group():
 
 def _resolve_mcp(ctx, client, ref, select=None):
     """Resolve MCP reference (ID or name) with ambiguity handling."""
-    if is_uuid(ref):
-        return client.mcps.get_mcp_by_id(ref)
-
-    # Find MCPs by name
-    matches = client.mcps.find_mcps(name=ref)
-    if not matches:
-        raise click.ClickException(f"MCP '{ref}' not found")
-
-    if len(matches) == 1:
-        return matches[0]
-
-    # Multiple matches - handle ambiguity
-    if select:
-        idx = int(select) - 1
-        if not (0 <= idx < len(matches)):
-            raise click.ClickException(f"--select must be 1..{len(matches)}")
-        return matches[idx]
-
-    return handle_ambiguous_resource(ctx, "MCP", ref, matches)
+    return resolve_resource(
+        ctx,
+        ref,
+        get_by_id=client.mcps.get_mcp_by_id,
+        find_by_name=client.mcps.find_mcps,
+        label="MCP",
+        select=select,
+    )
 
 
 @mcps_group.command(name="list")
@@ -71,24 +60,17 @@ def list_mcps(ctx):
 
         # Transform function for safe dictionary access
         def transform_mcp(mcp):
-            # Handle both dict and object formats
-            if isinstance(mcp, dict):
-                return {
-                    "id": str(mcp.get("id", "N/A")),
-                    "name": mcp.get("name", "N/A"),
-                    "config": str(mcp.get("config", "N/A"))[:50] + "..."
-                    if mcp.get("config")
-                    else "N/A",
-                }
-            else:
-                # Fallback to attribute access
-                return {
-                    "id": str(getattr(mcp, "id", "N/A")),
-                    "name": getattr(mcp, "name", "N/A"),
-                    "config": str(getattr(mcp, "config", "N/A"))[:50] + "..."
-                    if getattr(mcp, "config", None)
-                    else "N/A",
-                }
+            row = coerce_to_row(mcp, ["id", "name", "config"])
+            # Ensure id is always a string
+            row["id"] = str(row["id"])
+            # Truncate config field for display
+            if row["config"] != "N/A":
+                row["config"] = (
+                    str(row["config"])[:50] + "..."
+                    if len(str(row["config"])) > 50
+                    else str(row["config"])
+                )
+            return row
 
         output_list(ctx, mcps, "🔌 Available MCPs", columns, transform_mcp)
 
@@ -118,13 +100,14 @@ def create(ctx, name, transport, description, config):
 
         mcp = client.mcps.create_mcp(
             name=name,
-            type="server",  # Always server type
+            type="server",  # MCPs are always server type
             transport=transport,
             description=description,
             config=mcp_config,
         )
 
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps(mcp.model_dump(), indent=2))
         else:
             # Rich output
@@ -139,10 +122,11 @@ def create(ctx, name, transport, description, config):
             console.print(panel)
 
     except Exception as e:
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps({"error": str(e)}, indent=2))
         else:
-            console.print(f"[red]Error creating MCP: {e}[/red]")
+            console.print(Text(f"[red]Error creating MCP: {e}[/red]"))
         raise click.ClickException(str(e))
 
 
@@ -155,25 +139,8 @@ def get(ctx, mcp_ref):
     try:
         client = get_client(ctx)
 
-        # Get MCP by ID or name (shows all matches for names)
-        if is_uuid(mcp_ref):
-            mcp = client.mcps.get_mcp_by_id(mcp_ref)
-        else:
-            # Find MCPs by name
-            matches = client.mcps.find_mcps(name=mcp_ref)
-            if not matches:
-                raise click.ClickException(f"MCP '{mcp_ref}' not found")
-            elif len(matches) == 1:
-                mcp = matches[0]
-            else:
-                # Show all matches
-                console.print(
-                    f"[yellow]Multiple MCPs found with name '{mcp_ref}':[/yellow]"
-                )
-                for i, match in enumerate(matches, 1):
-                    console.print(f"  {i}. {match.name} (ID: {match.id})")
-                console.print("[yellow]Use the ID for unambiguous operations.[/yellow]")
-                return
+        # Resolve MCP using helper function
+        mcp = _resolve_mcp(ctx, client, mcp_ref)
 
         # Create result data with actual available fields
         result_data = {
@@ -202,53 +169,32 @@ def list_tools(ctx, mcp_ref):
     try:
         client = get_client(ctx)
 
-        # Get MCP by ID or name (shows all matches for names)
-        if is_uuid(mcp_ref):
-            mcp = client.get_mcp_by_id(mcp_ref)
-        else:
-            # Find MCPs by name
-            matches = client.find_mcps(name=mcp_ref)
-            if not matches:
-                raise click.ClickException(f"MCP '{mcp_ref}' not found")
-            elif len(matches) == 1:
-                mcp = matches[0]
-            else:
-                # Show all matches
-                console.print(
-                    f"[yellow]Multiple MCPs found with name '{mcp_ref}':[/yellow]"
-                )
-                for i, match in enumerate(matches, 1):
-                    console.print(f"  {i}. {match.name} (ID: {match.id})")
-                console.print("[yellow]Use the ID for unambiguous operations.[/yellow]")
-                return
+        # Resolve MCP using helper function
+        mcp = _resolve_mcp(ctx, client, mcp_ref)
 
         # Get tools from MCP
         tools = client.mcps.get_mcp_tools(mcp.id)
 
-        if ctx.obj.get("view") == "json":
-            click.echo(json.dumps(tools, indent=2))
-        else:  # rich output
-            if tools:
-                table = Table(
-                    title=f"🔧 Tools from MCP: {mcp.name}",
-                    show_header=True,
-                    header_style="bold magenta",
-                )
-                table.add_column("Name", style="cyan", no_wrap=True)
-                table.add_column("Description", style="green")
-                table.add_column("Type", style="yellow")
+        # Define table columns: (data_key, header, style, width)
+        columns = [
+            ("name", "Name", "cyan", None),
+            ("description", "Description", "green", 50),
+            ("type", "Type", "yellow", None),
+        ]
 
-                for tool in tools:
-                    table.add_row(
-                        tool.get("name", "N/A"),
-                        tool.get("description", "N/A")[:50] + "..."
-                        if len(tool.get("description", "")) > 50
-                        else tool.get("description", "N/A"),
-                        tool.get("type", "N/A"),
-                    )
-                console.print(table)
-            else:
-                console.print(f"[yellow]No tools found in MCP '{mcp.name}'[/yellow]")
+        # Transform function for safe dictionary access
+        def transform_tool(tool):
+            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"),
+                "type": tool.get("type", "N/A"),
+            }
+
+        output_list(
+            ctx, tools, f"🔧 Tools from MCP: {mcp.name}", columns, transform_tool
+        )
 
     except Exception as e:
         raise click.ClickException(str(e))
@@ -273,15 +219,17 @@ def tools_from_config(ctx, config_file):
         with open(config_file) as f:
             config = json.load(f)
 
-        if ctx.obj.get("view") != "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view != "json":
             console.print(
                 f"[yellow]Fetching tools from MCP config in {config_file}...[/yellow]"
             )
 
         # Get tools from MCP config
-        tools = client.mcps.get_tools_from_mcp_config(config)
+        tools = client.mcps.get_mcp_tools_from_config(config)
 
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps(tools, indent=2))
         else:  # rich output
             if tools:
@@ -304,7 +252,7 @@ def tools_from_config(ctx, config_file):
                     )
                 console.print(table)
             else:
-                console.print("[yellow]No tools found in MCP config[/yellow]")
+                console.print(Text("[yellow]No tools found in MCP config[/yellow]"))
 
     except Exception as e:
         raise click.ClickException(str(e))
@@ -328,15 +276,19 @@ def test_connection(ctx, config_file):
         with open(config_file) as f:
             config = json.load(f)
 
-        if ctx.obj.get("view") != "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view != "json":
             console.print(
-                f"[yellow]Testing MCP connection with config from {config_file}...[/yellow]"
+                Text(
+                    f"[yellow]Testing MCP connection with config from {config_file}...[/yellow]"
+                )
             )
 
         # Test connection using config
         result = client.mcps.test_mcp_connection_from_config(config)
 
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps(result, indent=2))
         else:
             success_panel = Panel(
@@ -363,25 +315,8 @@ def update(ctx, mcp_ref, name, description, config):
     try:
         client = get_client(ctx)
 
-        # Get MCP by ID or name (shows all matches for names)
-        if is_uuid(mcp_ref):
-            mcp = client.mcps.get_mcp_by_id(mcp_ref)
-        else:
-            # Find MCPs by name
-            matches = client.mcps.find_mcps(name=mcp_ref)
-            if not matches:
-                raise click.ClickException(f"MCP '{mcp_ref}' not found")
-            elif len(matches) == 1:
-                mcp = matches[0]
-            else:
-                # Show all matches
-                console.print(
-                    f"[yellow]Multiple MCPs found with name '{mcp_ref}':[/yellow]"
-                )
-                for i, match in enumerate(matches, 1):
-                    console.print(f"  {i}. {match.name} (ID: {match.id})")
-                console.print("[yellow]Use the ID for unambiguous operations.[/yellow]")
-                return
+        # Resolve MCP using helper function
+        mcp = _resolve_mcp(ctx, client, mcp_ref)
 
         # Build update data
         update_data = {}
@@ -399,20 +334,22 @@ def update(ctx, mcp_ref, name, description, config):
             raise click.ClickException("No update fields specified")
 
         # Update MCP
-        updated_mcp = client.mcps.update_mcp(mcp.id, update_data)
+        updated_mcp = client.mcps.update_mcp(mcp.id, **update_data)
 
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps(updated_mcp.model_dump(), indent=2))
         else:
             console.print(
-                f"[green]✅ MCP '{updated_mcp.name}' updated successfully[/green]"
+                Text(f"[green]✅ MCP '{updated_mcp.name}' updated successfully[/green]")
             )
 
     except Exception as e:
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps({"error": str(e)}, indent=2))
         else:
-            console.print(f"[red]Error updating MCP: {e}[/red]")
+            console.print(Text(f"[red]Error updating MCP: {e}[/red]"))
         raise click.ClickException(str(e))
 
 
@@ -426,48 +363,36 @@ def delete(ctx, mcp_ref, yes):
     try:
         client = get_client(ctx)
 
-        # Get MCP by ID or name (shows all matches for names)
-        if is_uuid(mcp_ref):
-            mcp = client.mcps.get_mcp_by_id(mcp_ref)
-        else:
-            # Find MCPs by name
-            matches = client.mcps.find_mcps(name=mcp_ref)
-            if not matches:
-                raise click.ClickException(f"MCP '{mcp_ref}' not found")
-            elif len(matches) == 1:
-                mcp = matches[0]
-            else:
-                # Show all matches
-                console.print(
-                    f"[yellow]Multiple MCPs found with name '{mcp_ref}':[/yellow]"
-                )
-                for i, match in enumerate(matches, 1):
-                    console.print(f"  {i}. {match.name} (ID: {match.id})")
-                console.print("[yellow]Use the ID for unambiguous operations.[/yellow]")
-                return
+        # Resolve MCP using helper function
+        mcp = _resolve_mcp(ctx, client, mcp_ref)
 
         # Confirm deletion
         if not yes and not click.confirm(
             f"Are you sure you want to delete MCP '{mcp.name}'?"
         ):
-            if ctx.obj.get("view") != "json":
-                console.print("Deletion cancelled.")
+            view = (ctx.obj or {}).get("view", "rich")
+            if view != "json":
+                console.print(Text("Deletion cancelled."))
             return
 
         client.mcps.delete_mcp(mcp.id)
 
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(
                 json.dumps(
                     {"success": True, "message": f"MCP '{mcp.name}' deleted"}, indent=2
                 )
             )
         else:
-            console.print(f"[green]✅ MCP '{mcp.name}' deleted successfully[/green]")
+            console.print(
+                Text(f"[green]✅ MCP '{mcp.name}' deleted successfully[/green]")
+            )
 
     except Exception as e:
-        if ctx.obj.get("view") == "json":
+        view = (ctx.obj or {}).get("view", "rich")
+        if view == "json":
             click.echo(json.dumps({"error": str(e)}, indent=2))
         else:
-            console.print(f"[red]Error deleting MCP: {e}[/red]")
+            console.print(Text(f"[red]Error deleting MCP: {e}[/red]"))
         raise click.ClickException(str(e))