improved parsing of schema and tests

Author: eavanvalkenburg

python/semantic_kernel/connectors/mcp.py

@@ -6,8 +6,10 @@
 from functools import partial
 from typing import Any
 
-from mcp import ClientSession, McpError, StdioServerParameters, stdio_client
+from mcp import McpError
+from mcp.client.session import ClientSession
 from mcp.client.sse import sse_client
+from mcp.client.stdio import StdioServerParameters, stdio_client
 from mcp.types import Tool
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -157,11 +159,7 @@ def get_parameters_from_tool(tool: Tool) -> list[KernelParameterMetadata]:
             is_required=prop_name in required,
             type=prop_details.get("type"),
             default_value=prop_details.get("default", None),
-            schema_data=prop_details["items"]
-            if "items" in prop_details and prop_details["items"] is not None and isinstance(prop_details["items"], dict)
-            else {"type": f"{prop_details['type']}"}
-            if "type" in prop_details
-            else None,
+            schema_data=prop_details,
         )
         for prop_name, prop_details in properties.items()
     ]

python/tests/integration/mcp/test_mcp_integration.py

@@ -0,0 +1,39 @@
+# Copyright (c) Microsoft. All rights reserved.
+
+
+import os
+from typing import TYPE_CHECKING
+
+from semantic_kernel.connectors.mcp import MCPStdioServerConfig, create_plugin_from_mcp_server
+from semantic_kernel.functions.kernel_arguments import KernelArguments
+
+if TYPE_CHECKING:
+    from semantic_kernel import Kernel
+
+
+async def test_from_mcp(kernel: "Kernel"):
+    mcp_server_path = os.path.join(os.path.dirname(__file__), "../../assets/test_plugins", "TestMCPPlugin")
+    mcp_server_file = "mcp_server.py"
+    config = MCPStdioServerConfig(
+        command="uv",
+        args=["--directory", mcp_server_path, "run", mcp_server_file],
+    )
+
+    plugin = await create_plugin_from_mcp_server(
+        plugin_name="TestMCPPlugin",
+        description="Test MCP Plugin",
+        server_config=config,
+    )
+
+    assert plugin is not None
+    assert plugin.name == "TestMCPPlugin"
+    assert plugin.functions.get("get_name") is not None
+    assert plugin.functions["get_name"].parameters[0].name == "name"
+    assert plugin.functions["get_name"].parameters[0].type_ == "string"
+    assert plugin.functions["get_name"].parameters[0].is_required
+    assert plugin.functions.get("set_name") is not None
+
+    kernel.add_plugin(plugin)
+
+    result = await plugin.functions["get_name"].invoke(kernel, arguments=KernelArguments(name="test"))
+    assert "test: Test" in result.value

python/tests/unit/connectors/mcp/test_mcp.py

@@ -1,21 +1,19 @@
 # Copyright (c) Microsoft. All rights reserved.
-import os
 from typing import TYPE_CHECKING
 from unittest.mock import MagicMock, patch
 
 import pytest
-from mcp import ClientSession, StdioServerParameters
+from mcp import ClientSession, ListToolsResult, StdioServerParameters, Tool
 
 from semantic_kernel.connectors.mcp import (
     MCPSseServerConfig,
     MCPStdioServerConfig,
     create_plugin_from_mcp_server,
 )
 from semantic_kernel.exceptions import KernelPluginInvalidConfigurationError
-from semantic_kernel.functions import KernelArguments
 
 if TYPE_CHECKING:
-    from semantic_kernel import Kernel
+    pass
 
 
 async def test_mcp_server_config_session_initialize():
@@ -104,34 +102,6 @@ async def test_mcp_stdio_server_config_failed_get_session():
                 pass
 
 
-async def test_from_mcp(kernel: "Kernel"):
-    mcp_server_path = os.path.join(os.path.dirname(__file__), "../../../assets/test_plugins", "TestMCPPlugin")
-    mcp_server_file = "mcp_server.py"
-    config = MCPStdioServerConfig(
-        command="uv",
-        args=["--directory", mcp_server_path, "run", mcp_server_file],
-    )
-
-    plugin = await create_plugin_from_mcp_server(
-        plugin_name="TestMCPPlugin",
-        description="Test MCP Plugin",
-        server_config=config,
-    )
-
-    assert plugin is not None
-    assert plugin.name == "TestMCPPlugin"
-    assert plugin.functions.get("get_name") is not None
-    assert plugin.functions["get_name"].parameters[0].name == "name"
-    assert plugin.functions["get_name"].parameters[0].type_ == "string"
-    assert plugin.functions["get_name"].parameters[0].is_required
-    assert plugin.functions.get("set_name") is not None
-
-    kernel.add_plugin(plugin)
-
-    result = await plugin.functions["get_name"].invoke(kernel, arguments=KernelArguments(name="test"))
-    assert "test: Test" in result.value
-
-
 @patch("semantic_kernel.connectors.mcp.stdio_client")
 @patch("semantic_kernel.connectors.mcp.ClientSession")
 async def test_with_kwargs_stdio(mock_session, mock_client):
@@ -145,7 +115,21 @@ async def test_with_kwargs_stdio(mock_session, mock_client):
 
     # Make the mock_stdio_client return an AsyncMock for the context manager
     mock_client.return_value = mock_generator
-    await create_plugin_from_mcp_server(
+    mock_session.return_value.__aenter__.return_value.list_tools.return_value = ListToolsResult(
+        tools=[
+            Tool(
+                name="get_name",
+                description="Get Name",
+                inputSchema={
+                    "properties": {
+                        "name": {"type": "string"},
+                    },
+                    "required": ["name"],
+                },
+            )
+        ]
+    )
+    plugin = await create_plugin_from_mcp_server(
         plugin_name="TestMCPPlugin",
         description="Test MCP Plugin",
         command="uv",
@@ -154,6 +138,12 @@ async def test_with_kwargs_stdio(mock_session, mock_client):
     mock_client.assert_called_once_with(
         server=StdioServerParameters(command="uv", args=["--directory", "path", "run", "file.py"])
     )
+    assert plugin is not None
+    assert plugin.name == "TestMCPPlugin"
+    assert plugin.description == "Test MCP Plugin"
+    assert plugin.functions.get("get_name") is not None
+    assert plugin.functions["get_name"].parameters[0].name == "name"
+    assert plugin.functions["get_name"].parameters[0].is_required
 
 
 @patch("semantic_kernel.connectors.mcp.sse_client")
@@ -169,9 +159,29 @@ async def test_with_kwargs_sse(mock_session, mock_client):
 
     # Make the mock_stdio_client return an AsyncMock for the context manager
     mock_client.return_value = mock_generator
-    await create_plugin_from_mcp_server(
+    mock_session.return_value.__aenter__.return_value.list_tools.return_value = ListToolsResult(
+        tools=[
+            Tool(
+                name="get_name",
+                description="Get Name",
+                inputSchema={
+                    "properties": {
+                        "name": {"type": "string"},
+                    },
+                    "required": ["name"],
+                },
+            )
+        ]
+    )
+    plugin = await create_plugin_from_mcp_server(
         plugin_name="TestMCPPlugin",
         description="Test MCP Plugin",
         url="http://localhost:8080/sse",
     )
     mock_client.assert_called_once_with(url="http://localhost:8080/sse")
+    assert plugin is not None
+    assert plugin.name == "TestMCPPlugin"
+    assert plugin.description == "Test MCP Plugin"
+    assert plugin.functions.get("get_name") is not None
+    assert plugin.functions["get_name"].parameters[0].name == "name"
+    assert plugin.functions["get_name"].parameters[0].is_required