From f591124f2f0513ca50b3ebf7ed6773155525b6c2 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Thu, 16 Nov 2023 07:07:51 -0700 Subject: [PATCH] Set pydantic version --- docker/main/requirements-wheels.txt | 2 +- frigate/config.py | 12 +++++++----- frigate/detectors/detector_config.py | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docker/main/requirements-wheels.txt b/docker/main/requirements-wheels.txt index 0b3fe2952..e9f8c2a3d 100644 --- a/docker/main/requirements-wheels.txt +++ b/docker/main/requirements-wheels.txt @@ -10,7 +10,7 @@ paho-mqtt == 1.6.* peewee == 3.17.* peewee_migrate == 1.12.* psutil == 5.9.* -pydantic == 1.10.* +pydantic == 2.5.* git+https://github.com/fbcotter/py3nvml#egg=py3nvml PyYAML == 6.0.* pytz == 2023.3.post1 diff --git a/frigate/config.py b/frigate/config.py index d70503077..74c060a1b 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -11,11 +11,11 @@ from typing import Dict, List, Optional, Tuple, Union import matplotlib.pyplot as plt import numpy as np from pydantic import ( - field_validator, - ConfigDict, BaseModel, - ValidationInfo, + ConfigDict, Field, + ValidationInfo, + field_validator, parse_obj_as, ) from pydantic.fields import PrivateAttr @@ -141,7 +141,9 @@ class MqttConfig(FrigateBaseModel): client_id: str = Field(default="frigate", title="MQTT Client ID") stats_interval: int = Field(default=60, title="MQTT Camera Stats Interval") user: Optional[str] = Field(default=None, title="MQTT Username") - password: Optional[str] = Field(default=None, title="MQTT Password", validate_default=True) + password: Optional[str] = Field( + default=None, title="MQTT Password", validate_default=True + ) tls_ca_certs: Optional[str] = Field(default=None, title="MQTT TLS CA Certificates") tls_client_cert: Optional[str] = Field( default=None, title="MQTT TLS Client Certificate" @@ -194,7 +196,7 @@ class PtzAutotrackConfig(FrigateBaseModel): title="Internal value used for PTZ movements based on the speed of your camera's motor.", ) enabled_in_config: Optional[bool] = Field( - title="Keep track of original state of autotracking." + default=None, title="Keep track of original state of autotracking." ) @field_validator("movement_weights", mode="before") diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py index 87456897e..3dfa51883 100644 --- a/frigate/detectors/detector_config.py +++ b/frigate/detectors/detector_config.py @@ -7,7 +7,7 @@ from typing import Dict, Optional, Tuple import matplotlib.pyplot as plt import requests -from pydantic import ConfigDict, BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from pydantic.fields import PrivateAttr from frigate.plus import PlusApi