3.0.1 (#42)

* Fix bug where end of detection caused crash

* Cleanup

* Update version

* Formatting

Author: NickM-27

Makefile

@@ -1,7 +1,7 @@
 default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
-VERSION = 3.0.0
+VERSION = 3.0.1
 
 local:
 	cd web; flutter build web;

swatch/detection.py

@@ -3,15 +3,14 @@
 import datetime
 import logging
 import multiprocessing
-import random
-import string
 import threading
 from typing import Any, Dict
 
 from swatch.config import CameraConfig, SwatchConfig
 from swatch.image import ImageProcessor
 from swatch.models import Detection
 from swatch.snapshot import SnapshotProcessor
+from swatch.util import get_random_suffix
 
 
 logger = logging.getLogger(__name__)
@@ -77,7 +76,7 @@ def __handle_detections__(self, detection_result: Dict[str, Any]) -> None:
                     self.obj_data[non_unique_id] = {}
 
                 unique_id = (
-                    f"{non_unique_id}.{''.join(random.choices(string.ascii_lowercase + string.digits, k=6))}"
+                    f"{non_unique_id}.{get_random_suffix()}"
                     if not self.obj_data[non_unique_id].get("id")
                     else self.obj_data[non_unique_id]["id"]
                 )
@@ -86,21 +85,22 @@ def __handle_detections__(self, detection_result: Dict[str, Any]) -> None:
                 self.obj_data[non_unique_id]["zone_name"] = zone_name
                 self.obj_data[non_unique_id]["variant"] = object_result["variant"]
 
-                top_area = max([d["area"] for d in object_result["objects"]])
-                best_box = next(
-                    d for d in object_result["objects"] if d["area"] == top_area
-                )["box"]
+                if object_result.get("objects"):
+                    top_area = max([d["area"] for d in object_result["objects"]])
+                    best_box = next(
+                        d for d in object_result["objects"] if d["area"] == top_area
+                    )["box"]
 
-                if top_area > self.obj_data[non_unique_id].get("top_area", 0):
-                    self.obj_data[non_unique_id]["top_area"] = top_area
+                    if top_area > self.obj_data[non_unique_id].get("top_area", 0):
+                        self.obj_data[non_unique_id]["top_area"] = top_area
 
-                    # save snapshot with best area
-                    self.snap_processor.save_detection_snapshot(
-                        cam_name,
-                        zone_name,
-                        unique_id,
-                        best_box,
-                    )
+                        # save snapshot with best area
+                        self.snap_processor.save_detection_snapshot(
+                            cam_name,
+                            zone_name,
+                            unique_id,
+                            best_box,
+                        )
 
                 if not self.obj_data[non_unique_id].get("id"):
                     self.obj_data[non_unique_id]["id"] = unique_id
@@ -113,6 +113,7 @@ def __handle_detections__(self, detection_result: Dict[str, Any]) -> None:
                         del self.obj_data[non_unique_id]
 
     def run(self) -> None:
+        # pylint: disable=singleton-comparison
         logger.info("Starting Auto Detection for %s", self.config.name)
 
         while not self.stop_event.wait(self.config.auto_detect):
@@ -123,7 +124,7 @@ def run(self) -> None:
 
         # ensure db doesn't contain bad data after shutdown
         Detection.update(end_time=datetime.datetime.now().timestamp()).where(
-            Detection.end_time is None
+            Detection.end_time == None
         ).execute()
         logger.info("Stopping Auto Detection for %s", self.config.name)
 

swatch/util.py

@@ -1,5 +1,7 @@
 """Utilities and convenience funs."""
 
+import random
+import string
 from typing import Any, Dict, Set, Tuple
 
 from colorthief import ColorThief
@@ -9,6 +11,9 @@
 from swatch.config import ColorVariantConfig, ObjectConfig
 
 
+### Image utils
+
+
 def mask_image(crop: Any, color_variant: ColorVariantConfig) -> Tuple[Any, int]:
     """Mask an image with color values"""
     color_lower = (
@@ -65,3 +70,11 @@ def parse_colors_from_image(test_image: Any) -> tuple[str, set[str]]:
     main_color = color_thief.get_color(quality=1)
     palette = color_thief.get_palette(color_count=3)
     return (main_color, palette)
+
+
+### String utils
+
+
+def get_random_suffix():
+    """Returns 6 random character suffix string."""
+    return "".join(random.choices(string.ascii_lowercase + string.digits, k=6))