From 6137aaaea35f8542a4b55ea21f406f2b45ba0eb6 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Fri, 10 Jan 2025 07:56:57 -0700 Subject: [PATCH] Rename processing metrics --- frigate/app.py | 6 +++--- frigate/embeddings/__init__.py | 4 ++-- frigate/embeddings/embeddings.py | 4 ++-- frigate/embeddings/maintainer.py | 4 ++-- frigate/{embeddings => postprocessing}/types.py | 2 +- frigate/stats/util.py | 4 ++-- frigate/types.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename frigate/{embeddings => postprocessing}/types.py (94%) diff --git a/frigate/app.py b/frigate/app.py index ad5d167c8..e3f2f9d7f 100644 --- a/frigate/app.py +++ b/frigate/app.py @@ -41,7 +41,6 @@ from frigate.const import ( ) from frigate.db.sqlitevecq import SqliteVecQueueDatabase from frigate.embeddings import EmbeddingsContext, manage_embeddings -from frigate.embeddings.types import EmbeddingsMetrics from frigate.events.audio import AudioProcessor from frigate.events.cleanup import EventCleanup from frigate.events.external import ExternalEventProcessor @@ -60,6 +59,7 @@ from frigate.models import ( from frigate.object_detection import ObjectDetectProcess from frigate.object_processing import TrackedObjectProcessor from frigate.output.output import output_frames +from frigate.postprocessing.types import PostProcessingMetrics from frigate.ptz.autotrack import PtzAutoTrackerThread from frigate.ptz.onvif import OnvifController from frigate.record.cleanup import RecordingCleanup @@ -90,8 +90,8 @@ class FrigateApp: self.detection_shms: list[mp.shared_memory.SharedMemory] = [] self.log_queue: Queue = mp.Queue() self.camera_metrics: dict[str, CameraMetrics] = {} - self.embeddings_metrics: EmbeddingsMetrics | None = ( - EmbeddingsMetrics() if config.semantic_search.enabled else None + self.embeddings_metrics: PostProcessingMetrics | None = ( + PostProcessingMetrics() if config.semantic_search.enabled else None ) self.ptz_metrics: dict[str, PTZMetrics] = {} self.processes: dict[str, int] = {} diff --git a/frigate/embeddings/__init__.py b/frigate/embeddings/__init__.py index 05c49013e..d75d88500 100644 --- a/frigate/embeddings/__init__.py +++ b/frigate/embeddings/__init__.py @@ -20,14 +20,14 @@ from frigate.models import Event from frigate.util.builtin import serialize from frigate.util.services import listen +from ..postprocessing.types import PostProcessingMetrics from .maintainer import EmbeddingMaintainer -from .types import EmbeddingsMetrics from .util import ZScoreNormalization logger = logging.getLogger(__name__) -def manage_embeddings(config: FrigateConfig, metrics: EmbeddingsMetrics) -> None: +def manage_embeddings(config: FrigateConfig, metrics: PostProcessingMetrics) -> None: # Only initialize embeddings if semantic search is enabled if not config.semantic_search.enabled: return diff --git a/frigate/embeddings/embeddings.py b/frigate/embeddings/embeddings.py index 376ae4713..3f046d0c3 100644 --- a/frigate/embeddings/embeddings.py +++ b/frigate/embeddings/embeddings.py @@ -21,8 +21,8 @@ from frigate.models import Event from frigate.types import ModelStatusTypesEnum from frigate.util.builtin import serialize +from ..postprocessing.types import PostProcessingMetrics from .functions.onnx import GenericONNXEmbedding, ModelTypeEnum -from .types import EmbeddingsMetrics logger = logging.getLogger(__name__) @@ -65,7 +65,7 @@ class Embeddings: self, config: FrigateConfig, db: SqliteVecQueueDatabase, - metrics: EmbeddingsMetrics, + metrics: PostProcessingMetrics, ) -> None: self.config = config self.db = db diff --git a/frigate/embeddings/maintainer.py b/frigate/embeddings/maintainer.py index 90ffd6455..c98cee2ce 100644 --- a/frigate/embeddings/maintainer.py +++ b/frigate/embeddings/maintainer.py @@ -39,8 +39,8 @@ from frigate.types import TrackedObjectUpdateTypesEnum from frigate.util.builtin import serialize from frigate.util.image import SharedMemoryFrameManager, area, calculate_region +from ..postprocessing.types import PostProcessingMetrics from .embeddings import Embeddings -from .types import EmbeddingsMetrics logger = logging.getLogger(__name__) @@ -54,7 +54,7 @@ class EmbeddingMaintainer(threading.Thread): self, db: SqliteQueueDatabase, config: FrigateConfig, - metrics: EmbeddingsMetrics, + metrics: PostProcessingMetrics, stop_event: MpEvent, ) -> None: super().__init__(name="embeddings_maintainer") diff --git a/frigate/embeddings/types.py b/frigate/postprocessing/types.py similarity index 94% rename from frigate/embeddings/types.py rename to frigate/postprocessing/types.py index bd994246c..464658219 100644 --- a/frigate/embeddings/types.py +++ b/frigate/postprocessing/types.py @@ -4,7 +4,7 @@ import multiprocessing as mp from multiprocessing.sharedctypes import Synchronized -class EmbeddingsMetrics: +class PostProcessingMetrics: image_embeddings_fps: Synchronized text_embeddings_sps: Synchronized face_rec_fps: Synchronized diff --git a/frigate/stats/util.py b/frigate/stats/util.py index d62ac2ee4..ec1bc0683 100644 --- a/frigate/stats/util.py +++ b/frigate/stats/util.py @@ -14,8 +14,8 @@ from requests.exceptions import RequestException from frigate.camera import CameraMetrics from frigate.config import FrigateConfig from frigate.const import CACHE_DIR, CLIPS_DIR, RECORD_DIR -from frigate.embeddings.types import EmbeddingsMetrics from frigate.object_detection import ObjectDetectProcess +from frigate.postprocessing.types import PostProcessingMetrics from frigate.types import StatsTrackingTypes from frigate.util.services import ( get_amd_gpu_stats, @@ -52,7 +52,7 @@ def get_latest_version(config: FrigateConfig) -> str: def stats_init( config: FrigateConfig, camera_metrics: dict[str, CameraMetrics], - embeddings_metrics: EmbeddingsMetrics | None, + embeddings_metrics: PostProcessingMetrics | None, detectors: dict[str, ObjectDetectProcess], processes: dict[str, int], ) -> StatsTrackingTypes: diff --git a/frigate/types.py b/frigate/types.py index 7c32646cc..f375430e2 100644 --- a/frigate/types.py +++ b/frigate/types.py @@ -2,13 +2,13 @@ from enum import Enum from typing import TypedDict from frigate.camera import CameraMetrics -from frigate.embeddings.types import EmbeddingsMetrics from frigate.object_detection import ObjectDetectProcess +from frigate.postprocessing.types import PostProcessingMetrics class StatsTrackingTypes(TypedDict): camera_metrics: dict[str, CameraMetrics] - embeddings_metrics: EmbeddingsMetrics | None + embeddings_metrics: PostProcessingMetrics | None detectors: dict[str, ObjectDetectProcess] started: int latest_frigate_version: str