fix: add various fixes regarding image processing (#461)

* fix: remove unused function from utils.py

* fix: suppress warnings in tests by using the right API version

* fix: convert image to RGB if needed in object detection pipeline

* chore: bump openfoodfacts version in uv.lock

Author: raphael0202

src/openfoodfacts/ml/object_detection.py

@@ -1,6 +1,7 @@
 import dataclasses
 import logging
 import typing
+import warnings
 
 import albumentations as A
 import cv2
@@ -51,6 +52,7 @@ def object_detection_transform(
                 position=pad_position,
                 fill=fill,
             ),
+            A.ToRGB(p=1.0),
             A.Normalize(mean=normalize_mean, std=normalize_std, p=1.0),
         ],
     )
@@ -299,9 +301,12 @@ def detect_from_image(
 
     def preprocess(self, image_array: np.ndarray) -> np.ndarray:
         # Apply the transform to the image
-        image_array = object_detection_transform(image_size=self.image_size)(
-            image=image_array
-        )["image"]
+
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", message="The image is already an RGB")
+            image_array = object_detection_transform(image_size=self.image_size)(
+                image=image_array
+            )["image"]
         image_array = np.transpose(image_array, (2, 0, 1))[np.newaxis, :]  # HWC to CHW
         return image_array
 

src/openfoodfacts/ml/utils.py

@@ -1,23 +1,6 @@
-import numpy as np
 from PIL import Image
 
 
-def convert_image_to_array(image: Image.Image) -> np.ndarray:
-    """Convert a PIL Image into a numpy array.
-
-    The image is converted to RGB if needed before generating the array.
-
-    :param image: the input image.
-    :return: the generated numpy array of shape (width, height, 3)
-    """
-    if image.mode != "RGB":
-        image = image.convert("RGB")
-
-    im_width, im_height = image.size
-
-    return np.array(image.getdata(), dtype=np.uint8).reshape((im_height, im_width, 3))
-
-
 def resize_image(image: Image.Image, max_size: tuple[int, int]) -> Image.Image:
     """Resize an image to fit within the specified dimensions.
 

tests/ml/test_utils.py

@@ -1,36 +1,6 @@
-import numpy as np
 from PIL import Image
 
-from openfoodfacts.ml.utils import convert_image_to_array, resize_image
-
-
-class TestConvertImageToArray:
-    def test_rgb(self):
-        # Create a simple RGB image
-        image = Image.new("RGB", (10, 10), color="red")
-        array = convert_image_to_array(image)
-
-        assert array.shape == (10, 10, 3)
-        assert array.dtype == np.uint8
-        assert (array == [255, 0, 0]).all()
-
-    def test_non_rgb(self):
-        # Create a simple grayscale image
-        image = Image.new("L", (10, 10), color=128)
-        array = convert_image_to_array(image)
-
-        assert array.shape == (10, 10, 3)
-        assert array.dtype == np.uint8
-        assert (array == [128, 128, 128]).all()
-
-    def test_size(self):
-        # Create a simple RGB image with different size
-        image = Image.new("RGB", (20, 15), color="blue")
-        array = convert_image_to_array(image)
-
-        assert array.shape == (15, 20, 3)
-        assert array.dtype == np.uint8
-        assert (array == [0, 0, 255]).all()
+from openfoodfacts.ml.utils import resize_image
 
 
 class TestResizeImage:

tests/unit/test_api.py

@@ -182,7 +182,10 @@ def test_parse_ingredients_fail_non_HTTP_200(self):
 
     def test_upload_image_success(self):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT,
+            version="v3",
+            username="test",
+            password="test",
         )
         code = "1223435"
         response_data = {
@@ -228,7 +231,7 @@ def test_upload_image_success(self):
 
     def test_upload_image_with_selected(self):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT, version="v3", username="test", password="test"
         )
         code = "1223435"
         response_data = {
@@ -291,7 +294,7 @@ def test_upload_image_with_selected(self):
             }
 
     def test_upload_image_no_auth(self):
-        api = openfoodfacts.API(user_agent=TEST_USER_AGENT, version="v2")
+        api = openfoodfacts.API(user_agent=TEST_USER_AGENT, version="v3")
         code = "1223435"
         with pytest.raises(
             ValueError,
@@ -301,7 +304,7 @@ def test_upload_image_no_auth(self):
 
     def test_upload_image_invalid_code(self):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT, version="v3", username="test", password="test"
         )
         code = "invalidcode"
         with pytest.raises(
@@ -312,7 +315,7 @@ def test_upload_image_invalid_code(self):
 
     def test_upload_image_no_data(self):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT, version="v3", username="test", password="test"
         )
         code = "1223435"
         with pytest.raises(
@@ -323,7 +326,7 @@ def test_upload_image_no_data(self):
 
     def test_upload_image_both_data(self):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT, version="v3", username="test", password="test"
         )
         code = "1223435"
         with pytest.raises(
@@ -336,7 +339,7 @@ def test_upload_image_both_data(self):
 
     def test_upload_image_invalid_selected(self):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT, version="v3", username="test", password="test"
         )
         code = "1223435"
         with pytest.raises(
@@ -352,7 +355,7 @@ def test_upload_image_invalid_selected(self):
 
     def test_upload_image_with_path(self, tmp_path):
         api = openfoodfacts.API(
-            user_agent=TEST_USER_AGENT, version="v2", username="test", password="test"
+            user_agent=TEST_USER_AGENT, version="v3", username="test", password="test"
         )
         code = "1223435"
         response_data = {