Skip to content

feat(object_detector): prepare object detector for config reload #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roflcoopter merged 1 commit into from
Feb 13, 2026
Merged

feat(object_detector): prepare object detector for config reload #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions viseron/domains/object_detector/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ def __init__(
ObjectDetectedBinarySensorFoVLabel(
vis, object_filter[CONFIG_LABEL_LABEL], self._camera
),
DOMAIN,
camera_identifier,
)

self.zones: list[Zone] = []
Expand Down Expand Up @@ -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."""
Expand Down Expand Up @@ -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()
53 changes: 32 additions & 21 deletions viseron/domains/object_detector/binary_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
)


Expand All @@ -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,
)
)


Expand Down Expand Up @@ -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,
)
)


Expand All @@ -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,
)
)
5 changes: 5 additions & 0 deletions viseron/domains/object_detector/zone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
CONFIG_COORDINATES,
CONFIG_LABELS,
CONFIG_ZONE_NAME,
DOMAIN,
EVENT_OBJECTS_IN_ZONE,
)

Expand Down Expand Up @@ -67,6 +68,8 @@ def __init__(
ObjectDetectedBinarySensorZoneLabel(
vis, self, object_filter[CONFIG_LABEL_LABEL], self._camera
),
DOMAIN,
camera_identifier,
)

else:
Expand All @@ -77,6 +80,8 @@ def __init__(
vis.add_entity(
component,
ObjectDetectedBinarySensorZone(vis, self, self._camera),
DOMAIN,
camera_identifier,
)

def filter_zone(
Expand Down
Loading