glaip-sdk 0.7.14__py3-none-any.whl → 0.7.15__py3-none-any.whl

glaip_sdk/agents/base.py

@@ -202,7 +202,11 @@ class Agent:
 
         self._agent_config = kwargs.pop("agent_config", Agent._UNSET)  # type: ignore[assignment]
         self._tool_configs = kwargs.pop("tool_configs", Agent._UNSET)  # type: ignore[assignment]
-        self._mcp_configs = kwargs.pop("mcp_configs", Agent._UNSET)  # type: ignore[assignment]
+        mcp_configs = kwargs.pop("mcp_configs", Agent._UNSET)
+        if mcp_configs is not Agent._UNSET and isinstance(mcp_configs, dict):
+            self._mcp_configs = self._normalize_mcp_configs(mcp_configs)
+        else:
+            self._mcp_configs = mcp_configs  # type: ignore[assignment]
         self._a2a_profile = kwargs.pop("a2a_profile", Agent._UNSET)  # type: ignore[assignment]
 
         # Warn about unexpected kwargs
@@ -783,6 +787,47 @@ class Agent:
 
         return resolved
 
+    def _normalize_mcp_configs(self, mcp_configs: dict[Any, Any]) -> dict[Any, Any]:
+        """Normalize mcp_configs by wrapping misplaced transport keys in 'config'.
+
+        This ensures that flat transport settings (e.g. {'url': '...'}) provided
+        by the user are correctly moved into the 'config' block required by the
+        Platform, ensuring parity between local and remote execution.
+
+        Args:
+            mcp_configs: The raw mcp_configs dictionary.
+
+        Returns:
+            Normalized mcp_configs dictionary.
+        """
+        from glaip_sdk.runner.langgraph import _MCP_TRANSPORT_KEYS  # noqa: PLC0415
+
+        normalized = {}
+        for mcp_key, override in mcp_configs.items():
+            if not isinstance(override, dict):
+                normalized[mcp_key] = override
+                continue
+
+            misplaced = {k: v for k, v in override.items() if k in _MCP_TRANSPORT_KEYS}
+
+            if misplaced:
+                new_override = override.copy()
+                config_block = new_override.get("config", {})
+                if not isinstance(config_block, dict):
+                    config_block = {}
+
+                config_block.update(misplaced)
+                new_override["config"] = config_block
+
+                for k in misplaced:
+                    new_override.pop(k, None)
+
+                normalized[mcp_key] = new_override
+            else:
+                normalized[mcp_key] = override
+
+        return normalized
+
     def _resolve_agents(self, registry: AgentRegistry) -> list[str]:
         """Resolve sub-agent references using AgentRegistry.
 

glaip_sdk/runner/langgraph.py

@@ -70,6 +70,10 @@ def _swallow_aip_logs(level: int = logging.ERROR) -> None:
 logger = LoggerManager().get_logger(__name__)
 
 
+# Constants for MCP configuration validation
+_MCP_TRANSPORT_KEYS = {"url", "command", "args", "env", "timeout", "headers"}
+
+
 def _convert_chat_history_to_messages(
     chat_history: list[dict[str, str]] | None,
 ) -> list[BaseMessage]:
@@ -870,39 +874,126 @@ class LangGraphRunner(BaseRunner):
         base_config: dict[str, Any],
         override: dict[str, Any] | None,
     ) -> dict[str, Any]:
-        """Merge a single MCP config with runtime override.
+        """Merge a single MCP config with a runtime override, handling normalization and parity fixes.
+
+        This method orchestrates the merging of base MCP settings (from the object definition)
+        with runtime overrides. It enforces Platform parity by prioritizing the nested 'config'
+        block while maintaining robustness for local development by auto-fixing flat transport keys.
+
+        The merge follows these priority rules (highest to lowest):
+        1. Misplaced flat keys in the override (e.g., 'url' at top level) - Auto-fixed with warning.
+        2. Nested 'config' block in the override (Matches Platform/Constructor schema).
+        3. Authentication objects in the override (Converted to HTTP headers).
+        4. Structural settings in the override (e.g., 'allowed_tools').
+        5. Base configuration from the MCP object definition.
+
+        Examples:
+            >>> # 1. Strict Nested Style (Recommended)
+            >>> override = {"config": {"url": "https://new.api"}, "allowed_tools": ["t1"]}
+            >>> self._merge_single_mcp_config("mcp", base, override)
+            >>> # Result: {"url": "https://new.api", "allowed_tools": ["t1"], ...}
+
+            >>> # 2. Flat Legacy Style (Auto-fixed with warning)
+            >>> override = {"url": "https://new.api"}
+            >>> self._merge_single_mcp_config("mcp", base, override)
+            >>> # Result: {"url": "https://new.api", ...}
+
+            >>> # 3. Header Merging (Preserves Auth)
+            >>> base = {"headers": {"Authorization": "Bearer token"}}
+            >>> override = {"headers": {"X-Custom": "val"}}
+            >>> self._merge_single_mcp_config("mcp", base, override)
+            >>> # Result: {"headers": {"Authorization": "Bearer token", "X-Custom": "val"}, ...}
 
         Args:
-            server_name: Name of the MCP server.
-            base_config: Base config from adapter.
-            override: Optional runtime override config.
+            server_name: Name of the MCP server being configured.
+            base_config: Base configuration dictionary derived from the MCP object.
+            override: Optional dictionary of runtime overrides.
 
         Returns:
-            Merged config dict.
+            A fully merged and normalized configuration dictionary ready for the local runner.
         """
         merged = base_config.copy()
 
         if not override:
             return merged
 
