Use zmq for event end queue and update python deps (#10886)

* Use zmq for events ended

* Cleanup

* Update deps

* formatting
This commit is contained in:
Nicolas Mowen
2024-04-08 17:19:45 -06:00
committed by GitHub
parent c577361923
commit 8163c036ef
6 changed files with 67 additions and 20 deletions

View File

@@ -6,6 +6,7 @@ import os
import queue
import threading
from collections import Counter, defaultdict
from multiprocessing.synchronize import Event as MpEvent
from statistics import median
from typing import Callable
@@ -14,7 +15,7 @@ import numpy as np
from frigate.comms.detections_updater import DetectionPublisher, DetectionTypeEnum
from frigate.comms.dispatcher import Dispatcher
from frigate.comms.events_updater import EventUpdatePublisher
from frigate.comms.events_updater import EventEndSubscriber, EventUpdatePublisher
from frigate.config import (
CameraConfig,
FrigateConfig,
@@ -827,7 +828,6 @@ class TrackedObjectProcessor(threading.Thread):
config: FrigateConfig,
dispatcher: Dispatcher,
tracked_objects_queue,
event_processed_queue,
ptz_autotracker_thread,
stop_event,
):
@@ -836,14 +836,14 @@ class TrackedObjectProcessor(threading.Thread):
self.config = config
self.dispatcher = dispatcher
self.tracked_objects_queue = tracked_objects_queue
self.event_processed_queue = event_processed_queue
self.stop_event = stop_event
self.stop_event: MpEvent = stop_event
self.camera_states: dict[str, CameraState] = {}
self.frame_manager = SharedMemoryFrameManager()
self.last_motion_detected: dict[str, float] = {}
self.ptz_autotracker_thread = ptz_autotracker_thread
self.detection_publisher = DetectionPublisher(DetectionTypeEnum.video)
self.event_sender = EventUpdatePublisher()
self.event_end_subscriber = EventEndSubscriber()
def start(camera, obj: TrackedObject, current_frame_time):
self.event_sender.publish(
@@ -1215,10 +1215,16 @@ class TrackedObjectProcessor(threading.Thread):
)
# cleanup event finished queue
while not self.event_processed_queue.empty():
event_id, camera = self.event_processed_queue.get()
while not self.stop_event.is_set():
update = self.event_end_subscriber.check_for_update(timeout=0.01)
if not update:
break
event_id, camera = update
self.camera_states[camera].finished(event_id)
self.detection_publisher.stop()
self.event_sender.stop()
self.event_end_subscriber.stop()
logger.info("Exiting object processor...")