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

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/rendering/renderer/base.py

@@ -310,56 +310,115 @@ class RichStreamRenderer:
 
     def _ensure_live(self) -> None:
         """Ensure live display is updated."""
-        # Lazily create Live if needed
-        # Rich's Live expects the console to maintain a _live_stack list. When tests
-        # or callers provide a lightweight console double (e.g. unittest.mock.Mock),
-        # the attribute might be missing or replaced with another type which breaks
-        # the background refresh thread. Normal Rich consoles always expose
-        # _live_stack as a list, so we defensively initialise it if needed.
-        live_stack = getattr(self.console, "_live_stack", None)
-        if not isinstance(live_stack, list):
-            try:
-                self.console._live_stack = []  # type: ignore[attr-defined]
-            except Exception:
-                # If the console forbids attribute assignment we simply skip the
-                # live update for this cycle and fall back to buffered printing.
-                logger.debug(
-                    "Console missing _live_stack; skipping live UI initialisation",
-                    exc_info=True,
-                )
-                return
-
-        if self.live is None and self.cfg.live:
-            try:
-                self.live = Live(
-                    console=self.console,
-                    refresh_per_second=1 / self.cfg.refresh_debounce,
-                    transient=not self.cfg.persist_live,
-                )
-                self.live.start()
-            except Exception:
-                self.live = None
+        if not self._ensure_live_stack():
+            return
+
+        self._start_live_if_needed()
 
         if self.live:
-            panels = [self._render_main_panel()]
-            steps_renderable = self._render_steps_text()
-            panels.append(
-                AIPPanel(
-                    steps_renderable,
-                    title="Steps",
-                    border_style="blue",
-                )
+            self._refresh_live_panels()
+
+    def _ensure_live_stack(self) -> bool:
+        """Guarantee the console exposes the internal live stack Rich expects."""
+        live_stack = getattr(self.console, "_live_stack", None)
+        if isinstance(live_stack, list):
+            return True
+
+        try:
+            self.console._live_stack = []  # type: ignore[attr-defined]
+            return True
+        except Exception:
+            # If the console forbids attribute assignment we simply skip the live
+            # update for this cycle and fall back to buffered printing.
+            logger.debug(
+                "Console missing _live_stack; skipping live UI initialisation",
+                exc_info=True,
+            )
+            return False
+
+    def _start_live_if_needed(self) -> None:
+        """Create and start a Live instance when configuration allows."""
+        if self.live is not None or not self.cfg.live:
+            return
+
+        try:
+            self.live = Live(
+                console=self.console,
+                refresh_per_second=1 / self.cfg.refresh_debounce,
+                transient=not self.cfg.persist_live,
             )
-            panels.extend(self._render_tool_panels())
-            self.live.update(Group(*panels))
+            self.live.start()
+        except Exception:
+            self.live = None
+
+    def _refresh_live_panels(self) -> None:
+        """Render panels and push them to the active Live display."""
+        if not self.live:
+            return
+
+        main_panel = self._render_main_panel()
+        steps_renderable = self._render_steps_text()
+        steps_panel = AIPPanel(
+            steps_renderable,
+            title="Steps",
+            border_style="blue",
+        )
+        tool_panels = self._render_tool_panels()
+        panels = self._build_live_panels(main_panel, steps_panel, tool_panels)
+
+        self.live.update(Group(*panels))
+
+    def _build_live_panels(
+        self,
+        main_panel: Any,
+        steps_panel: Any,
+        tool_panels: list[Any],
+    ) -> list[Any]:
+        """Assemble the panel order for the live display."""
+        if self.verbose:
+            return [main_panel, steps_panel, *tool_panels]
+
+        panels: list[Any] = [steps_panel]
+        if tool_panels:
+            panels.extend(tool_panels)
+        panels.append(main_panel)
+        return panels
 
     def _render_main_panel(self) -> Any:
         """Render the main content panel."""
         body = "".join(self.state.buffer).strip()
+        if not self.verbose:
+            final_content = (self.state.final_text or "").strip()
+            if final_content:
+                return create_final_panel(
+                    final_content,
+                    title="Final Result",
+                    theme=self.cfg.theme,
+                )
         # Dynamic title with spinner + elapsed/hints
         title = self._format_enhanced_main_title()
         return create_main_panel(body, title, self.cfg.theme)
 
+    def apply_verbosity(self, verbose: bool) -> None:
+        """Update verbose behaviour at runtime."""
+
+        if self.verbose == verbose:
+            return
+
+        self.verbose = verbose
+        self.cfg.style = "debug" if verbose else "pretty"
+
+        desired_live = not verbose
+        if desired_live != self.cfg.live:
+            self.cfg.live = desired_live
+            if not desired_live:
+                self._shutdown_live()
+            else:
+                self._ensure_live()
+
+        if self.cfg.live:
+            self._ensure_live()
+
     def _maybe_insert_thinking_gap(
         self, task_id: str | None, context_id: str | None
     ) -> None:
@@ -668,15 +727,16 @@ class RichStreamRenderer:
 
     def _clamp_snapshot_body(self, body_text: str) -> str:
         """Clamp snapshot body to configured limits."""
-        max_lines = int(self.cfg.snapshot_max_lines or 0) or 60
+        max_lines = int(self.cfg.snapshot_max_lines or 0)
         lines = body_text.splitlines()
-        if len(lines) > max_lines:
+        if max_lines > 0 and len(lines) > max_lines:
             lines = lines[:max_lines] + ["… (truncated)"]
-        body_text = "\n".join(lines)
+            body_text = "\n".join(lines)
 
-        max_chars = int(self.cfg.snapshot_max_chars or 0) or 4000
-        if len(body_text) > max_chars:
-            body_text = body_text[: max_chars - 12] + "\n… (truncated)"
+        max_chars = int(self.cfg.snapshot_max_chars or 0)
+        if max_chars > 0 and len(body_text) > max_chars:
+            suffix = "\n… (truncated)"
+            body_text = body_text[: max_chars - len(suffix)] + suffix
 
         return body_text
 

glaip_sdk/utils/rendering/renderer/config.py

@@ -29,5 +29,5 @@ class RendererConfig:
 
     # Scrollback/append options
     append_finished_snapshots: bool = False
-    snapshot_max_chars: int = 4000
-    snapshot_max_lines: int = 60
+    snapshot_max_chars: int = 12000
+    snapshot_max_lines: int = 200

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.9.dist-info → glaip_sdk-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glaip-sdk
-Version: 0.0.9
+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.9.dist-info → glaip_sdk-0.0.11.dist-info}/RECORD

