Merge pull request #1251 from roflcoopter/feature/reload-obj-det

feat(object_detector): prepare object detector for config reload

Author: roflcoopter

viseron/domains/object_detector/__init__.py

@@ -303,6 +303,8 @@ def __init__(
                     ObjectDetectedBinarySensorFoVLabel(
                         vis, object_filter[CONFIG_LABEL_LABEL], self._camera
                     ),
+                    DOMAIN,
+                    camera_identifier,
                 )
 
         self.zones: list[Zone] = []
@@ -360,8 +362,18 @@ def __init__(
                 )
                 self._scan_on_motion_only = False
 
-        vis.add_entity(component, ObjectDetectedBinarySensorFoV(vis, self._camera))
-        vis.add_entity(component, ObjectDetectorFPSSensor(vis, self, self._camera))
+        vis.add_entity(
+            component,
+            ObjectDetectedBinarySensorFoV(vis, self._camera),
+            DOMAIN,
+            camera_identifier,
+        )
+        vis.add_entity(
+            component,
+            ObjectDetectorFPSSensor(vis, self, self._camera),
+            DOMAIN,
+            camera_identifier,
+        )
 
     def __post_init__(self, *args, **kwargs):
         """Post init hook."""
@@ -603,7 +615,14 @@ def result_failed_callback(self):
         detector.
         """
 
+    def unload(self) -> None:
+        """Unload object detector."""
+        for unsubscribe in self._listeners:
+            unsubscribe()
+        self.stop()
+
     def stop(self) -> None:
         """Stop object detector."""
         self._kill_received = True
+        self._object_detection_thread.stop()
         self._object_detection_thread.join()

viseron/domains/object_detector/binary_sensor.py

@@ -31,11 +31,14 @@ def __init__(
 
     def setup(self) -> None:
         """Set up event listener."""
-        self._vis.listen_event(
-            EVENT_SCAN_FRAMES.format(
-                camera_identifier=self._camera.identifier, scanner_name=OBJECT_DETECTOR
-            ),
-            self.handle_stop_scan,
+        self._event_listeners.append(
+            self._vis.listen_event(
+                EVENT_SCAN_FRAMES.format(
+                    camera_identifier=self._camera.identifier,
+                    scanner_name=OBJECT_DETECTOR,
+                ),
+                self.handle_stop_scan,
+            )
         )
 
     @property
@@ -77,9 +80,11 @@ def __init__(
         self.object_id = f"{camera.identifier}_object_detected"
         self.name = f"{camera.name} Object Detected"
 
-        vis.listen_event(
-            EVENT_OBJECTS_IN_FOV.format(camera_identifier=camera.identifier),
-            self.handle_event,
+        self._event_listeners.append(
+            vis.listen_event(
+                EVENT_OBJECTS_IN_FOV.format(camera_identifier=camera.identifier),
+                self.handle_event,
+            )
         )
 
 
@@ -96,11 +101,13 @@ def __init__(
         self.object_id = f"{camera.identifier}_zone_{zone.name}_object_detected"
         self.name = f"{camera.name} Zone {zone.name} Object Detected"
 
-        vis.listen_event(
-            EVENT_OBJECTS_IN_ZONE.format(
-                camera_identifier=camera.identifier, zone_name=zone.name
-            ),
-            self.handle_event,
+        self._event_listeners.append(
+            vis.listen_event(
+                EVENT_OBJECTS_IN_ZONE.format(
+                    camera_identifier=camera.identifier, zone_name=zone.name
+                ),
+                self.handle_event,
+            )
         )
 
 
@@ -164,9 +171,11 @@ def __init__(
         self.object_id = f"{camera.identifier}_object_detected_{label}"
         self.name = f"{camera.name} Object Detected {label.capitalize()}"
 
-        vis.listen_event(
-            EVENT_OBJECTS_IN_FOV.format(camera_identifier=camera.identifier),
-            self.handle_event,
+        self._event_listeners.append(
+            vis.listen_event(
+                EVENT_OBJECTS_IN_FOV.format(camera_identifier=camera.identifier),
+                self.handle_event,
+            )
         )
 
 
@@ -186,9 +195,11 @@ def __init__(
             f"{camera.name} Zone {zone.name} Object Detected {label.capitalize()}"
         )
 
-        vis.listen_event(
-            EVENT_OBJECTS_IN_ZONE.format(
-                camera_identifier=camera.identifier, zone_name=zone.name
-            ),
-            self.handle_event,
+        self._event_listeners.append(
+            vis.listen_event(
+                EVENT_OBJECTS_IN_ZONE.format(
+                    camera_identifier=camera.identifier, zone_name=zone.name
+                ),
+                self.handle_event,
+            )
         )

viseron/domains/object_detector/zone.py

@@ -18,6 +18,7 @@
     CONFIG_COORDINATES,
     CONFIG_LABELS,
     CONFIG_ZONE_NAME,
+    DOMAIN,
     EVENT_OBJECTS_IN_ZONE,
 )
 
@@ -67,6 +68,8 @@ def __init__(
                     ObjectDetectedBinarySensorZoneLabel(
                         vis, self, object_filter[CONFIG_LABEL_LABEL], self._camera
                     ),
+                    DOMAIN,
+                    camera_identifier,
                 )
 
         else:
@@ -77,6 +80,8 @@ def __init__(
         vis.add_entity(
             component,
             ObjectDetectedBinarySensorZone(vis, self, self._camera),
+            DOMAIN,
+            camera_identifier,
         )
 
     def filter_zone(