From c1b06d63b6c0e7fa6b011e4bb3d925bad24ad7fa Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Fri, 28 Mar 2025 18:35:50 -0600 Subject: [PATCH] Fix embedding eps (#17437) * Fix embedding eps * Fix thumbnail cleanup --- frigate/embeddings/embeddings.py | 4 ++-- frigate/events/cleanup.py | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frigate/embeddings/embeddings.py b/frigate/embeddings/embeddings.py index 6eb060560..2fda584d3 100644 --- a/frigate/embeddings/embeddings.py +++ b/frigate/embeddings/embeddings.py @@ -126,8 +126,8 @@ class Embeddings: ) def update_stats(self) -> None: - self.metrics.image_embeddings_eps = self.image_eps.eps() - self.metrics.text_embeddings_eps = self.text_eps.eps() + self.metrics.image_embeddings_eps.value = self.image_eps.eps() + self.metrics.text_embeddings_eps.value = self.text_eps.eps() def get_model_definitions(self): # Version-specific models diff --git a/frigate/events/cleanup.py b/frigate/events/cleanup.py index ae39e3fd2..fbc7b6c3d 100644 --- a/frigate/events/cleanup.py +++ b/frigate/events/cleanup.py @@ -11,7 +11,7 @@ from frigate.config import FrigateConfig from frigate.const import CLIPS_DIR from frigate.db.sqlitevecq import SqliteVecQueueDatabase from frigate.models import Event, Timeline -from frigate.util.path import delete_event_images +from frigate.util.path import delete_event_snapshot, delete_event_thumbnail logger = logging.getLogger(__name__) @@ -98,7 +98,7 @@ class EventCleanup(threading.Thread): # delete the media from disk for expired in expired_events: - deleted = delete_event_images(expired) + deleted = delete_event_snapshot(expired) if not deleted: logger.warning( @@ -176,7 +176,7 @@ class EventCleanup(threading.Thread): # so no need to delete mp4 files for event in expired_events: events_to_update.append(event.id) - deleted = delete_event_images(event) + deleted = delete_event_snapshot(event) if not deleted: logger.warning( @@ -340,6 +340,10 @@ class EventCleanup(threading.Thread): .iterator() ) events_to_delete = [e.id for e in events] + + for e in events: + delete_event_thumbnail(e) + logger.debug(f"Found {len(events_to_delete)} events that can be expired") if len(events_to_delete) > 0: for i in range(0, len(events_to_delete), CHUNK_SIZE):