diff --git a/tests/test_patch_extraction.py b/tests/test_patch_extraction.py index 8b6d8e047..2609b9a48 100644 --- a/tests/test_patch_extraction.py +++ b/tests/test_patch_extraction.py @@ -669,9 +669,11 @@ def test_invalid_points_type() -> None: """Test invalid locations_list type for PointsPatchExtractor.""" img = np.zeros((256, 256, 3)) coords = [[10, 10]] + msg = "Please input correct locations_list. " + msg += "Supported types: np.ndarray, DataFrame, str, Path." with pytest.raises( TypeError, - match="Please input correct locations_list", + match=msg, ): patchextraction.get_patch_extractor( "point", input_img=img, locations_list=coords, patch_size=38 diff --git a/tiatoolbox/tools/patchextraction.py b/tiatoolbox/tools/patchextraction.py index f8a144f9e..21fcb4eb0 100644 --- a/tiatoolbox/tools/patchextraction.py +++ b/tiatoolbox/tools/patchextraction.py @@ -775,7 +775,8 @@ def __init__( try: self.locations_df = misc.read_locations(input_table=locations_list) except (TypeError, FileNotSupportedError) as exc: - msg = "Please input correct locations_list" + msg = "Please input correct locations_list. " + msg += "Supported types: np.ndarray, DataFrame, str, Path." raise TypeError(msg) from exc self.locations_df["x"] = self.locations_df["x"] - int( (self.patch_size[1] - 1) / 2, diff --git a/tiatoolbox/utils/misc.py b/tiatoolbox/utils/misc.py index f8703673b..1e02a3ce0 100644 --- a/tiatoolbox/utils/misc.py +++ b/tiatoolbox/utils/misc.py @@ -531,7 +531,7 @@ def read_locations( out_table = pd.read_json(input_table) return __assign_unknown_class(out_table) - msg = "File type not supported." + msg = "File type not supported. Supported types: .npy, .csv, .json" raise FileNotSupportedError(msg) if isinstance(input_table, np.ndarray): @@ -540,7 +540,9 @@ def read_locations( if isinstance(input_table, pd.DataFrame): return __assign_unknown_class(input_table) - msg = "File type not supported." + msg = "File type not supported. " + msg += "Supported types: str, Path, PathLike, np.ndarray, pd.DataFrame" + raise TypeError(msg)