glaip-sdk 0.0.18__py3-none-any.whl → 0.0.19__py3-none-any.whl

glaip_sdk/cli/commands/mcps.py

@@ -2,6 +2,7 @@
 
 Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
+    Putu Ravindra Wiguna (putu.r.wiguna@gdplabs.id)
 """
 
 import json
@@ -54,6 +55,201 @@ from glaip_sdk.utils.serialization import (
 console = Console()
 
 
+def _is_sensitive_data(val: Any) -> bool:
+    """Check if value contains sensitive authentication data.
+
+    Args:
+        val: Value to check for sensitive information
+
+    Returns:
+        True if the value appears to contain sensitive data
+    """
+    if not isinstance(val, dict):
+        return False
+
+    sensitive_patterns = {"token", "password", "secret", "key", "credential"}
+    return any(
+        pattern in str(k).lower() for k in val.keys() for pattern in sensitive_patterns
+    )
+
+
+def _format_preview_value(val: Any) -> str:
+    """Format a value for display in update preview with sensitive data redaction.
+
+    Args:
+        val: Value to format
+
+    Returns:
+        Formatted string representation of the value
+    """
+    if val is None:
+        return "[dim]None[/dim]"
+    if isinstance(val, dict):
+        # Redact sensitive fields in authentication
+        if _is_sensitive_data(val):
+            redacted = val.copy()
+            sensitive_patterns = {"token", "password", "secret", "key", "credential"}
+            for k in list(redacted.keys()):
+                if any(pattern in k.lower() for pattern in sensitive_patterns):
+                    redacted[k] = "<REDACTED>"
+            return json.dumps(redacted, indent=2)
+        return json.dumps(val, indent=2)
+    if isinstance(val, str):
+        return f'"{val}"' if val else '""'
+    return str(val)
+
+
+def _build_empty_override_warnings(empty_fields: list[str]) -> list[str]:
+    """Build warning lines for empty CLI overrides.
+
+    Args:
+        empty_fields: List of field names with empty string overrides
+
+    Returns:
+        List of formatted warning lines
+    """
+    if not empty_fields:
+        return []
+
+    warnings = [
+        "\n[yellow]⚠️  Warning: Empty values provided via CLI will override import values[/yellow]"
+    ]
+    warnings.extend(
+        f"- [yellow]{field}: will be set to empty string[/yellow]"
+        for field in empty_fields
+    )
+    return warnings
+
+
+def _validate_import_payload_fields(import_payload: dict[str, Any]) -> bool:
+    """Validate that import payload contains updatable fields.
+
+    Args:
+        import_payload: Import payload to validate
+
+    Returns:
+        True if payload has updatable fields, False otherwise
+    """
+    updatable_fields = {"name", "transport", "description", "config", "authentication"}
+    has_updatable = any(field in import_payload for field in updatable_fields)
+
+    if not has_updatable:
+        available_fields = set(import_payload.keys())
+        print_markup(
+            "[yellow]⚠️  No updatable fields found in import file.[/yellow]\n"
+            f"[dim]Found fields: {', '.join(sorted(available_fields))}[/dim]\n"
+            f"[dim]Updatable fields: {', '.join(sorted(updatable_fields))}[/dim]"
+        )
+    return has_updatable
+
+
+def _build_update_data_from_sources(
+    import_payload: dict[str, Any] | None,
+    mcp: Any,
+    name: str | None,
+    transport: str | None,
+    description: str | None,
+    config: str | None,
+    auth: str | None,
+) -> dict[str, Any]:
+    """Build update data from import payload and CLI flags.
+
+    Args:
+        import_payload: Optional import payload
+        mcp: Current MCP object
+        name: CLI name flag
+        transport: CLI transport flag
+        description: CLI description flag
+        config: CLI config flag
+        auth: CLI auth flag
+
+    Returns:
+        Dictionary with update data
+    """
+    update_data = {}
+
+    # Start with import data if available
+    if import_payload:
+        updatable_fields = [
+            "name",
+            "transport",
+            "description",
+            "config",
+            "authentication",
+        ]
+        for field in updatable_fields:
+            if field in import_payload:
+                update_data[field] = import_payload[field]
+
+    # CLI flags override import values
+    if name is not None:
+        update_data["name"] = name
+    if transport is not None:
+        update_data["transport"] = transport
+    if description is not None:
+        update_data["description"] = description
+    if config is not None:
+        parsed_config = parse_json_input(config)
+        config_transport = (
+            (transport or import_payload.get("transport"))
+            if import_payload
+            else (transport or getattr(mcp, "transport", None))
+        )
+        update_data["config"] = validate_mcp_config_structure(
+            parsed_config,
+            transport=config_transport,
+            source="--config",
+        )
+    if auth is not None:
+        parsed_auth = parse_json_input(auth)
+        update_data["authentication"] = validate_mcp_auth_structure(
+            parsed_auth, source="--auth"
+        )
+
+    return update_data
+
+
+def _collect_cli_overrides(
+    name: str | None,
+    transport: str | None,
+    description: str | None,
+    config: str | None,
+    auth: str | None,
+) -> dict[str, Any]:
+    """Collect CLI flags that were explicitly provided.
+
+    Args:
+        name: CLI name flag
+        transport: CLI transport flag
+        description: CLI description flag
+        config: CLI config flag
+        auth: CLI auth flag
+
+    Returns:
+        Dictionary of provided CLI overrides
+    """
+    cli_overrides = {}
+    if name is not None:
+        cli_overrides["name"] = name
+    if transport is not None:
+        cli_overrides["transport"] = transport
+    if description is not None:
+        cli_overrides["description"] = description
+    if config is not None:
+        cli_overrides["config"] = config
+    if auth is not None:
+        cli_overrides["auth"] = auth
+    return cli_overrides
+
+
+def _handle_cli_error(ctx: Any, error: Exception, operation: str) -> None:
+    """Render CLI error once and exit with non-zero status."""
+    handle_json_output(ctx, error=error)
+    if get_ctx_value(ctx, "view") != "json":
+        display_api_error(error, operation)
+    ctx.exit(1)
+
+
 @click.group(name="mcps", no_args_is_help=True)
 def mcps_group() -> None:
     """MCP management operations.
