glaip-sdk 0.0.10__py3-none-any.whl → 0.0.11__py3-none-any.whl

glaip_sdk/cli/utils.py

@@ -828,7 +828,7 @@ def _build_table_group(
     table = _create_table(columns, title)
     for row in rows:
         table.add_row(*[str(row.get(key, "N/A")) for key, _, _, _ in columns])
-    footer = Text(f"\n[dim]Total {len(rows)} items[/dim]")
+    footer = Text.from_markup(f"\n[dim]Total {len(rows)} items[/dim]")
     return Group(table, footer)
 
 
@@ -872,7 +872,7 @@ def _handle_markdown_output(
 
 def _handle_empty_items(title: str) -> None:
     """Handle case when no items are found."""
-    console.print(Text(f"[yellow]No {title.lower()} found.[/yellow]"))
+    console.print(Text.from_markup(f"[yellow]No {title.lower()} found.[/yellow]"))
 
 
 def _should_use_fuzzy_picker() -> bool:
@@ -916,7 +916,9 @@ def _print_selection_tip(title: str) -> None:
     """Print the contextual follow-up tip after a fuzzy selection."""
 
     tip_cmd = _resource_tip_command(title)
-    console.print(Text(f"\n[dim]Tip: use `{tip_cmd} <ID>` for details[/dim]"))
+    console.print(
+        Text.from_markup(f"\n[dim]Tip: use `{tip_cmd} <ID>` for details[/dim]")
+    )
 
 
 def _handle_fuzzy_pick_selection(
@@ -936,11 +938,21 @@ def _handle_fuzzy_pick_selection(
 
 
 def _handle_table_output(
-    rows: list[dict[str, Any]], columns: list[tuple], title: str
+    rows: list[dict[str, Any]],
+    columns: list[tuple],
+    title: str,
+    *,
+    use_pager: bool | None = None,
 ) -> None:
     """Handle table output with paging."""
     content = _build_table_group(rows, columns, title)
-    if _should_page_output(len(rows), console.is_terminal and os.isatty(1)):
+    should_page = (
+        _should_page_output(len(rows), console.is_terminal and os.isatty(1))
+        if use_pager is None
+        else use_pager
+    )
+
+    if should_page:
         ansi = _render_ansi(content)
         if not _page_with_system_pager(ansi):
             with console.pager(styles=True):
@@ -955,8 +967,11 @@ def output_list(
     title: str,
     columns: list[tuple[str, str, str, int | None]],
     transform_func: Callable | None = None,
+    *,
+    skip_picker: bool = False,
+    use_pager: bool | None = None,
 ) -> None:
-    """Display a list with fuzzy palette by default on TTY, Rich table as fallback."""
+    """Display a list with optional fuzzy palette for quick selection."""
     fmt = _get_view(ctx)
     rows = _normalise_rows(items, transform_func)
     rows = _mask_rows_if_configured(rows)
@@ -983,10 +998,10 @@ def output_list(
         except Exception:
             pass
 
-    if _handle_fuzzy_pick_selection(rows, columns, title):
+    if not skip_picker and _handle_fuzzy_pick_selection(rows, columns, title):
         return
 
-    _handle_table_output(rows, columns, title)
+    _handle_table_output(rows, columns, title, use_pager=use_pager)
 
 
 # ------------------------- Output flags decorator ------------------------ #

glaip_sdk/models.py

@@ -179,8 +179,6 @@ class MCP(BaseModel):
     name: str
     description: str | None = None
     config: dict[str, Any] | None = None
-    framework: str | None = None
-    version: str | None = None
     transport: str | None = None  # "sse" or "http"
     authentication: dict[str, Any] | None = None
     metadata: dict[str, Any] | None = None

glaip_sdk/utils/import_export.py

@@ -57,13 +57,9 @@ def convert_export_to_import_format(
     """
     import_data = data.copy()
 
-    # Convert tools from dicts to IDs
-    if "tools" in import_data and isinstance(import_data["tools"], list):
-        import_data["tools"] = extract_ids_from_export(import_data["tools"])
-
-    # Convert agents from dicts to IDs
-    if "agents" in import_data and isinstance(import_data["agents"], list):
-        import_data["agents"] = extract_ids_from_export(import_data["agents"])
+    for key in ["tools", "agents", "mcps"]:
+        if key in import_data and isinstance(import_data[key], list):
+            import_data[key] = extract_ids_from_export(import_data[key])
 
     return import_data
 

glaip_sdk/utils/serialization.py

@@ -10,10 +10,15 @@ Authors:
 import json
 from collections.abc import Callable, Iterable
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import yaml
 
+if TYPE_CHECKING:  # pragma: no cover - type-only imports
+    from rich.console import Console
+
+    from glaip_sdk.models import MCP
+
 
 def read_json(file_path: Path) -> dict[str, Any]:
     """Read data from JSON file.
@@ -132,7 +137,8 @@ def load_resource_from_file(file_path: Path) -> dict[str, Any]:
         return read_json(file_path)
     else:
         raise ValueError(
-            f"Unsupported file format: {file_path.suffix}. Only JSON and YAML files are supported."
+            f"Unsupported file format: {file_path.suffix}. "
+            f"Only JSON and YAML files are supported."
         )
 
 
@@ -305,6 +311,91 @@ def _should_include_attribute(key: str, value: Any) -> bool:
     return True
 
 
+def strip_empty_fields(data: dict[str, Any]) -> dict[str, Any]:
+    """Recursively remove None values and empty dictionaries from a dictionary.
+
+    Args:
+        data: Dictionary to clean
+
+    Returns:
+        Cleaned dictionary with None values and empty dicts removed
+    """
+    if not isinstance(data, dict):
+        return data
+
+    cleaned = {}
+    for key, value in data.items():
+        if value is None:
+            continue
+        if isinstance(value, dict):
+            nested = strip_empty_fields(value)
+            if nested:  # Only include non-empty dicts
+                cleaned[key] = nested
+        else:
+            cleaned[key] = value
+
+    return cleaned
+
+
+def build_mcp_export_payload(
+    mcp: "MCP",
+    *,
+    prompt_for_secrets: bool,
+    placeholder: str,
+    console: "Console",
+) -> dict[str, Any]:
+    """Build MCP export payload with authentication secret handling.
+
+    This function prepares an MCP resource for export by:
+    1. Starting from model_dump(exclude_none=True) for API alignment
+    2. Cleaning internal fields (_client, empty metadata)
+    3. Processing authentication with secret capture/placeholder logic
+    4. Removing empty fields recursively
+
+    Args:
+        mcp: MCP model instance to export
+        prompt_for_secrets: Whether to interactively prompt for missing secrets
+        placeholder: Placeholder text for missing secrets
+        console: Rich Console instance for user interaction
+
+    Returns:
+        Dictionary ready for export (JSON/YAML serialization)
+
+    Raises:
+        ImportError: If required modules (auth helpers) are not available
+    """
+    # Import here to avoid circular dependency
+    from glaip_sdk.cli.auth import prepare_authentication_export
+
+    # Start with model dump (excludes None values automatically)
+    payload = mcp.model_dump(exclude_none=True)
+
+    # Remove internal/CLI fields
+    payload.pop("_client", None)
+
+    # Remove empty metadata dict
+    if "metadata" in payload and not payload["metadata"]:
+        payload.pop("metadata")
+
+    # Process authentication section
+    if "authentication" in payload:
+        processed_auth = prepare_authentication_export(
+            payload["authentication"],
+            prompt_for_secrets=prompt_for_secrets,
+            placeholder=placeholder,
+            console=console,
+        )
+        if processed_auth:
+            payload["authentication"] = processed_auth
+        else:
+            payload.pop("authentication")
+
+    # Apply final cleanup to remove any remaining empty fields
+    payload = strip_empty_fields(payload)
+
+    return payload
+
+
 def validate_json_string(json_str: str) -> dict[str, Any]:
     """Validate JSON string and return parsed data.
 

{glaip_sdk-0.0.10.dist-info → glaip_sdk-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glaip-sdk
-Version: 0.0.10
+Version: 0.0.11
 Summary: Python SDK for GL AIP (GDP Labs AI Agent Package) - Simplified CLI Design
 License: MIT
 Author: Raymond Christopher
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: click (>=8.2.0,<8.3.0)
 Requires-Dist: httpx (>=0.28.1)
+Requires-Dist: packaging (>=23.2)
 Requires-Dist: pydantic (>=2.0.0)
 Requires-Dist: python-dotenv (>=1.1.1,<2.0.0)
 Requires-Dist: pyyaml (>=6.0.0)

{glaip_sdk-0.0.10.dist-info → glaip_sdk-0.0.11.dist-info}/RECORD

@@ -3,21 +3,23 @@ glaip_sdk/_version.py,sha256=tGkFWAVu2ry4Hy7j-u7ophGbPRX8y-ngBbXDhN1VBIQ,2007
 glaip_sdk/branding.py,sha256=xsHL7nRAWuwJrAvCi2fZhaPD-AWvdcLNoTVmlw4gZKc,5604
 glaip_sdk/cli/__init__.py,sha256=xCCfuF1Yc7mpCDcfhHZTX0vizvtrDSLeT8MJ3V7m5A0,156
 glaip_sdk/cli/agent_config.py,sha256=VHjebw68wAdhGUzYdPH8qz10oADZPRgUQcPW6F7iHIU,2421
+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=1xGSoH6C9hSaGglXf4pnloqX5gJQIPsgHhkliiWQQcY,39988
+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=fRCRQMAnogT76lHUn_nuqkge_x75Fj023CDRgdoj0kQ,14343
+glaip_sdk/cli/commands/mcps.py,sha256=a2p8KfPYv4YaC9qiC7LEyh8oPsbLAwXv4dsnwxZ_juI,19752
 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
 glaip_sdk/cli/io.py,sha256=GPkw3pQMLBGoD5GH-KlbKpNRlVWFZOXHE17F7V3kQsI,3343
-glaip_sdk/cli/main.py,sha256=uWuntvFl0hQSLfNa1rXb-J2zUK_msf3vrSbbrqBcEc4,12692
+glaip_sdk/cli/main.py,sha256=3Bl8u9t1MekzaNrAZqsx4TukbzzFdi6Wss6jvTDos00,12930
 glaip_sdk/cli/resolution.py,sha256=BOw2NchReLKewAwBAZLWw_3_bI7u3tfzQEO7kQbIiGE,2067
 glaip_sdk/cli/slash/__init__.py,sha256=Vdv6Y8bu-pA8dxDlyP4XrhudBPivztUozhLAz9vaLig,682
 glaip_sdk/cli/slash/agent_session.py,sha256=pDOwGXNHuyJIulrGYu1pacyF3oxHWeDQY-Uv92h2qVg,6859
 glaip_sdk/cli/slash/prompt.py,sha256=Pr5SSTOKFssRsi-AujOm5_BCW_f5MxgLwJ3CCji1ogM,7356
-glaip_sdk/cli/slash/session.py,sha256=W8Fk1t9qqr1B9clhIwsAuv3i_6yYk_vEAuM00zGHxHM,30482
-glaip_sdk/cli/utils.py,sha256=7UNg4qDIR0BDgiWJgtEDaVmRa9fhfUsBLiygcuTDxmE,42236
+glaip_sdk/cli/slash/session.py,sha256=U5UEL6eIvNkIJcSz04Uf8Ql0EptmLJukqHxDCAJ-nOQ,31097
+glaip_sdk/cli/update_notifier.py,sha256=uVbjZJnW4znTzx4AkqsDO4NfXiF-mtQiypTkJByAVuM,3236
+glaip_sdk/cli/utils.py,sha256=98n1tovTUSqS5BIUl4cz6zGoRSSJiXFGJW8oD0xIm2g,42537
 glaip_sdk/cli/validators.py,sha256=USbBgY86AwuDHO-Q_g8g7hu-ot4NgITBsWjTWIl62ms,5569
 glaip_sdk/client/__init__.py,sha256=nYLXfBVTTWwKjP0e63iumPYO4k5FifwWaELQPaPIKIg,188
 glaip_sdk/client/agents.py,sha256=FSKubF40wptMNIheC3_iawiX2CRbhTcNLFiz4qkPC6k,34659
@@ -28,14 +30,14 @@ glaip_sdk/client/tools.py,sha256=n8DIiOOf1YU_j9JK3Bx2-rDnkpckPi0MI9Ok2s1kwa4,166
 glaip_sdk/client/validators.py,sha256=NtPsWjQLjj25LiUnmR-WuS8lL5p4MVRaYT9UVRmj9bo,8809
 glaip_sdk/config/constants.py,sha256=ysEobMiXlLZGIOEaqTdHpPF8kmg5nbLn7BIcBvTCuHM,819
 glaip_sdk/exceptions.py,sha256=DJgaIcvGA09qIX10-ypYgQQ5_k5N3qknmiIFP3p4Z7E,1872
-glaip_sdk/models.py,sha256=Ry_Ihd6FuC0JGb0Obd5T3A22AOp2r9xStQisfE8uo8c,8822
+glaip_sdk/models.py,sha256=0Y65LXpLqUY3IYVPIzP7jm8gdZUMw-EKRKGC1ZOLOcA,8758
 glaip_sdk/rich_components.py,sha256=pmJd-81OQE8bC9UOXtga5rsax4zphKlzCZ1JoWbbQzQ,803
 glaip_sdk/utils/__init__.py,sha256=fmVGcUFa7G0CCfSMSqfNU2BqFl36G1gOFyDfTvtJfVw,926
 glaip_sdk/utils/agent_config.py,sha256=b7_J5DELyk0b_XEoi7tsxbS3wqzAKbMa-3_C-65pPIY,6791
 glaip_sdk/utils/client_utils.py,sha256=M6rZloMKyONaZfI0RtU5tnkibwrIJL5Udw4wPMKkJcw,13588
 glaip_sdk/utils/display.py,sha256=94s9lYF_8ra8jpeqOkbVrUm8oidtCE6OtucyxLQPKmU,3105
 glaip_sdk/utils/general.py,sha256=V5hJrIpYDvDsldU_nChHpuvV2AwhFLUI7Qvcaihq_8A,2270
-glaip_sdk/utils/import_export.py,sha256=Wxt2QuWI7JexSkkcBOdTgeYs1nly35yppaTNeF28XJo,5400
+glaip_sdk/utils/import_export.py,sha256=az_0jCpMB7I6N5HygS2uc62-W6ddm4buEwm6gTsalhY,5203
 glaip_sdk/utils/rendering/__init__.py,sha256=vXjwk5rPhhfPyD8S0DnV4GFFEtPJp4HCCg1Um9SXfs0,70
 glaip_sdk/utils/rendering/formatting.py,sha256=_k8tkcobctmHvdygMljZF7-ALGXpD9-hHF1CNtM2KMU,7201
 glaip_sdk/utils/rendering/models.py,sha256=SS34_00FaoGuSYn-viBkAtIbq7cJNwwPjpxnvyeUmxI,1567
@@ -51,9 +53,9 @@ glaip_sdk/utils/rendering/steps.py,sha256=4zdeyKxMbUzCal4-yv8yf18144cs5wwXaxhe6m
 glaip_sdk/utils/resource_refs.py,sha256=0YzblJNfRhz9xhpaKE9aE68XEV-6_ssr0fIkiMVOka0,5489
 glaip_sdk/utils/rich_utils.py,sha256=-Ij-1bIJvnVAi6DrfftchIlMcvOTjVmSE0Qqax0EY_s,763
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
-glaip_sdk/utils/serialization.py,sha256=cUE6PxqTsfJuEEmsk_Li3QmaDavTIPotEA-BQ-v5exY,9043
+glaip_sdk/utils/serialization.py,sha256=T1yt_8G2DCFpcxx7XnqFl5slksRXfBCUuLQJTreGYEQ,11806
 glaip_sdk/utils/validation.py,sha256=QNORcdyvuliEs4EH2_mkDgmoyT9utgl7YNhaf45SEf8,6992
-glaip_sdk-0.0.10.dist-info/METADATA,sha256=ryaYhShJ7h43sX_oXbkLdKqpy5-eRgAP0lDczHVkCog,4950
-glaip_sdk-0.0.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.0.10.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.0.10.dist-info/RECORD,,
+glaip_sdk-0.0.11.dist-info/METADATA,sha256=Z8hxLQAn8fWQtisQyZAi6QgOCSxDpEWw4gLbTBMDrxU,4984
+glaip_sdk-0.0.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.0.11.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.0.11.dist-info/RECORD,,