mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-18 09:04:28 +03:00
Rename processing metrics
This commit is contained in:
parent
c9e3ab1c5c
commit
6137aaaea3
@ -41,7 +41,6 @@ from frigate.const import (
|
|||||||
)
|
)
|
||||||
from frigate.db.sqlitevecq import SqliteVecQueueDatabase
|
from frigate.db.sqlitevecq import SqliteVecQueueDatabase
|
||||||
from frigate.embeddings import EmbeddingsContext, manage_embeddings
|
from frigate.embeddings import EmbeddingsContext, manage_embeddings
|
||||||
from frigate.embeddings.types import EmbeddingsMetrics
|
|
||||||
from frigate.events.audio import AudioProcessor
|
from frigate.events.audio import AudioProcessor
|
||||||
from frigate.events.cleanup import EventCleanup
|
from frigate.events.cleanup import EventCleanup
|
||||||
from frigate.events.external import ExternalEventProcessor
|
from frigate.events.external import ExternalEventProcessor
|
||||||
@ -60,6 +59,7 @@ from frigate.models import (
|
|||||||
from frigate.object_detection import ObjectDetectProcess
|
from frigate.object_detection import ObjectDetectProcess
|
||||||
from frigate.object_processing import TrackedObjectProcessor
|
from frigate.object_processing import TrackedObjectProcessor
|
||||||
from frigate.output.output import output_frames
|
from frigate.output.output import output_frames
|
||||||
|
from frigate.postprocessing.types import PostProcessingMetrics
|
||||||
from frigate.ptz.autotrack import PtzAutoTrackerThread
|
from frigate.ptz.autotrack import PtzAutoTrackerThread
|
||||||
from frigate.ptz.onvif import OnvifController
|
from frigate.ptz.onvif import OnvifController
|
||||||
from frigate.record.cleanup import RecordingCleanup
|
from frigate.record.cleanup import RecordingCleanup
|
||||||
@ -90,8 +90,8 @@ class FrigateApp:
|
|||||||
self.detection_shms: list[mp.shared_memory.SharedMemory] = []
|
self.detection_shms: list[mp.shared_memory.SharedMemory] = []
|
||||||
self.log_queue: Queue = mp.Queue()
|
self.log_queue: Queue = mp.Queue()
|
||||||
self.camera_metrics: dict[str, CameraMetrics] = {}
|
self.camera_metrics: dict[str, CameraMetrics] = {}
|
||||||
self.embeddings_metrics: EmbeddingsMetrics | None = (
|
self.embeddings_metrics: PostProcessingMetrics | None = (
|
||||||
EmbeddingsMetrics() if config.semantic_search.enabled else None
|
PostProcessingMetrics() if config.semantic_search.enabled else None
|
||||||
)
|
)
|
||||||
self.ptz_metrics: dict[str, PTZMetrics] = {}
|
self.ptz_metrics: dict[str, PTZMetrics] = {}
|
||||||
self.processes: dict[str, int] = {}
|
self.processes: dict[str, int] = {}
|
||||||
|
|||||||
@ -20,14 +20,14 @@ from frigate.models import Event
|
|||||||
from frigate.util.builtin import serialize
|
from frigate.util.builtin import serialize
|
||||||
from frigate.util.services import listen
|
from frigate.util.services import listen
|
||||||
|
|
||||||
|
from ..postprocessing.types import PostProcessingMetrics
|
||||||
from .maintainer import EmbeddingMaintainer
|
from .maintainer import EmbeddingMaintainer
|
||||||
from .types import EmbeddingsMetrics
|
|
||||||
from .util import ZScoreNormalization
|
from .util import ZScoreNormalization
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
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
|
# Only initialize embeddings if semantic search is enabled
|
||||||
if not config.semantic_search.enabled:
|
if not config.semantic_search.enabled:
|
||||||
return
|
return
|
||||||
|
|||||||
@ -21,8 +21,8 @@ from frigate.models import Event
|
|||||||
from frigate.types import ModelStatusTypesEnum
|
from frigate.types import ModelStatusTypesEnum
|
||||||
from frigate.util.builtin import serialize
|
from frigate.util.builtin import serialize
|
||||||
|
|
||||||
|
from ..postprocessing.types import PostProcessingMetrics
|
||||||
from .functions.onnx import GenericONNXEmbedding, ModelTypeEnum
|
from .functions.onnx import GenericONNXEmbedding, ModelTypeEnum
|
||||||
from .types import EmbeddingsMetrics
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ class Embeddings:
|
|||||||
self,
|
self,
|
||||||
config: FrigateConfig,
|
config: FrigateConfig,
|
||||||
db: SqliteVecQueueDatabase,
|
db: SqliteVecQueueDatabase,
|
||||||
metrics: EmbeddingsMetrics,
|
metrics: PostProcessingMetrics,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.config = config
|
self.config = config
|
||||||
self.db = db
|
self.db = db
|
||||||
|
|||||||
@ -39,8 +39,8 @@ from frigate.types import TrackedObjectUpdateTypesEnum
|
|||||||
from frigate.util.builtin import serialize
|
from frigate.util.builtin import serialize
|
||||||
from frigate.util.image import SharedMemoryFrameManager, area, calculate_region
|
from frigate.util.image import SharedMemoryFrameManager, area, calculate_region
|
||||||
|
|
||||||
|
from ..postprocessing.types import PostProcessingMetrics
|
||||||
from .embeddings import Embeddings
|
from .embeddings import Embeddings
|
||||||
from .types import EmbeddingsMetrics
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ class EmbeddingMaintainer(threading.Thread):
|
|||||||
self,
|
self,
|
||||||
db: SqliteQueueDatabase,
|
db: SqliteQueueDatabase,
|
||||||
config: FrigateConfig,
|
config: FrigateConfig,
|
||||||
metrics: EmbeddingsMetrics,
|
metrics: PostProcessingMetrics,
|
||||||
stop_event: MpEvent,
|
stop_event: MpEvent,
|
||||||
) -> None:
|
) -> None:
|
||||||
super().__init__(name="embeddings_maintainer")
|
super().__init__(name="embeddings_maintainer")
|
||||||
|
|||||||
@ -4,7 +4,7 @@ import multiprocessing as mp
|
|||||||
from multiprocessing.sharedctypes import Synchronized
|
from multiprocessing.sharedctypes import Synchronized
|
||||||
|
|
||||||
|
|
||||||
class EmbeddingsMetrics:
|
class PostProcessingMetrics:
|
||||||
image_embeddings_fps: Synchronized
|
image_embeddings_fps: Synchronized
|
||||||
text_embeddings_sps: Synchronized
|
text_embeddings_sps: Synchronized
|
||||||
face_rec_fps: Synchronized
|
face_rec_fps: Synchronized
|
||||||
@ -14,8 +14,8 @@ from requests.exceptions import RequestException
|
|||||||
from frigate.camera import CameraMetrics
|
from frigate.camera import CameraMetrics
|
||||||
from frigate.config import FrigateConfig
|
from frigate.config import FrigateConfig
|
||||||
from frigate.const import CACHE_DIR, CLIPS_DIR, RECORD_DIR
|
from frigate.const import CACHE_DIR, CLIPS_DIR, RECORD_DIR
|
||||||
from frigate.embeddings.types import EmbeddingsMetrics
|
|
||||||
from frigate.object_detection import ObjectDetectProcess
|
from frigate.object_detection import ObjectDetectProcess
|
||||||
|
from frigate.postprocessing.types import PostProcessingMetrics
|
||||||
from frigate.types import StatsTrackingTypes
|
from frigate.types import StatsTrackingTypes
|
||||||
from frigate.util.services import (
|
from frigate.util.services import (
|
||||||
get_amd_gpu_stats,
|
get_amd_gpu_stats,
|
||||||
@ -52,7 +52,7 @@ def get_latest_version(config: FrigateConfig) -> str:
|
|||||||
def stats_init(
|
def stats_init(
|
||||||
config: FrigateConfig,
|
config: FrigateConfig,
|
||||||
camera_metrics: dict[str, CameraMetrics],
|
camera_metrics: dict[str, CameraMetrics],
|
||||||
embeddings_metrics: EmbeddingsMetrics | None,
|
embeddings_metrics: PostProcessingMetrics | None,
|
||||||
detectors: dict[str, ObjectDetectProcess],
|
detectors: dict[str, ObjectDetectProcess],
|
||||||
processes: dict[str, int],
|
processes: dict[str, int],
|
||||||
) -> StatsTrackingTypes:
|
) -> StatsTrackingTypes:
|
||||||
|
|||||||
@ -2,13 +2,13 @@ from enum import Enum
|
|||||||
from typing import TypedDict
|
from typing import TypedDict
|
||||||
|
|
||||||
from frigate.camera import CameraMetrics
|
from frigate.camera import CameraMetrics
|
||||||
from frigate.embeddings.types import EmbeddingsMetrics
|
|
||||||
from frigate.object_detection import ObjectDetectProcess
|
from frigate.object_detection import ObjectDetectProcess
|
||||||
|
from frigate.postprocessing.types import PostProcessingMetrics
|
||||||
|
|
||||||
|
|
||||||
class StatsTrackingTypes(TypedDict):
|
class StatsTrackingTypes(TypedDict):
|
||||||
camera_metrics: dict[str, CameraMetrics]
|
camera_metrics: dict[str, CameraMetrics]
|
||||||
embeddings_metrics: EmbeddingsMetrics | None
|
embeddings_metrics: PostProcessingMetrics | None
|
||||||
detectors: dict[str, ObjectDetectProcess]
|
detectors: dict[str, ObjectDetectProcess]
|
||||||
started: int
|
started: int
|
||||||
latest_frigate_version: str
|
latest_frigate_version: str
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user