Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-08-04 13:47:37 +02:00
Code Issues Projects Releases Wiki Activity

Improve config validation error messages (#11292)

Browse Source
This commit is contained in:
Josh Hawkins 2024-05-08 09:46:31 -05:00 committed by GitHub
parent 3ed89ec042
commit 2be15b6c01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frigate/app.py
View File

@ -16,6 +16,7 @@ import psutil
from peewee_migrate import Router from peewee_migrate import Router
from playhouse.sqlite_ext import SqliteExtDatabase from playhouse.sqlite_ext import SqliteExtDatabase
from playhouse.sqliteq import SqliteQueueDatabase from playhouse.sqliteq import SqliteQueueDatabase
from pydantic import ValidationError
from frigate.api.app import create_app from frigate.api.app import create_app
from frigate.comms.config_updater import ConfigPublisher from frigate.comms.config_updater import ConfigPublisher
@ -611,6 +612,11 @@ class FrigateApp:
print("*************************************************************") print("*************************************************************")
print("*** Config Validation Errors ***") print("*** Config Validation Errors ***")
print("*************************************************************") print("*************************************************************")
if isinstance(e, ValidationError):
for error in e.errors():
location = ".".join(str(item) for item in error["loc"])
print(f"{location}: {error['msg']}")
else:
print(e) print(e)
print(traceback.format_exc()) print(traceback.format_exc())
print("*************************************************************") print("*************************************************************")

10
frigate/config.py
View File

@ -555,6 +555,7 @@ class ZoneConfig(BaseModel):
# old native resolution coordinates # old native resolution coordinates
if isinstance(coordinates, list): if isinstance(coordinates, list):
explicit = any(p.split(",")[0] > "1.0" for p in coordinates) explicit = any(p.split(",")[0] > "1.0" for p in coordinates)
try:
self._contour = np.array( self._contour = np.array(
[ [
( (
@ -568,6 +569,10 @@ class ZoneConfig(BaseModel):
for p in coordinates for p in coordinates
] ]
) )
except ValueError:
raise ValueError(
f"Invalid coordinates found in configuration file. Coordinates must be relative (between 0-1): {coordinates}"
)
if explicit: if explicit:
self.coordinates = ",".join( self.coordinates = ",".join(
@ -579,6 +584,7 @@ class ZoneConfig(BaseModel):
elif isinstance(coordinates, str): elif isinstance(coordinates, str):
points = coordinates.split(",") points = coordinates.split(",")
explicit = any(p > "1.0" for p in points) explicit = any(p > "1.0" for p in points)
try:
self._contour = np.array( self._contour = np.array(
[ [
( (
@ -592,6 +598,10 @@ class ZoneConfig(BaseModel):
for i in range(0, len(points), 2) for i in range(0, len(points), 2)
] ]
) )
except ValueError:
raise ValueError(
f"Invalid coordinates found in configuration file. Coordinates must be relative (between 0-1): {coordinates}"
)
if explicit: if explicit:
self.coordinates = ",".join( self.coordinates = ",".join(