MAINT Parameters validation for sklearn.datasets.load_sample_image (#26226)

jiawei-zhang-a · jeremiedbb · web-flow · commit 75d1deaf42c0 · 2023-04-25T15:44:48.000Z
Co-authored-by: Jérémie du Boisberranger &lt;34657725+jeremiedbb@users.noreply.github.com&gt;
diff --git a/sklearn/datasets/_base.py b/sklearn/datasets/_base.py
@@ -1275,6 +1275,11 @@ def load_sample_images():
     return Bunch(images=images, filenames=filenames, DESCR=descr)
 
 
+@validate_params(
+    {
+        "image_name": [StrOptions({"china.jpg", "flower.jpg"})],
+    }
+)
 def load_sample_image(image_name):
     """Load the numpy array of a single sample image.
 
diff --git a/sklearn/datasets/tests/test_base.py b/sklearn/datasets/tests/test_base.py
@@ -222,12 +222,6 @@ def test_load_sample_image():
         warnings.warn("Could not load sample images, PIL is not available.")
 
 
-def test_load_missing_sample_image_error():
-    pytest.importorskip("PIL")
-    with pytest.raises(AttributeError):
-        load_sample_image("blop.jpg")
-
-
 def test_load_diabetes_raw():
     """Test to check that we load a scaled version by default but that we can
     get an unscaled version when setting `scaled=False`."""
diff --git a/sklearn/tests/test_public_functions.py b/sklearn/tests/test_public_functions.py
@@ -138,6 +138,7 @@ def _check_function_param_validation(
     "sklearn.datasets.load_files",
     "sklearn.datasets.load_iris",
     "sklearn.datasets.load_linnerud",
+    "sklearn.datasets.load_sample_image",
     "sklearn.datasets.load_svmlight_file",
     "sklearn.datasets.load_svmlight_files",
     "sklearn.datasets.load_wine",
