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

glaip_sdk/cli/commands/configure.py

@@ -11,12 +11,12 @@ from pathlib import Path
 import click
 import yaml
 from rich.console import Console
-from rich.table import Table
 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.rich_components import AIPTable
 
 console = Console()
 
@@ -68,7 +68,7 @@ def list_config():
         )
         return
 
-    table = Table(title="🔧 AIP Configuration")
+    table = AIPTable(title="🔧 AIP Configuration")
     table.add_column("Setting", style="cyan", width=20)
     table.add_column("Value", style="green")
 

glaip_sdk/cli/commands/mcps.py

@@ -5,21 +5,37 @@ Authors:
 """
 
 import json
+from pathlib import Path
 
 import click
 from rich.console import Console
-from rich.panel import Panel
-from rich.table import Table
 from rich.text import Text
 
-from ..utils import (
+from glaip_sdk.cli.display import (
+    display_api_error,
+    display_confirmation_prompt,
+    display_creation_success,
+    display_deletion_success,
+    display_update_success,
+    handle_json_output,
+    handle_rich_output,
+)
+from glaip_sdk.cli.io import (
+    export_resource_to_file_with_validation as export_resource_to_file,
+)
+from glaip_sdk.cli.io import (
+    fetch_raw_resource_details,
+)
+from glaip_sdk.cli.resolution import resolve_resource_reference
+from glaip_sdk.cli.utils import (
     coerce_to_row,
     get_client,
     output_flags,
     output_list,
     output_result,
-    resolve_resource,
 )
+from glaip_sdk.rich_components import AIPPanel
+from glaip_sdk.utils import format_datetime
 
 console = Console()
 
@@ -32,12 +48,14 @@ def mcps_group():
 
 def _resolve_mcp(ctx, client, ref, select=None):
     """Resolve MCP reference (ID or name) with ambiguity handling."""
-    return resolve_resource(
+    return resolve_resource_reference(
         ctx,
+        client,
         ref,
-        get_by_id=client.mcps.get_mcp_by_id,
-        find_by_name=client.mcps.find_mcps,
-        label="MCP",
+        "mcp",
+        client.mcps.get_mcp_by_id,
+        client.mcps.find_mcps,
+        "MCP",
         select=select,
     )
 
@@ -106,55 +124,117 @@ def create(ctx, name, transport, description, config):
             config=mcp_config,
         )
 
-        view = (ctx.obj or {}).get("view", "rich")
-        if view == "json":
-            click.echo(json.dumps(mcp.model_dump(), indent=2))
-        else:
-            # Rich output
-            panel = Panel(
-                f"[green]✅ MCP '{mcp.name}' created successfully![/green]\n\n"
-                f"ID: {mcp.id}\n"
-                f"Type: server (default)\n"
-                f"Description: {description or 'No description'}",
-                title="🔌 MCP Created",
-                border_style="green",
-            )
-            console.print(panel)
+        # Handle JSON output
+        handle_json_output(ctx, mcp.model_dump())
+
+        # Handle Rich output
+        rich_panel = display_creation_success(
+            "MCP",
+            mcp.name,
+            mcp.id,
+            Type="server",
+            Transport=getattr(mcp, "transport", transport),
+            Description=description or "No description",
+        )
+        handle_rich_output(ctx, rich_panel)
 
     except Exception as e:
-        view = (ctx.obj or {}).get("view", "rich")
-        if view == "json":
-            click.echo(json.dumps({"error": str(e)}, indent=2))
-        else:
-            console.print(Text(f"[red]Error creating MCP: {e}[/red]"))
+        handle_json_output(ctx, error=e)
+        if ctx.obj.get("view") != "json":
+            display_api_error(e, "MCP creation")
         raise click.ClickException(str(e))
 
 
 @mcps_group.command()
 @click.argument("mcp_ref")
+@click.option(
+    "--export",
+    type=click.Path(dir_okay=False, writable=True),
+    help="Export complete MCP configuration to file (format auto-detected from .json/.yaml extension)",
+)
 @output_flags()
 @click.pass_context
-def get(ctx, mcp_ref):
-    """Get MCP details."""
+def get(ctx, mcp_ref, export):
+    """Get MCP details.
+
+    Examples:
+        aip mcps get my-mcp
+        aip mcps get my-mcp --export mcp.json    # Exports complete configuration as JSON
+        aip mcps get my-mcp --export mcp.yaml    # Exports complete configuration as YAML
+    """
     try:
         client = get_client(ctx)
 
         # Resolve MCP using helper function
         mcp = _resolve_mcp(ctx, client, mcp_ref)
 
-        # Create result data with actual available fields
-        result_data = {
-            "id": str(getattr(mcp, "id", "N/A")),
-            "name": getattr(mcp, "name", "N/A"),
-            "type": getattr(mcp, "type", "N/A"),
-            "config": getattr(mcp, "config", "N/A"),
-            "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}"
-        )
+        # Handle export option
+        if export:
+            export_path = Path(export)
+            # Auto-detect format from file extension
+            if export_path.suffix.lower() in [".yaml", ".yml"]:
+                detected_format = "yaml"
+            else:
+                detected_format = "json"
+
+            # Always export comprehensive data - re-fetch MCP with full details if needed
+            try:
+                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]")
+                )
+                console.print(
+                    Text("[yellow]⚠️  Proceeding with available data[/yellow]")
+                )
+
+            export_resource_to_file(mcp, export_path, detected_format)
+            console.print(
+                Text(
+                    f"[green]✅ Complete MCP configuration exported to: {export_path} (format: {detected_format})[/green]"
+                )
+            )
+
+        # Try to fetch raw API data first to preserve ALL fields
+        raw_mcp_data = fetch_raw_resource_details(client, mcp, "mcps")
+
+        if raw_mcp_data:
+            # Use raw API data - this preserves ALL fields
+            # Format dates for better display (minimal postprocessing)
+            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"]
+                )
+
+            # Display using output_result with raw data
+            output_result(
+                ctx,
+                formatted_data,
+                title="MCP Details",
+                panel_title=f"🔌 {raw_mcp_data.get('name', 'Unknown')}",
+            )
+        else:
+            # Fall back to original method if raw fetch fails
+            console.print("[yellow]Falling back to Pydantic model data[/yellow]")
+
+            # Create result data with actual available fields
+            result_data = {
+                "id": str(getattr(mcp, "id", "N/A")),
+                "name": getattr(mcp, "name", "N/A"),
+                "type": getattr(mcp, "type", "N/A"),
+                "config": getattr(mcp, "config", "N/A"),
+                "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}"
+            )
 
     except Exception as e:
         raise click.ClickException(str(e))
@@ -200,65 +280,7 @@ def list_tools(ctx, mcp_ref):
         raise click.ClickException(str(e))
 
 
-@mcps_group.command("tools-from-config")
-@click.option(
-    "--from-file",
-    "config_file",
-    type=click.Path(exists=True),
-    required=True,
-    help="MCP config JSON file",
-)
-@output_flags()
-@click.pass_context
-def tools_from_config(ctx, config_file):
-    """Fetch tools from MCP config."""
-    try:
-        client = get_client(ctx)
-
-        # Load MCP config from file
-        with open(config_file) as f:
-            config = json.load(f)
-
-        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_mcp_tools_from_config(config)
-
-        view = (ctx.obj or {}).get("view", "rich")
-        if view == "json":
-            click.echo(json.dumps(tools, indent=2))
-        else:  # rich output
-            if tools:
-                table = Table(
-                    title="🔧 Tools from MCP Config",
-                    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")
-
-                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(Text("[yellow]No tools found in MCP config[/yellow]"))
-
-    except Exception as e:
-        raise click.ClickException(str(e))
-
-
-@mcps_group.command("test-connection")
+@mcps_group.command("connect")
 @click.option(
     "--from-file",
     "config_file",
@@ -267,8 +289,8 @@ def tools_from_config(ctx, config_file):
 )
 @output_flags()
 @click.pass_context
-def test_connection(ctx, config_file):
-    """Test MCP connection using config file."""
+def connect(ctx, config_file):
+    """Connect to MCP using config file."""
     try:
         client = get_client(ctx)
 
@@ -280,7 +302,7 @@ def test_connection(ctx, config_file):
         if view != "json":
             console.print(
                 Text(
-                    f"[yellow]Testing MCP connection with config from {config_file}...[/yellow]"
+                    f"[yellow]Connecting to MCP with config from {config_file}...[/yellow]"
                 )
             )
 
@@ -289,12 +311,12 @@ def test_connection(ctx, config_file):
 
         view = (ctx.obj or {}).get("view", "rich")
         if view == "json":
-            click.echo(json.dumps(result, indent=2))
+            handle_json_output(ctx, result)
         else:
-            success_panel = Panel(
-                f"[green]✓[/green] MCP connection test successful!\n\n"
+            success_panel = AIPPanel(
+                f"[green]✓[/green] MCP connection successful!\n\n"
                 f"[bold]Result:[/bold] {result}",
-                title="🔌 Connection Test",
+                title="🔌 Connection",
                 border_style="green",
             )
             console.print(success_panel)
@@ -333,23 +355,16 @@ def update(ctx, mcp_ref, name, description, config):
         if not update_data:
             raise click.ClickException("No update fields specified")
 
-        # Update MCP
+        # Update MCP (automatically chooses PUT or PATCH based on provided fields)
         updated_mcp = client.mcps.update_mcp(mcp.id, **update_data)
 
-        view = (ctx.obj or {}).get("view", "rich")
-        if view == "json":
-            click.echo(json.dumps(updated_mcp.model_dump(), indent=2))
-        else:
-            console.print(
-                Text(f"[green]✅ MCP '{updated_mcp.name}' updated successfully[/green]")
-            )
+        handle_json_output(ctx, updated_mcp.model_dump())
+        handle_rich_output(ctx, display_update_success("MCP", updated_mcp.name))
 
     except Exception as e:
-        view = (ctx.obj or {}).get("view", "rich")
-        if view == "json":
-            click.echo(json.dumps({"error": str(e)}, indent=2))
-        else:
-            console.print(Text(f"[red]Error updating MCP: {e}[/red]"))
+        handle_json_output(ctx, error=e)
+        if (ctx.obj or {}).get("view") != "json":
+            display_api_error(e, "MCP update")
         raise click.ClickException(str(e))
 
 
@@ -367,32 +382,22 @@ def delete(ctx, mcp_ref, yes):
         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}'?"
-        ):
-            view = (ctx.obj or {}).get("view", "rich")
-            if view != "json":
-                console.print(Text("Deletion cancelled."))
+        if not yes and not display_confirmation_prompt("MCP", mcp.name):
             return
 
         client.mcps.delete_mcp(mcp.id)
 
-        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(
-                Text(f"[green]✅ MCP '{mcp.name}' deleted successfully[/green]")
-            )
+        handle_json_output(
+            ctx,
+            {
+                "success": True,
+                "message": f"MCP '{mcp.name}' deleted",
+            },
+        )
+        handle_rich_output(ctx, display_deletion_success("MCP", mcp.name))
 
     except Exception as e:
-        view = (ctx.obj or {}).get("view", "rich")
-        if view == "json":
-            click.echo(json.dumps({"error": str(e)}, indent=2))
-        else:
-            console.print(Text(f"[red]Error deleting MCP: {e}[/red]"))
+        handle_json_output(ctx, error=e)
+        if (ctx.obj or {}).get("view") != "json":
+            display_api_error(e, "MCP deletion")
         raise click.ClickException(str(e))

glaip_sdk/cli/commands/models.py

@@ -7,7 +7,7 @@ Authors:
 import click
 from rich.console import Console
 
-from ..utils import get_client, output_flags, output_list
+from glaip_sdk.cli.utils import get_client, output_flags, output_list
 
 console = Console()