administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 01:35:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Set types and clenup

Browse Source
This commit is contained in:
Nick Mowen 2022-11-19 10:15:57 -07:00
parent 3b8c3c7514
commit 5a59426c64
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frigate/mqtt.py
View File

@ -26,10 +26,9 @@ class FrigateMqttClient:
def __init__( def __init__(
self, config: FrigateConfig, camera_metrics: dict[str, CameraMetricsTypes] self, config: FrigateConfig, camera_metrics: dict[str, CameraMetricsTypes]
) -> None: ) -> None:
self.config: FrigateConfig = config self.config = config
self.mqtt_config = config.mqtt self.mqtt_config = config.mqtt
self.camera_metrics: dict[str, CameraMetricsTypes] = camera_metrics self.camera_metrics = camera_metrics
self.client: mqtt.Client = None
self.connected: bool = False self.connected: bool = False
self._start() self._start()

13
frigate/object_processing.py
View File

@ -12,8 +12,15 @@ from typing import Callable
import cv2 import cv2
import numpy as np import numpy as np
from frigate.config import CameraConfig, SnapshotsConfig, RecordConfig, FrigateConfig from frigate.config import (
CameraConfig,
MqttConfig,
SnapshotsConfig,
RecordConfig,
FrigateConfig,
)
from frigate.const import CLIPS_DIR from frigate.const import CLIPS_DIR
from frigate.mqtt import FrigateMqttClient
from frigate.util import ( from frigate.util import (
SharedMemoryFrameManager, SharedMemoryFrameManager,
calculate_region, calculate_region,
@ -626,7 +633,7 @@ class TrackedObjectProcessor(threading.Thread):
def __init__( def __init__(
self, self,
config: FrigateConfig, config: FrigateConfig,
client, client: FrigateMqttClient,
topic_prefix, topic_prefix,
tracked_objects_queue, tracked_objects_queue,
event_queue, event_queue,
@ -724,7 +731,7 @@ class TrackedObjectProcessor(threading.Thread):
self.event_queue.put(("end", camera, obj.to_dict(include_thumbnail=True))) self.event_queue.put(("end", camera, obj.to_dict(include_thumbnail=True)))
def snapshot(camera, obj: TrackedObject, current_frame_time): def snapshot(camera, obj: TrackedObject, current_frame_time):
mqtt_config = self.config.cameras[camera].mqtt mqtt_config: MqttConfig = self.config.cameras[camera].mqtt
if mqtt_config.enabled and self.should_mqtt_snapshot(camera, obj): if mqtt_config.enabled and self.should_mqtt_snapshot(camera, obj):
jpg_bytes = obj.get_jpg_bytes( jpg_bytes = obj.get_jpg_bytes(
timestamp=mqtt_config.timestamp, timestamp=mqtt_config.timestamp,

4
frigate/stats.py
View File

@ -7,11 +7,11 @@ import shutil
import os import os
import requests import requests
from typing import Optional, Any from typing import Optional, Any
from paho.mqtt.client import Client
from multiprocessing.synchronize import Event as MpEvent from multiprocessing.synchronize import Event as MpEvent
from frigate.config import FrigateConfig from frigate.config import FrigateConfig
from frigate.const import RECORD_DIR, CLIPS_DIR, CACHE_DIR from frigate.const import RECORD_DIR, CLIPS_DIR, CACHE_DIR
from frigate.mqtt import FrigateMqttClient
from frigate.types import StatsTrackingTypes, CameraMetricsTypes from frigate.types import StatsTrackingTypes, CameraMetricsTypes
from frigate.version import VERSION from frigate.version import VERSION
from frigate.util import get_cpu_stats from frigate.util import get_cpu_stats
@ -146,7 +146,7 @@ class StatsEmitter(threading.Thread):
self, self,
config: FrigateConfig, config: FrigateConfig,
stats_tracking: StatsTrackingTypes, stats_tracking: StatsTrackingTypes,
mqtt_client: Client, mqtt_client: FrigateMqttClient,
topic_prefix: str, topic_prefix: str,
stop_event: MpEvent, stop_event: MpEvent,
): ):