Progress towards flexible tests

Author: adamtheturtle

src/mock_vws/target.py

@@ -14,6 +14,7 @@
 from zoneinfo import ZoneInfo
 
 import brisque
+import cv2
 import numpy as np
 from PIL import Image, ImageStat
 
@@ -64,12 +65,15 @@ def _quality(image_content: bytes) -> int:
     image = Image.open(fp=image_file)
     image_array = np.asarray(a=image)
     obj = brisque.BRISQUE(url=False)
+    min_height = min_width = 2
+    if image.height < min_height or image.width < min_width:
+        return -2
     # We avoid a barrage of warnings from the BRISQUE library.
     with np.errstate(divide="ignore", invalid="ignore"):
         score = obj.score(img=image_array)
     if math.isnan(score):
         return 0
-    return int(score / 20)
+    return min(int(score / 5), 5)
 
 
 @dataclass(frozen=True, eq=True)
@@ -168,10 +172,14 @@ def tracking_rating(self) -> int:
         if time_since_upload <= pre_rating_time:
             return -1
 
-        if self._post_processing_status == TargetStatuses.SUCCESS:
+        try:
             return _quality(image_content=self.image_value)
-
-        return 0
+        except cv2.error as exc:
+            breakpoint()
+            print(exc)
+            return -2
+        else:
+            return 0
 
     @classmethod
     def from_dict(cls, target_dict: TargetDict) -> Target:

tests/mock_vws/test_get_target.py

@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 import uuid
+from enum import Enum, auto
 from typing import TYPE_CHECKING
 
 import pytest
@@ -140,13 +141,19 @@ def test_target_quality(
         """
         The target tracking rating is as expected.
         """
+
+        class TrackingRating(Enum):
+            ZERO = auto()
+            NEGATIVE = auto()
+            POSITIVE = auto()
+
         target_id_expected_rating_pairs = []
         for image_file in (
             high_quality_image,
             image_file_failed_state,
-            image_file_success_state_low_rating,
+            # image_file_success_state_low_rating,
             corrupted_image_file,
-            different_high_quality_image,
+            # different_high_quality_image,
         ):
             target_id = vws_client.add_target(
                 name=f"example_{uuid.uuid4().hex}",
@@ -157,11 +164,11 @@ def test_target_quality(
             )
 
             expected_tracking_rating = {
-                high_quality_image: 5,
-                image_file_failed_state: 0,
-                image_file_success_state_low_rating: 0,
-                corrupted_image_file: -2,
-                different_high_quality_image: 0,
+                high_quality_image: TrackingRating.POSITIVE,
+                image_file_failed_state: TrackingRating.ZERO,
+                image_file_success_state_low_rating: TrackingRating.ZERO,
+                corrupted_image_file: TrackingRating.NEGATIVE,
+                different_high_quality_image: TrackingRating.ZERO,
             }[image_file]
             target_id_expected_rating_pairs.append(
                 (target_id, expected_tracking_rating),
@@ -174,10 +181,12 @@ def test_target_quality(
             vws_client.wait_for_target_processed(target_id=target_id)
 
             target_details = vws_client.get_target_record(target_id=target_id)
-            assert (
-                target_details.target_record.tracking_rating
-                == expected_tracking_rating
-            )
+            if expected_tracking_rating == TrackingRating.ZERO:
+                assert target_details.target_record.tracking_rating == 0
+            elif expected_tracking_rating == TrackingRating.NEGATIVE:
+                assert target_details.target_record.tracking_rating < 0
+            else:
+                assert target_details.target_record.tracking_rating > 0
 
 
 @pytest.mark.usefixtures("verify_mock_vuforia")