test: allow for another output in test_flowchart

Author: percevalw

eds_scikit/biology/utils/config.py

@@ -1,9 +1,9 @@
 import glob
+import os
 from pathlib import Path
 from typing import List
 
 import pandas as pd
-from importlib_metadata import os
 from loguru import logger
 
 from eds_scikit.biology.utils.process_concepts import ConceptsSet

eds_scikit/utils/test_utils.py

@@ -96,7 +96,7 @@ def assert_equal(
     return output
 
 
-def assert_images_equal(image_1: str, image_2: str):
+def image_diff(image_1: str, image_2: str):
     img1 = Image.open(image_1)
     img2 = Image.open(image_2)
 
@@ -105,12 +105,11 @@ def assert_images_equal(image_1: str, image_2: str):
     img2 = img2.resize(img1.size)
 
     sum_sq_diff = np.sum(
-        (np.asarray(img1).astype("float") - np.asarray(img2).astype("float")) ** 2
-    )
-
-    if sum_sq_diff == 0:
-        # Images are exactly the same
-        pass
-    else:
-        normalized_sum_sq_diff = sum_sq_diff / np.sqrt(sum_sq_diff)
-        assert normalized_sum_sq_diff < 0.001
+        (
+            np.asarray(img1).astype("float") / 255
+            - np.asarray(img2).astype("float") / 255
+        )
+        ** 2
+    ) / np.prod(img1.size)
+
+    return sum_sq_diff

tests/flowchart/expected_flowchart_bis.png

@@ -5,7 +5,7 @@
 import pytest
 
 from eds_scikit.utils.flowchart import Flowchart
-from eds_scikit.utils.test_utils import assert_images_equal
+from eds_scikit.utils.test_utils import image_diff
 
 data_as_df = pd.DataFrame(
     dict(
@@ -63,12 +63,13 @@ def test_flowchart(data, tmpdir_factory):
 
     _ = F.generate_flowchart(alternate=True, fontsize=10)
 
-    result_path = tmp_dir / "flowchart.png"
-    F.save(result_path, dpi=72)
+    out_path = str(tmp_dir / "flowchart.png")
+    F.save(out_path, dpi=72)
 
-    expected = Path(__file__).parent / "expected_flowchart.png"
+    tgt_1 = str(Path(__file__).parent / "expected_flowchart.png")
+    tgt_2 = str(Path(__file__).parent / "expected_flowchart_bis.png")
 
-    assert_images_equal(result_path, expected)
+    assert image_diff(out_path, tgt_1) < 0.05 or image_diff(out_path, tgt_2) < 0.05
 
 
 def test_incorrect_data():