From 1b0d78c40e7bf3500f75421e595693a74d37a9cb Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Thu, 5 Mar 2026 13:28:07 -0600 Subject: [PATCH] consolidate --- frigate/config/camera/profile.py | 2 -- frigate/config/profile_manager.py | 26 +++++++------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/frigate/config/camera/profile.py b/frigate/config/camera/profile.py index 3cb8ac3cf..d37829f22 100644 --- a/frigate/config/camera/profile.py +++ b/frigate/config/camera/profile.py @@ -6,7 +6,6 @@ from ..base import FrigateBaseModel from .audio import AudioConfig from .birdseye import BirdseyeCameraConfig from .detect import DetectConfig -from .live import CameraLiveConfig from .motion import MotionConfig from .notification import NotificationConfig from .objects import ObjectConfig @@ -28,7 +27,6 @@ class CameraProfileConfig(FrigateBaseModel): audio: Optional[AudioConfig] = None birdseye: Optional[BirdseyeCameraConfig] = None detect: Optional[DetectConfig] = None - live: Optional[CameraLiveConfig] = None motion: Optional[MotionConfig] = None notifications: Optional[NotificationConfig] = None objects: Optional[ObjectConfig] = None diff --git a/frigate/config/profile_manager.py b/frigate/config/profile_manager.py index e9ec052ef..07daab82a 100644 --- a/frigate/config/profile_manager.py +++ b/frigate/config/profile_manager.py @@ -9,25 +9,13 @@ from frigate.config.camera.updater import ( CameraConfigUpdatePublisher, CameraConfigUpdateTopic, ) +from frigate.const import CONFIG_DIR from frigate.util.builtin import deep_merge from frigate.util.config import apply_section_update logger = logging.getLogger(__name__) -PROFILE_SECTIONS = { - "audio", - "birdseye", - "detect", - "live", - "motion", - "notifications", - "objects", - "record", - "review", - "snapshots", -} - -SECTION_TO_UPDATE_ENUM: dict[str, CameraConfigUpdateEnum] = { +PROFILE_SECTION_UPDATES: dict[str, CameraConfigUpdateEnum] = { "audio": CameraConfigUpdateEnum.audio, "birdseye": CameraConfigUpdateEnum.birdseye, "detect": CameraConfigUpdateEnum.detect, @@ -39,7 +27,7 @@ SECTION_TO_UPDATE_ENUM: dict[str, CameraConfigUpdateEnum] = { "snapshots": CameraConfigUpdateEnum.snapshots, } -PERSISTENCE_FILE = Path("/config/.active_profile") +PERSISTENCE_FILE = Path(CONFIG_DIR) / ".active_profile" class ProfileManager: @@ -61,7 +49,7 @@ class ProfileManager: """Snapshot each camera's current section configs as the base.""" for cam_name, cam_config in self.config.cameras.items(): self._base_configs[cam_name] = {} - for section in PROFILE_SECTIONS: + for section in PROFILE_SECTION_UPDATES: section_config = getattr(cam_config, section, None) if section_config is not None: self._base_configs[cam_name][section] = section_config.model_dump() @@ -110,7 +98,7 @@ class ProfileManager: """Reset all cameras to their base (no-profile) config.""" for cam_name, cam_config in self.config.cameras.items(): base = self._base_configs.get(cam_name, {}) - for section in PROFILE_SECTIONS: + for section in PROFILE_SECTION_UPDATES: base_data = base.get(section) if base_data is None: continue @@ -136,7 +124,7 @@ class ProfileManager: base = self._base_configs.get(cam_name, {}) - for section in PROFILE_SECTIONS: + for section in PROFILE_SECTION_UPDATES: profile_section = getattr(profile, section, None) if profile_section is None: continue @@ -164,7 +152,7 @@ class ProfileManager: continue for section in sections: - update_enum = SECTION_TO_UPDATE_ENUM.get(section) + update_enum = PROFILE_SECTION_UPDATES.get(section) if update_enum is None: continue settings = getattr(cam_config, section, None)