glaip-sdk 0.0.12__py3-none-any.whl → 0.0.13__py3-none-any.whl

glaip_sdk/cli/commands/mcps.py

@@ -24,6 +24,7 @@ from glaip_sdk.cli.display import (
 )
 from glaip_sdk.cli.io import (
     fetch_raw_resource_details,
+    load_resource_from_file_with_validation,
 )
 from glaip_sdk.cli.mcp_validators import (
     validate_mcp_auth_structure,
@@ -41,8 +42,12 @@ from glaip_sdk.cli.utils import (
     output_result,
     spinner_context,
 )
+from glaip_sdk.config.constants import (
+    DEFAULT_MCP_TYPE,
+)
 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,
     write_resource_export,
@@ -90,6 +95,180 @@ def _resolve_mcp(
     )
 
 
+def _strip_server_only_fields(import_data: dict[str, Any]) -> dict[str, Any]:
+    """Remove fields that should not be forwarded during import-driven creation.
+
+    Args:
+        import_data: Raw import payload loaded from disk.
+
+    Returns:
+        A shallow copy of the data with server-managed fields removed.
+    """
+    cleaned = dict(import_data)
+    for key in (
+        "id",
+        "type",
+        "status",
+        "connection_status",
+        "created_at",
+        "updated_at",
+    ):
+        cleaned.pop(key, None)
+    return cleaned
+
+
+def _load_import_ready_payload(import_file: str) -> dict[str, Any]:
+    """Load and normalise an imported MCP definition for create operations.
+
+    Args:
+        import_file: Path to an MCP export file (JSON or YAML).
+
+    Returns:
+        Normalised import payload ready for CLI/REST usage.
+
+    Raises:
+        click.ClickException: If the file cannot be parsed or validated.
+    """
+    raw_data = load_resource_from_file_with_validation(Path(import_file), "MCP")
+    import_data = convert_export_to_import_format(raw_data)
+    import_data = _strip_server_only_fields(import_data)
+
+    transport = import_data.get("transport")
+
+    if "config" in import_data:
+        import_data["config"] = validate_mcp_config_structure(
+            import_data["config"],
+            transport=transport,
+            source="import file",
+        )
+
+    if "authentication" in import_data:
+        import_data["authentication"] = validate_mcp_auth_structure(
+            import_data["authentication"],
+            source="import file",
+        )
+
+    return import_data
+
+
+def _coerce_cli_string(value: str | None) -> str | None:
+    """Normalise CLI string values so blanks are treated as missing.
+
+    Args:
+        value: User-provided string option.
+
+    Returns:
+        The stripped string, or ``None`` when the value is blank/whitespace-only.
+    """
+    if value is None:
+        return None
+    trimmed = value.strip()
+    # Treat whitespace-only strings as None
+    return trimmed if trimmed else None
+
+
+def _merge_config_field(
+    merged_base: dict[str, Any],
+    cli_config: str | None,
+    final_transport: str | None,
+) -> None:
+    """Merge config field with validation.
+
+    Args:
+        merged_base: Base payload to update in-place.
+        cli_config: Raw CLI JSON string for config.
+        final_transport: Transport type for validation.
+
+    Raises:
+        click.ClickException: If config JSON parsing or validation fails.
+    """
+    if cli_config is not None:
+        parsed_config = parse_json_input(cli_config)
+        merged_base["config"] = validate_mcp_config_structure(
+            parsed_config,
+            transport=final_transport,
+            source="--config",
+        )
+    elif "config" not in merged_base or merged_base["config"] is None:
+        merged_base["config"] = {}
+
+
+def _merge_auth_field(
+    merged_base: dict[str, Any],
+    cli_auth: str | None,
+) -> None:
+    """Merge authentication field with validation.
+
+    Args:
+        merged_base: Base payload to update in-place.
+        cli_auth: Raw CLI JSON string for authentication.
+
+    Raises:
+        click.ClickException: If auth JSON parsing or validation fails.
+    """
+    if cli_auth is not None:
+        parsed_auth = parse_json_input(cli_auth)
+        merged_base["authentication"] = validate_mcp_auth_structure(
+            parsed_auth,
+            source="--auth",
+        )
+    elif "authentication" not in merged_base:
+        merged_base["authentication"] = None
+
+
+def _merge_import_payload(
+    import_data: dict[str, Any] | None,
+    *,
+    cli_name: str | None,
+    cli_transport: str | None,
+    cli_description: str | None,
+    cli_config: str | None,
+    cli_auth: str | None,
+) -> tuple[dict[str, Any], list[str]]:
+    """Merge import data with CLI overrides while tracking missing fields.
+
+    Args:
+        import_data: Normalised payload loaded from file (if provided).
+        cli_name: Name supplied via CLI option.
+        cli_transport: Transport supplied via CLI option.
+        cli_description: Description supplied via CLI option.
+        cli_config: Raw CLI JSON string for config.
+        cli_auth: Raw CLI JSON string for authentication.
+
+    Returns:
+        A tuple of (merged_payload, missing_required_fields).
+
+    Raises:
+        click.ClickException: If config/auth JSON parsing or validation fails.
+    """
+    merged_base = import_data.copy() if import_data else {}
+
+    # Merge simple string fields using truthy CLI overrides
+    for field, cli_value in (
+        ("name", _coerce_cli_string(cli_name)),
+        ("transport", _coerce_cli_string(cli_transport)),
+        ("description", _coerce_cli_string(cli_description)),
+    ):
+        if cli_value is not None:
+            merged_base[field] = cli_value
+
+    # Determine final transport before validating config
+    final_transport = merged_base.get("transport")
+
+    # Merge config and authentication with validation
+    _merge_config_field(merged_base, cli_config, final_transport)
+    _merge_auth_field(merged_base, cli_auth)
+
+    # Validate required fields
+    missing_fields = []
+    for required in ("name", "transport"):
+        value = merged_base.get(required)
+        if not isinstance(value, str) or not value.strip():
+            missing_fields.append(required)
+
+    return merged_base, missing_fields
+
+
 @mcps_group.command(name="list")
 @output_flags()
 @click.pass_context
@@ -139,8 +318,8 @@ def list_mcps(ctx: Any) -> None:
 
 
 @mcps_group.command()
-@click.option("--name", required=True, help="MCP name")
-@click.option("--transport", required=True, help="MCP transport protocol")
+@click.option("--name", help="MCP name")
+@click.option("--transport", help="MCP transport protocol")
 @click.option("--description", help="MCP description")
 @click.option(
     "--config",
@@ -152,72 +331,100 @@ def list_mcps(ctx: Any) -> None:
     "auth",
     help="JSON authentication object or @file reference (e.g., @auth.json)",
 )
+@click.option(
+    "--import",
+    "import_file",
+    type=click.Path(exists=True, dir_okay=False),
+    help="Import MCP configuration from JSON or YAML export",
+)
 @output_flags()
 @click.pass_context
 def create(
     ctx: Any,
-    name: str,
-    transport: str,
+    name: str | None,
+    transport: str | None,
     description: str | None,
     config: str | None,
     auth: str | None,
+    import_file: str | None,
 ) -> None:
     """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.
+
     Args:
         ctx: Click context containing output format preferences
-        name: MCP name (required)
-        transport: MCP transport protocol (required)
+        name: MCP name (required unless provided via --import)
+        transport: MCP transport protocol (required unless provided via --import)
         description: Optional MCP description
         config: JSON configuration string or @file reference
         auth: JSON authentication object or @file reference
+        import_file: Optional path to import configuration from export file.
+            CLI options override imported values.
 
     Raises:
         ClickException: If JSON parsing fails or API request fails
+
+    Examples:
+        Create from CLI options:
+            aip mcps create --name my-mcp --transport http --config '{"url": "https://api.example.com"}'
+
+        Import from file:
+            aip mcps create --import mcp-export.json
+
+        Import with overrides:
+            aip mcps create --import mcp-export.json --name new-name --transport sse
     """
     try:
         client = get_client(ctx)
 
-        # Parse config if provided (supports inline JSON or @file)
-        raw_config = parse_json_input(config)
-        if raw_config is None:
-            mcp_config: dict[str, Any] = {}
-        else:
-            mcp_config = validate_mcp_config_structure(
-                raw_config,
-                transport=transport,
-                source="--config",
-            )
-
-        # Parse authentication if provided (supports inline JSON or @file)
-        mcp_auth = parse_json_input(auth)
-        validated_auth = (
-            validate_mcp_auth_structure(mcp_auth, source="--auth")
-            if mcp_auth is not None
-            else None
+        import_payload = (
+            _load_import_ready_payload(import_file) if import_file is not None else None
         )
 
-        # Build kwargs for create_mcp
-        create_kwargs = {
-            "name": name,
-            "type": "server",  # MCPs are always server type
-            "transport": transport,
-            "config": mcp_config,
-        }
+        merged_payload, missing_fields = _merge_import_payload(
+            import_payload,
+            cli_name=name,
+            cli_transport=transport,
+            cli_description=description,
+            cli_config=config,
+            cli_auth=auth,
+        )
 
-        # Only add description if provided
-        if description is not None:
-            create_kwargs["description"] = description
+        if missing_fields:
+            raise click.ClickException(
+                "Missing required fields after combining import and CLI values: "
+                + ", ".join(missing_fields)
+            )
 
-        # Only add authentication if provided
-        if validated_auth:
-            create_kwargs["authentication"] = validated_auth
+        effective_name = merged_payload["name"]
+        effective_transport = merged_payload["transport"]
+        effective_description = merged_payload.get("description")
+        effective_config = merged_payload.get("config") or {}
+        effective_auth = merged_payload.get("authentication")
 
         with spinner_context(
             ctx,
             "[bold blue]Creating MCP…[/bold blue]",
             console_override=console,
         ):
+            create_kwargs: dict[str, Any] = {
+                "name": effective_name,
+                "config": effective_config,
+                "transport": effective_transport,
+            }
+
+            if effective_description is not None:
+                create_kwargs["description"] = effective_description
+
+            if effective_auth:
+                create_kwargs["authentication"] = effective_auth
+
+            mcp_metadata = merged_payload.get("mcp_metadata")
+            if mcp_metadata is not None:
+                create_kwargs["mcp_metadata"] = mcp_metadata
+
             mcp = client.mcps.create_mcp(**create_kwargs)
 
         # Handle JSON output
@@ -228,9 +435,9 @@ def create(
             "MCP",
             mcp.name,
             mcp.id,
-            Type="server",
-            Transport=getattr(mcp, "transport", transport),
-            Description=description or "No description",
+            Type=getattr(mcp, "type", DEFAULT_MCP_TYPE),
+            Transport=getattr(mcp, "transport", effective_transport),
+            Description=effective_description or "No description",
         )
         handle_rich_output(ctx, rich_panel)
 
@@ -478,7 +685,6 @@ def list_tools(ctx: Any, mcp_ref: str) -> None:
         columns = [
             ("name", "Name", "cyan", None),
             ("description", "Description", "green", 50),
-            ("type", "Type", "yellow", None),
         ]
 
         # Transform function for safe dictionary access
@@ -488,7 +694,6 @@ def list_tools(ctx: Any, mcp_ref: str) -> None:
                 "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(

{glaip_sdk-0.0.12.dist-info → glaip_sdk-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glaip-sdk
-Version: 0.0.12
+Version: 0.0.13
 Summary: Python SDK for GL AIP (GDP Labs AI Agent Package) - Simplified CLI Design
 License: MIT
 Author: Raymond Christopher

{glaip_sdk-0.0.12.dist-info → glaip_sdk-0.0.13.dist-info}/RECORD

@@ -7,7 +7,7 @@ glaip_sdk/cli/auth.py,sha256=eYdtGmJ3XgiO96hq_69GF6b3W-aRWZrDQ-6bHuaRX4M,13517
 glaip_sdk/cli/commands/__init__.py,sha256=x0CZlZbZHoHvuzfoTWIyEch6WmNnbPzxajrox6riYp0,173
 glaip_sdk/cli/commands/agents.py,sha256=97dzowjHgk5knyHuI-0z2ojvqNlkebNN1-ikGEoS5sc,40623
 glaip_sdk/cli/commands/configure.py,sha256=eRDzsaKV4fl2lJt8ieS4g2-xRnaa02eAAPW8xBf-tqA,7507
-glaip_sdk/cli/commands/mcps.py,sha256=_zBT-8LMg8DTkiMO0d63tUqjy36-bdqrjxZX7bM-vpg,21514
+glaip_sdk/cli/commands/mcps.py,sha256=ENhasfSupmCSKs-Ycg-M9Gy-58Y55SMIQzeg3fBJj48,28186
 glaip_sdk/cli/commands/models.py,sha256=Ra3-50BPScNs0Q-j4b7U4iK0hNooucEyVgHpQ11-pt8,1700
 glaip_sdk/cli/commands/tools.py,sha256=MOM9Db3HGL1stF-WvL5cZXjw-iZo2qc-oyKQHy6VwIM,18690
 glaip_sdk/cli/display.py,sha256=jE20swoRKzpYUmc0jgbeonaXKeE9x95hfjWAEdnBYRc,8727
@@ -58,7 +58,7 @@ glaip_sdk/utils/rich_utils.py,sha256=-Ij-1bIJvnVAi6DrfftchIlMcvOTjVmSE0Qqax0EY_s
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
 glaip_sdk/utils/serialization.py,sha256=T1yt_8G2DCFpcxx7XnqFl5slksRXfBCUuLQJTreGYEQ,11806
 glaip_sdk/utils/validation.py,sha256=QNORcdyvuliEs4EH2_mkDgmoyT9utgl7YNhaf45SEf8,6992
-glaip_sdk-0.0.12.dist-info/METADATA,sha256=9nmM8Y3WqIoYIkJytD_HKN2CHtHEG-R1Kdi1_SdsLnY,4984
-glaip_sdk-0.0.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.0.12.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.0.12.dist-info/RECORD,,
+glaip_sdk-0.0.13.dist-info/METADATA,sha256=Kv1zs8YO3gQigogChDeITrmnA7UggqkM_qBFnkAAi-k,4984
+glaip_sdk-0.0.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.0.13.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.0.13.dist-info/RECORD,,