Skip to content

Commit

Permalink
Update error message
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiaqi-Lv committed Nov 28, 2024
1 parent f9f560f commit 3f8b70e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 3 additions & 1 deletion tests/test_patch_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tiatoolbox/tools/patchextraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions tiatoolbox/utils/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)


Expand Down

0 comments on commit 3f8b70e

Please sign in to comment.