Increase ruff coverage (#23644)

* Pin ruff

* Add python upgrade fixes

This enables python upgrade checks in ruff to look for deprecated types and patterns. This namely fixes:
- usage of deprecated `Typing` which is now built in
- some specific exceptions which are caught and have new aliases

Some specific UP checks were also ignored as they are stylistic / unimportant and likely to cause bugs

* Remove async blocking calls

Use asyncio.to_thread on two remaining blocking calls to fix hanging event thread loop. Enable this specific rule to block it in the future.

* Use proper logging mechanism

* Correctly format logs

* Raise with context

When raising an exception include the from context to improve debugging

* Cleanup

frigate/config/camera/audio.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import Field
 
 from frigate.const import AUDIO_MIN_CONFIDENCE
@@ -43,12 +41,12 @@ class AudioConfig(FrigateBaseModel):
         title="Listen types",
         description="List of audio event types to detect (for example: bark, fire_alarm, speech, yell).",
     )
-    filters: Optional[dict[str, AudioFilterConfig]] = Field(
+    filters: dict[str, AudioFilterConfig] | None = Field(
         None,
         title="Audio filters",
         description="Per-audio-type filter settings such as confidence thresholds used to reduce false positives.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         None,
         title="Original audio state",
         description="Indicates whether audio detection was originally enabled in the static config file.",

frigate/config/camera/birdseye.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -35,7 +34,7 @@ class BirdseyeLayoutConfig(FrigateBaseModel):
         ge=1.0,
         le=5.0,
     )
-    max_cameras: Optional[int] = Field(
+    max_cameras: int | None = Field(
         default=None,
         title="Max cameras",
         description="Maximum number of cameras to display at once in Birdseye; shows the most recent cameras.",

frigate/config/camera/camera.py

@@ -1,6 +1,5 @@
 import os
 from enum import Enum
-from typing import Optional
 
 from pydantic import Field, PrivateAttr, model_validator
 
@@ -51,14 +50,14 @@ class CameraTypeEnum(str, Enum):
 
 
 class CameraConfig(FrigateBaseModel):
-    name: Optional[str] = Field(
+    name: str | None = Field(
         None,
         title="Camera name",
         description="Camera name is required",
         pattern=REGEX_CAMERA_NAME,
     )
 
-    friendly_name: Optional[str] = Field(
+    friendly_name: str | None = Field(
         None,
         title="Friendly name",
         description="Camera friendly name used in the Frigate UI",
@@ -180,7 +179,7 @@ class CameraConfig(FrigateBaseModel):
         title="Camera UI",
         description="Display ordering and visibility for this camera in the UI. Ordering affects the default dashboard. For more granular control, use camera groups.",
     )
-    webui_url: Optional[str] = Field(
+    webui_url: str | None = Field(
         None,
         title="Camera URL",
         description="URL to visit the camera directly from system page",
@@ -196,7 +195,7 @@ class CameraConfig(FrigateBaseModel):
         title="Zones",
         description="Zones allow you to define a specific area of the frame so you can determine whether or not an object is within a particular area.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original camera state",
         description="Keep track of original state of camera.",

frigate/config/camera/detect.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import Field, model_validator
 
 from ..base import FrigateBaseModel
@@ -8,7 +6,7 @@ __all__ = ["DetectConfig", "StationaryConfig", "StationaryMaxFramesConfig"]
 
 
 class StationaryMaxFramesConfig(FrigateBaseModel):
-    default: Optional[int] = Field(
+    default: int | None = Field(
         default=None,
         title="Default max frames",
         description="Default maximum frames to track a stationary object before stopping.",
@@ -22,13 +20,13 @@ class StationaryMaxFramesConfig(FrigateBaseModel):
 
 
 class StationaryConfig(FrigateBaseModel):
-    interval: Optional[int] = Field(
+    interval: int | None = Field(
         default=None,
         title="Stationary interval",
         description="How often (in frames) to run a detection check to confirm a stationary object.",
         gt=0,
     )
-    threshold: Optional[int] = Field(
+    threshold: int | None = Field(
         default=None,
         title="Stationary threshold",
         description="Number of frames with no position change required to mark an object as stationary.",
@@ -52,12 +50,12 @@ class DetectConfig(FrigateBaseModel):
         title="Enable object detection",
         description="Enable or disable object detection for all cameras; can be overridden per-camera.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=None,
         title="Detect height",
         description="Height (pixels) of frames used for the detect stream; leave empty to use the native stream resolution.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=None,
         title="Detect width",
         description="Width (pixels) of frames used for the detect stream; leave empty to use the native stream resolution.",
@@ -67,13 +65,13 @@ class DetectConfig(FrigateBaseModel):
         title="Detect FPS",
         description="Desired frames per second to run detection on; lower values reduce CPU usage (recommended value is 5, only set higher - at most 10 - if tracking extremely fast moving objects).",
     )
-    min_initialized: Optional[int] = Field(
+    min_initialized: int | None = Field(
         default=None,
         title="Minimum initialization frames",
         description="Number of consecutive detection hits required before creating a tracked object. Increase to reduce false initializations. Default value is fps divided by 2.",
         ge=2,
     )
-    max_disappeared: Optional[int] = Field(
+    max_disappeared: int | None = Field(
         default=None,
         title="Maximum disappeared frames",
         description="Number of frames without a detection before a tracked object is considered gone.",

frigate/config/camera/ffmpeg.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Union
 
 from pydantic import Field, field_validator
 
@@ -33,12 +32,12 @@ DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT = [
 
 
 class FfmpegOutputArgsConfig(FrigateBaseModel):
-    detect: Union[str, list[str]] = Field(
+    detect: str | list[str] = Field(
         default=DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT,
         title="Detect output arguments",
         description="Default output arguments for detect role streams.",
     )
-    record: Union[str, list[str]] = Field(
+    record: str | list[str] = Field(
         default=RECORD_FFMPEG_OUTPUT_ARGS_DEFAULT,
         title="Record output arguments",
         description="Default output arguments for record role streams.",
@@ -51,17 +50,17 @@ class FfmpegConfig(FrigateBaseModel):
         title="FFmpeg path",
         description='Path to the FFmpeg binary to use or a version alias ("7.0" or "8.0").',
     )
-    global_args: Union[str, list[str]] = Field(
+    global_args: str | list[str] = Field(
         default=FFMPEG_GLOBAL_ARGS_DEFAULT,
         title="FFmpeg global arguments",
         description="Global arguments passed to FFmpeg processes.",
     )
-    hwaccel_args: Union[str, list[str]] = Field(
+    hwaccel_args: str | list[str] = Field(
         default="auto",
         title="Hardware acceleration arguments",
         description="Hardware acceleration arguments for FFmpeg. Provider-specific presets are recommended.",
     )
-    input_args: Union[str, list[str]] = Field(
+    input_args: str | list[str] = Field(
         default=FFMPEG_INPUT_ARGS_DEFAULT,
         title="Input arguments",
         description="Input arguments applied to FFmpeg input streams.",
@@ -112,17 +111,17 @@ class CameraInput(FrigateBaseModel):
         title="Input roles",
         description="Roles for this input stream.",
     )
-    global_args: Union[str, list[str]] = Field(
+    global_args: str | list[str] = Field(
         default_factory=list,
         title="FFmpeg global arguments",
         description="FFmpeg global arguments for this input stream.",
     )
-    hwaccel_args: Union[str, list[str]] = Field(
+    hwaccel_args: str | list[str] = Field(
         default_factory=list,
         title="Hardware acceleration arguments",
         description="Hardware acceleration arguments for this input stream.",
     )
-    input_args: Union[str, list[str]] = Field(
+    input_args: str | list[str] = Field(
         default_factory=list,
         title="Input arguments",
         description="Input arguments specific to this stream.",

frigate/config/camera/genai.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field
 
@@ -26,12 +26,12 @@ class GenAIRoleEnum(str, Enum):
 class GenAIConfig(FrigateBaseModel):
     """Primary GenAI Config to define GenAI Provider."""
 
-    api_key: Optional[EnvString] = Field(
+    api_key: EnvString | None = Field(
         default=None,
         title="API key",
         description="API key required by some providers (can also be set via environment variables).",
     )
-    base_url: Optional[str] = Field(
+    base_url: str | None = Field(
         default=None,
         title="Base URL",
         description="Base URL for self-hosted or compatible providers (for example an Ollama instance).",

frigate/config/camera/live.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 from pydantic import Field
 
 from ..base import FrigateBaseModel
@@ -8,7 +6,7 @@ __all__ = ["CameraLiveConfig"]
 
 
 class CameraLiveConfig(FrigateBaseModel):
-    streams: Dict[str, str] = Field(
+    streams: dict[str, str] = Field(
         default_factory=list,
         title="Live stream names",
         description="Mapping of configured stream names to restream/go2rtc names used for live playback.",

frigate/config/camera/mask.py

@@ -1,6 +1,6 @@
 """Mask configuration for motion and object masks."""
 
-from typing import Any, Optional, Union
+from typing import Any
 
 from pydantic import Field, field_serializer
 
@@ -12,7 +12,7 @@ __all__ = ["MotionMaskConfig", "ObjectMaskConfig"]
 class MotionMaskConfig(FrigateBaseModel):
     """Configuration for a single motion mask."""
 
-    friendly_name: Optional[str] = Field(
+    friendly_name: str | None = Field(
         default=None,
         title="Friendly name",
         description="A friendly name for this motion mask used in the Frigate UI",
@@ -22,13 +22,13 @@ class MotionMaskConfig(FrigateBaseModel):
         title="Enabled",
         description="Enable or disable this motion mask",
     )
-    coordinates: Union[str, list[str]] = Field(
+    coordinates: str | list[str] = Field(
         default="",
         title="Coordinates",
         description="Ordered x,y coordinates defining the motion mask polygon used to include/exclude areas.",
     )
-    raw_coordinates: Union[str, list[str]] = ""
-    enabled_in_config: Optional[bool] = Field(
+    raw_coordinates: str | list[str] = ""
+    enabled_in_config: bool | None = Field(
         default=None, title="Keep track of original state of motion mask."
     )
 
@@ -50,7 +50,7 @@ class MotionMaskConfig(FrigateBaseModel):
 class ObjectMaskConfig(FrigateBaseModel):
     """Configuration for a single object mask."""
 
-    friendly_name: Optional[str] = Field(
+    friendly_name: str | None = Field(
         default=None,
         title="Friendly name",
         description="A friendly name for this object mask used in the Frigate UI",
@@ -60,13 +60,13 @@ class ObjectMaskConfig(FrigateBaseModel):
         title="Enabled",
         description="Enable or disable this object mask",
     )
-    coordinates: Union[str, list[str]] = Field(
+    coordinates: str | list[str] = Field(
         default="",
         title="Coordinates",
         description="Ordered x,y coordinates defining the object mask polygon used to include/exclude areas.",
     )
-    raw_coordinates: Union[str, list[str]] = ""
-    enabled_in_config: Optional[bool] = Field(
+    raw_coordinates: str | list[str] = ""
+    enabled_in_config: bool | None = Field(
         default=None, title="Keep track of original state of object mask."
     )
 

frigate/config/camera/motion.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field, field_serializer
 
@@ -28,7 +28,7 @@ class MotionConfig(FrigateBaseModel):
         ge=0.3,
         le=1.0,
     )
-    skip_motion_threshold: Optional[float] = Field(
+    skip_motion_threshold: float | None = Field(
         default=None,
         title="Skip motion threshold",
         description="If set to a value between 0.0 and 1.0, and more than this fraction of the image changes in a single frame, the detector will return no motion boxes and immediately recalibrate. This can save CPU and reduce false positives during lightning, storms, etc., but may miss real events such as a PTZ camera auto‑tracking an object. The trade‑off is between dropping a few megabytes of recordings versus reviewing a couple short clips. Leave unset (None) to disable this feature.",
@@ -40,7 +40,7 @@ class MotionConfig(FrigateBaseModel):
         title="Improve contrast",
         description="Apply contrast improvement to frames before motion analysis to help detection.",
     )
-    contour_area: Optional[int] = Field(
+    contour_area: int | None = Field(
         default=10,
         title="Contour area",
         description="Minimum contour area in pixels required for a motion contour to be counted.",
@@ -55,12 +55,12 @@ class MotionConfig(FrigateBaseModel):
         title="Frame alpha",
         description="Alpha value used when blending frames for motion preprocessing.",
     )
-    frame_height: Optional[int] = Field(
+    frame_height: int | None = Field(
         default=100,
         title="Frame height",
         description="Height in pixels to scale frames to when computing motion.",
     )
-    mask: dict[str, Optional[MotionMaskConfig]] = Field(
+    mask: dict[str, MotionMaskConfig | None] = Field(
         default_factory=dict,
         title="Mask coordinates",
         description="Ordered x,y coordinates defining the motion mask polygon used to include/exclude areas.",
@@ -70,12 +70,12 @@ class MotionConfig(FrigateBaseModel):
         title="MQTT off delay",
         description="Seconds to wait after last motion before publishing an MQTT 'off' state.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original motion state",
         description="Indicates whether motion detection was enabled in the original static configuration.",
     )
-    raw_mask: dict[str, Optional[MotionMaskConfig]] = Field(
+    raw_mask: dict[str, MotionMaskConfig | None] = Field(
         default_factory=dict, exclude=True
     )
 

frigate/config/camera/notification.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import Field
 
 from ..base import FrigateBaseModel
@@ -13,7 +11,7 @@ class NotificationConfig(FrigateBaseModel):
         title="Enable notifications",
         description="Enable or disable notifications for all cameras; can be overridden per-camera.",
     )
-    email: Optional[str] = Field(
+    email: str | None = Field(
         default=None,
         title="Notification email",
         description="Email address used for push notifications or required by certain notification providers.",
@@ -24,7 +22,7 @@ class NotificationConfig(FrigateBaseModel):
         title="Cooldown period",
         description="Cooldown (seconds) between notifications to avoid spamming recipients.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original notifications state",
         description="Indicates whether notifications were enabled in the original static configuration.",

frigate/config/camera/objects.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 from pydantic import Field, PrivateAttr, field_serializer, field_validator
 
@@ -12,12 +12,12 @@ DEFAULT_TRACKED_OBJECTS = ["person"]
 
 
 class FilterConfig(FrigateBaseModel):
-    min_area: Union[int, float] = Field(
+    min_area: int | float = Field(
         default=0,
         title="Minimum object area",
         description="Minimum bounding box area (pixels or percentage) required for this object type. Can be pixels (int) or percentage (float between 0.000001 and 0.99).",
     )
-    max_area: Union[int, float] = Field(
+    max_area: int | float = Field(
         default=24000000,
         title="Maximum object area",
         description="Maximum bounding box area (pixels or percentage) allowed for this object type. Can be pixels (int) or percentage (float between 0.000001 and 0.99).",
@@ -42,12 +42,12 @@ class FilterConfig(FrigateBaseModel):
         title="Minimum confidence",
         description="Minimum single-frame detection confidence required for the object to be counted.",
     )
-    mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+    mask: dict[str, ObjectMaskConfig | None] = Field(
         default_factory=dict,
         title="Filter mask",
         description="Polygon coordinates defining where this filter applies within the frame.",
     )
-    raw_mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+    raw_mask: dict[str, ObjectMaskConfig | None] = Field(
         default_factory=dict, exclude=True
     )
 
@@ -68,7 +68,7 @@ class GenAIObjectTriggerConfig(FrigateBaseModel):
         title="Send on end",
         description="Send a request to GenAI when the tracked object ends.",
     )
-    after_significant_updates: Optional[int] = Field(
+    after_significant_updates: int | None = Field(
         default=None,
         title="Early GenAI trigger",
         description="Send a request to GenAI after a specified number of significant updates for the tracked object.",
@@ -98,12 +98,12 @@ class GenAIObjectConfig(FrigateBaseModel):
         description="Per-object prompts to customize GenAI outputs for specific labels.",
     )
 
-    objects: Union[str, list[str]] = Field(
+    objects: str | list[str] = Field(
         default_factory=list,
         title="GenAI objects",
         description="List of object labels to send to GenAI by default.",
     )
-    required_zones: Union[str, list[str]] = Field(
+    required_zones: str | list[str] = Field(
         default_factory=list,
         title="Required zones",
         description="Zones that must be entered for objects to qualify for GenAI description generation.",
@@ -118,7 +118,7 @@ class GenAIObjectConfig(FrigateBaseModel):
         title="GenAI triggers",
         description="Defines when frames should be sent to GenAI (on end, after updates, etc.).",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original GenAI state",
         description="Indicates whether GenAI was enabled in the original static config.",
@@ -144,12 +144,12 @@ class ObjectConfig(FrigateBaseModel):
         title="Object filters",
         description="Filters applied to detected objects to reduce false positives (area, ratio, confidence).",
     )
-    mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+    mask: dict[str, ObjectMaskConfig | None] = Field(
         default_factory=dict,
         title="Object mask",
         description="Mask polygon used to prevent object detection in specified areas.",
     )
-    raw_mask: dict[str, Optional[ObjectMaskConfig]] = Field(
+    raw_mask: dict[str, ObjectMaskConfig | None] = Field(
         default_factory=dict, exclude=True
     )
     genai: GenAIObjectConfig = Field(

frigate/config/camera/onvif.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional, Union
 
 from pydantic import Field, field_validator
 
@@ -59,12 +58,12 @@ class PtzAutotrackConfig(FrigateBaseModel):
         title="Return timeout",
         description="Wait this many seconds after losing tracking before returning camera to preset position.",
     )
-    movement_weights: Optional[Union[str, list[str]]] = Field(
+    movement_weights: str | list[str] | None = Field(
         default_factory=list,
         title="Movement weights",
         description="Calibration values automatically generated by camera calibration. Do not modify manually.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original autotrack state",
         description="Internal field to track whether autotracking was enabled in configuration.",
@@ -102,12 +101,12 @@ class OnvifConfig(FrigateBaseModel):
         title="ONVIF port",
         description="Port number for the ONVIF service.",
     )
-    user: Optional[EnvString] = Field(
+    user: EnvString | None = Field(
         default=None,
         title="ONVIF username",
         description="Username for ONVIF authentication; some devices require admin user for ONVIF.",
     )
-    password: Optional[EnvString] = Field(
+    password: EnvString | None = Field(
         default=None,
         title="ONVIF password",
         description="Password for ONVIF authentication.",
@@ -117,7 +116,7 @@ class OnvifConfig(FrigateBaseModel):
         title="Disable TLS verify",
         description="Skip TLS verification and disable digest auth for ONVIF (unsafe; use in safe networks only).",
     )
-    profile: Optional[str] = Field(
+    profile: str | None = Field(
         default=None,
         title="ONVIF profile",
         description="Specific ONVIF media profile to use for PTZ control, matched by token or name. If not set, the first profile with valid PTZ configuration is selected automatically.",

frigate/config/camera/profile.py

@@ -1,7 +1,5 @@
 """Camera profile configuration for named config overrides."""
 
-from typing import Optional
-
 from ..base import FrigateBaseModel
 from ..classification import (
     CameraFaceRecognitionConfig,
@@ -29,16 +27,16 @@ class CameraProfileConfig(FrigateBaseModel):
     explicitly-set fields are used as overrides via exclude_unset.
     """
 
-    enabled: Optional[bool] = None
-    audio: Optional[AudioConfig] = None
-    birdseye: Optional[BirdseyeCameraConfig] = None
-    detect: Optional[DetectConfig] = None
-    face_recognition: Optional[CameraFaceRecognitionConfig] = None
-    lpr: Optional[CameraLicensePlateRecognitionConfig] = None
-    motion: Optional[MotionConfig] = None
-    notifications: Optional[NotificationConfig] = None
-    objects: Optional[ObjectConfig] = None
-    record: Optional[RecordConfig] = None
-    review: Optional[ReviewConfig] = None
-    snapshots: Optional[SnapshotsConfig] = None
-    zones: Optional[dict[str, ZoneConfig]] = None
+    enabled: bool | None = None
+    audio: AudioConfig | None = None
+    birdseye: BirdseyeCameraConfig | None = None
+    detect: DetectConfig | None = None
+    face_recognition: CameraFaceRecognitionConfig | None = None
+    lpr: CameraLicensePlateRecognitionConfig | None = None
+    motion: MotionConfig | None = None
+    notifications: NotificationConfig | None = None
+    objects: ObjectConfig | None = None
+    record: RecordConfig | None = None
+    review: ReviewConfig | None = None
+    snapshots: SnapshotsConfig | None = None
+    zones: dict[str, ZoneConfig] | None = None

frigate/config/camera/record.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional, Union
 
 from pydantic import Field
 
@@ -94,7 +93,7 @@ class ChaptersEnum(str, Enum):
 
 
 class RecordExportConfig(FrigateBaseModel):
-    hwaccel_args: Union[str, list[str]] = Field(
+    hwaccel_args: str | list[str] = Field(
         default="auto",
         title="Export hwaccel args",
         description="Hardware acceleration args to use for export/transcode operations.",
@@ -152,7 +151,7 @@ class RecordConfig(FrigateBaseModel):
         title="Preview config",
         description="Settings controlling the quality of recording previews shown in the UI.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original recording state",
         description="Indicates whether recording was enabled in the original static configuration.",

frigate/config/camera/review.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional, Union
 
 from pydantic import Field, field_validator
 
@@ -32,13 +31,13 @@ class AlertsConfig(FrigateBaseModel):
         title="Alert labels",
         description="List of object labels that qualify as alerts (for example: car, person).",
     )
-    required_zones: Union[str, list[str]] = Field(
+    required_zones: str | list[str] = Field(
         default_factory=list,
         title="Required zones",
         description="Zones that an object must enter to be considered an alert; leave empty to allow any zone.",
     )
 
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original alerts state",
         description="Tracks whether alerts were originally enabled in the static configuration.",
@@ -67,12 +66,12 @@ class DetectionsConfig(FrigateBaseModel):
         description="Enable or disable detection events for all cameras; can be overridden per-camera.",
     )
 
-    labels: Optional[list[str]] = Field(
+    labels: list[str] | None = Field(
         default=None,
         title="Detection labels",
         description="List of object labels that qualify as detection events.",
     )
-    required_zones: Union[str, list[str]] = Field(
+    required_zones: str | list[str] = Field(
         default_factory=list,
         title="Required zones",
         description="Zones that an object must enter to be considered a detection; leave empty to allow any zone.",
@@ -83,7 +82,7 @@ class DetectionsConfig(FrigateBaseModel):
         description="Seconds to wait after no detection-causing activity before cutting off a detection.",
     )
 
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original detections state",
         description="Tracks whether detections were originally enabled in the static configuration.",
@@ -129,7 +128,7 @@ class GenAIReviewConfig(FrigateBaseModel):
         title="Save thumbnails",
         description="Save thumbnails that are sent to the GenAI provider for debugging and review.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None,
         title="Original GenAI state",
         description="Tracks whether GenAI review was originally enabled in the static configuration.",

frigate/config/camera/snapshots.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import Field
 
 from ..base import FrigateBaseModel
@@ -46,7 +44,7 @@ class SnapshotsConfig(FrigateBaseModel):
         title="Required zones",
         description="Zones an object must enter for a snapshot to be saved.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=None,
         title="Snapshot height",
         description="Height (pixels) to resize snapshots from API to; leave empty to preserve original size.",

frigate/config/camera/timestamp.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional
 
 from pydantic import Field
 
@@ -76,7 +75,7 @@ class TimestampStyleConfig(FrigateBaseModel):
         title="Timestamp thickness",
         description="Line thickness of the timestamp text.",
     )
-    effect: Optional[TimestampEffectEnum] = Field(
+    effect: TimestampEffectEnum | None = Field(
         default=None,
         title="Timestamp effect",
         description="Visual effect for the timestamp text (none, solid, shadow).",

frigate/config/camera/zone.py

@@ -1,6 +1,5 @@
 # this uses the base model because the color is an extra attribute
 import logging
-from typing import Optional, Union
 
 import numpy as np
 from pydantic import BaseModel, Field, PrivateAttr, field_validator, model_validator
@@ -13,7 +12,7 @@ logger = logging.getLogger(__name__)
 
 
 class ZoneConfig(BaseModel):
-    friendly_name: Optional[str] = Field(
+    friendly_name: str | None = Field(
         None,
         title="Zone name",
         description="A user-friendly name for the zone, displayed in the Frigate UI. If not set, a formatted version of the zone name will be used.",
@@ -23,7 +22,7 @@ class ZoneConfig(BaseModel):
         title="Enabled",
         description="Enable or disable this zone. Disabled zones are ignored at runtime.",
     )
-    enabled_in_config: Optional[bool] = Field(
+    enabled_in_config: bool | None = Field(
         default=None, title="Keep track of original state of zone."
     )
     filters: dict[str, FilterConfig] = Field(
@@ -31,11 +30,11 @@ class ZoneConfig(BaseModel):
         title="Zone filters",
         description="Filters to apply to objects within this zone. Used to reduce false positives or restrict which objects are considered present in the zone.",
     )
-    coordinates: Union[str, list[str]] = Field(
+    coordinates: str | list[str] = Field(
         title="Coordinates",
         description="Polygon coordinates that define the zone area. Can be a comma-separated string or a list of coordinate strings. Coordinates should be relative (0-1) or absolute (legacy).",
     )
-    distances: Optional[Union[str, list[str]]] = Field(
+    distances: str | list[str] | None = Field(
         default_factory=list,
         title="Real-world distances",
         description="Optional real-world distances for each side of the zone quadrilateral, used for speed or distance calculations. Must have exactly 4 values if set.",
@@ -52,18 +51,18 @@ class ZoneConfig(BaseModel):
         title="Loitering seconds",
         description="Number of seconds an object must remain in the zone to be considered as loitering. Set to 0 to disable loitering detection.",
     )
-    speed_threshold: Optional[float] = Field(
+    speed_threshold: float | None = Field(
         default=None,
         ge=0.1,
         title="Minimum speed",
         description="Minimum speed (in real-world units if distances are set) required for an object to be considered present in the zone. Used for speed-based zone triggers.",
     )
-    objects: Union[str, list[str]] = Field(
+    objects: str | list[str] = Field(
         default_factory=list,
         title="Trigger objects",
         description="List of object types (from labelmap) that can trigger this zone. Can be a string or a list of strings. If empty, all objects are considered.",
     )
-    _color: Optional[tuple[int, int, int]] = PrivateAttr()
+    _color: tuple[int, int, int] | None = PrivateAttr()
     _contour: np.ndarray = PrivateAttr()
 
     @property
@@ -147,7 +146,7 @@ class ZoneConfig(BaseModel):
             except ValueError:
                 raise ValueError(
                     f"Invalid coordinates found in configuration file. Coordinates must be relative (between 0-1): {coordinates}"
-                )
+                ) from None
 
             if explicit:
                 self.coordinates = ",".join(
@@ -176,7 +175,7 @@ class ZoneConfig(BaseModel):
             except ValueError:
                 raise ValueError(
                     f"Invalid coordinates found in configuration file. Coordinates must be relative (between 0-1): {coordinates}"
-                )
+                ) from None
 
             if explicit:
                 self.coordinates = ",".join(