update deps (blakeblackshear#6093)

* update dev deps

* update deps

* docs deps

* python dev deps

* update python deps

docs/package.json

@@ -14,12 +14,12 @@
  "write-heading-ids": "docusaurus write-heading-ids"
  },
  "dependencies": {
- "@docusaurus/core": "^2.2.0",
- "@docusaurus/preset-classic": "^2.2.0",
+ "@docusaurus/core": "^2.4.0",
+ "@docusaurus/preset-classic": "^2.4.0",
  "@mdx-js/react": "^1.6.22",
  "clsx": "^1.2.1",
- "raw-loader": "^4.0.2",
  "prism-react-renderer": "^1.3.5",
+ "raw-loader": "^4.0.2",
  "react": "^17.0.2",
  "react-dom": "^17.0.2"
  },
@@ -36,8 +36,8 @@
  ]
  },
  "devDependencies": {
- "@types/react": "^17.0.0",
- "@docusaurus/module-type-aliases": "2.2.0"
+ "@docusaurus/module-type-aliases": "^2.4.0",
+ "@types/react": "^17.0.0"
  },
  "engines": {
  "node": ">=16.14"

frigate/app.py

@@ -391,7 +391,6 @@ def start(self) -> None:
  self.start_stats_emitter()
  self.start_watchdog()
  self.check_shm()
- # self.zeroconf = broadcast_zeroconf(self.config.mqtt.client_id)
 
  def receiveSignal(signalNumber: int, frame: Optional[FrameType]) -> None:
  self.stop()

frigate/mypy.ini

@@ -59,6 +59,3 @@ ignore_errors = false
 [mypy-frigate.watchdog]
 ignore_errors = false
 disallow_untyped_calls = false
-
-[mypy-frigate.zeroconf]
-ignore_errors = false

frigate/output.py

@@ -329,7 +329,6 @@ def update_frame(self):
 
  # update each position in the layout
  for position, camera in enumerate(self.camera_layout, start=0):
-
  # if this camera was removed, replace it or clear it
  if camera in removed_cameras:
  # if replacing this camera with a newly added one

frigate/record.py

@@ -111,7 +111,6 @@ def move_files(self):
  grouped_recordings[camera] = grouped_recordings[camera][-keep_count:]
 
  for camera, recordings in grouped_recordings.items():
-
  # clear out all the recording info for old frames
  while (
  len(self.recordings_info[camera]) > 0

frigate/stats.py

@@ -23,7 +23,6 @@
 
 
 def get_latest_version(config: FrigateConfig) -> str:
-
  if not config.telemetry.version_check:
  return "disabled"
 

frigate/storage.py

@@ -179,7 +179,6 @@ def reduce_storage_consumption(self) -> None:
  def run(self):
  """Check every 5 minutes if storage needs to be cleaned up."""
  while not self.stop_event.wait(300):
-
  if not self.camera_storage_stats or True in [
  r["needs_refresh"] for r in self.camera_storage_stats.values()
  ]:

frigate/test/test_config.py

@@ -673,7 +673,6 @@ def test_max_disappeared_default(self):
  assert runtime_config.cameras["back"].detect.max_disappeared == 5 * 5
 
  def test_motion_frame_height_wont_go_below_120(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -702,7 +701,6 @@ def test_motion_frame_height_wont_go_below_120(self):
  assert runtime_config.cameras["back"].motion.frame_height == 50
 
  def test_motion_contour_area_dynamic(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -731,7 +729,6 @@ def test_motion_contour_area_dynamic(self):
  assert round(runtime_config.cameras["back"].motion.contour_area) == 30
 
  def test_merge_labelmap(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "model": {"labelmap": {7: "truck"}},
@@ -761,7 +758,6 @@ def test_merge_labelmap(self):
  assert runtime_config.model.merged_labelmap[7] == "truck"
 
  def test_default_labelmap_empty(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -790,7 +786,6 @@ def test_default_labelmap_empty(self):
  assert runtime_config.model.merged_labelmap[0] == "person"
 
  def test_default_labelmap(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "model": {"width": 320, "height": 320},
@@ -820,7 +815,6 @@ def test_default_labelmap(self):
  assert runtime_config.model.merged_labelmap[0] == "person"
 
  def test_fails_on_invalid_role(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -849,7 +843,6 @@ def test_fails_on_invalid_role(self):
  self.assertRaises(ValidationError, lambda: FrigateConfig(**config))
 
  def test_fails_on_missing_role(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -880,7 +873,6 @@ def test_fails_on_missing_role(self):
  self.assertRaises(ValueError, lambda: frigate_config.runtime_config)
 
  def test_works_on_missing_role_multiple_cams(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -929,7 +921,6 @@ def test_works_on_missing_role_multiple_cams(self):
  runtime_config = frigate_config.runtime_config
 
  def test_global_detect(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "detect": {"max_disappeared": 1},
@@ -959,7 +950,6 @@ def test_global_detect(self):
  assert runtime_config.cameras["back"].detect.height == 1080
 
  def test_default_detect(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -983,7 +973,6 @@ def test_default_detect(self):
  assert runtime_config.cameras["back"].detect.height == 720
 
  def test_global_detect_merge(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "detect": {"max_disappeared": 1, "height": 720},
@@ -1014,7 +1003,6 @@ def test_global_detect_merge(self):
  assert runtime_config.cameras["back"].detect.width == 1920
 
  def test_global_snapshots(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "snapshots": {"enabled": True},
@@ -1042,7 +1030,6 @@ def test_global_snapshots(self):
  assert runtime_config.cameras["back"].snapshots.height == 100
 
  def test_default_snapshots(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -1066,7 +1053,6 @@ def test_default_snapshots(self):
  assert runtime_config.cameras["back"].snapshots.quality == 70
 
  def test_global_snapshots_merge(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "snapshots": {"bounding_box": False, "height": 300},
@@ -1096,7 +1082,6 @@ def test_global_snapshots_merge(self):
  assert runtime_config.cameras["back"].snapshots.enabled
 
  def test_global_rtmp_disabled(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -1119,7 +1104,6 @@ def test_global_rtmp_disabled(self):
  assert not runtime_config.cameras["back"].rtmp.enabled
 
  def test_default_not_rtmp(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -1142,7 +1126,6 @@ def test_default_not_rtmp(self):
  assert not runtime_config.cameras["back"].rtmp.enabled
 
  def test_global_rtmp_merge(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "rtmp": {"enabled": False},
@@ -1169,7 +1152,6 @@ def test_global_rtmp_merge(self):
  assert runtime_config.cameras["back"].rtmp.enabled
 
  def test_global_rtmp_default(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -1196,7 +1178,6 @@ def test_global_rtmp_default(self):
  assert not runtime_config.cameras["back"].rtmp.enabled
 
  def test_global_jsmpeg(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "live": {"quality": 4},
@@ -1220,7 +1201,6 @@ def test_global_jsmpeg(self):
  assert runtime_config.cameras["back"].live.quality == 4
 
  def test_default_live(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -1243,7 +1223,6 @@ def test_default_live(self):
  assert runtime_config.cameras["back"].live.quality == 8
 
  def test_global_live_merge(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "live": {"quality": 4, "height": 480},
@@ -1271,7 +1250,6 @@ def test_global_live_merge(self):
  assert runtime_config.cameras["back"].live.height == 480
 
  def test_global_timestamp_style(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "timestamp_style": {"position": "bl"},
@@ -1295,7 +1273,6 @@ def test_global_timestamp_style(self):
  assert runtime_config.cameras["back"].timestamp_style.position == "bl"
 
  def test_default_timestamp_style(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "cameras": {
@@ -1318,7 +1295,6 @@ def test_default_timestamp_style(self):
  assert runtime_config.cameras["back"].timestamp_style.position == "tl"
 
  def test_global_timestamp_style_merge(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "rtmp": {"enabled": False},
@@ -1345,7 +1321,6 @@ def test_global_timestamp_style_merge(self):
  assert runtime_config.cameras["back"].timestamp_style.thickness == 4
 
  def test_allow_retain_to_be_a_decimal(self):
-
  config = {
  "mqtt": {"host": "mqtt"},
  "snapshots": {"retain": {"default": 1.5}},

frigate/util.py

@@ -772,7 +772,6 @@ def get_docker_memlimit_bytes() -> int:
 
  # check running a supported cgroups version
  if get_cgroups_version() == "cgroup2":
-
  memlimit_command = ["cat", "/sys/fs/cgroup/memory.max"]
 
  p = sp.run(
@@ -817,7 +816,6 @@ def get_cpu_stats() -> dict[str, dict]:
  for line in lines:
  stats = list(filter(lambda a: a != "", line.strip().split(" ")))
  try:
-
  if docker_memlimit > 0:
  mem_res = int(stats[5])
  mem_pct = str(

frigate/video.py

@@ -162,7 +162,6 @@ def capture_frames(
  current_frame: mp.Value,
  stop_event: mp.Event,
 ):
-
  frame_size = frame_shape[0] * frame_shape[1]
  frame_rate = EventsPerSecond()
  frame_rate.start()
@@ -594,7 +593,6 @@ def process_frames(
  stop_event,
  exit_on_empty: bool = False,
 ):
-
  fps = process_info["process_fps"]
  detection_fps = process_info["detection_fps"]
  current_frame_time = process_info["detection_frame"]
@@ -748,7 +746,6 @@ def process_frames(
 
  selected_objects = []
  for group in detected_object_groups.values():
-
  # apply non-maxima suppression to suppress weak, overlapping bounding boxes
  # o[2] is the box of the object: xmin, ymin, xmax, ymax
  # apply max/min to ensure values do not exceed the known frame size

requirements-dev.txt

@@ -1,2 +1,2 @@
-pylint == 2.15.*
-black == 22.12.*
+pylint == 2.17.*
+black == 23.3.*

requirements-wheels.txt

@@ -11,15 +11,14 @@ peewee_migrate == 1.6.*
 psutil == 5.9.*
 pydantic == 1.10.*
 PyYAML == 6.0
-pytz == 2022.7
+pytz == 2023.3
 tzlocal == 4.2
 types-PyYAML == 6.0.*
 requests == 2.28.*
 types-requests == 2.28.*
-scipy == 1.8.*
+scipy == 1.10.*
 setproctitle == 1.3.*
 ws4py == 0.5.*
-zeroconf == 0.47.*
 # Openvino Library - Custom built with MYRIAD support
 openvino @ https://github.com/NateMeyer/openvino-wheels/releases/download/multi-arch_2022.2.0/openvino-2022.2.0-000-cp39-cp39-manylinux_2_31_x86_64.whl; platform_machine == 'x86_64'
 openvino @ https://github.com/NateMeyer/openvino-wheels/releases/download/multi-arch_2022.2.0/openvino-2022.2.0-000-cp39-cp39-linux_aarch64.whl; platform_machine == 'aarch64'