From 4b6fa49449b59d4a0ea0e848b94c6339843f33d0 Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Fri, 29 May 2026 07:53:17 -0500 Subject: [PATCH] Miscellaneous fixes (#23335) * stabilize chart options to stop ApexCharts updateOptions running on every stats tick * constrain height of export dialog * stop audio maintainer when deleting a camera * run face register and recognize API handlers in threadpool --- frigate/api/classification.py | 8 ++-- frigate/events/audio.py | 52 +++++++++++++++++---- web/src/components/graph/LineGraph.tsx | 50 +++++++++++++------- web/src/components/graph/SystemGraph.tsx | 25 ++++++---- web/src/components/overlay/ExportDialog.tsx | 2 +- 5 files changed, 96 insertions(+), 41 deletions(-) diff --git a/frigate/api/classification.py b/frigate/api/classification.py index dea4d28b21..6dd7055092 100644 --- a/frigate/api/classification.py +++ b/frigate/api/classification.py @@ -280,7 +280,7 @@ async def create_face(request: Request, name: str): success response with details about the registration, or an error if face recognition is not enabled or the image cannot be processed.""", ) -async def register_face(request: Request, name: str, file: UploadFile): +def register_face(request: Request, name: str, file: UploadFile): if not request.app.frigate_config.face_recognition.enabled: return JSONResponse( status_code=400, @@ -288,7 +288,7 @@ async def register_face(request: Request, name: str, file: UploadFile): ) context: EmbeddingsContext = request.app.embeddings - result = None if context is None else context.register_face(name, await file.read()) + result = None if context is None else context.register_face(name, file.file.read()) if not isinstance(result, dict): return JSONResponse( @@ -313,7 +313,7 @@ async def register_face(request: Request, name: str, file: UploadFile): registered faces in the system. Returns the recognized face name and confidence score, or an error if face recognition is not enabled or the image cannot be processed.""", ) -async def recognize_face(request: Request, file: UploadFile): +def recognize_face(request: Request, file: UploadFile): if not request.app.frigate_config.face_recognition.enabled: return JSONResponse( status_code=400, @@ -321,7 +321,7 @@ async def recognize_face(request: Request, file: UploadFile): ) context: EmbeddingsContext = request.app.embeddings - result = context.recognize_face(await file.read()) + result = context.recognize_face(file.file.read()) if not isinstance(result, dict): return JSONResponse( diff --git a/frigate/events/audio.py b/frigate/events/audio.py index b90b795778..d44521787c 100644 --- a/frigate/events/audio.py +++ b/frigate/events/audio.py @@ -94,9 +94,21 @@ class AudioProcessor(FrigateProcess): self.camera_metrics = camera_metrics self.config = config + def __stop_audio_thread(self, camera: str) -> None: + thread = self.audio_threads.pop(camera, None) + if thread is None: + return + + thread.stop() + thread.join(10) + if thread.is_alive(): + self.logger.warning(f"Audio maintainer thread for {camera} is still alive") + else: + self.logger.info(f"Audio maintainer stopped for {camera}") + def run(self) -> None: self.pre_run_setup(self.config.logger) - audio_threads: dict[str, AudioEventMaintainer] = {} + self.audio_threads: dict[str, AudioEventMaintainer] = {} threading.current_thread().name = "process:audio_manager" @@ -120,12 +132,13 @@ class AudioProcessor(FrigateProcess): CameraConfigUpdateEnum.add, CameraConfigUpdateEnum.audio, CameraConfigUpdateEnum.ffmpeg, + CameraConfigUpdateEnum.remove, ], ) def spawn_if_needed(camera: CameraConfig) -> None: name = camera.name - if name is None or name in audio_threads: + if name is None or name in self.audio_threads: return if not camera.enabled or not camera.audio.enabled: return @@ -139,7 +152,7 @@ class AudioProcessor(FrigateProcess): self.transcription_model_runner, self.stop_event, # type: ignore[arg-type] ) - audio_threads[name] = thread + self.audio_threads[name] = thread thread.start() self.logger.info(f"Audio maintainer started for {name}") @@ -148,21 +161,31 @@ class AudioProcessor(FrigateProcess): self.logger.info(f"Audio processor started (pid: {self.pid})") - # poll for newly added cameras or cameras flipped to audio.enabled at runtime + # poll for newly added/removed cameras or cameras flipped to + # audio.enabled at runtime while not self.stop_event.wait(timeout=1.0): - config_subscriber.check_for_updates() + updated_topics = config_subscriber.check_for_updates() + + # stop maintainers for removed cameras so their ffmpeg process is + # torn down and they stop touching camera_metrics (which the camera + # maintainer has already popped for the removed camera) + for removed_camera in updated_topics.get( + CameraConfigUpdateEnum.remove.name, [] + ): + self.__stop_audio_thread(removed_camera) + for camera in self.config.cameras.values(): spawn_if_needed(camera) config_subscriber.stop() - for thread in audio_threads.values(): + for thread in self.audio_threads.values(): thread.join(1) if thread.is_alive(): self.logger.info(f"Waiting for thread {thread.name:s} to exit") thread.join(10) - for thread in audio_threads.values(): + for thread in self.audio_threads.values(): if thread.is_alive(): self.logger.warning(f"Thread {thread.name} is still alive") @@ -184,6 +207,9 @@ class AudioEventMaintainer(threading.Thread): self.camera_config = camera self.camera_metrics = camera_metrics self.stop_event = stop_event + # per-camera stop signal so a single maintainer can be torn down at + # runtime (e.g. on camera removal) without stopping the whole process + self.camera_stop_event = threading.Event() self.detector = AudioTfl(stop_event, self.camera_config.audio.num_threads) self.shape = (int(round(AUDIO_DURATION * AUDIO_SAMPLE_RATE)),) self.chunk_size = int(round(AUDIO_DURATION * AUDIO_SAMPLE_RATE * 2)) @@ -233,7 +259,11 @@ class AudioEventMaintainer(threading.Thread): self.was_audio_enabled = camera.audio.enabled def detect_audio(self, audio: np.ndarray) -> None: - if not self.camera_config.audio.enabled or self.stop_event.is_set(): + if ( + not self.camera_config.audio.enabled + or self.stop_event.is_set() + or self.camera_stop_event.is_set() + ): return audio_as_float: np.ndarray = audio.astype(np.float32) @@ -352,11 +382,15 @@ class AudioEventMaintainer(threading.Thread): self.logger.error(f"Error reading audio data from ffmpeg process: {e}") log_and_restart() + def stop(self) -> None: + """Signal this maintainer to exit its run loop and clean up.""" + self.camera_stop_event.set() + def run(self) -> None: if self.camera_config.enabled: self.start_or_restart_ffmpeg() - while not self.stop_event.is_set(): + while not self.stop_event.is_set() and not self.camera_stop_event.is_set(): # check if there is an updated config self.config_subscriber.check_for_updates() diff --git a/web/src/components/graph/LineGraph.tsx b/web/src/components/graph/LineGraph.tsx index b571bdfc25..c7d1b0f4e6 100644 --- a/web/src/components/graph/LineGraph.tsx +++ b/web/src/components/graph/LineGraph.tsx @@ -56,18 +56,25 @@ export function CameraLineGraph({ }); }, [t, timeFormat]); + const updateTimesRef = useRef(updateTimes); + useEffect(() => { + updateTimesRef.current = updateTimes; + }, [updateTimes]); + const formatTime = useCallback( (val: unknown) => { - return formatUnixTimestampToDateTime( - updateTimes[Math.round(val as number)], - { - timezone: config?.ui.timezone, - date_format: format, - locale, - }, - ); + const times = updateTimesRef.current; + const ts = times[Math.round(val as number)]; + if (isNaN(ts)) { + return ""; + } + return formatUnixTimestampToDateTime(ts, { + timezone: config?.ui.timezone, + date_format: format, + locale, + }); }, - [config?.ui.timezone, format, locale, updateTimes], + [config?.ui.timezone, format, locale], ); const options = useMemo(() => { @@ -211,18 +218,25 @@ export function EventsPerSecondsLineGraph({ }); }, [t, timeFormat]); + const updateTimesRef = useRef(updateTimes); + useEffect(() => { + updateTimesRef.current = updateTimes; + }, [updateTimes]); + const formatTime = useCallback( (val: unknown) => { - return formatUnixTimestampToDateTime( - updateTimes[Math.round(val as number) - 1], - { - timezone: config?.ui.timezone, - date_format: format, - locale, - }, - ); + const times = updateTimesRef.current; + const ts = times[Math.round(val as number) - 1]; + if (isNaN(ts)) { + return ""; + } + return formatUnixTimestampToDateTime(ts, { + timezone: config?.ui.timezone, + date_format: format, + locale, + }); }, - [config?.ui.timezone, format, locale, updateTimes], + [config?.ui.timezone, format, locale], ); const options = useMemo(() => { diff --git a/web/src/components/graph/SystemGraph.tsx b/web/src/components/graph/SystemGraph.tsx index c1ee47f710..f7610cf30f 100644 --- a/web/src/components/graph/SystemGraph.tsx +++ b/web/src/components/graph/SystemGraph.tsx @@ -61,6 +61,11 @@ export function ThresholdBarGraph({ }); }, [t, timeFormat]); + const updateTimesRef = useRef(updateTimes); + useEffect(() => { + updateTimesRef.current = updateTimes; + }, [updateTimes]); + const formatTime = useCallback( (val: unknown) => { const dateIndex = Math.round(val as number); @@ -69,16 +74,18 @@ export function ThresholdBarGraph({ if (dateIndex < 0) { timeOffset = 5 * Math.abs(dateIndex); } - return formatUnixTimestampToDateTime( - updateTimes[Math.max(1, dateIndex) - 1] - timeOffset, - { - timezone: config?.ui.timezone, - date_format: format, - locale, - }, - ); + const times = updateTimesRef.current; + const ts = times[Math.max(1, dateIndex) - 1] - timeOffset; + if (isNaN(ts)) { + return ""; + } + return formatUnixTimestampToDateTime(ts, { + timezone: config?.ui.timezone, + date_format: format, + locale, + }); }, - [config?.ui.timezone, format, locale, updateTimes], + [config?.ui.timezone, format, locale], ); const options = useMemo(() => { diff --git a/web/src/components/overlay/ExportDialog.tsx b/web/src/components/overlay/ExportDialog.tsx index 6d407ecc34..12f2141a4b 100644 --- a/web/src/components/overlay/ExportDialog.tsx +++ b/web/src/components/overlay/ExportDialog.tsx @@ -287,7 +287,7 @@ export default function ExportDialog({