-        from glaip_sdk.runner.mcp_adapter.mcp_config_builder import (  # noqa: PLC0415
-            MCPConfigBuilder,
-        )
+        # 1. Check for misplaced keys and warn (DX/Parity guidance)
+        self._warn_if_mcp_override_misplaced(server_name, override)
+
+        # 2. Apply Authentication (Converted to headers)
+        self._apply_mcp_auth_override(server_name, merged, override)
+
+        # 3. Apply Transport Settings (Nested 'config')
+        if "config" in override and isinstance(override["config"], dict):
+            merged.update(override["config"])
 
-        # Handle authentication override
-        if "authentication" in override:
-            headers = MCPConfigBuilder.build_headers_from_auth(override["authentication"])
-            if headers:
-                merged["headers"] = headers
-                logger.debug("Applied runtime authentication headers for MCP '%s'", server_name)
+        # 4. Apply Structural Settings (e.g., allowed_tools)
+        if "allowed_tools" in override:
+            merged["allowed_tools"] = override["allowed_tools"]
 
-        # Merge other config keys (excluding authentication since we converted it)
+        # 5. Preserve unknown top-level keys (backward compatibility)
+        known_keys = _MCP_TRANSPORT_KEYS | {"config", "authentication", "allowed_tools"}
         for key, value in override.items():
-            if key != "authentication":
+            if key not in known_keys:
                 merged[key] = value
 
+        # 6. Apply Auto-fix for misplaced keys (Local Success)
+        for key in [k for k in override if k in _MCP_TRANSPORT_KEYS]:
+            val = override[key]
+            # Special case: Merge headers instead of overwriting to preserve auth
+            if key == "headers" and isinstance(val, dict) and isinstance(merged.get("headers"), dict):
+                merged["headers"].update(val)
+            else:
+                merged[key] = val
+
         return merged
 
