Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Remove use_experimental config as part of config migration (#11003)

Browse Source 
* Remove experimental config as part of config migration

* Remove from config

* remove config from docs
This commit is contained in:
Nicolas Mowen 2024-04-17 06:02:59 -06:00 committed by GitHub
parent a87cca23ea
commit 392ff1319d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs/configuration/reference.md
View File

@ -607,8 +607,6 @@ ui:
live_mode: mse live_mode: mse
# Optional: Set a timezone to use in the UI (default: use browser local time) # Optional: Set a timezone to use in the UI (default: use browser local time)
# timezone: America/Denver # timezone: America/Denver
# Optional: Use an experimental recordings / camera view UI (default: shown below)
use_experimental: False
# Optional: Set the time format used. # Optional: Set the time format used.
# Options are browser, 12hour, or 24hour (default: shown below) # Options are browser, 12hour, or 24hour (default: shown below)
time_format: browser time_format: browser

18
frigate/config.py
View File

@ -101,7 +101,6 @@ class UIConfig(FrigateBaseModel):
default=LiveModeEnum.mse, title="Default Live Mode." default=LiveModeEnum.mse, title="Default Live Mode."
) )
timezone: Optional[str] = Field(default=None, title="Override UI timezone.") timezone: Optional[str] = Field(default=None, title="Override UI timezone.")
use_experimental: bool = Field(default=False, title="Experimental UI")
time_format: TimeFormatEnum = Field( time_format: TimeFormatEnum = Field(
default=TimeFormatEnum.browser, title="Override UI time format." default=TimeFormatEnum.browser, title="Override UI time format."
) )
@ -1351,12 +1350,11 @@ class FrigateConfig(FrigateBaseModel):
"timestamp_style": ..., "timestamp_style": ...,
}, },
exclude_unset=True, exclude_unset=True,
warnings="none",
) )
for name, camera in config.cameras.items(): for name, camera in config.cameras.items():
merged_config = deep_merge( merged_config = deep_merge(
camera.model_dump(exclude_unset=True, warnings="none"), global_config camera.model_dump(exclude_unset=True), global_config
) )
camera_config: CameraConfig = CameraConfig.model_validate( camera_config: CameraConfig = CameraConfig.model_validate(
{"name": name, **merged_config} {"name": name, **merged_config}
@ -1467,7 +1465,7 @@ class FrigateConfig(FrigateBaseModel):
# Set runtime filter to create masks # Set runtime filter to create masks
camera_config.objects.filters[object] = RuntimeFilterConfig( camera_config.objects.filters[object] = RuntimeFilterConfig(
frame_shape=camera_config.frame_shape, frame_shape=camera_config.frame_shape,
**filter.model_dump(exclude_unset=True, warnings="none"), **filter.model_dump(exclude_unset=True),
) )
# Convert motion configuration # Convert motion configuration
@ -1479,9 +1477,7 @@ class FrigateConfig(FrigateBaseModel):
camera_config.motion = RuntimeMotionConfig( camera_config.motion = RuntimeMotionConfig(
frame_shape=camera_config.frame_shape, frame_shape=camera_config.frame_shape,
raw_mask=camera_config.motion.mask, raw_mask=camera_config.motion.mask,
**camera_config.motion.model_dump( **camera_config.motion.model_dump(exclude_unset=True),
exclude_unset=True, warnings="none"
),
) )
camera_config.motion.enabled_in_config = camera_config.motion.enabled camera_config.motion.enabled_in_config = camera_config.motion.enabled
@ -1518,9 +1514,7 @@ class FrigateConfig(FrigateBaseModel):
for key, detector in config.detectors.items(): for key, detector in config.detectors.items():
adapter = TypeAdapter(DetectorConfig) adapter = TypeAdapter(DetectorConfig)
model_dict = ( model_dict = (
detector detector if isinstance(detector, dict) else detector.model_dump()
if isinstance(detector, dict)
else detector.model_dump(warnings="none")
) )
detector_config: DetectorConfig = adapter.validate_python(model_dict) detector_config: DetectorConfig = adapter.validate_python(model_dict)
if detector_config.model is None: if detector_config.model is None:
@ -1541,8 +1535,8 @@ class FrigateConfig(FrigateBaseModel):
"Customizing more than a detector model path is unsupported." "Customizing more than a detector model path is unsupported."
) )
merged_model = deep_merge( merged_model = deep_merge(
detector_config.model.model_dump(exclude_unset=True, warnings="none"), detector_config.model.model_dump(exclude_unset=True),
config.model.model_dump(exclude_unset=True, warnings="none"), config.model.model_dump(exclude_unset=True),
) )
if "path" not in merged_model: if "path" not in merged_model:

6
frigate/util/config.py
View File

@ -81,6 +81,12 @@ def migrate_014(config: dict[str, dict[str, any]]) -> dict[str, dict[str, any]]:
if not new_config["record"]: if not new_config["record"]:
del new_config["record"] del new_config["record"]
if new_config.get("ui", {}).get("use_experimental"):
del new_config["ui"]["experimental"]
if not new_config["ui"]:
del new_config["ui"]
# remove rtmp # remove rtmp
if new_config.get("ffmpeg", {}).get("output_args", {}).get("rtmp"): if new_config.get("ffmpeg", {}).get("output_args", {}).get("rtmp"):
del new_config["ffmpeg"]["output_args"]["rtmp"] del new_config["ffmpeg"]["output_args"]["rtmp"]