diff --git a/docs/docs/configuration/advanced.md b/docs/docs/configuration/advanced.md index f0a739afc..b6b2ba150 100644 --- a/docs/docs/configuration/advanced.md +++ b/docs/docs/configuration/advanced.md @@ -23,7 +23,7 @@ Examples of available modules are: - `frigate.app` - `frigate.mqtt` -- `frigate.edgetpu` +- `frigate.object_detection` - `frigate.zeroconf` - `detector.` - `watchdog.` diff --git a/frigate/object_detection.py b/frigate/object_detection.py index 048462fa5..f1b9d3675 100644 --- a/frigate/object_detection.py +++ b/frigate/object_detection.py @@ -9,6 +9,7 @@ from abc import ABC, abstractmethod import numpy as np from setproctitle import setproctitle + from frigate.config import DetectorTypeEnum from frigate.detectors.edgetpu_tfl import EdgeTpuTfl from frigate.detectors.cpu_tfl import CpuTfl diff --git a/frigate/stats.py b/frigate/stats.py index b1d244c69..7605ea1bc 100644 --- a/frigate/stats.py +++ b/frigate/stats.py @@ -14,7 +14,7 @@ from frigate.config import FrigateConfig from frigate.const import RECORD_DIR, CLIPS_DIR, CACHE_DIR from frigate.types import StatsTrackingTypes, CameraMetricsTypes from frigate.version import VERSION -from frigate.edgetpu import EdgeTPUProcess +from frigate.object_detection import ObjectDetectProcess logger = logging.getLogger(__name__) @@ -37,7 +37,8 @@ def get_latest_version() -> str: def stats_init( - camera_metrics: dict[str, CameraMetricsTypes], detectors: dict[str, EdgeTPUProcess] + camera_metrics: dict[str, CameraMetricsTypes], + detectors: dict[str, ObjectDetectProcess], ) -> StatsTrackingTypes: stats_tracking: StatsTrackingTypes = { "camera_metrics": camera_metrics, diff --git a/frigate/types.py b/frigate/types.py index 2c9c50ec1..d31e0cd06 100644 --- a/frigate/types.py +++ b/frigate/types.py @@ -3,7 +3,7 @@ from multiprocessing.queues import Queue from multiprocessing.sharedctypes import Synchronized from multiprocessing.context import Process -from frigate.edgetpu import EdgeTPUProcess +from frigate.object_detection import ObjectDetectProcess class CameraMetricsTypes(TypedDict): @@ -26,6 +26,6 @@ class CameraMetricsTypes(TypedDict): class StatsTrackingTypes(TypedDict): camera_metrics: dict[str, CameraMetricsTypes] - detectors: dict[str, EdgeTPUProcess] + detectors: dict[str, ObjectDetectProcess] started: int latest_frigate_version: str diff --git a/frigate/video.py b/frigate/video.py index e41675db8..dd1ea18dd 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -12,8 +12,6 @@ from collections import defaultdict import numpy as np import cv2 - -# from cv2 import cv2, reduce from setproctitle import setproctitle from frigate.config import CameraConfig, DetectConfig diff --git a/frigate/watchdog.py b/frigate/watchdog.py index 9f8b3f8d9..4316dc316 100644 --- a/frigate/watchdog.py +++ b/frigate/watchdog.py @@ -5,7 +5,7 @@ import time import os import signal -from frigate.edgetpu import EdgeTPUProcess +from frigate.object_detection import ObjectDetectProcess from frigate.util import restart_frigate from multiprocessing.synchronize import Event @@ -13,7 +13,7 @@ logger = logging.getLogger(__name__) class FrigateWatchdog(threading.Thread): - def __init__(self, detectors: dict[str, EdgeTPUProcess], stop_event: Event): + def __init__(self, detectors: dict[str, ObjectDetectProcess], stop_event: Event): threading.Thread.__init__(self) self.name = "frigate_watchdog" self.detectors = detectors