+    def _warn_if_mcp_override_misplaced(self, server_name: str, override: dict[str, Any]) -> None:
+        """Log a warning if transport keys are found at the top level of an override.
+
+        Args:
+            server_name: Name of the MCP server.
+            override: The raw override dictionary.
+        """
+        misplaced = [k for k in override if k in _MCP_TRANSPORT_KEYS]
+        if misplaced:
+            logger.warning(
+                "MCP '%s' override contains transport keys at the top level: %s. "
+                "This structure is inconsistent with the Platform and MCP constructor. "
+                "Transport settings should be nested within a 'config' dictionary. "
+                "Example: mcp_configs={'%s': {'config': {'%s': '...'}}}. "
+                "Automatically merging top-level keys for local execution parity.",
+                server_name,
+                misplaced,
+                server_name,
+                misplaced[0],
+            )
+
+    def _apply_mcp_auth_override(
+        self,
+        server_name: str,
+        merged_config: dict[str, Any],
+        override: dict[str, Any],
+    ) -> None:
+        """Convert authentication override to headers and apply to config.
+
+        Args:
+            server_name: Name of the MCP server.
+            merged_config: The configuration being built (mutated in place).
+            override: The raw override dictionary.
+        """
+        if "authentication" not in override:
+            return
+
+        from glaip_sdk.runner.mcp_adapter.mcp_config_builder import (  # noqa: PLC0415
+            MCPConfigBuilder,
+        )
+
+        headers = MCPConfigBuilder.build_headers_from_auth(override["authentication"])
+        if headers:
+            merged_config["headers"] = headers
+            logger.debug("Applied runtime authentication headers for MCP '%s'", server_name)
+
     def _validate_sub_agent_for_local_mode(self, sub_agent: Any) -> None:
         """Validate that a sub-agent reference is supported for local execution.
 

{glaip_sdk-0.7.14.dist-info → glaip_sdk-0.7.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glaip-sdk
-Version: 0.7.14
+Version: 0.7.15
 Summary: Python SDK and CLI for GL AIP (GDP Labs AI Agent Package) - Build, run, and manage AI agents
 Author-email: Raymond Christopher <raymond.christopher@gdplabs.id>
 License: MIT

{glaip_sdk-0.7.14.dist-info → glaip_sdk-0.7.15.dist-info}/RECORD

@@ -5,7 +5,7 @@ glaip_sdk/exceptions.py,sha256=iAChFClkytXRBLP0vZq1_YjoZxA9i4m4bW1gDLiGR1g,2321
 glaip_sdk/icons.py,sha256=J5THz0ReAmDwIiIooh1_G3Le-mwTJyEjhJDdJ13KRxM,524
 glaip_sdk/rich_components.py,sha256=44Z0V1ZQleVh9gUDGwRR5mriiYFnVGOhm7fFxZYbP8c,4052
 glaip_sdk/agents/__init__.py,sha256=VfYov56edbWuySXFEbWJ_jLXgwnFzPk1KB-9-mfsUCc,776
-glaip_sdk/agents/base.py,sha256=Aq7bDGHAw7214wW-9Re_uAzbaGphIUpIIbuibuDf7i4,49131
+glaip_sdk/agents/base.py,sha256=OCJP2yBOo1rYqUAzpwdcEb2ZjIGHj9-ivDvldzfQX48,50813
 glaip_sdk/cli/__init__.py,sha256=xCCfuF1Yc7mpCDcfhHZTX0vizvtrDSLeT8MJ3V7m5A0,156
 glaip_sdk/cli/account_store.py,sha256=u_memecwEQssustZs2wYBrHbEmKUlDfmmL-zO1F3n3A,19034
 glaip_sdk/cli/agent_config.py,sha256=YAbFKrTNTRqNA6b0i0Q3pH-01rhHDRi5v8dxSFwGSwM,2401
@@ -151,7 +151,7 @@ glaip_sdk/registry/tool.py,sha256=c0Ja4rFYMOKs_1yjDLDZxCId4IjQzprwXzX0iIL8Fio,14
 glaip_sdk/runner/__init__.py,sha256=orJ3nLR9P-n1qMaAMWZ_xRS4368YnDpdltg-bX5BlUk,2210
 glaip_sdk/runner/base.py,sha256=KIjcSAyDCP9_mn2H4rXR5gu1FZlwD9pe0gkTBmr6Yi4,2663
 glaip_sdk/runner/deps.py,sha256=Du3hr2R5RHOYCRAv7RVmx661x-ayVXIeZ8JD7ODirTA,3884
-glaip_sdk/runner/langgraph.py,sha256=sKF8JMMRicr9iiDNA8hIoZVfvfhjT_TMqlYfvW3yT6w,36379
+glaip_sdk/runner/langgraph.py,sha256=HB1n6w44LdyE7OSB2iSEtwhm_IeD7fGi_20erCZurX4,40869
 glaip_sdk/runner/logging_config.py,sha256=OrQgW23t42qQRqEXKH8U4bFg4JG5EEkUJTlbvtU65iE,2528
 glaip_sdk/runner/mcp_adapter/__init__.py,sha256=Rdttfg3N6kg3-DaTCKqaGXKByZyBt0Mwf6FV8s_5kI8,462
 glaip_sdk/runner/mcp_adapter/base_mcp_adapter.py,sha256=ic56fKgb3zgVZZQm3ClWUZi7pE1t4EVq8mOg6AM6hdA,1374
@@ -216,8 +216,8 @@ glaip_sdk/utils/rendering/steps/format.py,sha256=Chnq7OBaj8XMeBntSBxrX5zSmrYeGcO
 glaip_sdk/utils/rendering/steps/manager.py,sha256=BiBmTeQMQhjRMykgICXsXNYh1hGsss-fH9BIGVMWFi0,13194
 glaip_sdk/utils/rendering/viewer/__init__.py,sha256=XrxmE2cMAozqrzo1jtDFm8HqNtvDcYi2mAhXLXn5CjI,457
 glaip_sdk/utils/rendering/viewer/presenter.py,sha256=mlLMTjnyeyPVtsyrAbz1BJu9lFGQSlS-voZ-_Cuugv0,5725
-glaip_sdk-0.7.14.dist-info/METADATA,sha256=zUdx8wiJbp1JiDNlntuItt5_Y1krwQRZDhpyEcnGcDo,8528
-glaip_sdk-0.7.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glaip_sdk-0.7.14.dist-info/entry_points.txt,sha256=NkhO6FfgX9Zrjn63GuKphf-dLw7KNJvucAcXc7P3aMk,54
-glaip_sdk-0.7.14.dist-info/top_level.txt,sha256=td7yXttiYX2s94-4wFhv-5KdT0rSZ-pnJRSire341hw,10
-glaip_sdk-0.7.14.dist-info/RECORD,,
+glaip_sdk-0.7.15.dist-info/METADATA,sha256=L7wF6kfY6yiNHvUsl6gGSVhFjMGllD9K3ZHA3UmIbkA,8528
+glaip_sdk-0.7.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glaip_sdk-0.7.15.dist-info/entry_points.txt,sha256=NkhO6FfgX9Zrjn63GuKphf-dLw7KNJvucAcXc7P3aMk,54
+glaip_sdk-0.7.15.dist-info/top_level.txt,sha256=td7yXttiYX2s94-4wFhv-5KdT0rSZ-pnJRSire341hw,10
+glaip_sdk-0.7.15.dist-info/RECORD,,