@@ -440,10 +636,7 @@ def create(
         handle_rich_output(ctx, rich_panel)
 
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        if get_ctx_value(ctx, "view") != "json":
-            display_api_error(e, "MCP creation")
-        raise click.ClickException(str(e))
+        _handle_cli_error(ctx, e, "MCP creation")
 
 
 def _handle_mcp_export(
@@ -762,9 +955,50 @@ def connect(ctx: Any, config_file: str) -> None:
         raise click.ClickException(str(e))
 
 
+def _generate_update_preview(
+    mcp: Any, update_data: dict[str, Any], cli_overrides: dict[str, Any]
+) -> str:
+    """Generate formatted preview of changes for user confirmation.
+
+    Args:
+        mcp: Current MCP object
+        update_data: Data that will be sent in update request
+        cli_overrides: CLI flags that were explicitly provided
+
+    Returns:
+        Formatted preview string showing old→new values
+    """
+    lines = [
+        f"\n[bold]The following fields will be updated for MCP '{mcp.name}':[/bold]\n"
+    ]
+
+    empty_overrides = []
+
+    # Show each field that will be updated
+    for field, new_value in update_data.items():
+        old_value = getattr(mcp, field, None)
+
+        # Track empty CLI overrides
+        if field in cli_overrides and cli_overrides[field] == "":
+            empty_overrides.append(field)
+
+        old_display = _format_preview_value(old_value)
+        new_display = _format_preview_value(new_value)
+
+        lines.append(f"- [cyan]{field}[/cyan]: {old_display} → {new_display}")
+
+    # Add warnings for empty CLI overrides
+    lines.extend(_build_empty_override_warnings(empty_overrides))
+
+    return "\n".join(lines)
+
+
 @mcps_group.command()
 @click.argument("mcp_ref")
 @click.option("--name", help="New MCP name")
+@click.option(
+    "--transport", type=click.Choice(["http", "sse"]), help="New transport protocol"
+)
 @click.option("--description", help="New description")
 @click.option(
     "--config",
@@ -776,62 +1010,105 @@ def connect(ctx: Any, config_file: str) -> 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, readable=True),
+    help="Import MCP configuration from JSON or YAML export",
+)
+@click.option("-y", is_flag=True, help="Skip confirmation prompt when using --import")
 @output_flags()
 @click.pass_context
 def update(
     ctx: Any,
     mcp_ref: str,
     name: str | None,
+    transport: str | None,
     description: str | None,
     config: str | None,
     auth: str | None,
+    import_file: str | None,
+    y: bool,
 ) -> None:
     """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.
+
     Args:
         ctx: Click context containing output format preferences
         mcp_ref: MCP reference (ID or name)
         name: New MCP name (optional)
+        transport: New transport protocol (optional)
         description: New description (optional)
         config: New JSON configuration string or @file reference (optional)
         auth: New JSON authentication object or @file reference (optional)
+        import_file: Optional path to import configuration from export file.
+            CLI options override imported values.
+        y: Skip confirmation prompt when using --import
 
     Raises:
         ClickException: If MCP not found, JSON invalid, or no fields specified
 
     Note:
-        At least one field must be specified for update.
-        Uses PUT for complete updates or PATCH for partial updates.
+        Must specify either --import OR at least one CLI field.
+        CLI options override imported values when both are specified.
+        Uses PATCH for import-based updates, PUT/PATCH for CLI-only updates.
+
+    Examples:
+        Update with CLI options:
+            aip mcps update my-mcp --name new-name --transport sse
+
+        Import from file:
+            aip mcps update my-mcp --import mcp-export.json
+
+        Import with overrides:
+            aip mcps update my-mcp --import mcp-export.json --name new-name -y
     """
     try:
         client = get_client(ctx)
 
+        # Validate that at least one update method is provided
+        cli_flags_provided = any(
+            v is not None for v in [name, transport, description, config, auth]
+        )
+        if not import_file and not cli_flags_provided:
+            raise click.ClickException(
+                "No update fields specified. Use --import file or at least one of: "
+                "--name, --transport, --description, --config, --auth"
+            )
+
         # Resolve MCP using helper function
         mcp = _resolve_mcp(ctx, client, mcp_ref)
 
-        # Build update data
-        update_data = {}
-        if name is not None:
-            update_data["name"] = name
-        if description is not None:
-            update_data["description"] = description
-        if config is not None:
-            parsed_config = parse_json_input(config)
-            update_data["config"] = validate_mcp_config_structure(
-                parsed_config,
-                transport=getattr(mcp, "transport", None),
-                source="--config",
-            )
-        if auth is not None:
-            parsed_auth = parse_json_input(auth)
-            update_data["authentication"] = validate_mcp_auth_structure(
-                parsed_auth, source="--auth"
-            )
+        # Load and validate import data if provided
+        import_payload = None
+        if import_file:
+            import_payload = _load_import_ready_payload(import_file)
+            if not _validate_import_payload_fields(import_payload):
+                return
+
+        # Build update data from import and CLI flags
+        update_data = _build_update_data_from_sources(
+            import_payload, mcp, name, transport, description, config, auth
+        )
 
         if not update_data:
             raise click.ClickException("No update fields specified")
 
-        # Update MCP (automatically chooses PUT or PATCH based on provided fields)
+        # Show confirmation preview for import-based updates (unless -y flag)
+        if import_payload and not y:
+            cli_overrides = _collect_cli_overrides(
+                name, transport, description, config, auth
+            )
+            preview = _generate_update_preview(mcp, update_data, cli_overrides)
+            print_markup(preview)
+
+            if not click.confirm("\nContinue with update?", default=False):
+                print_markup("[yellow]Update cancelled.[/yellow]")
+                return
+
+        # Update MCP
         with spinner_context(
             ctx,
             "[bold blue]Updating MCP…[/bold blue]",
@@ -843,10 +1120,7 @@ def update(
         handle_rich_output(ctx, display_update_success("MCP", updated_mcp.name))
 
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        if get_ctx_value(ctx, "view") != "json":
-            display_api_error(e, "MCP update")
-        raise click.ClickException(str(e))
+        _handle_cli_error(ctx, e, "MCP update")
 
 
 @mcps_group.command()
@@ -896,7 +1170,4 @@ def delete(ctx: Any, mcp_ref: str, yes: bool) -> None:
         handle_rich_output(ctx, display_deletion_success("MCP", mcp.name))
 
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        if get_ctx_value(ctx, "view") != "json":
-            display_api_error(e, "MCP deletion")
-        raise click.ClickException(str(e))
+        _handle_cli_error(ctx, e, "MCP deletion")

glaip_sdk/cli/parsers/json_input.py

@@ -12,6 +12,25 @@ from pathlib import Path
 from typing import Any
 
 import click
+import yaml
+
+
+def _looks_like_file_path(value: str) -> bool:
+    """Check if string looks like a file reference.
+
+    Args:
+        value: String to check for file-like patterns
+
+    Returns:
+        True if the string appears to be a file path
+    """
+    return (
+        value.lower().endswith((".json", ".yaml", ".yml"))
+        or "/" in value
+        or "\\" in value  # Path separators
+        or value.startswith(("./", "../"))  # Relative paths
+        or value.count(".") > 1  # Likely a filename with extension
+    )
 
 
 def _format_file_error(
@@ -40,16 +59,16 @@ def _format_file_error(
 
 
 def _parse_json_from_file(file_path_str: str) -> Any:
-    """Parse JSON from a file path.
+    """Parse JSON or YAML from a file path.
 
     Args:
-        file_path_str: Path to the JSON file (without @ prefix).
+        file_path_str: Path to the JSON or YAML file (without @ prefix).
 
     Returns:
         Parsed dictionary from file.
 
     Raises:
-        click.ClickException: If file not found, not readable, empty, or invalid JSON.
+        click.ClickException: If file not found, not readable, empty, or invalid format.
     """
     # Resolve relative paths against CWD
     file_path = Path(file_path_str)
@@ -86,18 +105,35 @@ def _parse_json_from_file(file_path_str: str) -> Any:
             _format_file_error("File is empty", file_path_str, file_path)
         )
 
-    # Parse JSON from file content
-    try:
-        return json.loads(content)
-    except json.JSONDecodeError as e:
-        raise click.ClickException(
-            _format_file_error(
-                "Invalid JSON in file",
-                file_path_str,
-                file_path,
-                detail=f"Error: {e.msg} at line {e.lineno}, column {e.colno}",
+    # Determine file format and parse accordingly
+    file_ext = file_path.suffix.lower()
+
+    if file_ext in [".yaml", ".yml"]:
+        # Parse YAML from file content
+        try:
+            return yaml.safe_load(content)
+        except yaml.YAMLError as e:
+            raise click.ClickException(
+                _format_file_error(
+                    "Invalid YAML in file",
+                    file_path_str,
+                    file_path,
+                    detail=f"Error: {e}",
+                )
+            )
+    else:
+        # Default to JSON parsing
+        try:
+            return json.loads(content)
+        except json.JSONDecodeError as e:
+            raise click.ClickException(
+                _format_file_error(
+                    "Invalid JSON in file",
+                    file_path_str,
+                    file_path,
+                    detail=f"Error: {e.msg} at line {e.lineno}, column {e.colno}",
+                )
             )
-        )
 
 
 def parse_json_input(value: str | None) -> Any:
@@ -119,6 +155,9 @@ def parse_json_input(value: str | None) -> Any:
         >>> parse_json_input('@/path/to/config.json')
         # Returns content of config.json parsed as JSON
 
+        >>> parse_json_input('/path/to/config.json')
+        # Fallback: treats as file path if JSON parsing fails
+
         >>> parse_json_input(None)
         None
     """
@@ -134,6 +173,15 @@ def parse_json_input(value: str | None) -> Any:
     try:
         return json.loads(value)
     except json.JSONDecodeError as e:
+        # Check if the value looks like a file path and provide helpful hint
+        if _looks_like_file_path(trimmed):
+            raise click.ClickException(
+                f"Invalid JSON in inline value\n"
+                f"Error: {e.msg} at line {e.lineno}, column {e.colno}\n"
+                f"\n💡 Did you mean to load this from a file? "
+                f"File-based config values should start with @ (e.g., @{trimmed})"
+            )
+
         raise click.ClickException(
             f"Invalid JSON in inline value\n"
             f"Error: {e.msg} at line {e.lineno}, column {e.colno}"

{glaip_sdk-0.0.18.dist-info → glaip_sdk-0.0.19.dist-info}/METADATA

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

{glaip_sdk-0.0.18.dist-info → glaip_sdk-0.0.19.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=FtWGhbl4QRlqxXFNMEnZUpw5mjQ0KPjY0_6o0hYyoaU,41251
 glaip_sdk/cli/commands/configure.py,sha256=h2GgBpnBWYHAhp3zqkAiy8QNgwPD_7pToZBZRpuMoNM,7869
-glaip_sdk/cli/commands/mcps.py,sha256=V41Te3IG8jNFRMb1v1XQV1t461uxpPsrmDFIO6cZPOk,28185
+glaip_sdk/cli/commands/mcps.py,sha256=wqUbkQ6qUUhr6B0n2jJxPUkbxHwfsEnYvdLKew_qorM,36800
 glaip_sdk/cli/commands/models.py,sha256=G1ce-wZOfvMP6SMnIVuSQ89CF444Kz8Ja6nrNOQXCqU,1729
 glaip_sdk/cli/commands/tools.py,sha256=YfkB7HRBGcAOC6N-wXTV5Ch5XTXqjKTtyq-Cfb0-18c,18908
 glaip_sdk/cli/config.py,sha256=jCLJxTBAnOU6EJI6JjcpwUTEAWCJRoALbMrhOvvAofc,946
@@ -19,7 +19,7 @@ glaip_sdk/cli/masking.py,sha256=BOZjwUqxQf3LQlYgUMwq7UYgve8x4_1Qk04ixiJJPZ8,4399
 glaip_sdk/cli/mcp_validators.py,sha256=SeDbgXkRuBXyDtCmUMpL-1Vh7fmGldz-shAaHhOqbCc,10125
 glaip_sdk/cli/pager.py,sha256=n9ypOGPPSaseJlwPG1X38qSz1yV3pjRWunzA4xx5E7M,8052
 glaip_sdk/cli/parsers/__init__.py,sha256=Ycd4HDfYmA7GUGFt0ndBPBo5uTbv15XsXnYUj-a89ug,183
-glaip_sdk/cli/parsers/json_input.py,sha256=6NqzVM5l8g0pwCNLKeTVL9SeLM9W_Fl4H__X0dfaQEA,4039
+glaip_sdk/cli/parsers/json_input.py,sha256=ZBhJNUR4bKDX3A5s9lRvuCicaztvQyP0lWuiNYMIO08,5721
 glaip_sdk/cli/resolution.py,sha256=jXUNpKKhs30n7Ke0uz1Hbny5DTo2_sxvchIhTbeBubE,2393
 glaip_sdk/cli/rich_helpers.py,sha256=ByUOmK16IisoXWE7nEiI55BF1KWDrm6KCYAxqHu0XOU,825
 glaip_sdk/cli/slash/__init__.py,sha256=Vdv6Y8bu-pA8dxDlyP4XrhudBPivztUozhLAz9vaLig,682
@@ -67,7 +67,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=AFbucakFaCtQDfcgsm2gHZ1iZDA8OaJSZUsS6FhWFR0,12820
 glaip_sdk/utils/validation.py,sha256=QNORcdyvuliEs4EH2_mkDgmoyT9utgl7YNhaf45SEf8,6992
-glaip_sdk-0.0.18.dist-info/METADATA,sha256=IaSz5FAxBzrHDKtbgjyg6h4vyClUS7C3M4ovlax0rv4,5164
-glaip_sdk-0.0.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.0.18.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.0.18.dist-info/RECORD,,
+glaip_sdk-0.0.19.dist-info/METADATA,sha256=CxTXRqseeY6CsuhudOT_ddbxuK5WLfkkM6oSaaMSxdY,5164
+glaip_sdk-0.0.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.0.19.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.0.19.dist-info/RECORD,,