Merge branch 'dev' of github.com:blakeblackshear/frigate into testing

Author: ivanjx

.cspell/frigate-dictionary.txt

@@ -109,6 +109,7 @@ imdecode
 imencode
 imread
 imwrite
+inpoint
 interp
 iostat
 iotop
@@ -264,6 +265,7 @@ tensorrt
 tflite
 thresholded
 timelapse
+titlecase
 tmpfs
 tobytes
 toggleable

README_CN.md

@@ -24,11 +24,9 @@
 - 通过RTSP重新流传输以减少摄像头的连接数
 - 支持WebRTC和MSE，实现低延迟的实时观看
 
-## 文档（英文）
+## 社区中文翻译文档
 
-你可以在这里查看文档 https://docs.frigate.video
-
-文档还暂时没有提供翻译，将会在未来提供。
+你可以在这里查看文档 https://docs.frigate-cn.video
 
 ## 赞助
 
@@ -41,7 +39,7 @@
 <img width="800" alt="实时监控面板" src="https://github.com/blakeblackshear/frigate/assets/569905/5e713cb9-9db5-41dc-947a-6937c3bc376e">
 </div>
 
-### 简单的审查工作流程
+### 简单的核查工作流程
 <div>
 <img width="800" alt="简单的审查工作流程" src="https://github.com/blakeblackshear/frigate/assets/569905/6fed96e8-3b18-40e5-9ddc-31e6f3c9f2ff">
 </div>
@@ -60,5 +58,13 @@
 ## 翻译
 我们使用 [Weblate](https://hosted.weblate.org/projects/frigate-nvr/) 平台提供翻译支持，欢迎参与进来一起完善。
 
-## 中文讨论社区
-欢迎加入非官方中文讨论QQ群：1043861059
+
+## 非官方中文讨论社区
+欢迎加入中文讨论QQ群：[1043861059](https://qm.qq.com/q/7vQKsTmSz)
+
+Bilibili：https://space.bilibili.com/3546894915602564
+
+
+## 中文社区赞助商
+[![EdgeOne](https://edgeone.ai/media/34fe3a45-492d-4ea4-ae5d-ea1087ca7b4b.png)](https://edgeone.ai/zh?from=github)
+本项目 CDN 加速及安全防护由 Tencent EdgeOne 赞助

docker/hailo8l/user_installation.sh

@@ -4,7 +4,7 @@
 sudo apt-get update
 sudo apt-get install -y build-essential cmake git wget
 
-hailo_version="4.20.1"
+hailo_version="4.21.0"
 arch=$(uname -m)
 
 if [[ $arch == "x86_64" ]]; then

docker/main/Dockerfile

@@ -260,7 +260,7 @@ ENTRYPOINT ["/init"]
 CMD []
 
 HEALTHCHECK --start-period=300s --start-interval=5s --interval=15s --timeout=5s --retries=3 \
-    CMD curl --fail --silent --show-error http://127.0.0.1:5000/api/version || exit 1
+    CMD test -f /dev/shm/.frigate-is-stopping && exit 0; curl --fail --silent --show-error http://127.0.0.1:5000/api/version || exit 1
 
 # Frigate deps with Node.js and NPM for devcontainer
 FROM deps AS devcontainer

docker/main/install_hailort.sh

@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-hailo_version="4.20.1"
+hailo_version="4.21.0"
 
 if [[ "${TARGETARCH}" == "amd64" ]]; then
     arch="x86_64"

docker/main/install_s6_overlay.sh

@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-s6_version="3.1.5.0"
+s6_version="3.2.1.0"
 
 if [[ "${TARGETARCH}" == "amd64" ]]; then
     s6_arch="x86_64"

docker/main/requirements-wheels.txt

@@ -31,6 +31,7 @@ norfair == 2.2.*
 setproctitle == 1.3.*
 ws4py == 0.5.*
 unidecode == 1.3.*
+titlecase == 2.4.*
 # Image Manipulation
 numpy == 1.26.*
 opencv-python-headless == 4.11.0.*

docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run

@@ -6,7 +6,7 @@ set -o errexit -o nounset -o pipefail
 
 # opt out of openvino telemetry
 if [ -e /usr/local/bin/opt_in_out ]; then
-  /usr/local/bin/opt_in_out --opt_out
+  /usr/local/bin/opt_in_out --opt_out > /dev/null 2>&1
 fi
 
 # Logs should be sent to stdout so that s6 can collect them

docker/main/rootfs/etc/s6-overlay/s6-rc.d/prepare/run

@@ -138,5 +138,9 @@ function migrate_db_from_media_to_config() {
     fi
 }
 
+# remove leftover from last run, not normally needed, but just in case
+# used by the docker healthcheck
+rm -f /dev/shm/.frigate-is-stopping
+
 migrate_addon_config_dir
 migrate_db_from_media_to_config

docker/main/rootfs/usr/local/ffmpeg/get_ffmpeg_path.py

@@ -1,5 +1,6 @@
 import json
 import sys
+from typing import Any
 
 from ruamel.yaml import YAML
 
@@ -21,11 +22,11 @@
         raw_config = f.read()
 
     if config_file.endswith((".yaml", ".yml")):
-        config: dict[str, any] = yaml.load(raw_config)
+        config: dict[str, Any] = yaml.load(raw_config)
     elif config_file.endswith(".json"):
-        config: dict[str, any] = json.loads(raw_config)
+        config: dict[str, Any] = json.loads(raw_config)
 except FileNotFoundError:
-    config: dict[str, any] = {}
+    config: dict[str, Any] = {}
 
 path = config.get("ffmpeg", {}).get("path", "default")
 if path == "default":