Fix various typing issues (#18187)

* Fix the `Any` typing hint treewide

There has been confusion between the Any type[1] and the any function[2]
in typing hints.

[1] https://docs.python.org/3/library/typing.html#typing.Any
[2] https://docs.python.org/3/library/functions.html#any

* Fix typing for various frame_shape members

Frame shapes are most likely defined by height and width, so a single int
cannot express that.

* Wrap gpu stats functions in Optional[]

These can return `None`, so they need to be `Type | None`, which is what
`Optional` expresses very nicely.

* Fix return type in get_latest_segment_datetime

Returns a datetime object, not an integer.

* Make the return type of FrameManager.write optional

This is necessary since the SharedMemoryFrameManager.write function can
return None.

* Fix total_seconds() return type in get_tz_modifiers

The function returns a float, not an int.

https://docs.python.org/3/library/datetime.html#datetime.timedelta.total_seconds

* Account for floating point results in to_relative_box

Because the function uses division the return types may either be int or
float.

* Resolve ruff deprecation warning

The config has been split into formatter and linter, and the global
options are deprecated.
This commit is contained in:
Martin Weinelt
2025-05-13 08:27:20 -06:00
committed by GitHub
parent 2c9bfaa49c
commit 4d4d54d030
50 changed files with 191 additions and 164 deletions
+2 -1
View File
@@ -1,4 +1,5 @@
from abc import ABC, abstractmethod
from typing import Any
from frigate.config import DetectConfig
@@ -10,6 +11,6 @@ class ObjectTracker(ABC):
@abstractmethod
def match_and_update(
self, frame_name: str, frame_time: float, detections: list[dict[str, any]]
self, frame_name: str, frame_time: float, detections: list[dict[str, Any]]
) -> None:
pass
+2 -2
View File
@@ -1,7 +1,7 @@
import logging
import random
import string
from typing import Sequence
from typing import Any, Sequence
import cv2
import numpy as np
@@ -460,7 +460,7 @@ class NorfairTracker(ObjectTracker):
self.match_and_update(frame_name, frame_time, detections=detections)
def match_and_update(
self, frame_name: str, frame_time: float, detections: list[dict[str, any]]
self, frame_name: str, frame_time: float, detections: list[dict[str, Any]]
):
# Group detections by object type
detections_by_type = {}
+3 -2
View File
@@ -7,6 +7,7 @@ import threading
from collections import defaultdict
from enum import Enum
from multiprocessing.synchronize import Event as MpEvent
from typing import Any
import cv2
import numpy as np
@@ -70,7 +71,7 @@ class TrackedObjectProcessor(threading.Thread):
self.event_end_subscriber = EventEndSubscriber()
self.sub_label_subscriber = EventMetadataSubscriber(EventMetadataTypeEnum.all)
self.camera_activity: dict[str, dict[str, any]] = {}
self.camera_activity: dict[str, dict[str, Any]] = {}
self.ongoing_manual_events: dict[str, str] = {}
# {
@@ -301,7 +302,7 @@ class TrackedObjectProcessor(threading.Thread):
return {}
def get_current_frame(
self, camera: str, draw_options: dict[str, any] = {}
self, camera: str, draw_options: dict[str, Any] = {}
) -> np.ndarray | None:
if camera == "birdseye":
return self.frame_manager.get(
+4 -4
View File
@@ -5,7 +5,7 @@ import math
import os
from collections import defaultdict
from statistics import median
from typing import Optional
from typing import Any, Optional
import cv2
import numpy as np
@@ -38,7 +38,7 @@ class TrackedObject:
camera_config: CameraConfig,
ui_config: UIConfig,
frame_cache,
obj_data: dict[str, any],
obj_data: dict[str, Any],
):
# set the score history then remove as it is not part of object state
self.score_history = obj_data["score_history"]
@@ -621,7 +621,7 @@ class TrackedObjectAttribute:
self.ratio = raw_data[4]
self.region = raw_data[5]
def get_tracking_data(self) -> dict[str, any]:
def get_tracking_data(self) -> dict[str, Any]:
"""Return data saved to the object."""
return {
"label": self.label,
@@ -629,7 +629,7 @@ class TrackedObjectAttribute:
"box": self.box,
}
def find_best_object(self, objects: list[dict[str, any]]) -> Optional[str]:
def find_best_object(self, objects: list[dict[str, Any]]) -> Optional[str]:
"""Find the best attribute for each object and return its ID."""
best_object_area = None
best_object_id = None