Upgrade_mcp_version (#6814)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

Author: victordibia

python/packages/autogen-ext/pyproject.toml

@@ -150,7 +150,7 @@ semantic-kernel-all = [
 
 rich = ["rich>=13.9.4"]
 
-mcp = ["mcp>=1.8.1"]
+mcp = ["mcp>=1.11.0"]
 canvas = [
     "unidiff>=0.7.5",
 ]

python/packages/autogen-ext/src/autogen_ext/tools/mcp/_base.py

@@ -2,7 +2,7 @@
 import builtins
 import json
 from abc import ABC
-from typing import Any, Dict, Generic, Type, TypeVar
+from typing import Any, Dict, Generic, Sequence, Type, TypeVar
 
 from autogen_core import CancellationToken
 from autogen_core.tools import BaseTool
@@ -11,7 +11,7 @@
 from pydantic.networks import AnyUrl
 
 from mcp import ClientSession, Tool
-from mcp.types import EmbeddedResource, ImageContent, TextContent
+from mcp.types import AudioContent, ContentBlock, EmbeddedResource, ImageContent, ResourceLink, TextContent
 
 from ._config import McpServerParams
 from ._session import create_mcp_server_session
@@ -75,21 +75,20 @@ async def run(self, args: BaseModel, cancellation_token: CancellationToken) -> A
             await session.initialize()
             return await self._run(args=kwargs, cancellation_token=cancellation_token, session=session)
 
-    def _normalize_payload_to_content_list(
-        self, payload: list[TextContent | ImageContent | EmbeddedResource]
-    ) -> list[TextContent | ImageContent | EmbeddedResource]:
+    def _normalize_payload_to_content_list(self, payload: Sequence[ContentBlock]) -> list[ContentBlock]:
         """
         Normalizes a raw tool output payload into a list of content items.
-        - If payload is already a list of (TextContent, ImageContent, EmbeddedResource), it's returned as is.
-        - If payload is a single TextContent, ImageContent, or EmbeddedResource, it's wrapped in a list.
+        - If payload is already a sequence of ContentBlock items, it's converted to a list and returned.
+        - If payload is a single ContentBlock item, it's wrapped in a list.
         - If payload is a string, it's wrapped in [TextContent(text=payload)].
         - Otherwise, the payload is stringified and wrapped in [TextContent(text=str(payload))].
         """
-        if isinstance(payload, list) and all(
-            isinstance(item, (TextContent, ImageContent, EmbeddedResource)) for item in payload
+        if isinstance(payload, Sequence) and all(
+            isinstance(item, (TextContent, ImageContent, EmbeddedResource, AudioContent, ResourceLink))
+            for item in payload
         ):
-            return payload
-        elif isinstance(payload, (TextContent, ImageContent, EmbeddedResource)):
+            return list(payload)
+        elif isinstance(payload, (TextContent, ImageContent, EmbeddedResource, AudioContent, ResourceLink)):
             return [payload]
         elif isinstance(payload, str):
             return [TextContent(text=payload, type="text")]
@@ -154,18 +153,37 @@ def return_value_as_string(self, value: list[Any]) -> str:
         """Return a string representation of the result."""
 
         def serialize_item(item: Any) -> dict[str, Any]:
-            if isinstance(item, (TextContent, ImageContent)):
-                return item.model_dump()
+            if isinstance(item, (TextContent, ImageContent, AudioContent)):
+                dumped = item.model_dump()
+                # Remove the 'meta' field if it exists and is None (for backward compatibility)
+                if dumped.get("meta") is None:
+                    dumped.pop("meta", None)
+                return dumped
             elif isinstance(item, EmbeddedResource):
                 type = item.type
                 resource = {}
                 for key, val in item.resource.model_dump().items():
+                    # Skip 'meta' field if it's None (for backward compatibility)
+                    if key == "meta" and val is None:
+                        continue
                     if isinstance(val, AnyUrl):
                         resource[key] = str(val)
                     else:
                         resource[key] = val
-                annotations = item.annotations.model_dump() if item.annotations else None
-                return {"type": type, "resource": resource, "annotations": annotations}
+                dumped_annotations = item.annotations.model_dump() if item.annotations else None
+                # Remove 'meta' from annotations if it exists and is None
+                if dumped_annotations and dumped_annotations.get("meta") is None:
+                    dumped_annotations.pop("meta", None)
+                return {"type": type, "resource": resource, "annotations": dumped_annotations}
+            elif isinstance(item, ResourceLink):
+                dumped = item.model_dump()
+                # Remove the 'meta' field if it exists and is None (for backward compatibility)
+                if dumped.get("meta") is None:
+                    dumped.pop("meta", None)
+                # Convert AnyUrl to string for JSON serialization
+                if "uri" in dumped and isinstance(dumped["uri"], AnyUrl):
+                    dumped["uri"] = str(dumped["uri"])
+                return dumped
             else:
                 return {}
 

python/packages/autogen-ext/tests/tools/test_mcp_tools.py

@@ -27,6 +27,7 @@
     Annotations,
     EmbeddedResource,
     ImageContent,
+    ResourceLink,
     TextContent,
     TextResourceContents,
 )
@@ -909,3 +910,21 @@ async def test_mcp_tool_adapter_run_cancelled_during_call(
         await adapter._run(args=args, cancellation_token=cancellation_token, session=mock_session)  # type: ignore[reportPrivateUsage]
 
     mock_session.call_tool.assert_called_once_with(name=sample_tool.name, arguments=args)
+
+
+def test_return_value_as_string_with_resource_link(sample_tool: Tool, sample_server_params: StdioServerParams) -> None:
+    """Test return_value_as_string handles ResourceLink objects correctly."""
+    adapter = StdioMcpToolAdapter(server_params=sample_server_params, tool=sample_tool)
+
+    # Test ResourceLink with meta field
+    resource_link = ResourceLink(
+        name="test_link",
+        type="resource_link",
+        uri=AnyUrl(url="http://example.com"),
+    )
+
+    result = adapter.return_value_as_string([resource_link])
+    # Verify the JSON serialization contains expected fields
+    assert '"type": "resource_link"' in result
+    assert '"name": "test_link"' in result
+    assert '"uri": "http://example.com/"' in result  # AnyUrl normalizes with trailing slash