diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a8264a227..7769737a7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -73,7 +73,11 @@ "isort.args": ["--settings-path=./pyproject.toml"], "[python]": { "editor.defaultFormatter": "ms-python.black-formatter", - "editor.formatOnSave": true + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll": true, + "source.organizeImports": true + } }, "[json][jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -86,7 +90,7 @@ "editor.tabSize": 2 }, "cSpell.ignoreWords": ["rtmp"], - "cSpell.words": ["preact"] + "cSpell.words": ["preact", "astype", "hwaccel", "mqtt"] } } } diff --git a/frigate/config.py b/frigate/config.py index f21d49d1a..9b434ca1e 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -13,11 +13,7 @@ from pydantic.fields import PrivateAttr from frigate.const import CACHE_DIR, DEFAULT_DB_PATH, REGEX_CAMERA_NAME, YAML_EXT from frigate.detectors import DetectorConfig, ModelConfig -from frigate.detectors.detector_config import ( - BaseDetectorConfig, - InputTensorEnum, # noqa: F401 - PixelFormatEnum, # noqa: F401 -) +from frigate.detectors.detector_config import BaseDetectorConfig from frigate.ffmpeg_presets import ( parse_preset_hardware_acceleration_decode, parse_preset_hardware_acceleration_scale, diff --git a/frigate/object_detection.py b/frigate/object_detection.py index 9201dfcd1..0a2a7059c 100644 --- a/frigate/object_detection.py +++ b/frigate/object_detection.py @@ -10,8 +10,8 @@ from abc import ABC, abstractmethod import numpy as np from setproctitle import setproctitle -from frigate.config import InputTensorEnum from frigate.detectors import create_detector +from frigate.detectors.detector_config import InputTensorEnum from frigate.util import EventsPerSecond, SharedMemoryFrameManager, listen, load_labels logger = logging.getLogger(__name__) diff --git a/frigate/test/test_object_detector.py b/frigate/test/test_object_detector.py index 1e1efa957..40a9fac14 100644 --- a/frigate/test/test_object_detector.py +++ b/frigate/test/test_object_detector.py @@ -6,8 +6,9 @@ from pydantic import parse_obj_as import frigate.detectors as detectors import frigate.object_detection -from frigate.config import DetectorConfig, InputTensorEnum, ModelConfig +from frigate.config import DetectorConfig, ModelConfig from frigate.detectors import DetectorTypeEnum +from frigate.detectors.detector_config import InputTensorEnum class TestLocalObjectDetector(unittest.TestCase): diff --git a/frigate/video.py b/frigate/video.py index 17a83b626..25ae35664 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -14,8 +14,9 @@ import cv2 import numpy as np from setproctitle import setproctitle -from frigate.config import CameraConfig, DetectConfig, PixelFormatEnum +from frigate.config import CameraConfig, DetectConfig from frigate.const import CACHE_DIR +from frigate.detectors.detector_config import PixelFormatEnum from frigate.log import LogPipe from frigate.motion import MotionDetector from frigate.motion.improved_motion import ImprovedMotionDetector