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

fix CameraLiveConfig JSON serialization error on profile activation

Browse Source 
refactor _publish_updates to only publish ZMQ updates for
sections that actually changed, not all sections on affected cameras.
This commit is contained in:
Josh Hawkins 2026-03-05 13:08:54 -06:00
parent 61746984d1
commit 708399508b
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frigate/config/profile_manager.py
View File

@ -31,7 +31,6 @@ SECTION_TO_UPDATE_ENUM: dict[str, CameraConfigUpdateEnum] = {
"audio": CameraConfigUpdateEnum.audio, "audio": CameraConfigUpdateEnum.audio,
"birdseye": CameraConfigUpdateEnum.birdseye, "birdseye": CameraConfigUpdateEnum.birdseye,
"detect": CameraConfigUpdateEnum.detect, "detect": CameraConfigUpdateEnum.detect,
"live": CameraConfigUpdateEnum.enabled,
"motion": CameraConfigUpdateEnum.motion, "motion": CameraConfigUpdateEnum.motion,
"notifications": CameraConfigUpdateEnum.notifications, "notifications": CameraConfigUpdateEnum.notifications,
"objects": CameraConfigUpdateEnum.objects, "objects": CameraConfigUpdateEnum.objects,
@ -84,15 +83,21 @@ class ProfileManager:
if not has_profile: if not has_profile:
return f"Profile '{profile_name}' not found on any camera" return f"Profile '{profile_name}' not found on any camera"
# Track which camera/section pairs get changed for ZMQ publishing
changed: dict[str, set[str]] = {}
# Reset all cameras to base config # Reset all cameras to base config
self._reset_to_base() self._reset_to_base(changed)
# Apply new profile overrides if activating # Apply new profile overrides if activating
if profile_name is not None: if profile_name is not None:
err = self._apply_profile_overrides(profile_name) err = self._apply_profile_overrides(profile_name, changed)
if err: if err:
return err return err
# Publish ZMQ updates only for sections that actually changed
self._publish_updates(changed)
self.config.active_profile = profile_name self.config.active_profile = profile_name
self._persist_active_profile(profile_name) self._persist_active_profile(profile_name)
logger.info( logger.info(
@ -101,7 +106,7 @@ class ProfileManager:
) )
return None return None
def _reset_to_base(self) -> None: def _reset_to_base(self, changed: dict[str, set[str]]) -> None:
"""Reset all cameras to their base (no-profile) config.""" """Reset all cameras to their base (no-profile) config."""
for cam_name, cam_config in self.config.cameras.items(): for cam_name, cam_config in self.config.cameras.items():
base = self._base_configs.get(cam_name, {}) base = self._base_configs.get(cam_name, {})
@ -117,11 +122,13 @@ class ProfileManager:
cam_name, cam_name,
err, err,
) )
else:
changed.setdefault(cam_name, set()).add(section)
def _apply_profile_overrides(self, profile_name: str) -> Optional[str]: def _apply_profile_overrides(
self, profile_name: str, changed: dict[str, set[str]]
) -> Optional[str]:
"""Apply profile overrides for all cameras that have the named profile.""" """Apply profile overrides for all cameras that have the named profile."""
affected_cameras: set[str] = set()
for cam_name, cam_config in self.config.cameras.items(): for cam_name, cam_config in self.config.cameras.items():
profile = cam_config.profiles.get(profile_name) profile = cam_config.profiles.get(profile_name)
if profile is None: if profile is None:
@ -145,20 +152,21 @@ class ProfileManager:
if err: if err:
return f"Failed to apply profile '{profile_name}' section '{section}' on camera '{cam_name}': {err}" return f"Failed to apply profile '{profile_name}' section '{section}' on camera '{cam_name}': {err}"
affected_cameras.add(cam_name) changed.setdefault(cam_name, set()).add(section)
# Publish ZMQ updates for all affected cameras
self._publish_updates(affected_cameras)
return None return None
def _publish_updates(self, affected_cameras: set[str]) -> None: def _publish_updates(self, changed: dict[str, set[str]]) -> None:
"""Publish ZMQ config updates for affected cameras.""" """Publish ZMQ config updates only for sections that changed."""
for cam_name in affected_cameras: for cam_name, sections in changed.items():
cam_config = self.config.cameras.get(cam_name) cam_config = self.config.cameras.get(cam_name)
if cam_config is None: if cam_config is None:
continue continue
for section, update_enum in SECTION_TO_UPDATE_ENUM.items(): for section in sections:
update_enum = SECTION_TO_UPDATE_ENUM.get(section)
if update_enum is None:
continue
settings = getattr(cam_config, section, None) settings = getattr(cam_config, section, None)
if settings is not None: if settings is not None:
self.config_updater.publish_update( self.config_updater.publish_update(