@@ -1,23 +1,25 @@
 glaip_sdk/__init__.py,sha256=FD-oTyFUKsTB9xTuGiqvkhuFXfeZ-TspjkeXERglha8,370
 glaip_sdk/_version.py,sha256=tGkFWAVu2ry4Hy7j-u7ophGbPRX8y-ngBbXDhN1VBIQ,2007
-glaip_sdk/branding.py,sha256=_TiQtiwH3ZSWaQhooWPHioriL0goTiYANeN6DT8lQX8,5398
+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=JFIFBxB4xzigqHtpLGbl2fgg7RHNwy3e-kUMPMK9MdM,5006
-glaip_sdk/cli/slash/prompt.py,sha256=QFWYgNt5AhBRYGGyUkH30ToZE7B6LS-eZGzoyibYrK8,6064
-glaip_sdk/cli/slash/session.py,sha256=GtnnBqV79KtFJHeLfCKKnCXJ6SU1AmeXquPjy72T20E,24215
-glaip_sdk/cli/utils.py,sha256=S7aa4-v808BEZGvEhKn8N8HQr2slSpvV-TtWw3j15S8,41779
+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=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
@@ -26,22 +28,22 @@ glaip_sdk/client/main.py,sha256=LlvYHP7-Hy7Eq1ep1kfk337K-Oue5SdKWJpqYfX9eXY,7993
 glaip_sdk/client/mcps.py,sha256=yxwrAtztElYDEGhp2EHRpeYUxNsOlTLTqtw9jSKJmcI,8936
 glaip_sdk/client/tools.py,sha256=n8DIiOOf1YU_j9JK3Bx2-rDnkpckPi0MI9Ok2s1kwa4,16634
 glaip_sdk/client/validators.py,sha256=NtPsWjQLjj25LiUnmR-WuS8lL5p4MVRaYT9UVRmj9bo,8809
-glaip_sdk/config/constants.py,sha256=NgmPqJmpK1wgEds7T-_B6CDUBsvcsmIy27ms-Z8GFgY,902
-glaip_sdk/exceptions.py,sha256=QTVtwxRHMN4e8gGn0icXphZvdugiRvcSrlMYylwGsDc,1993
-glaip_sdk/models.py,sha256=Ry_Ihd6FuC0JGb0Obd5T3A22AOp2r9xStQisfE8uo8c,8822
+glaip_sdk/config/constants.py,sha256=ysEobMiXlLZGIOEaqTdHpPF8kmg5nbLn7BIcBvTCuHM,819
+glaip_sdk/exceptions.py,sha256=DJgaIcvGA09qIX10-ypYgQQ5_k5N3qknmiIFP3p4Z7E,1872
+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
 glaip_sdk/utils/rendering/renderer/__init__.py,sha256=EXwVBmGkSYcype4ocAXo69Z1kXu0gpNXmhH5LW0_B7A,2939
-glaip_sdk/utils/rendering/renderer/base.py,sha256=HfIeq-izi3WprbKX_qxNeQRrpernFtoCvgQqrIyVYSU,40950
-glaip_sdk/utils/rendering/renderer/config.py,sha256=E4ER8TJJbqr1hcWjkwG7XROqLuccQy4EL99CbuLvSXE,783
+glaip_sdk/utils/rendering/renderer/base.py,sha256=A_f8r3hWDVrQjzUR5CYzQMekPRIdG-l7Wjh9Hx492Xk,42425
+glaip_sdk/utils/rendering/renderer/config.py,sha256=-P35z9JO_1ypJXAqxJ1ybHraH4i-I1LPopeW3Lh7ACE,785
 glaip_sdk/utils/rendering/renderer/console.py,sha256=4cLOw4Q1fkHkApuj6dWW8eYpeYdcT0t2SO5MbVt5UTc,1844
 glaip_sdk/utils/rendering/renderer/debug.py,sha256=FEYxAu4ZB0CjrJKevqQ2TKDgElA2cf6GqZXCNm12sNQ,3721
 glaip_sdk/utils/rendering/renderer/panels.py,sha256=05u6SjU53iP9VD0YHTNruzD7sO6qYCp-P5dTTSdSZmU,3364
@@ -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.9.dist-info/METADATA,sha256=f2-GNqMR8cLgyQnA4f7TCPZv1ETZE4S8LSpQaPD6GrE,4949
-glaip_sdk-0.0.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.0.9.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.0.9.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,,