administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-08 20:25:26 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Nicolas Mowen 2024-02-29 13:57:37 -07:00
parent a1987b71e9
commit c70f4940e9
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frigate/config.py
View File

@ -15,9 +15,9 @@ from pydantic import (
ConfigDict, ConfigDict,
Field, Field,
TypeAdapter, TypeAdapter,
ValidationInfo,
field_serializer, field_serializer,
field_validator, field_validator,
validator,
) )
from pydantic.fields import PrivateAttr from pydantic.fields import PrivateAttr
@ -149,11 +149,10 @@ class MqttConfig(FrigateBaseModel):
tls_client_key: Optional[str] = Field(None, title="MQTT TLS Client Key") tls_client_key: Optional[str] = Field(None, title="MQTT TLS Client Key")
tls_insecure: Optional[bool] = Field(None, title="MQTT TLS Insecure") tls_insecure: Optional[bool] = Field(None, title="MQTT TLS Insecure")
# TODO[pydantic]: We couldn't refactor the `validator`, please replace it by `field_validator` manually. @field_validator("password")
# Check https://docs.pydantic.dev/dev-v2/migration/#changes-to-validators for more information. @classmethod
@validator("password", pre=True, always=True) def validate_password(cls, v, info: ValidationInfo):
def validate_password(cls, v, values): if (v is None) != (info.data["user"] is None):
if (v is None) != (values["user"] is None):
raise ValueError("Password must be provided with username.") raise ValueError("Password must be provided with username.")
return v return v
@ -207,7 +206,7 @@ class PtzAutotrackConfig(FrigateBaseModel):
if isinstance(v, str): if isinstance(v, str):
weights = list(map(str, map(float, v.split(",")))) weights = list(map(str, map(float, v.split(","))))
elif isinstance(v, list): elif isinstance(v, list):
weights = [str(val) for val in v] weights = [str(float(val)) for val in v]
else: else:
raise ValueError("Invalid type for movement_weights") raise ValueError("Invalid type for movement_weights")
@ -1238,7 +1237,7 @@ class FrigateConfig(FrigateBaseModel):
) )
# Default min_initialized configuration # Default min_initialized configuration
min_initialized = camera_config.detect.fps / 2 min_initialized = int(camera_config.detect.fps / 2)
if camera_config.detect.min_initialized is None: if camera_config.detect.min_initialized is None:
camera_config.detect.min_initialized = min_initialized camera_config.detect.min_initialized = min_initialized