diff --git a/frigate/config/classification.py b/frigate/config/classification.py index 0ad86da27..7f4f39bbd 100644 --- a/frigate/config/classification.py +++ b/frigate/config/classification.py @@ -94,7 +94,7 @@ class CameraFaceRecognitionConfig(FrigateBaseModel): default=500, title="Min area of face box to consider running face recognition." ) - model_config = ConfigDict(extra="ignore", protected_namespaces=()) + model_config = ConfigDict(extra="forbid", protected_namespaces=()) class LicensePlateRecognitionConfig(FrigateBaseModel): @@ -168,4 +168,4 @@ class CameraLicensePlateRecognitionConfig(FrigateBaseModel): le=10, ) - model_config = ConfigDict(extra="ignore", protected_namespaces=()) + model_config = ConfigDict(extra="forbid", protected_namespaces=()) diff --git a/frigate/config/config.py b/frigate/config/config.py index 373e08376..2470818b0 100644 --- a/frigate/config/config.py +++ b/frigate/config/config.py @@ -472,8 +472,24 @@ class FrigateConfig(FrigateBaseModel): ) for name, camera in self.cameras.items(): + modified_global_config = global_config.copy() + + # only populate some fields down to the camera level for specific keys + allowed_fields_map = { + "face_recognition": ["enabled", "min_area"], + "lpr": ["enabled", "expire_time", "min_area", "enhancement"], + } + + for section in allowed_fields_map: + if section in modified_global_config: + modified_global_config[section] = { + k: v + for k, v in modified_global_config[section].items() + if k in allowed_fields_map[section] + } + merged_config = deep_merge( - camera.model_dump(exclude_unset=True), global_config + camera.model_dump(exclude_unset=True), modified_global_config ) camera_config: CameraConfig = CameraConfig.model_validate( {"name": name, **merged_config} diff --git a/frigate/data_processing/common/license_plate/mixin.py b/frigate/data_processing/common/license_plate/mixin.py index afd5c8280..c67f11956 100644 --- a/frigate/data_processing/common/license_plate/mixin.py +++ b/frigate/data_processing/common/license_plate/mixin.py @@ -1221,7 +1221,10 @@ class LicensePlateProcessingMixin: license_plate_area = (license_plate[2] - license_plate[0]) * ( license_plate[3] - license_plate[1] ) - if license_plate_area < self.lpr_config.min_area: + if ( + license_plate_area + < self.config.cameras[obj_data["camera"]].lpr.min_area + ): logger.debug(f"{camera}: License plate area below minimum threshold.") return