feat(tools): Add MCP resource operations

Author: xiehust

src/strands/tools/mcp/mcp_client.py

@@ -505,42 +505,6 @@ async def _read_resource_async() -> ReadResourceResult:
 
         return read_resource_result
 
-    def subscribe_resource_sync(self, uri: AnyUrl | str) -> None:
-        """Synchronously subscribes to updates for a resource from the MCP server.
-
-        Args:
-            uri: The URI of the resource to subscribe to
-        """
-        self._log_debug_with_thread("subscribing to MCP resource: %s", uri)
-        if not self._is_session_active():
-            raise MCPClientInitializationError(CLIENT_SESSION_NOT_RUNNING_ERROR_MESSAGE)
-
-        async def _subscribe_resource_async() -> None:
-            # Convert string to AnyUrl if needed
-            resource_uri = AnyUrl(uri) if isinstance(uri, str) else uri
-            await cast(ClientSession, self._background_thread_session).subscribe_resource(resource_uri)
-
-        self._invoke_on_background_thread(_subscribe_resource_async()).result()
-        self._log_debug_with_thread("successfully subscribed to resource")
-
-    def unsubscribe_resource_sync(self, uri: AnyUrl | str) -> None:
-        """Synchronously unsubscribes from updates for a resource from the MCP server.
-
-        Args:
-            uri: The URI of the resource to unsubscribe from
-        """
-        self._log_debug_with_thread("unsubscribing from MCP resource: %s", uri)
-        if not self._is_session_active():
-            raise MCPClientInitializationError(CLIENT_SESSION_NOT_RUNNING_ERROR_MESSAGE)
-
-        async def _unsubscribe_resource_async() -> None:
-            # Convert string to AnyUrl if needed
-            resource_uri = AnyUrl(uri) if isinstance(uri, str) else uri
-            await cast(ClientSession, self._background_thread_session).unsubscribe_resource(resource_uri)
-
-        self._invoke_on_background_thread(_unsubscribe_resource_async()).result()
-        self._log_debug_with_thread("successfully unsubscribed from resource")
-
     def list_resource_templates_sync(self, pagination_token: Optional[str] = None) -> ListResourceTemplatesResult:
         """Synchronously retrieves the list of available resource templates from the MCP server.
 

tests/strands/tools/mcp/test_mcp_client.py

@@ -877,74 +877,6 @@ def test_read_resource_sync_session_not_active():
         client.read_resource_sync("file://documents/test.txt")
 
 
-def test_subscribe_resource_sync(mock_transport, mock_session):
-    """Test that subscribe_resource_sync correctly subscribes to a resource."""
-    mock_session.subscribe_resource.return_value = None
-
-    with MCPClient(mock_transport["transport_callable"]) as client:
-        # Should not raise any exception
-        client.subscribe_resource_sync("file://documents/test.txt")
-
-        mock_session.subscribe_resource.assert_called_once()
-        call_args = mock_session.subscribe_resource.call_args[0]
-        assert str(call_args[0]) == "file://documents/test.txt"
-
-
-def test_subscribe_resource_sync_with_anyurl(mock_transport, mock_session):
-    """Test that subscribe_resource_sync correctly handles AnyUrl input."""
-    mock_session.subscribe_resource.return_value = None
-
-    with MCPClient(mock_transport["transport_callable"]) as client:
-        uri = AnyUrl("file://documents/test.txt")
-        client.subscribe_resource_sync(uri)
-
-        mock_session.subscribe_resource.assert_called_once()
-        call_args = mock_session.subscribe_resource.call_args[0]
-        assert str(call_args[0]) == "file://documents/test.txt"
-
-
-def test_subscribe_resource_sync_session_not_active():
-    """Test that subscribe_resource_sync raises an error when session is not active."""
-    client = MCPClient(MagicMock())
-
-    with pytest.raises(MCPClientInitializationError, match="client session is not running"):
-        client.subscribe_resource_sync("file://documents/test.txt")
-
-
-def test_unsubscribe_resource_sync(mock_transport, mock_session):
-    """Test that unsubscribe_resource_sync correctly unsubscribes from a resource."""
-    mock_session.unsubscribe_resource.return_value = None
-
-    with MCPClient(mock_transport["transport_callable"]) as client:
-        # Should not raise any exception
-        client.unsubscribe_resource_sync("file://documents/test.txt")
-
-        mock_session.unsubscribe_resource.assert_called_once()
-        call_args = mock_session.unsubscribe_resource.call_args[0]
-        assert str(call_args[0]) == "file://documents/test.txt"
-
-
-def test_unsubscribe_resource_sync_with_anyurl(mock_transport, mock_session):
-    """Test that unsubscribe_resource_sync correctly handles AnyUrl input."""
-    mock_session.unsubscribe_resource.return_value = None
-
-    with MCPClient(mock_transport["transport_callable"]) as client:
-        uri = AnyUrl("file://documents/test.txt")
-        client.unsubscribe_resource_sync(uri)
-
-        mock_session.unsubscribe_resource.assert_called_once()
-        call_args = mock_session.unsubscribe_resource.call_args[0]
-        assert str(call_args[0]) == "file://documents/test.txt"
-
-
-def test_unsubscribe_resource_sync_session_not_active():
-    """Test that unsubscribe_resource_sync raises an error when session is not active."""
-    client = MCPClient(MagicMock())
-
-    with pytest.raises(MCPClientInitializationError, match="client session is not running"):
-        client.unsubscribe_resource_sync("file://documents/test.txt")
-
-
 def test_list_resource_templates_sync(mock_transport, mock_session):
     """Test that list_resource_templates_sync correctly retrieves resource templates."""
     mock_template = ResourceTemplate(